diff --git a/.gitmodules b/.gitmodules
index df5b4ae..cba1613 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,22 +1,15 @@
-[submodule "lib/RmlUi"]
-	path = lib/RmlUi
-	url = https://github.com/mikke89/RmlUi/
 [submodule "lib/rt64"]
 	path = lib/rt64
 	url = https://github.com/rt64/rt64
-[submodule "lib/freetype-windows-binaries"]
-	path = lib/freetype-windows-binaries
-	url = https://github.com/ubawurinna/freetype-windows-binaries
 [submodule "lib/mm-decomp"]
 	path = lib/mm-decomp
 	url = https://github.com/zeldaret/mm
-[submodule "lib/lunasvg"]
-	path = lib/lunasvg
-	url = https://github.com/sammycage/lunasvg
 [submodule "lib/N64ModernRuntime"]
 	path = lib/N64ModernRuntime
 	url = https://github.com/N64Recomp/N64ModernRuntime.git
 [submodule "Zelda64RecompSyms"]
 	path = Zelda64RecompSyms
 	url = https://github.com/Zelda64Recomp/Zelda64RecompSyms
-
+[submodule "lib/RecompFrontend"]
+	path = lib/RecompFrontend
+	url = https://github.com/N64Recomp/RecompFrontend
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cdda09..51e19b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,15 +51,7 @@ endif()
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/lib/rt64 ${CMAKE_BINARY_DIR}/rt64)
 
-# set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
 set(BUILD_SHARED_LIBS OFF)
-SET(LUNASVG_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
-add_subdirectory(${CMAKE_SOURCE_DIR}/lib/lunasvg)
-# set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
-SET(RMLUI_SVG_PLUGIN ON CACHE BOOL "" FORCE)
-SET(RMLUI_TESTS_ENABLED OFF CACHE BOOL "" FORCE)
-add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RmlUi)
-target_compile_definitions(rmlui_core PRIVATE LUNASVG_BUILD_STATIC)
 
 add_subdirectory(${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime)
 
@@ -148,14 +140,13 @@ add_custom_command(OUTPUT
 add_executable(Zelda64Recompiled)
 
 set (SOURCES
+    ${CMAKE_SOURCE_DIR}/src/main/launcher_animation.cpp
     ${CMAKE_SOURCE_DIR}/src/main/main.cpp
     ${CMAKE_SOURCE_DIR}/src/main/support.cpp
     ${CMAKE_SOURCE_DIR}/src/main/register_overlays.cpp
     ${CMAKE_SOURCE_DIR}/src/main/register_patches.cpp
-    ${CMAKE_SOURCE_DIR}/src/main/rt64_render_context.cpp
+    ${CMAKE_SOURCE_DIR}/src/main/theme.cpp
 
-    ${CMAKE_SOURCE_DIR}/src/game/input.cpp
-    ${CMAKE_SOURCE_DIR}/src/game/controls.cpp
     ${CMAKE_SOURCE_DIR}/src/game/config.cpp
     ${CMAKE_SOURCE_DIR}/src/game/scene_table.cpp
     ${CMAKE_SOURCE_DIR}/src/game/debug.cpp
@@ -165,68 +156,35 @@ set (SOURCES
     ${CMAKE_SOURCE_DIR}/src/game/recomp_data_api.cpp
     ${CMAKE_SOURCE_DIR}/src/game/rom_decompression.cpp
 
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_renderer.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_state.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_launcher.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_config.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_prompt.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_config_sub_menu.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_color_hack.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_rml_hacks.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_elements.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_mod_details_panel.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_mod_installer.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_mod_menu.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_api.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_api_events.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_api_images.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/ui_utils.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/util/hsv.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/core/ui_context.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_button.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_clickable.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_container.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_element.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_image.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_label.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_radio.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_scroll_container.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_slider.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_span.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_style.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_text_input.cpp
-    ${CMAKE_SOURCE_DIR}/src/ui/elements/ui_toggle.cpp
-
     ${CMAKE_SOURCE_DIR}/rsp/aspMain.cpp
     ${CMAKE_SOURCE_DIR}/rsp/njpgdspMain.cpp
-
-    ${CMAKE_SOURCE_DIR}/lib/RmlUi/Backends/RmlUi_Platform_SDL.cpp
 )
 
-if (APPLE)
-    list(APPEND SOURCES ${CMAKE_SOURCE_DIR}/src/main/support_apple.mm)
-endif()
-
 target_include_directories(Zelda64Recompiled PRIVATE
     ${CMAKE_SOURCE_DIR}/include
     ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/N64Recomp/include
-    ${CMAKE_SOURCE_DIR}/lib/concurrentqueue
-    ${CMAKE_SOURCE_DIR}/lib/GamepadMotionHelpers
-    ${CMAKE_SOURCE_DIR}/lib/RmlUi/Include
-    ${CMAKE_SOURCE_DIR}/lib/RmlUi/Backends
+    ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime/thirdparty/sse2neon
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/hlslpp/include
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/dxc/inc
     ${CMAKE_SOURCE_DIR}/lib/rt64/src
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/rhi
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/render
-    ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include
+    ${CMAKE_SOURCE_DIR}/lib/RecompFrontend/recompinput/include
+    ${CMAKE_SOURCE_DIR}/lib/RecompFrontend/recompui/include
+    ${CMAKE_SOURCE_DIR}/lib/RecompFrontend/recompui/src
     ${CMAKE_SOURCE_DIR}/lib/rt64/src/contrib/nativefiledialog-extended/src/include
     ${CMAKE_SOURCE_DIR}/lib/SlotMap
-    ${CMAKE_BINARY_DIR}/shaders
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+# Generate icon_bytes.c from the app icon PNG.
+add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
+    COMMAND file_to_c ${CMAKE_SOURCE_DIR}/icons/512.png icon_bytes ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
+    DEPENDS ${CMAKE_SOURCE_DIR}/icons/512.png
+)
+target_sources(Zelda64Recompiled PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c)
+
 if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64")
     target_compile_options(Zelda64Recompiled PRIVATE
         -march=nehalem
@@ -309,14 +267,9 @@ endif()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     find_package(SDL2 REQUIRED)
-    add_compile_definitions("RT64_SDL_WINDOW_VULKAN")
 
-    # Generate icon_bytes.c from the app icon PNG.
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
-        COMMAND file_to_c ${CMAKE_SOURCE_DIR}/icons/512.png icon_bytes ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
-        DEPENDS ${CMAKE_SOURCE_DIR}/icons/512.png
-    )
-    target_sources(Zelda64Recompiled PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c)
+    add_compile_definitions("PLUME_SDL_VULKAN_ENABLED")
+    add_compile_definitions("RT64_SDL_WINDOW_VULKAN")
 
     message(STATUS "SDL2_FOUND = ${SDL2_FOUND}")
     message(STATUS "SDL2_INCLUDE_DIRS = ${SDL2_INCLUDE_DIRS}")
@@ -339,18 +292,6 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")
     target_link_libraries(Zelda64Recompiled PRIVATE "-latomic -static-libstdc++" ${CMAKE_DL_LIBS} Threads::Threads)
 endif()
 
-target_link_libraries(Zelda64Recompiled PRIVATE
-    PatchesLib
-    RecompiledFuncs
-    librecomp
-    ultramodern
-    rt64
-    RmlUi::Core
-    RmlUi::Debugger
-    nfd
-    lunasvg
-)
-
 # TODO fix the rt64 CMake script so that this doesn't need to be duplicated here
 # For DXC
 set (DXC_COMMON_OPTS "-I${PROJECT_SOURCE_DIR}/src")
@@ -383,8 +324,21 @@ else()
     endif()
 endif()
 
-build_vertex_shader(Zelda64Recompiled "shaders/InterfaceVS.hlsl" "shaders/InterfaceVS.hlsl")
-build_pixel_shader(Zelda64Recompiled "shaders/InterfacePS.hlsl" "shaders/InterfacePS.hlsl")
+set(RECOMP_FRONTEND_N64MODERNRUNTIME_PATH ${CMAKE_SOURCE_DIR}/lib/N64ModernRuntime)
+set(RECOMP_FRONTEND_RT64_PATH ${CMAKE_SOURCE_DIR}/lib/rt64)
+
+add_subdirectory(${CMAKE_SOURCE_DIR}/lib/RecompFrontend)
+
+target_link_libraries(Zelda64Recompiled PRIVATE
+    PatchesLib
+    RecompiledFuncs
+    recompui
+    recompinput
+    librecomp
+    ultramodern
+    rt64
+    nfd
+)
 
 # Embed all .nrm files in the "mods" directory
 file(GLOB NRM_FILES "${CMAKE_SOURCE_DIR}/mods/*.nrm")
diff --git a/assets/config_menu/controls.rml b/assets/config_menu/controls.rml
deleted file mode 100644
index d947ae8..0000000
--- a/assets/config_menu/controls.rml
+++ /dev/null
@@ -1,360 +0,0 @@
-<template name="config-menu__controls">
-    <head>
-    </head>
-    <body>
-        <form class="config__form" data-attr-cur-input="cur_input_row" data-attr-cur-binding-slot="active_binding_slot">
-            <div class="config__header">
-                <div class="config__header-left">
-                    <button
-                        class="toggle"
-                        id="cont_kb_toggle"
-                        data-class-toggle--checked="input_device_is_keyboard"
-                        onclick="toggle_input_device"
-                        style="nav-down: #input_row_button_0_0; nav-up: #tab_controls"
-                    >
-                        <div class="toggle__border" />
-                        <div class="toggle__floater" />
-                        <div class="toggle__icons">
-                            <div class="toggle__icon toggle__icon--left"><div>␼</div></div>
-                            <div class="toggle__icon toggle__icon--right"><div>␽</div></div>
-                        </div>
-                    </button>
-                </div>
-                <div>
-                    <button
-                        class="button button--warning"
-                        style="nav-down:#input_row_button_0_0"
-                        data-event-click="reset_input_bindings_to_defaults"
-                    >
-                        <div class="button__label">Reset to defaults</div>
-                    </button>
-                </div>
-            </div>
-            <div class="config__wrapper input-config">
-                <div class="input-config__horizontal-split">
-                    <div class="input-config__mappings" data-event-mouseout="set_input_row_focus(-1)">
-                        <div class="input-config__mappings-scroll">
-                            <div class="input-config__mappings-wrapper">
-                                <div
-                                    class="control-option"
-                                    data-attr-id="'input_row_' + i"
-                                    data-for="input_bindings, i : inputs.array"
-                                    data-event-mouseover="set_input_row_focus(i)"
-                                    data-class-control-option--active="get_input_enum_name(i)==cur_input_row"
-                                    data-if="!input_device_is_keyboard || (get_input_enum_name(i) != 'TOGGLE_MENU' && get_input_enum_name(i) != 'ACCEPT_MENU' && get_input_enum_name(i) != 'APPLY_MENU')"
-                                >
-                                    <label
-                                        class="control-option__label"
-                                    >{{get_input_name(i)}}</label>
-                                    <div class="control-option__bindings">
-                                        <button
-                                            data-attr-id="'input_row_button_' + i + '_' + j"
-                                            data-event-blur="set_input_row_focus(-1)"
-                                            data-event-focus="set_input_row_focus(i)"
-                                            data-for="cur_binding, j : input_bindings"
-                                            data-event-click="set_input_binding(i,j)"
-                                            class="prompt-font control-option__binding"
-                                            data-attr-bind-slot="j"
-                                            data-attr-style="i == 0 ? 'nav-up:#cont_kb_toggle' : 'nav-up:auto'"
-                                        >
-                                            <div class="control-option__binding-recording">
-                                                <div class="control-option__binding-circle" />
-                                                <div class="control-option__binding-edge">
-                                                    <svg class="control-option__binding-edge-svg" src="icons/RecordBorder.svg" />
-                                                </div>
-                                            </div>
-                                            <div class="control-option__binding-icon">{{cur_binding}}</div>
-                                        </button>
-                                    </div>
-                                    <button
-                                        data-if="get_input_enum_name(i) != 'TOGGLE_MENU' && get_input_enum_name(i) != 'ACCEPT_MENU'"
-                                        data-event-blur="set_input_row_focus(-1)"
-                                        data-event-focus="set_input_row_focus(i)"
-                                        data-event-click="clear_input_bindings(i)"
-                                        class="icon-button icon-button--error"
-                                        data-attr-style="i == 0 ? 'nav-up:#cont_kb_toggle' : 'nav-up:auto'"
-                                    >
-                                        <svg src="icons/Trash.svg" />
-                                    </button>
-                                    <button
-                                        data-if="get_input_enum_name(i) == 'TOGGLE_MENU' || get_input_enum_name(i) == 'ACCEPT_MENU'"
-                                        data-event-blur="set_input_row_focus(-1)"
-                                        data-event-focus="set_input_row_focus(i)"
-                                        data-event-click="reset_single_input_binding_to_default(i)"
-                                        class="icon-button icon-button--error"
-                                        data-attr-style="i == 0 ? 'nav-up:#cont_kb_toggle' : 'nav-up:auto'"
-                                    >
-                                        <svg src="icons/Reset.svg" />
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="input-config__visual-wrapper">
-                        <div class="input-config__visual-aspect">
-                            <div class="input-config__visual">
-                                <!-- stick only -->
-                                <div class="input-config__visual-stick-wrapper">
-                                    <div
-                                        class="input-viz input-config__visual-stick"
-                                        visual-input="X_AXIS_NEG X_AXIS_POS Y_AXIS_NEG Y_AXIS_POS"
-                                    >
-                                        <div class="input-viz__stick-split input-viz__stick-split--vertical">
-                                            <div class="input-viz input-viz__mappings" visual-input="Y_AXIS_POS">
-                                                <svg class="input-viz__dpad-arrow input-viz__dpad-arrow--up" src="icons/VizMap/DPadArrow.svg" />
-                                                <div
-                                                    class="input-config__visual-mapping"
-                                                    data-for="cur_binding, i : inputs.Y_AXIS_POS"
-                                                >
-                                                    <div>{{cur_binding}}</div>
-                                                </div>
-                                            </div>
-                                            <div class="input-viz__dpad-divider" />
-                                            <div class="input-viz input-viz__mappings" visual-input="Y_AXIS_NEG">
-                                                <svg class="input-viz__dpad-arrow input-viz__dpad-arrow--down" src="icons/VizMap/DPadArrow.svg" />
-                                                <div
-                                                    class="input-config__visual-mapping"
-                                                    data-for="cur_binding, i : inputs.Y_AXIS_NEG"
-                                                >
-                                                    <div>{{cur_binding}}</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="input-viz__stick-split input-viz__stick-split--horizontal">
-                                            <div class="input-viz input-viz__mappings" visual-input="X_AXIS_NEG">
-                                                <svg class="input-viz__dpad-arrow input-viz__dpad-arrow--left" src="icons/VizMap/DPadArrow.svg" />
-                                                <div
-                                                    class="input-config__visual-mapping"
-                                                    data-for="cur_binding, i : inputs.X_AXIS_NEG"
-                                                >
-                                                    <div>{{cur_binding}}</div>
-                                                </div>
-                                            </div>
-                                            <div class="input-viz__dpad-divider" />
-                                            <div class="input-viz input-viz__mappings" visual-input="X_AXIS_POS">
-                                                <svg class="input-viz__dpad-arrow input-viz__dpad-arrow--right" src="icons/VizMap/DPadArrow.svg" />
-                                                <div
-                                                    class="input-config__visual-mapping"
-                                                    data-for="cur_binding, i : inputs.X_AXIS_POS"
-                                                >
-                                                    <div>{{cur_binding}}</div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!-- top half -->
-                                <div class="input-config__visual-half">
-                                    <div class="input-config__visual-quarter-left">
-                                        <div
-                                            class="input-viz input-viz__dpad"
-                                            visual-input="DPAD_UP DPAD_DOWN DPAD_LEFT DPAD_RIGHT"
-                                        >
-                                            <svg src="icons/VizMap/DPad.svg" />
-                                            <div class="input-viz__dpad-split input-viz__dpad-split--vertical">
-                                                <div class="input-viz input-viz__mappings" visual-input="DPAD_UP">
-                                                    <svg class="input-viz__dpad-arrow input-viz__dpad-arrow--up" src="icons/VizMap/DPadArrow.svg" />
-                                                    <div
-                                                        class="input-config__visual-mapping"
-                                                        data-for="cur_binding, i : inputs.DPAD_UP"
-                                                    >
-                                                        <div>{{cur_binding}}</div>
-                                                    </div>
-                                                </div>
-                                                <div class="input-viz__dpad-divider" />
-                                                <div class="input-viz input-viz__mappings" visual-input="DPAD_DOWN">
-                                                    <svg class="input-viz__dpad-arrow input-viz__dpad-arrow--down" src="icons/VizMap/DPadArrow.svg" />
-                                                    <div
-                                                        class="input-config__visual-mapping"
-                                                        data-for="cur_binding, i : inputs.DPAD_DOWN"
-                                                    >
-                                                        <div>{{cur_binding}}</div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="input-viz__dpad-split input-viz__dpad-split--horizontal">
-                                                <div class="input-viz input-viz__mappings" visual-input="DPAD_LEFT">
-                                                    <svg class="input-viz__dpad-arrow input-viz__dpad-arrow--left" src="icons/VizMap/DPadArrow.svg" />
-                                                    <div
-                                                        class="input-config__visual-mapping"
-                                                        data-for="cur_binding, i : inputs.DPAD_LEFT"
-                                                    >
-                                                        <div>{{cur_binding}}</div>
-                                                    </div>
-                                                </div>
-                                                <div class="input-viz__dpad-divider" />
-                                                <div class="input-viz input-viz__mappings" visual-input="DPAD_RIGHT">
-                                                    <svg class="input-viz__dpad-arrow input-viz__dpad-arrow--right" src="icons/VizMap/DPadArrow.svg" />
-                                                    <div
-                                                        class="input-config__visual-mapping"
-                                                        data-for="cur_binding, i : inputs.DPAD_RIGHT"
-                                                    >
-                                                        <div>{{cur_binding}}</div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div class="input-config__visual-quarter-right">
-                                        <div class="input-config__main-buttons">
-                                            <div
-                                                class="input-viz input-viz__button input-viz__button--sm input-viz__button--Start"
-                                                visual-input="START"
-                                            >
-                                                <svg src="icons/VizMap/ButtonSmall.svg" />
-                                                <div class="input-viz__mappings">
-                                                    <div
-                                                        class="input-config__visual-mapping"
-                                                        data-for="cur_binding, i : inputs.START"
-                                                    >
-                                                        <div>{{cur_binding}}</div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div
-                                                class="input-viz input-viz__button input-viz__button--lg input-viz__button--B"
-                                                visual-input="B"
-                                            >
-                                                <svg src="icons/VizMap/ButtonLarge.svg" />
-                                                <div class="input-viz__mappings">
-                                                    <div
-                                                        class="input-config__visual-mapping"
-                                                        data-for="cur_binding, i : inputs.B"
-                                                    >
-                                                        <div>{{cur_binding}}</div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div
-                                                class="input-viz input-viz__button input-viz__button--lg input-viz__button--A"
-                                                visual-input="A"
-                                            >
-                                                <svg src="icons/VizMap/ButtonLarge.svg" />
-                                                <div class="input-viz__mappings">
-                                                    <div
-                                                        class="input-config__visual-mapping"
-                                                        data-for="cur_binding, i : inputs.A"
-                                                    >
-                                                        <div>{{cur_binding}}</div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="input-config__c-buttons">
-                                            <div class="input-config__c-buttons-lr">
-                                                <div
-                                                    class="input-viz input-viz__button input-viz__button--md input-viz__button--C"
-                                                    visual-input="C_LEFT"
-                                                >
-                                                    <svg src="icons/VizMap/ButtonMedium.svg" />
-                                                    <div class="input-viz__mappings">
-                                                        <div
-                                                            class="input-config__visual-mapping"
-                                                            data-for="cur_binding, i : inputs.C_LEFT"
-                                                        >
-                                                            <div>{{cur_binding}}</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div
-                                                    class="input-viz input-viz__button input-viz__button--md input-viz__button--C"
-                                                    visual-input="C_RIGHT"
-                                                >
-                                                    <svg src="icons/VizMap/ButtonMedium.svg" />
-                                                    <div class="input-viz__mappings">
-                                                        <div
-                                                            class="input-config__visual-mapping"
-                                                            data-for="cur_binding, i : inputs.C_RIGHT"
-                                                        >
-                                                            <div>{{cur_binding}}</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                            <div class="input-config__c-buttons-du">
-                                                <div
-                                                    class="input-viz input-viz__button input-viz__button--md input-viz__button--C"
-                                                    visual-input="C_DOWN"
-                                                >
-                                                    <svg src="icons/VizMap/ButtonMedium.svg" />
-                                                    <div class="input-viz__mappings">
-                                                        <div
-                                                            class="input-config__visual-mapping"
-                                                            data-for="cur_binding, i : inputs.C_DOWN"
-                                                        >
-                                                            <div>{{cur_binding}}</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                                <div
-                                                    class="input-viz input-viz__button input-viz__button--sm input-viz__button--C"
-                                                    visual-input="C_UP"
-                                                >
-                                                    <svg src="icons/VizMap/ButtonMedium.svg" />
-                                                    <div class="input-viz__mappings">
-                                                        <div
-                                                            class="input-config__visual-mapping"
-                                                            data-for="cur_binding, i : inputs.C_UP"
-                                                        >
-                                                            <div>{{cur_binding}}</div>
-                                                        </div>
-                                                    </div>
-                                                </div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                                <!-- bottom half -->
-                                <div class="input-config__visual-half input-config__visual-half--bottom">
-                                    <div
-                                        class="input-viz input-viz__Z"
-                                        visual-input="Z"
-                                    >
-                                        <svg src="icons/VizMap/Target.svg" />
-                                        <div class="input-viz__mappings">
-                                            <div
-                                                class="input-config__visual-mapping"
-                                                data-for="cur_binding, i : inputs.Z"
-                                            >
-                                                <div>{{cur_binding}}</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div
-                                        class="input-viz input-viz__R"
-                                        visual-input="R"
-                                    >
-                                        <svg src="icons/VizMap/Shield.svg" />
-                                        <div class="input-viz__mappings">
-                                            <div
-                                                class="input-config__visual-mapping"
-                                                data-for="cur_binding, i : inputs.R"
-                                            >
-                                                <div>{{cur_binding}}</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                    <div
-                                        class="input-viz input-viz__L"
-                                        visual-input="L"
-                                    >
-                                        <svg src="icons/VizMap/Map.svg" />
-                                        <div class="input-viz__mappings">
-                                            <div
-                                                class="input-config__visual-mapping"
-                                                data-for="cur_binding, i : inputs.L"
-                                            >
-                                                <div>{{cur_binding}}</div>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </body>
-</template>
-    
\ No newline at end of file
diff --git a/assets/config_menu/debug.rml b/assets/config_menu/debug.rml
deleted file mode 100644
index 22cb26e..0000000
--- a/assets/config_menu/debug.rml
+++ /dev/null
@@ -1,108 +0,0 @@
-<template name="config-menu__debug">
-    <head>
-    </head>
-    <body>
-        <form class="config__form">
-            <div class="config__wrapper">
-                <div class="config-debug">
-                    <div class="config-debug__scroll">
-                        <div class="config-debug-option">
-                            <label
-                                class="config-debug-option__label"
-                            >
-                                <div>Warp</div>
-                            </label>
-                            <div class="config-debug__option-split">
-                                <div class="config-debug__option-controls">
-                                    <div class="config-debug__select-wrapper">
-                                        <div class="config-debug__select-label"><div>Region</div></div>
-                                        <select data-value="area_index" onchange="area_index_changed" id="area_index_select" style="nav-up: #tab_debug">
-                                            <option data-for="area, i : area_names" data-attr-value="i">{{area}}</option>
-                                        </select>
-                                    </div>
-                                    <div class="config-debug__select-wrapper">
-                                        <div class="config-debug__select-label"><div>Scene</div></div>
-                                        <select data-value="scene_index" onchange="scene_index_changed">
-                                            <option data-for="scene, i : scene_names" data-attr-value="i">{{scene}}</option>
-                                        </select>
-                                    </div>
-                                    <div class="config-debug__select-wrapper">
-                                        <div class="config-debug__select-label"><div>Entrance</div></div>
-                                        <select data-value="entrance_index">
-                                            <option data-for="entrance, i : entrance_names" data-attr-value="i">{{entrance}}</option>
-                                        </select>
-                                    </div>
-                                </div>
-                                <div class="config-debug__option-trigger">
-                                    <button
-                                        class="icon-button icon-button--success" onclick="do_warp"
-                                    >
-                                        <svg src="icons/Arrow.svg" />
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                        <div class="config-debug-option">
-                            <label
-                                class="config-debug-option__label"
-                            >
-                                <div>Set time</div>
-                            </label>
-                            <div class="config-debug__option-split">
-                                <div class="config-debug__option-controls">
-                                    <div class="config-option__range-wrapper config-debug__select-wrapper config-option__list">
-                                        <div class="config-debug__select-label"><div>Day: {{debug_time_day}}</div></div>
-                                        <input
-                                            data-event-blur="set_cur_config_index(-1)"
-                                            data-event-focus="set_cur_config_index(1)"
-                                            class="nav-vert"
-                                            id="debug_time_set_day"
-                                            type="range"
-                                            data-value="debug_time_day"
-                                            min="0"
-                                            max="7"
-                                        />
-                                    </div>
-                                    <div class="config-option__range-wrapper config-debug__select-wrapper config-option__list">
-                                        <div class="config-debug__select-label"><div>Hour: {{debug_time_hour}}</div></div>
-                                        <input
-                                            data-event-blur="set_cur_config_index(-1)"
-                                            data-event-focus="set_cur_config_index(1)"
-                                            class="nav-vert"
-                                            id="debug_time_set_hour"
-                                            type="range"
-                                            data-value="debug_time_hour"
-                                            min="0"
-                                            max="23"
-                                        />
-                                    </div>
-                                    <div class="config-option__range-wrapper config-debug__select-wrapper config-option__list">
-                                        <div class="config-debug__select-label"><div>Minute: {{debug_time_minute}}</div></div>
-                                        <input
-                                            data-event-blur="set_cur_config_index(-1)"
-                                            data-event-focus="set_cur_config_index(1)"
-                                            class="nav-vert"
-                                            id="debug_time_set_minute"
-                                            type="range"
-                                            data-value="debug_time_minute"
-                                            min="0"
-                                            max="59"
-                                        />
-                                    </div>
-                                </div>
-                                <div class="config-debug__option-trigger">
-                                    <button
-                                        class="icon-button icon-button--success" onclick="set_time"
-                                    >
-                                        <svg src="icons/Arrow.svg" />
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </body>
-</template>
-    
\ No newline at end of file
diff --git a/assets/config_menu/general.rml b/assets/config_menu/general.rml
deleted file mode 100644
index 291bf8c..0000000
--- a/assets/config_menu/general.rml
+++ /dev/null
@@ -1,369 +0,0 @@
-<template name="config-menu__general">
-    <head>
-    </head>
-    <body>
-        <form class="config__form" id="conf-general__form">
-            <div class="config__hz-wrapper" id="conf-general__hz-wrapper">
-                <!-- Options -->
-                <div class="config__wrapper" data-event-mouseout="set_cur_config_index(-1)" id="conf-general__wrapper">
-                    <!-- targeting mode -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(0)" id="conf-general__Targeting-Mode">
-                        <label class="config-option__title">Targeting Mode</label>
-                        <div class="config-option__list">
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(0)"
-                                name="targeting_mode"
-                                data-checked="targeting_mode"
-                                value="Switch"
-                                id="tm_switch"
-                                style="nav-up: #tab_general; nav-down: #rumble_strength_input"
-                            />
-                            <label class="config-option__tab-label" for="tm_switch">Switch</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(0)"
-                                name="targeting_mode"
-                                data-checked="targeting_mode"
-                                value="Hold"
-                                id="tm_hold"
-                                style="nav-up: #tab_general; nav-down: #rumble_strength_input"
-                            />
-                            <label class="config-option__tab-label" for="tm_hold">Hold</label>
-                        </div>
-                    </div>
-
-                    <!-- rumble strength -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(1)">
-                        <label class="config-option__title">Rumble Strength</label>
-                        <div class="config-option__range-wrapper config-option__list">
-                            <label class="config-option__range-label">{{rumble_strength}}%</label>
-                            <input
-                                class="nav-vert"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(1)"
-                                id="rumble_strength_input"
-                                type="range"
-                                min="0"
-                                max="100"
-                                style="flex: 1; margin: 0dp;"
-                                data-value="rumble_strength"
-                            />
-                        </div>
-                    </div>
-
-                    <!-- gyro sensitivity -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(2)">
-                        <label class="config-option__title">Gyro Sensitivity</label>
-                        <div class="config-option__range-wrapper config-option__list">
-                            <label class="config-option__range-label">{{gyro_sensitivity}}%</label>
-                            <input
-                                class="nav-vert"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(2)"
-                                id="gyro_sensitivity_input"
-                                type="range"
-                                min="0"
-                                max="100"
-                                style="flex: 1; margin: 0dp;"
-                                data-value="gyro_sensitivity"
-                            />
-                        </div>
-                    </div>
-
-                    <!-- mouse sensitivity -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(3)">
-                        <label class="config-option__title">Mouse Sensitivity</label>
-                        <div class="config-option__range-wrapper config-option__list">
-                            <label class="config-option__range-label">{{mouse_sensitivity}}%</label>
-                            <input
-                                class="nav-vert"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(3)"
-                                id="mouse_sensitivity_input"
-                                type="range"
-                                min="0"
-                                max="100"
-                                style="flex: 1; margin: 0dp;"
-                                data-value="mouse_sensitivity"
-                            />
-                        </div>
-                    </div>
-                    
-                    <!-- joystick deadzone -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(4)">
-                        <label class="config-option__title">Joystick Deadzone</label>
-                        <div class="config-option__range-wrapper config-option__list">
-                            <label class="config-option__range-label">{{joystick_deadzone}}%</label>
-                            <input
-                                class="nav-vert"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(4)"
-                                id="joystick_deadzone_input"
-                                type="range"
-                                min="0"
-                                max="100"
-                                style="flex: 1; margin: 0dp; nav-down: #bg_input_enabled"
-                                data-value="joystick_deadzone"
-                            />
-                        </div>
-                    </div>
-
-                    <!-- background input -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(5)" id="conf-general__Background-Input">
-                        <label class="config-option__title">Background Input</label>
-                        <div class="config-option__list">
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(5)"
-                                name="background_input_mode"
-                                data-checked="background_input_mode"
-                                value="On"
-                                id="bg_input_enabled"
-                                style="nav-up: #joystick_deadzone_input; nav-down: #autosave_enabled"
-                            />
-                            <label class="config-option__tab-label" for="bg_input_enabled">On</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(5)"
-                                name="background_input_mode"
-                                data-checked="background_input_mode"
-                                value="Off"
-                                id="bg_input_disabled"
-                                style="nav-up: #joystick_deadzone_input; nav-down: #autosave_disabled"
-                            />
-                            <label class="config-option__tab-label" for="bg_input_disabled">Off</label>
-                        </div>
-                    </div>
-
-                    <!-- autosave -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(6)">
-                        <label class="config-option__title">Autosaving</label>
-                        <div class="config-option__list">
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(6)"
-                                name="autosave_mode"
-                                data-checked="autosave_mode"
-                                value="On"
-                                id="autosave_enabled"
-                                style="nav-up: #bg_input_enabled; nav-down: #camera_inversion_none"
-                            />
-                            <label class="config-option__tab-label" for="autosave_enabled">On</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(6)"
-                                name="autosave_mode"
-                                data-checked="autosave_mode"
-                                value="Off"
-                                id="autosave_disabled"
-                                style="nav-up: #bg_input_disabled; nav-down: #camera_inversion_x"
-                            />
-                            <label class="config-option__tab-label" for="autosave_disabled">Off</label>
-                        </div>
-                    </div>
-                    
-                    <!-- camera inversion -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(7)">
-                        <label class="config-option__title">Aiming Camera Mode</label>
-                        <div class="config-option__list">
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(7)"
-                                name="camera_invert_mode"
-                                data-checked="camera_invert_mode"
-                                value="InvertNone"
-                                id="camera_inversion_none"
-                                style="nav-up: #autosave_enabled; nav-down: #analog_cam_enabled"
-                            />
-                            <label class="config-option__tab-label" for="camera_inversion_none">None</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(7)"
-                                name="camera_invert_mode"
-                                data-checked="camera_invert_mode"
-                                value="InvertX"
-                                id="camera_inversion_x"
-                                style="nav-up: #autosave_disabled; nav-down: #analog_cam_disabled"
-                            />
-                            <label class="config-option__tab-label" for="camera_inversion_x">Invert X</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(7)"
-                                name="camera_invert_mode"
-                                data-checked="camera_invert_mode"
-                                value="InvertY"
-                                id="camera_inversion_y"
-                                style="nav-up: #autosave_disabled; nav-down: #analog_cam_disabled"
-                            />
-                            <label class="config-option__tab-label" for="camera_inversion_y">Invert Y</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(7)"
-                                name="camera_invert_mode"
-                                data-checked="camera_invert_mode"
-                                value="InvertBoth"
-                                id="camera_inversion_both"
-                                style="nav-up: #autosave_disabled; nav-down: #analog_cam_disabled"
-                            />
-                            <label class="config-option__tab-label" for="camera_inversion_both">Invert Both</label>
-                        </div>
-                    </div>
-                    
-                    <!-- analog camera -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(8)">
-                        <label class="config-option__title">Analog Camera</label>
-                        <div class="config-option__list">
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(8)"
-                                name="analog_cam_mode"
-                                data-checked="analog_cam_mode"
-                                value="On"
-                                id="analog_cam_enabled"
-                                style="nav-up: #camera_inversion_none; nav-down: #analog_camera_inversion_none"
-                            />
-                            <label class="config-option__tab-label" for="analog_cam_enabled">On</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(8)"
-                                name="analog_cam_mode"
-                                data-checked="analog_cam_mode"
-                                value="Off"
-                                id="analog_cam_disabled"
-                                style="nav-up: #camera_inversion_x; nav-down: #analog_camera_inversion_x"
-                            />
-                            <label class="config-option__tab-label" for="analog_cam_disabled">Off</label>
-                        </div>
-                    </div>
-                    
-                    <!-- analog camera inversion -->
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(9)">
-                        <label class="config-option__title">Analog Camera Mode</label>
-                        <div class="config-option__list">
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(9)"
-                                name="analog_camera_invert_mode"
-                                data-checked="analog_camera_invert_mode"
-                                value="InvertNone"
-                                id="analog_camera_inversion_none"
-                                style="nav-up: #analog_cam_enabled;"
-                            />
-                            <label class="config-option__tab-label" for="analog_camera_inversion_none">None</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(9)"
-                                name="analog_camera_invert_mode"
-                                data-checked="analog_camera_invert_mode"
-                                value="InvertX"
-                                id="analog_camera_inversion_x"
-                                style="nav-up: #analog_cam_disabled;"
-                            />
-                            <label class="config-option__tab-label" for="analog_camera_inversion_x">Invert X</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(9)"
-                                name="analog_camera_invert_mode"
-                                data-checked="analog_camera_invert_mode"
-                                value="InvertY"
-                                id="analog_camera_inversion_y"
-                                style="nav-up: #analog_cam_disabled;"
-                            />
-                            <label class="config-option__tab-label" for="analog_camera_inversion_y">Invert Y</label>
-
-                            <input
-                                type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(9)"
-                                name="analog_camera_invert_mode"
-                                data-checked="analog_camera_invert_mode"
-                                value="InvertBoth"
-                                id="analog_camera_inversion_both"
-                                style="nav-up: #analog_cam_disabled;"
-                            />
-                            <label class="config-option__tab-label" for="analog_camera_inversion_both">Invert Both</label>
-                        </div>
-                    </div>
-                </div>
-                <!-- Descriptions -->
-                <div class="config__wrapper">
-                    <p data-if="cur_config_index == 0">
-                        Controls how targeting enemies and objects works. <b>Switch</b> will start or stop targeting each time the target button is pressed. <b>Hold</b> will start when the target button is pressed and stop when the button is released. 
-                    </p>
-                    <p data-if="cur_config_index == 1">
-                        Controls the strength of rumble when using a controller that supports it. <b>Setting this to zero will disable rumble.</b>
-                    </p>
-                    <p data-if="cur_config_index == 2">
-                        Controls the sensitivity of gyro aiming when using items in first person for controllers that support it. <b>Setting this to zero will disable gyro.</b>
-                        <br />
-                        <br />
-                        <b>Note: To recalibrate controller gyro, set the controller down on a still, flat surface for 5 seconds.</b>
-                    </p>
-                    <p data-if="cur_config_index == 3">
-                        Controls the sensitivity of mouse aiming when using items in first person. <b>Setting this to zero will disable mouse aiming.</b>
-                        <br />
-                        <br />
-                        <b>Note: This option does not allow mouse buttons to activate items. Mouse aiming is intended to be used with inputs that are mapped to mouse movement, such as gyro on Steam Deck.</b>
-                    </p>
-                    <p data-if="cur_config_index == 4">
-                        Applies a deadzone to joystick inputs.
-                    </p>
-                    <p data-if="cur_config_index == 5">
-                        Allows the game to read controller input when out of focus.
-                        <br/>
-                        <b>This setting does not affect keyboard input.</b>
-                    </p>
-                    <p data-if="cur_config_index == 6">
-                        Turns on autosaving and prevents owl saves from being deleted on load. Autosaves act as owl saves and take up the same slot as they do.
-                        <br/>
-                        <br/>
-                        Loading an autosave will place you in Clock Town or at the entrance of the current dungeon if you were in one.
-                        <br/>
-                        <br/>
-                        <b>If autosaving is disabled, existing autosaves will be deleted when loaded.</b>
-                    </p>
-                    <p data-if="cur_config_index == 7">
-                        Inverts the camera controls for first-person aiming. <b>Invert Y</b> is the default and matches the original game.
-                    </p>
-                    <p data-if="cur_config_index == 8">
-                        Enables an analog "free" camera similar to later entries in the series that's mapped to the right analog stick on the controller.
-                        <br/>
-                        <br/>
-                        When you move the right stick, the camera will enter free mode and stop centering behind Link. Press the <b>Target</b> button at any time to go back into the normal camera mode. The camera will also return to normal mode after a cutscene plays or when you move between areas.
-                        <br/>
-                        <br/>
-                        This option also enables right stick control while looking and aiming.
-                    </p>
-                    <p data-if="cur_config_index == 9">
-                        Inverts the camera controls for the analog camera if it's enabled. <b>None</b> is the default.
-                    </p>
-                </div>
-            </div>
-        </form>
-    </body>
-</template>
diff --git a/assets/config_menu/graphics.rml b/assets/config_menu/graphics.rml
deleted file mode 100644
index a11de72..0000000
--- a/assets/config_menu/graphics.rml
+++ /dev/null
@@ -1,325 +0,0 @@
-<template name="config-menu__graphics">
-    <head>
-    </head>
-    <body>
-        <form class="config__form">
-            <div class="config__hz-wrapper">
-                <div class="config__wrapper" data-event-mouseout="set_cur_config_index(-1)">
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(0)">
-                        <label class="config-option__title">Resolution</label>
-                        <div class="config-option__list">
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(0)"
-                                name="resolution"
-                                data-checked="res_option"
-                                value="Original"
-                                id="res_original"
-                                style="nav-up:#tab_graphics; nav-down: #ds_windowed"
-                                data-attr-style="res_option == 'Auto' ? 'nav-up:#tab_graphics; nav-down: #ar_original' : 'nav-up:#tab_graphics; nav-down: #ds_windowed'"
-                            />
-                            <label class="config-option__tab-label" for="res_original">Original</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(0)"
-                                name="resolution"
-                                data-checked="res_option"
-                                value="Original2x"
-                                id="res_2x"
-                                style="nav-up:#tab_graphics; nav-down: #ds_2x"
-                                data-attr-style="res_option == 'Auto' ? 'nav-up:#tab_graphics; nav-down: #ar_expand' : 'nav-up:#tab_graphics; nav-down: #ds_2x'"
-                            />
-                            <label class="config-option__tab-label" for="res_2x">Original 2x</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(0)"
-                                name="resolution"
-                                data-checked="res_option"
-                                value="Auto"
-                                id="res_auto"
-                                style="nav-up:#tab_graphics; nav-down: #ds_4x"
-                                data-attr-style="res_option == 'Auto' ? 'nav-up:#tab_graphics; nav-down: #ar_expand' : 'nav-up:#tab_graphics; nav-down: #ds_4x'"
-                            />
-                            <label class="config-option__tab-label" for="res_auto">Auto</label>
-                        </div>
-                    </div>
-
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(1)">
-                        <label class="config-option__title">Downsampling Quality</label>
-                        <div class="config-option__list">
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(1)"
-                                name="downsampling"
-                                data-attrif-disabled="res_option == 'Auto'"
-                                data-checked="ds_option"
-                                value="1"
-                                id="ds_windowed"
-                                style="nav-up: #res_original; nav-down: #ar_original"
-                            />
-                            <label class="config-option__tab-label" for="ds_windowed">Off</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(1)"
-                                name="downsampling"
-                                data-attrif-disabled="res_option == 'Auto'"
-                                data-checked="ds_option"
-                                value="2"
-                                id="ds_2x"
-                                style="nav-up: #res_2x; nav-down: #ar_expand"
-                            />
-                            <label class="config-option__tab-label" for="ds_2x">2x</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(1)"
-                                name="downsampling"
-                                data-attrif-disabled="res_option == 'Auto'"
-                                data-checked="ds_option"
-                                value="4"
-                                id="ds_4x"
-                                style="nav-up: #res_auto; nav-down: #ar_expand"
-                            />
-                            <label class="config-option__tab-label" for="ds_4x">4x</label>
-                            <div class="config-option__details">{{ds_info}}</div>
-                        </div>
-                    </div>
-
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(2)">
-                        <label class="config-option__title">Aspect Ratio</label>
-                        <div class="config-option__list">
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(2)"
-                                name="aspectratio"
-                                data-checked="ar_option"
-                                value="Original"
-                                id="ar_original"
-                                style="nav-up: #ds_windowed; nav-down: #wm_windowed"
-                                data-attr-style="res_option == 'Auto' ? 'nav-up:#res_original; nav-down: #wm_windowed' : 'nav-up:#ds_windowed; nav-down: #wm_windowed'"
-                            />
-                            <label class="config-option__tab-label" for="ar_original">Original</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(2)"
-                                name="aspectratio"
-                                data-checked="ar_option"
-                                value="Expand"
-                                id="ar_expand"
-                                style="nav-up: #ds_2x; nav-down: #wm_fullscreen"
-                                data-attr-style="res_option == 'Auto' ? 'nav-up:#res_2x; nav-down: #wm_fullscreen' : 'nav-up:#ds_2x; nav-down: #wm_fullscreen'"
-                            />
-                            <label class="config-option__tab-label" for="ar_expand">Expand</label>
-                        </div>
-                    </div>
-
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(3)">
-                        <label class="config-option__title">Window Mode</label>
-                        <div class="config-option__list">
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(3)"
-                                name="windowmode"
-                                data-checked="wm_option"
-                                value="Windowed"
-                                id="wm_windowed"
-                                style="nav-up: #ar_original; nav-down: #rr_original"
-                            />
-                            <label class="config-option__tab-label" for="wm_windowed">Windowed</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(3)"
-                                name="windowmode"
-                                data-checked="wm_option"
-                                value="Fullscreen"
-                                id="wm_fullscreen"
-                                style="nav-up: #ar_expand; nav-down: #rr_display"
-                            />
-                            <label class="config-option__tab-label" for="wm_fullscreen">Fullscreen</label>
-                        </div>
-                    </div>
-
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(4)">
-                        <label class="config-option__title">Framerate</label>
-                        <div class="config-option__list">
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)" 
-                                data-event-focus="set_cur_config_index(4)"
-                                name="refreshrate"
-                                data-checked="rr_option"
-                                value="Original"
-                                id="rr_original"
-                                data-attr-style="rr_option=='Manual' ? 'nav-up: #wm_windowed; nav-down: #rr_manual_input' : 'nav-up: #wm_windowed; nav-down: #msaa_none'"
-                            />
-                            <label class="config-option__tab-label" for="rr_original">Original</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)" 
-                                data-event-focus="set_cur_config_index(4)"
-                                name="refreshrate"
-                                data-checked="rr_option"
-                                value="Display"
-                                id="rr_display"
-                                style="nav-up: #wm_fullscreen"
-                                data-style-nav-down="rr_option=='Manual' ? '#rr_manual_input' : (msaa2x_supported ? '#msaa_2x' : '#msaa_none')"
-                            />
-                            <label class="config-option__tab-label" for="rr_display">Display</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)" 
-                                data-event-focus="set_cur_config_index(4)"
-                                name="refreshrate"
-                                data-checked="rr_option"
-                                value="Manual"
-                                id="rr_manual"
-                                style="nav-up: #wm_fullscreen"
-                                data-style-nav-down="rr_option=='Manual' ? '#rr_manual_input' : (msaa4x_supported ? '#msaa_4x' : (msaa2x_supported ? '#msaa_2x' : '#msaa_none'))"
-                            />
-                            <label class="config-option__tab-label" for="rr_manual">Manual</label>
-                        </div>
-                        <div data-if="rr_option=='Manual'" class="config-option__range-wrapper config-option__list">
-                            <label class="config-option__range-label">{{rr_manual_value}}</label>
-                            <input
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(4)"
-                                id="rr_manual_input"
-                                type="range"
-                                min="20"
-                                max="360"
-                                style="flex:1;margin: 0dp;nav-up:#rr_manual;nav-down:#msaa_none;"
-                                data-value="rr_manual_value"
-                            />
-                        </div>
-                    </div>
-
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(5)">
-                        <label class="config-option__title">MS Anti-Aliasing</label>
-                        <div class="config-option__list">
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(5)"
-                                name="antialiasing"
-                                data-checked="msaa_option"
-                                value="None"
-                                id="msaa_none"
-                                data-attr-style="rr_option=='Manual' ? 'nav-up: #rr_manual_input; nav-down: #hr_original' : 'nav-up: #rr_original; nav-down: #hr_original'"
-                            />
-                            <label class="config-option__tab-label" for="msaa_none">None</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(5)"
-                                name="antialiasing"
-                                data-attrif-disabled="!msaa2x_supported"
-                                data-checked="msaa_option"
-                                value="MSAA2X"
-                                id="msaa_2x"
-                                data-attr-style="rr_option=='Manual' ? 'nav-up: #rr_manual_input; nav-down: #hr_16_9' : 'nav-up: #rr_display; nav-down: #hr_16_9'"
-                                data-style-nav-right="msaa4x_supported ? '#msaa_4x' : 'none'"
-                            />
-                            <label class="config-option__tab-label" for="msaa_2x">2x</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(5)"
-                                name="antialiasing"
-                                data-attrif-disabled="!msaa4x_supported"
-                                data-checked="msaa_option"
-                                value="MSAA4X"
-                                id="msaa_4x"
-                                data-attr-style="rr_option=='Manual' ? 'nav-up: #rr_manual_input; nav-down: #hr_full' : 'nav-up: #rr_manual; nav-down: #hr_full'"
-                            />
-                            <label class="config-option__tab-label" for="msaa_4x">4x</label>
-                            <div class="config-option__details" data-if="!sample_positions_supported">Not available (missing sample positions support)</div>
-                        </div>
-                    </div>
-
-                    <div class="config-option" data-event-mouseover="set_cur_config_index(6)">
-                        <label class="config-option__title">HUD Placement</label>
-                        <div class="config-option__list">
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(6)"
-                                name="hr-option"
-                                data-checked="hr_option"
-                                value="Original"
-                                id="hr_original"
-                                style="nav-up: #msaa_none; nav-down: #apply_button"
-                            />
-                            <label class="config-option__tab-label" for="hr_original">Original</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(6)"
-                                name="hr-option"
-                                data-checked="hr_option"
-                                value="Clamp16x9"
-                                id="hr_16_9"
-                                style="nav-up: #msaa_2x; nav-down: #apply_button"
-                                data-style-nav-up="msaa2x_supported ? '#msaa_2x' : '#msaa_none'"
-                            />
-                            <label class="config-option__tab-label" for="hr_16_9">16:9</label>
-                            <input type="radio"
-                                data-event-blur="set_cur_config_index(-1)"
-                                data-event-focus="set_cur_config_index(6)"
-                                name="hr-option"
-                                data-checked="hr_option"
-                                value="Full"
-                                id="hr_full"
-                                style="nav-up: #msaa_4x; nav-down: #apply_button"
-                                data-style-nav-up="msaa4x_supported ? '#msaa_4x' : (msaa2x_supported ? '#msaa_2x' : '#msaa_none')"
-                            />
-                            <label class="config-option__tab-label" for="hr_full">Expand</label>
-                        </div>
-                    </div>
-
-                </div>
-                <div class="config__wrapper">
-                    <p data-if="cur_config_index == 0">
-                        Sets the output resolution of the game. <b>Original</b> matches the game's original 240p resolution. <b>Original 2x</b> will render at 480p. <b>Auto</b> will scale based on the game window's resolution.
-                    </p>
-                    <p data-if="cur_config_index == 1">
-                        Renders at a higher resolution and scales it down to the output resolution for increased quality. Only available in <b>Original</b> and <b>Original 2x</b> resolution.
-                        <br />
-                        <br />
-                        Note: <b>4x</b> downsampling quality at <b>Original 2x</b> resolution may cause performance issues on low end devices, as it will cause the game to render <i>at almost 4k internal resolution</i>.
-                    </p>
-                    <p data-if="cur_config_index == 2">
-                        Sets the horizontal aspect ratio. <b>Original</b> uses the game's original 4:3 aspect ratio. <b>Expand</b> will adjust to match the game window's aspect ratio.
-                    </p>
-                    <p data-if="cur_config_index == 3">
-                        Sets whether the game should display <b>Windowed</b> or <b>Fullscreen</b>. You can also use <b>F11</b> or <b>Alt + Enter</b> to toggle this option.
-                    </p>
-                    <p data-if="cur_config_index == 4">
-                        Sets the game's output framerate. This option does not affect gameplay.
-                        <br />
-                        <br />
-                        Note: If you have issues with <b>Display</b> mode while using an external frame limiter, use <b>Manual</b> mode instead and configure it to that same frame limit.
-                        <br />
-                        <br />
-                        <b>Detected display refresh rate: {{display_refresh_rate}}hz</b>
-                    </p>
-                    <p data-if="cur_config_index == 5">
-                        Sets the multisample anti-aliasing (MSAA) quality level. This reduces jagged edges in the final image at the expense of rendering performance.
-                        <br />
-                        <br />
-                        <b>Note: This option won't be available if your GPU does not support programmable MSAA sample positions, as it is currently required to avoid rendering glitches.</b>
-                    </p>
-                    <p data-if="cur_config_index == 6">
-                        Adjusts the placement of HUD elements to fit the selected aspect ratio. <b>Expand</b> will use the aspect ratio of the game's output window.
-                    </p>
-                </div>
-            </div>
-            <div class="config__footer">
-                <!-- this empty div makes sure Apply button gets right aligned -->
-                <div />
-                <div>
-                    <button
-                        class="button button--secondary"
-                        nav-return="rr_manual"
-                        data-attrif-disabled="!options_changed"
-                        onclick="apply_options"
-                        id="apply_button"
-                        style="nav-up:#hr_original"
-                    >
-                        <div class="button__label">Apply<span class="prompt-font-sm">{{gfx_help__apply}}</span></div>
-                    </button>
-                </div>
-            </div>
-        </form>
-    </body>
-</template>
diff --git a/assets/config_menu/mods.rml b/assets/config_menu/mods.rml
deleted file mode 100644
index debab39..0000000
--- a/assets/config_menu/mods.rml
+++ /dev/null
@@ -1,9 +0,0 @@
-<template name="config-menu__mods">
-    <head>
-    </head>
-    <body>
-        <form class="config__form">
-            <recomp-mod-menu id="menu_mods" />
-        </form>
-    </body>
-</template>
diff --git a/assets/config_menu/sound.rml b/assets/config_menu/sound.rml
deleted file mode 100644
index badadce..0000000
--- a/assets/config_menu/sound.rml
+++ /dev/null
@@ -1,89 +0,0 @@
-<template name="config-menu__sound">
-    <head>
-    </head>
-    <body>
-        <form class="config__form">
-            <div class="config__hz-wrapper">
-                <!-- Options -->
-                <div class="config__wrapper" data-event-mouseout="set_cur_config_index(-1)">
-                        <div class="config-option" data-event-mouseover="set_cur_config_index(0)">
-                            <label class="config-option__title">Main Volume</label>
-                            <div class="config-option__range-wrapper config-option__list">
-                                <label class="config-option__range-label">{{main_volume}}%</label>
-                                <input
-                                    data-event-blur="set_cur_config_index(-1)"
-                                    data-event-focus="set_cur_config_index(0)"
-                                    class="nav-vert"
-                                    id="main_volume_input"
-                                    type="range"
-                                    min="0"
-                                    max="100"
-                                    style="flex: 1; margin: 0dp; nav-up: #tab_sound; nav-down: #bgm_volume_input;"
-                                    data-value="main_volume"
-                                />
-                            </div>
-                        </div>
-                        <div class="config-option" data-event-mouseover="set_cur_config_index(1)">
-                            <label class="config-option__title">Background Music Volume</label>
-                            <div class="config-option__range-wrapper config-option__list">
-                                <label class="config-option__range-label">{{bgm_volume}}%</label>
-                                <input
-                                    data-event-blur="set_cur_config_index(-1)"
-                                    data-event-focus="set_cur_config_index(1)"
-                                    class="nav-vert"
-                                    id="bgm_volume_input"
-                                    type="range"
-                                    min="0"
-                                    max="100"
-                                    style="flex: 1; margin: 0dp; nav-up: #main_volume_input; nav-down: #lhb_on;"
-                                    data-value="bgm_volume"
-                                />
-                            </div>
-                        </div>
-
-                        <div class="config-option" data-event-mouseover="set_cur_config_index(2)">
-                            <label class="config-option__title">Low Health Beeps</label>
-                            <div class="config-option__list">
-                                <input
-                                    type="radio"
-                                    data-event-blur="set_cur_config_index(-1)"
-                                    data-event-focus="set_cur_config_index(2)"
-                                    name="lhb"
-                                    data-checked="low_health_beeps_enabled"
-                                    value="1"
-                                    id="lhb_on"
-                                    style="nav-up: #bgm_volume_input"
-                                />
-                                <label class="config-option__tab-label" for="lhb_on">On</label>
-
-                                <input
-                                    type="radio"
-                                    data-event-blur="set_cur_config_index(-1)"
-                                    data-event-focus="set_cur_config_index(2)"
-                                    name="lhb"
-                                    data-checked="low_health_beeps_enabled"
-                                    value="0"
-                                    id="lhb_off"
-                                    style="nav-up: #bgm_volume_input"
-                                />
-                                <label class="config-option__tab-label" for="lhb_off">Off</label>
-                            </div>
-                        </div>
-                </div>
-                <!-- Descriptions -->
-                <div class="config__wrapper">
-					<p data-if="cur_config_index == 0">
-						Controls the main volume of the game.
-					</p>
-                    <p data-if="cur_config_index == 1">
-                        Controls the overall volume of background music.
-                    </p>
-                    <p data-if="cur_config_index == 2">
-                        Toggles whether or not the low-health beeping sound plays.
-                    </p>
-                </div>
-            </div>
-        </form>
-    </body>
-</template>
-    
\ No newline at end of file
diff --git a/assets/icons/Cont.svg b/assets/icons/Cont.svg
new file mode 100644
index 0000000..5959613
--- /dev/null
+++ b/assets/icons/Cont.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.72625 23.3925C8.13475 23.0659 8.61021 22.3958 9.032 21.7129C9.78396 20.4953 11.0499 19.6669 12.4578 19.6669H19.5422C20.9501 19.6669 22.216 20.4953 22.968 21.7129C23.3898 22.3958 23.8653 23.0659 24.2738 23.3925C25.2857 24.2015 26.6008 24.2035 27.6585 23.3925C28.4268 22.8033 29 21.7232 29 20.2983C29 18.8735 28.6384 12.9609 27.6585 9.98045C26.6786 7 23.4285 7 16 7C8.57147 7 5.32145 7 4.34153 9.98045C3.36162 12.9609 3 18.8735 3 20.2983C3 21.7232 3.5732 22.8033 4.34153 23.3925C5.39916 24.2035 6.71431 24.2015 7.72625 23.3925Z" stroke="white" stroke-width="4"/>
+</svg>
diff --git a/assets/icons/Keyboard.svg b/assets/icons/Keyboard.svg
new file mode 100644
index 0000000..880ceb0
--- /dev/null
+++ b/assets/icons/Keyboard.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M27 7C29.2091 7 31 8.79086 31 11V21C31 23.2091 29.2091 25 27 25H5C2.79086 25 1 23.2091 1 21V11C1 8.79086 2.79086 7 5 7H27ZM5 19V21H7V19H5ZM9 19V21H23V19H9ZM25 19V21H27V19H25ZM5 15V17H9V15H5ZM11 15V17H13V15H11ZM15 15V17H17V15H15ZM19 15V17H21V15H19ZM23 15V17H27V15H23ZM5 11V13H7V11H5ZM9 11V13H11V11H9ZM13 11V13H15V11H13ZM17 11V13H19V11H17ZM21 11V13H23V11H21ZM25 11V13H27V11H25Z" fill="white"/>
+</svg>
diff --git a/assets/scss/.nvmrc b/assets/scss/.nvmrc
deleted file mode 100644
index b7586d6..0000000
--- a/assets/scss/.nvmrc
+++ /dev/null
@@ -1 +0,0 @@
-iron
diff --git a/assets/scss/.stylelintrc b/assets/scss/.stylelintrc
deleted file mode 100644
index 60ad85f..0000000
--- a/assets/scss/.stylelintrc
+++ /dev/null
@@ -1,99 +0,0 @@
-{
-    "extends": [
-        "stylelint-config-recommended",
-        "stylelint-config-standard",
-        "stylelint-config-sass-guidelines",
-        "stylelint-config-property-sort-order-smacss",
-        "stylelint-config-standard-scss"
-    ],
-    "plugins": ["stylelint-scss"],
-    "overrides": [{
-        "files": ["**/*.scss"],
-        "customSyntax": "postcss-scss"
-    }],
-    "rules": {
-        "no-descending-specificity": null,
-        "declaration-empty-line-before": null,
-        "declaration-colon-newline-after": null,
-        "declaration-block-no-duplicate-properties": true,
-        "declaration-block-trailing-semicolon": null,
-        "declaration-no-important": true,
-        "declaration-property-value-disallowed-list": {
-            "/^transition/": ["/all/"]
-        },
-        "block-closing-brace-newline-after": null,
-        "max-empty-lines": null,
-        "selector-list-comma-newline-after": null,
-        "at-rule-empty-line-before": null,
-        "at-rule-semicolon-newline-after": null,
-        "selector-pseudo-element-colon-notation": "single",
-        "color-no-hex": true,
-        "function-url-quotes": "always",
-        "max-nesting-depth": [
-            4,
-            {
-                "ignoreAtRules": ["each", "media", "supports", "include"],
-                "severity": "warning"
-            }
-        ],
-        "number-leading-zero": null,
-        "order/order": [
-            [
-                "custom-properties",
-                "dollar-variables",
-                {
-                    "type": "at-rule",
-                    "name": "extend"
-                },
-                {
-                    "type": "at-rule",
-                    "name": "include"
-                },
-                "declarations",
-                "rules"
-            ]
-        ],
-        "order/properties-alphabetical-order": null,
-        "property-no-vendor-prefix": [
-            true,
-            {
-                "severity": "warning"
-            }
-        ],
-        "value-no-vendor-prefix": [
-            true,
-            {
-                "severity": "warning"
-            }
-        ],
-        "scss/selector-no-redundant-nesting-selector": null,
-        "selector-class-pattern": null,
-        "selector-max-compound-selectors": [
-            4,
-            {
-                "severity": "warning"
-            }
-        ],
-        "selector-no-qualifying-type": null,
-        "string-quotes": null,
-        "max-line-length": null,
-        "keyframes-name-pattern": null,
-        "scss/double-slash-comment-empty-line-before": null,
-        "scss/double-slash-comment-whitespace-inside": null,
-        "scss/dollar-variable-empty-line-before": null,
-        "scss/dollar-variable-pattern": "[a-z-]",
-        "scss/at-import-partial-extension": null,
-        "declaration-block-no-redundant-longhand-properties": null,
-        "color-function-notation": null,
-        "alpha-value-notation": null,
-        "at-rule-no-unknown": null,
-        "property-no-unknown": null,
-        "scss/at-rule-no-unknown": true,
-        "selector-pseudo-class-no-unknown": [true, { "ignorePseudoClasses": ["selected"] }],
-        "font-family-no-missing-generic-family-keyword": null,
-        "scss/no-global-function-names": null,
-        "unit-no-unknown": [true, { "ignoreUnits": ["dp"] }],
-        "selector-type-no-unknown": [true, { "ignore": ["custom-elements", "default-namespace"] }],
-        "value-keyword-case": null
-    }
-}
diff --git a/assets/scss/main.scss b/assets/scss/main.scss
deleted file mode 100644
index 9d03ad3..0000000
--- a/assets/scss/main.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import "styles/base";
-@import "styles/global";
diff --git a/assets/scss/package-lock.json b/assets/scss/package-lock.json
deleted file mode 100644
index 78ab77a..0000000
--- a/assets/scss/package-lock.json
+++ /dev/null
@@ -1,2261 +0,0 @@
-{
-  "name": "mmrecomp-ui-scss",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "mmrecomp-ui-scss",
-      "version": "1.0.0",
-      "license": "ISC",
-      "dependencies": {
-        "sass": "^1.75.0"
-      },
-      "devDependencies": {
-        "postcss-scss": "^4.0.9",
-        "stylelint": "^15.11.0",
-        "stylelint-config-property-sort-order-smacss": "^9.1.0",
-        "stylelint-config-sass-guidelines": "^10.0.0",
-        "stylelint-config-scss": "^1.0.0-security",
-        "stylelint-config-standard": "^34.0.0",
-        "stylelint-config-standard-scss": "^11.1.0",
-        "stylelint-scss": "^5.3.1"
-      }
-    },
-    "node_modules/@babel/code-frame": {
-      "version": "7.23.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz",
-      "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/highlight": "^7.23.4",
-        "chalk": "^2.4.2"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/highlight": {
-      "version": "7.23.4",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz",
-      "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==",
-      "dev": true,
-      "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
-        "chalk": "^2.4.2",
-        "js-tokens": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@csstools/css-parser-algorithms": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.2.tgz",
-      "integrity": "sha512-sLYGdAdEY2x7TSw9FtmdaTrh2wFtRJO5VMbBrA8tEqEod7GEggFmxTSK9XqExib3yMuYNcvcTdCZIP6ukdjAIA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "@csstools/css-tokenizer": "^2.2.1"
-      }
-    },
-    "node_modules/@csstools/css-tokenizer": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-2.2.1.tgz",
-      "integrity": "sha512-Zmsf2f/CaEPWEVgw29odOj+WEVoiJy9s9NOv5GgNY9mZ1CZ7394By6wONrONrTsnNDv6F9hR02nvFihrGVGHBg==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      }
-    },
-    "node_modules/@csstools/media-query-list-parser": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.5.tgz",
-      "integrity": "sha512-IxVBdYzR8pYe89JiyXQuYk4aVVoCPhMJkz6ElRwlVysjwURTsTk/bmY/z4FfeRE+CRBMlykPwXEVUg8lThv7AQ==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "@csstools/css-parser-algorithms": "^2.3.2",
-        "@csstools/css-tokenizer": "^2.2.1"
-      }
-    },
-    "node_modules/@csstools/selector-specificity": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz",
-      "integrity": "sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/csstools"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/csstools"
-        }
-      ],
-      "engines": {
-        "node": "^14 || ^16 || >=18"
-      },
-      "peerDependencies": {
-        "postcss-selector-parser": "^6.0.13"
-      }
-    },
-    "node_modules/@nodelib/fs.scandir": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
-      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "2.0.5",
-        "run-parallel": "^1.1.9"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.stat": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
-      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@nodelib/fs.walk": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
-      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.scandir": "2.1.5",
-        "fastq": "^1.6.0"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@types/minimist": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/@types/minimist/-/minimist-1.2.5.tgz",
-      "integrity": "sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag==",
-      "dev": true
-    },
-    "node_modules/@types/normalize-package-data": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
-      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
-      "dev": true
-    },
-    "node_modules/ajv": {
-      "version": "8.12.0",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
-      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
-      "dev": true,
-      "dependencies": {
-        "fast-deep-equal": "^3.1.1",
-        "json-schema-traverse": "^1.0.0",
-        "require-from-string": "^2.0.2",
-        "uri-js": "^4.2.2"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/epoberezkin"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/anymatch": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-      "dependencies": {
-        "normalize-path": "^3.0.0",
-        "picomatch": "^2.0.4"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/argparse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
-      "dev": true
-    },
-    "node_modules/array-union": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
-      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/arrify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
-      "integrity": "sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/astral-regex": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
-      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz",
-      "integrity": "sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==",
-      "dev": true
-    },
-    "node_modules/binary-extensions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-      "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "node_modules/brace-expansion/node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/braces": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
-      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
-      "dependencies": {
-        "fill-range": "^7.1.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/camelcase-keys": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz",
-      "integrity": "sha512-Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==",
-      "dev": true,
-      "dependencies": {
-        "camelcase": "^6.3.0",
-        "map-obj": "^4.1.0",
-        "quick-lru": "^5.1.1",
-        "type-fest": "^1.2.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/chokidar": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-      "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-      "dependencies": {
-        "anymatch": "~3.1.2",
-        "braces": "~3.0.2",
-        "glob-parent": "~5.1.2",
-        "is-binary-path": "~2.1.0",
-        "is-glob": "~4.0.1",
-        "normalize-path": "~3.0.0",
-        "readdirp": "~3.6.0"
-      },
-      "engines": {
-        "node": ">= 8.10.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.2"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "dev": true
-    },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==",
-      "dev": true
-    },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
-    },
-    "node_modules/cosmiconfig": {
-      "version": "8.3.6",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz",
-      "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==",
-      "dev": true,
-      "dependencies": {
-        "import-fresh": "^3.3.0",
-        "js-yaml": "^4.1.0",
-        "parse-json": "^5.2.0",
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/d-fischer"
-      },
-      "peerDependencies": {
-        "typescript": ">=4.9.5"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/css-functions-list": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/css-functions-list/-/css-functions-list-3.2.1.tgz",
-      "integrity": "sha512-Nj5YcaGgBtuUmn1D7oHqPW0c9iui7xsTsj5lIX8ZgevdfhmjFfKB3r8moHJtNJnctnYXJyYX5I1pp90HM4TPgQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12 || >=16"
-      }
-    },
-    "node_modules/css-property-sort-order-smacss": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/css-property-sort-order-smacss/-/css-property-sort-order-smacss-2.2.0.tgz",
-      "integrity": "sha512-nXutswsivIEBOrPo/OZw2KQjFPLvtg68aovJf6Kqrm3L6FmTvvFPaeDrk83hh0+pRJGuP3PeKJwMS0E6DFipdQ==",
-      "dev": true
-    },
-    "node_modules/css-tree": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz",
-      "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==",
-      "dev": true,
-      "dependencies": {
-        "mdn-data": "2.0.30",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0"
-      }
-    },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "dev": true,
-      "bin": {
-        "cssesc": "bin/cssesc"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-      "dev": true,
-      "dependencies": {
-        "ms": "2.1.2"
-      },
-      "engines": {
-        "node": ">=6.0"
-      },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/decamelize": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-5.0.1.tgz",
-      "integrity": "sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decamelize-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz",
-      "integrity": "sha512-WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==",
-      "dev": true,
-      "dependencies": {
-        "decamelize": "^1.1.0",
-        "map-obj": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/decamelize-keys/node_modules/map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dev": true,
-      "dependencies": {
-        "path-type": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-      "dev": true
-    },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "dependencies": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
-      "dev": true,
-      "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=8.6.0"
-      }
-    },
-    "node_modules/fastest-levenshtein": {
-      "version": "1.0.16",
-      "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz",
-      "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4.9.1"
-      }
-    },
-    "node_modules/fastq": {
-      "version": "1.15.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
-      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
-      "dev": true,
-      "dependencies": {
-        "reusify": "^1.0.4"
-      }
-    },
-    "node_modules/file-entry-cache": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-7.0.2.tgz",
-      "integrity": "sha512-TfW7/1iI4Cy7Y8L6iqNdZQVvdXn0f8B4QcIXmkIbtTIe/Okm/nSlHb4IwGzRVOd3WfSieCgvf5cMzEfySAIl0g==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^3.2.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
-      "dev": true,
-      "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/flat-cache": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-      "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
-      "dev": true,
-      "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.3",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": "^10.12.0 || >=12.0.0"
-      }
-    },
-    "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
-      "dev": true
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
-      "dev": true
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "dev": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-      "dependencies": {
-        "is-glob": "^4.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/global-modules": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
-      "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
-      "dev": true,
-      "dependencies": {
-        "global-prefix": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/global-prefix": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
-      "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
-      "dev": true,
-      "dependencies": {
-        "ini": "^1.3.5",
-        "kind-of": "^6.0.2",
-        "which": "^1.3.1"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dev": true,
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globjoin": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz",
-      "integrity": "sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==",
-      "dev": true
-    },
-    "node_modules/hard-rejection": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz",
-      "integrity": "sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.0.tgz",
-      "integrity": "sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/hosted-git-info": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz",
-      "integrity": "sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/html-tags": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz",
-      "integrity": "sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ignore": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz",
-      "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/immutable": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz",
-      "integrity": "sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw=="
-    },
-    "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
-      "dev": true,
-      "dependencies": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-lazy": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-4.0.0.tgz",
-      "integrity": "sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz",
-      "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "dev": true,
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
-      "dev": true
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
-      "dev": true
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
-      "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
-      "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz",
-      "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "dev": true
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "node_modules/js-yaml": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
-      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
-      "dev": true,
-      "dependencies": {
-        "argparse": "^2.0.1"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-      "dev": true
-    },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/known-css-properties": {
-      "version": "0.29.0",
-      "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.29.0.tgz",
-      "integrity": "sha512-Ne7wqW7/9Cz54PDt4I3tcV+hAyat8ypyOGzYRJQfdxnnjeWsTxt1cy8pjvvKeI5kfXuyvULyeeAvwvvtAX3ayQ==",
-      "dev": true
-    },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "dev": true
-    },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
-      "dev": true,
-      "dependencies": {
-        "p-locate": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash.truncate": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz",
-      "integrity": "sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==",
-      "dev": true
-    },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/map-obj": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-4.3.0.tgz",
-      "integrity": "sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/mathml-tag-names": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz",
-      "integrity": "sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==",
-      "dev": true,
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/wooorm"
-      }
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.30",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz",
-      "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==",
-      "dev": true
-    },
-    "node_modules/meow": {
-      "version": "10.1.5",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz",
-      "integrity": "sha512-/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==",
-      "dev": true,
-      "dependencies": {
-        "@types/minimist": "^1.2.2",
-        "camelcase-keys": "^7.0.0",
-        "decamelize": "^5.0.0",
-        "decamelize-keys": "^1.1.0",
-        "hard-rejection": "^2.1.0",
-        "minimist-options": "4.1.0",
-        "normalize-package-data": "^3.0.2",
-        "read-pkg-up": "^8.0.0",
-        "redent": "^4.0.0",
-        "trim-newlines": "^4.0.2",
-        "type-fest": "^1.2.2",
-        "yargs-parser": "^20.2.9"
-      },
-      "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dev": true,
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
-      },
-      "engines": {
-        "node": ">=8.6"
-      }
-    },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dev": true,
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/minimist-options": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz",
-      "integrity": "sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==",
-      "dev": true,
-      "dependencies": {
-        "arrify": "^1.0.1",
-        "is-plain-obj": "^1.1.0",
-        "kind-of": "^6.0.3"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
-    "node_modules/normalize-package-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-3.0.3.tgz",
-      "integrity": "sha512-p2W1sgqij3zMMyRC067Dg16bfzVH+w7hyegmpIvZ4JNjqtGOVAIvLmjBx3yP7YTe9vKJgkoNOPjwQGogDoMXFA==",
-      "dev": true,
-      "dependencies": {
-        "hosted-git-info": "^4.0.1",
-        "is-core-module": "^2.5.0",
-        "semver": "^7.3.4",
-        "validate-npm-package-license": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dev": true,
-      "dependencies": {
-        "wrappy": "1"
-      }
-    },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
-      "dev": true,
-      "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
-      "dev": true,
-      "dependencies": {
-        "p-limit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "dependencies": {
-        "callsites": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dev": true,
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
-    },
-    "node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/postcss": {
-      "version": "8.4.32",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.32.tgz",
-      "integrity": "sha512-D/kj5JNu6oo2EIy+XL/26JEDTlIbB8hw85G8StOE6L74RQAVVP5rej6wxCNqyMbR4RkPfqvezVbPw81Ngd6Kcw==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
-        "source-map-js": "^1.0.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-media-query-parser": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz",
-      "integrity": "sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==",
-      "dev": true
-    },
-    "node_modules/postcss-resolve-nested-selector": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz",
-      "integrity": "sha512-HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==",
-      "dev": true
-    },
-    "node_modules/postcss-safe-parser": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-6.0.0.tgz",
-      "integrity": "sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3"
-      }
-    },
-    "node_modules/postcss-scss": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-4.0.9.tgz",
-      "integrity": "sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss-scss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "engines": {
-        "node": ">=12.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.29"
-      }
-    },
-    "node_modules/postcss-selector-parser": {
-      "version": "6.0.13",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
-      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
-      "dev": true,
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/postcss-sorting": {
-      "version": "8.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-8.0.2.tgz",
-      "integrity": "sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==",
-      "dev": true,
-      "peerDependencies": {
-        "postcss": "^8.4.20"
-      }
-    },
-    "node_modules/postcss-value-parser": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "dev": true
-    },
-    "node_modules/punycode": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
-      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/queue-microtask": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
-      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/quick-lru": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz",
-      "integrity": "sha512-X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==",
-      "dev": true,
-      "dependencies": {
-        "@types/normalize-package-data": "^2.4.0",
-        "normalize-package-data": "^3.0.2",
-        "parse-json": "^5.2.0",
-        "type-fest": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/read-pkg-up": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz",
-      "integrity": "sha512-snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==",
-      "dev": true,
-      "dependencies": {
-        "find-up": "^5.0.0",
-        "read-pkg": "^6.0.0",
-        "type-fest": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/readdirp": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-      "dependencies": {
-        "picomatch": "^2.2.1"
-      },
-      "engines": {
-        "node": ">=8.10.0"
-      }
-    },
-    "node_modules/redent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-4.0.0.tgz",
-      "integrity": "sha512-tYkDkVVtYkSVhuQ4zBgfvciymHaeuel+zFKXShfDnFP5SyVEP7qo70Rf1jTOTCx3vGNAbnEi/xFkcfQVMIBWag==",
-      "dev": true,
-      "dependencies": {
-        "indent-string": "^5.0.0",
-        "strip-indent": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/require-from-string": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
-      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/resolve-from": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
-      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "dev": true,
-      "engines": {
-        "iojs": ">=1.0.0",
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/rimraf": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
-      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
-      "dev": true,
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/run-parallel": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
-      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
-      "dev": true,
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "queue-microtask": "^1.2.2"
-      }
-    },
-    "node_modules/sass": {
-      "version": "1.75.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.75.0.tgz",
-      "integrity": "sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==",
-      "dependencies": {
-        "chokidar": ">=3.0.0 <4.0.0",
-        "immutable": "^4.0.0",
-        "source-map-js": ">=0.6.2 <2.0.0"
-      },
-      "bin": {
-        "sass": "sass.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/semver": {
-      "version": "7.5.4",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
-      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/signal-exit": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-      "dev": true,
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/slash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
-      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/slice-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
-      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "astral-regex": "^2.0.0",
-        "is-fullwidth-code-point": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/source-map-js": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
-      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/spdx-correct": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
-      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
-      "dev": true,
-      "dependencies": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-exceptions": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz",
-      "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==",
-      "dev": true
-    },
-    "node_modules/spdx-expression-parse": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
-      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
-      "dev": true,
-      "dependencies": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "node_modules/spdx-license-ids": {
-      "version": "3.0.16",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.16.tgz",
-      "integrity": "sha512-eWN+LnM3GR6gPu35WxNgbGl8rmY1AEmoMDvL/QD6zYmPWgywxWqJWNdLGT+ke8dKNWrcYgYjPpG5gbTfghP8rw==",
-      "dev": true
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dev": true,
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dev": true,
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.0.0.tgz",
-      "integrity": "sha512-mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==",
-      "dev": true,
-      "dependencies": {
-        "min-indent": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/style-search": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz",
-      "integrity": "sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==",
-      "dev": true
-    },
-    "node_modules/stylelint": {
-      "version": "15.11.0",
-      "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-15.11.0.tgz",
-      "integrity": "sha512-78O4c6IswZ9TzpcIiQJIN49K3qNoXTM8zEJzhaTE/xRTCZswaovSEVIa/uwbOltZrk16X4jAxjaOhzz/hTm1Kw==",
-      "dev": true,
-      "dependencies": {
-        "@csstools/css-parser-algorithms": "^2.3.1",
-        "@csstools/css-tokenizer": "^2.2.0",
-        "@csstools/media-query-list-parser": "^2.1.4",
-        "@csstools/selector-specificity": "^3.0.0",
-        "balanced-match": "^2.0.0",
-        "colord": "^2.9.3",
-        "cosmiconfig": "^8.2.0",
-        "css-functions-list": "^3.2.1",
-        "css-tree": "^2.3.1",
-        "debug": "^4.3.4",
-        "fast-glob": "^3.3.1",
-        "fastest-levenshtein": "^1.0.16",
-        "file-entry-cache": "^7.0.0",
-        "global-modules": "^2.0.0",
-        "globby": "^11.1.0",
-        "globjoin": "^0.1.4",
-        "html-tags": "^3.3.1",
-        "ignore": "^5.2.4",
-        "import-lazy": "^4.0.0",
-        "imurmurhash": "^0.1.4",
-        "is-plain-object": "^5.0.0",
-        "known-css-properties": "^0.29.0",
-        "mathml-tag-names": "^2.1.3",
-        "meow": "^10.1.5",
-        "micromatch": "^4.0.5",
-        "normalize-path": "^3.0.0",
-        "picocolors": "^1.0.0",
-        "postcss": "^8.4.28",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-safe-parser": "^6.0.0",
-        "postcss-selector-parser": "^6.0.13",
-        "postcss-value-parser": "^4.2.0",
-        "resolve-from": "^5.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1",
-        "style-search": "^0.1.0",
-        "supports-hyperlinks": "^3.0.0",
-        "svg-tags": "^1.0.0",
-        "table": "^6.8.1",
-        "write-file-atomic": "^5.0.1"
-      },
-      "bin": {
-        "stylelint": "bin/stylelint.mjs"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/stylelint"
-      }
-    },
-    "node_modules/stylelint-config-property-sort-order-smacss": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-property-sort-order-smacss/-/stylelint-config-property-sort-order-smacss-9.1.0.tgz",
-      "integrity": "sha512-TijYeDoDgHAFjpn9NnziQrmUCGrm2AM4e1HzsdI2mCWBRkQRuewc343YqDwdFgQ5eHoMZ3JRL02i72W3vktuDA==",
-      "dev": true,
-      "dependencies": {
-        "css-property-sort-order-smacss": "~2.2.0",
-        "stylelint-order": "^6.0.2"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0 || ^15.0.0"
-      }
-    },
-    "node_modules/stylelint-config-recommended": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended/-/stylelint-config-recommended-13.0.0.tgz",
-      "integrity": "sha512-EH+yRj6h3GAe/fRiyaoO2F9l9Tgg50AOFhaszyfov9v6ayXJ1IkSHwTxd7lB48FmOeSGDPLjatjO11fJpmarkQ==",
-      "dev": true,
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^15.10.0"
-      }
-    },
-    "node_modules/stylelint-config-recommended-scss": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-recommended-scss/-/stylelint-config-recommended-scss-13.1.0.tgz",
-      "integrity": "sha512-8L5nDfd+YH6AOoBGKmhH8pLWF1dpfY816JtGMePcBqqSsLU+Ysawx44fQSlMOJ2xTfI9yTGpup5JU77c17w1Ww==",
-      "dev": true,
-      "dependencies": {
-        "postcss-scss": "^4.0.9",
-        "stylelint-config-recommended": "^13.0.0",
-        "stylelint-scss": "^5.3.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3",
-        "stylelint": "^15.10.0"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/stylelint-config-sass-guidelines": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-sass-guidelines/-/stylelint-config-sass-guidelines-10.0.0.tgz",
-      "integrity": "sha512-+Rr2Dd4b72CWA4qoj1Kk+y449nP/WJsrD0nzQAWkmPPIuyVcy2GMIcfNr0Z8JJOLjRvtlkKxa49FCNXMePBikQ==",
-      "dev": true,
-      "dependencies": {
-        "postcss-scss": "^4.0.6",
-        "stylelint-scss": "^4.4.0"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.13.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.21",
-        "stylelint": "^15.2.0"
-      }
-    },
-    "node_modules/stylelint-config-sass-guidelines/node_modules/stylelint-scss": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-4.7.0.tgz",
-      "integrity": "sha512-TSUgIeS0H3jqDZnby1UO1Qv3poi1N8wUYIJY6D1tuUq2MN3lwp/rITVo0wD+1SWTmRm0tNmGO0b7nKInnqF6Hg==",
-      "dev": true,
-      "dependencies": {
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.11",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.5.1 || ^15.0.0"
-      }
-    },
-    "node_modules/stylelint-config-scss": {
-      "version": "1.0.0-security",
-      "resolved": "https://registry.npmjs.org/stylelint-config-scss/-/stylelint-config-scss-1.0.0-security.tgz",
-      "integrity": "sha512-8Pgul2mNpzTeK2KCuyV5RcDC1BgzWzU7dCLVJWuxpkKgmxrMqCvjqgyosaKbAVZy2AiaMU0zfHBt7prg7/NaxA==",
-      "dev": true
-    },
-    "node_modules/stylelint-config-standard": {
-      "version": "34.0.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-34.0.0.tgz",
-      "integrity": "sha512-u0VSZnVyW9VSryBG2LSO+OQTjN7zF9XJaAJRX/4EwkmU0R2jYwmBSN10acqZisDitS0CLiEiGjX7+Hrq8TAhfQ==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended": "^13.0.0"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^15.10.0"
-      }
-    },
-    "node_modules/stylelint-config-standard-scss": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/stylelint-config-standard-scss/-/stylelint-config-standard-scss-11.1.0.tgz",
-      "integrity": "sha512-5gnBgeNTgRVdchMwiFQPuBOtj9QefYtfXiddrOMJA2pI22zxt6ddI2s+e5Oh7/6QYl7QLJujGnaUR5YyGq72ow==",
-      "dev": true,
-      "dependencies": {
-        "stylelint-config-recommended-scss": "^13.1.0",
-        "stylelint-config-standard": "^34.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.3.3",
-        "stylelint": "^15.10.0"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/stylelint-order": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-6.0.3.tgz",
-      "integrity": "sha512-1j1lOb4EU/6w49qZeT2SQVJXm0Ht+Qnq9GMfUa3pMwoyojIWfuA+JUDmoR97Bht1RLn4ei0xtLGy87M7d29B1w==",
-      "dev": true,
-      "dependencies": {
-        "postcss": "^8.4.21",
-        "postcss-sorting": "^8.0.2"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.0.0 || ^15.0.0"
-      }
-    },
-    "node_modules/stylelint-scss": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-5.3.1.tgz",
-      "integrity": "sha512-5I9ZDIm77BZrjOccma5WyW2nJEKjXDd4Ca8Kk+oBapSO4pewSlno3n+OyimcyVJJujQZkBN2D+xuMkIamSc6hA==",
-      "dev": true,
-      "dependencies": {
-        "known-css-properties": "^0.29.0",
-        "postcss-media-query-parser": "^0.2.3",
-        "postcss-resolve-nested-selector": "^0.1.1",
-        "postcss-selector-parser": "^6.0.13",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "peerDependencies": {
-        "stylelint": "^14.5.1 || ^15.0.0"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/supports-hyperlinks": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-3.0.0.tgz",
-      "integrity": "sha512-QBDPHyPQDRTy9ku4URNGY5Lah8PAaXs6tAAwp55sL5WCsSW7GIfdf6W5ixfziW+t7wh3GVvHyHHyQ1ESsoRvaA==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0",
-        "supports-color": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=14.18"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-hyperlinks/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/svg-tags": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz",
-      "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
-      "dev": true
-    },
-    "node_modules/table": {
-      "version": "6.8.1",
-      "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",
-      "integrity": "sha512-Y4X9zqrCftUhMeH2EptSSERdVKt/nEdijTOacGD/97EKjhQ/Qs8RTlEGABSJNNN8lac9kheH+af7yAkEWlgneA==",
-      "dev": true,
-      "dependencies": {
-        "ajv": "^8.0.1",
-        "lodash.truncate": "^4.4.2",
-        "slice-ansi": "^4.0.0",
-        "string-width": "^4.2.3",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      }
-    },
-    "node_modules/to-regex-range": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-      "dependencies": {
-        "is-number": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=8.0"
-      }
-    },
-    "node_modules/trim-newlines": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-4.1.1.tgz",
-      "integrity": "sha512-jRKj0n0jXWo6kh62nA5TEh3+4igKDXLvzBJcPpiizP7oOolUrYIxmVBG9TOtHYFHoddUk6YvAkGeGoSVTXfQXQ==",
-      "dev": true,
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/type-fest": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz",
-      "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/uri-js": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
-      "dependencies": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "dev": true
-    },
-    "node_modules/validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "dependencies": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
-      }
-    },
-    "node_modules/wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-      "dev": true
-    },
-    "node_modules/write-file-atomic": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz",
-      "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==",
-      "dev": true,
-      "dependencies": {
-        "imurmurhash": "^0.1.4",
-        "signal-exit": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
-      }
-    },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
-    "node_modules/yargs-parser": {
-      "version": "20.2.9",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
-      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/yocto-queue": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
-      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    }
-  }
-}
diff --git a/assets/scss/package.json b/assets/scss/package.json
deleted file mode 100644
index 1055122..0000000
--- a/assets/scss/package.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name": "mmrecomp-ui-scss",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "start": "npm run watch",
-    "watch": "sass --no-source-map --no-charset --style=compressed main.scss ..\\recomp.rcss --watch",
-    "watch:debug": "sass --no-source-map --no-charset main.scss ..\\recomp.rcss --watch",
-    "build": "sass --no-source-map --no-charset --style=compressed main.scss ..\\recomp.rcss",
-    "build:debug": "sass --no-source-map --no-charset main.scss ..\\recomp.rcss",
-    "lint": "stylelint '.\\**\\*.scss'"
-  },
-  "author": "",
-  "license": "ISC",
-  "devDependencies": {
-    "postcss-scss": "^4.0.9",
-    "stylelint": "^15.11.0",
-    "stylelint-config-property-sort-order-smacss": "^9.1.0",
-    "stylelint-config-sass-guidelines": "^10.0.0",
-    "stylelint-config-scss": "^1.0.0-security",
-    "stylelint-config-standard": "^34.0.0",
-    "stylelint-config-standard-scss": "^11.1.0",
-    "stylelint-scss": "^5.3.1"
-  },
-  "dependencies": {
-    "sass": "^1.75.0"
-  }
-}
diff --git a/assets/scss/styles/base.scss b/assets/scss/styles/base.scss
deleted file mode 100644
index 88e158e..0000000
--- a/assets/scss/styles/base.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@use 'sass:math';
-@import "./functions/spacing";
-@import "./vars/spacing";
-@import "./vars/colors";
-@import "./vars/borders";
-@import "./vars/gradients";
-@import "./vars/transitions";
-@import "./vars/animations";
-@import "./mixins/typography";
-@import "./mixins/transitions";
-@import "./mixins/helpers";
diff --git a/assets/scss/styles/components/BottomLeft.scss b/assets/scss/styles/components/BottomLeft.scss
deleted file mode 100644
index 28821c8..0000000
--- a/assets/scss/styles/components/BottomLeft.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@use 'sass:math';
-
-.bottom-left {
-    display: flex;
-    position: absolute;
-    bottom: space(4);
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: flex-start;
-    width: 100%;
-    max-width: space($base-modal-max-width);
-    height: auto;
-    margin: 0 space(4);
-}
diff --git a/assets/scss/styles/components/Button.scss b/assets/scss/styles/components/Button.scss
deleted file mode 100644
index d5d1514..0000000
--- a/assets/scss/styles/components/Button.scss
+++ /dev/null
@@ -1,81 +0,0 @@
-@use 'sass:color';
-
-@mixin create-button-variation($base-col) {
-    border-color: rgba($base-col, 0.8);
-    background-color: rgba($base-col, 0.05);
-    color: $color-text-dim;
-
-    &:focus, &:hover {
-        border-color: $base-col;
-        background-color: rgba($base-col, 0.3);
-        color: $color-text;
-    }
-
-    &:disabled,&[disabled] {
-        color: $color-text-inactive;
-    }
-
-    &:active {
-        background-color: rgba($base-col, 0.2);
-        color: color.scale($color-text, $lightness: 20%);
-    }
-}
-
-.button {
-    @extend %label-md;
-    @extend %nav-all;
-    @include create-button-variation($color-primary);
-    @include trans-colors;
-
-    display: block;
-    width: auto;
-    height: auto;
-    // leave 1dp room for border expansion
-    padding: space(24 - 1);
-    border-width: $border-width-thickness;
-
-    border-radius: $border-radius-md;
-
-    // Setting it by default for convenience
-    &--primary {
-        @include create-button-variation($color-primary);
-    }
-
-    &--large {
-        @extend %label-lg;
-    }
-
-    &--secondary {
-        @include create-button-variation($color-secondary);
-    }
-
-    &--tertiary {
-        @include create-button-variation($color-text);
-    }
-
-    &--success {
-        @include create-button-variation($color-success);
-    }
-
-    &--error {
-        @include create-button-variation($color-error);
-    }
-
-    &--warning {
-        @include create-button-variation($color-warning);
-    }
-
-    &:not([disabled]) {
-        @extend %nav-all;
-        cursor: pointer;
-    }
-
-    &:disabled,&[disabled] {
-        opacity: 0.5;
-    }
-
-    &__label {
-        width: auto;
-        height: auto;
-    }
-}
diff --git a/assets/scss/styles/components/CenteredPage.scss b/assets/scss/styles/components/CenteredPage.scss
deleted file mode 100644
index a724472..0000000
--- a/assets/scss/styles/components/CenteredPage.scss
+++ /dev/null
@@ -1,73 +0,0 @@
-@use 'sass:math';
-
-.centered-page {
-    display: flex;
-    // visibility: hidden;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    padding: space($page-margin);
-    background-color: $color-border-soft;
-}
-
-.centered-page__modal {
-    display: flex;
-    position: relative;
-    flex: 1 1 100%;
-    flex-direction: column;
-    width: 100%;
-    max-width: space($base-modal-max-width);
-    height: 100%;
-    margin: auto;
-    border-width: $border-width-thickness;
-    border-radius: $border-radius-modal;
-    border-color: $color-border;
-    background: $color-modal-overlay;
-
-    > .tabs {
-        display: flex;
-        position: relative;
-        flex: 1 1 100%;
-        flex-direction: column;
-        width: 100%;
-        max-width: space($base-modal-max-width);
-        height: 100%;
-        margin: auto;
-    }
-
-    panels {
-        flex: 1 1 100%;
-    }
-}
-
-.centered-page__controls {
-    display: flex;
-    position: absolute;
-    bottom: space(24);
-    flex-direction: row;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    max-width: space($base-modal-max-width);
-    height: auto;
-    margin: 0 auto;
-
-    > label {
-        @extend %label-sm;
-        display: inline-block;
-        align-items: center;
-        justify-content: space-between;
-        width: auto;
-        height: space(24);
-
-        &:not(:last-child) {
-            margin-right: space(40);
-        }
-
-        > span:first-child {
-            margin-right: space(4);
-        }
-    }
-}
diff --git a/assets/scss/styles/components/Config.scss b/assets/scss/styles/components/Config.scss
deleted file mode 100644
index 54c6e1d..0000000
--- a/assets/scss/styles/components/Config.scss
+++ /dev/null
@@ -1,101 +0,0 @@
-
-.config__icon-buttons {
-    display: flex;
-    position: absolute;
-    top: space(8);
-    right: space(0);
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-end;
-    width: auto;
-
-    .icon-button {
-        margin: 0 space(8);
-    }
-}
-
-.config__form {
-    @include border-top($color-border-soft);
-    display: flex;
-    flex: 1 1 100%;
-    flex-direction: column;
-    justify-content: space-between;
-    width: 100%;
-    height: 100%;
-    border-bottom-right-radius: $border-radius-modal;
-    border-bottom-left-radius: $border-radius-modal;
-}
-
-.config__wrapper {
-    flex: 1 1 100%;
-    width: auto;
-    height: auto;
-    padding: space(16);
-    border-radius: 0dp;
-    border-bottom-right-radius: $border-radius-modal;
-    border-bottom-left-radius: $border-radius-modal;
-    background-color: $color-bg-shadow;
-    text-align: left;
-
-    p {
-        @extend %body;
-        padding: space(16);
-        line-height: space(28);
-        white-space: pre-line;
-
-        b {
-            color: $color-primary;
-        }
-
-        i {
-            color: $color-warning;
-            font-style: normal;
-        }
-    }
-}
-
-.config__hz-wrapper {
-    display: flex;
-    flex: 1 1 100%;
-    flex-direction: row;
-    width: 100%;
-    height: 100%;
-    border-radius: 0dp;
-    text-align: left;
-}
-
-.config__header, .config__footer {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    background-color: $color-bg-shadow;
-}
-
-.config__header {
-    @include border-bottom($color-border-soft);
-    padding: space(12) space(20);
-}
-
-.config__footer {
-    @include border-top($color-border-soft);
-    padding: space(20) space(20);
-    border-bottom-right-radius: $border-radius-modal;
-    border-bottom-left-radius: $border-radius-modal;
-}
-
-.config__header-left {
-    display: flex;
-    flex: 1 1 auto;
-    flex-direction: row;
-
-    > :not(:first-child) {
-        margin-left: space(8);
-    }
-}
-
-.config__row {
-    display: flex;
-    flex-direction: row;
-}
-
diff --git a/assets/scss/styles/components/ConfigDescription.scss b/assets/scss/styles/components/ConfigDescription.scss
deleted file mode 100644
index 2f4966f..0000000
--- a/assets/scss/styles/components/ConfigDescription.scss
+++ /dev/null
@@ -1,27 +0,0 @@
-.config-description {
-    flex: 1 1 100%;
-    width: auto;
-    height: auto;
-    padding: space(16);
-    border-radius: 0dp;
-    border-bottom-right-radius: $border-radius-modal;
-    border-bottom-left-radius: $border-radius-modal;
-    background-color: $color-bg-shadow;
-    text-align: left;
-
-    &__contents {
-        @extend %body;
-        padding: space(16);
-        line-height: space(28);
-        white-space: pre-line;
-
-        b {
-            color: $color-primary;
-        }
-
-        i {
-            color: $color-warning;
-            font-style: normal;
-        }
-    }
-}
diff --git a/assets/scss/styles/components/ConfigGroup.scss b/assets/scss/styles/components/ConfigGroup.scss
deleted file mode 100644
index 9f6444b..0000000
--- a/assets/scss/styles/components/ConfigGroup.scss
+++ /dev/null
@@ -1,29 +0,0 @@
-
-.config-group {
-    position: relative;
-
-    &--scrollable {
-        flex: 1 1 100%;
-        width: auto;
-        height: auto;
-        padding: 0 0 0 space(16);
-        
-        .config-group__wrapper {
-            max-height: 100%;
-            overflow-y: auto;
-        }
-    }
-
-    &__title {
-        @extend %label-md;
-        color: $color-primary;
-
-        &--hidden {
-            display: none;
-        }
-    }
-    
-    &__wrapper {
-        padding: space(16) 0;
-    }
-}
diff --git a/assets/scss/styles/components/ConfigOption.scss b/assets/scss/styles/components/ConfigOption.scss
deleted file mode 100644
index 26acd85..0000000
--- a/assets/scss/styles/components/ConfigOption.scss
+++ /dev/null
@@ -1,413 +0,0 @@
-.config-option {
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: flex-start;
-    margin: space(16) space(0) space(24);
-
-    &--hz {
-        flex-direction: row-reverse;
-        align-items: center;
-        margin-top: space(4);
-        margin-bottom: space(4);
-
-        .config-option__title {
-            @extend %label-md;
-            flex: 1 1 100%;
-        }
-
-        .config-option__list {
-            flex: 1 1 auto;
-            width: auto;
-        }
-
-        &:first-child {
-            margin-top: 0;
-        }
-
-        &:last-child {
-            margin-bottom: 0;
-        }
-    }
-}
-
-.config-option__title {
-    @extend %label-md;
-    padding: 0 space(12);
-}
-
-.config-option__radio-tabs,
-.config-option__list {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: flex-start;
-    width: 100%;
-    height: auto;
-    padding: 0;
-
-    input:first-of-type {
-        nav-left: none;
-    }
-
-    input:last-of-type {
-        nav-right: none;
-    }
-
-    .config-option__tab-label {
-        @extend %label-sm;
-        @include trans-colors-opa;
-        display: block;
-        position: relative;
-        height: auto;
-        margin: space(4) space(12) 0;
-        padding: space(8) 0;
-        color: $color-text-inactive;
-        tab-index: none;
-
-        &:hover {
-            color: $color-text;
-            cursor: pointer;
-        }
-    }
-
-    .config-option__checkbox-wrapper {
-        @include trans-colors-opa;
-        width: space(32);
-        height: space(32);
-        margin: space(4) space(12) 0;
-        border-radius: $border-radius-sm;
-        opacity: 0.5;
-        background-color: $color-bg-overlay;
-        cursor: pointer;
-
-        &:hover {
-            opacity: 1;
-        }
-        
-        &[checked] {
-            background-color: $color-a;
-        }
-    }
-
-    .config-option__checkbox {
-        @extend %nav-all;
-        @include trans-colors-opa;
-        visibility: visible;
-        width: 0;
-        height: 0;
-    }
-
-    // TODO: Remove & Replace old stylings
-    input.radio {
-        @extend %nav-all;
-        @include trans-colors-opa;
-        visibility: visible;
-        width: 0;
-        height: 0;
-
-        &:not(:disabled) {
-            &:checked + .config-option__tab-label {
-                border-bottom: 1dp;
-                border-color: $color-text;
-                color: $color-text;
-    
-                &:hover {
-                    cursor: default;
-                }
-            }
-    
-            .rmlui-window:not([mouse-active]) &:focus + .config-option__tab-label {
-                transition: none;
-                animation: $focus-anim-border;
-                border-color: $color-secondary;
-                color: $color-secondary;
-            }
-
-            &:focus + .config-option__tab-label,
-            &:hover + .config-option__tab-label {
-                color: $color-text;
-            }
-        }
-
-        &:disabled + .config-option__tab-label {
-            opacity: 0.5;
-
-            &:hover {
-                cursor: default;
-            }
-        }
-    }
-
-    input.range slidertrack {
-        @include trans-colors;
-        height: 2dp;
-        margin-top: space(8);
-        background-color: $color-border;
-    }
-    
-    input.range sliderbar {
-        @include trans-colors;
-        width: space(16);
-        height: space(16);
-        margin-top: space(1);
-        margin-right: space(-8);
-        margin-left: space(-8);
-        transition: background-color $transition-quick;
-        border-radius: 8dp;
-        background-color: $color-text-dim;
-        
-        .rmlui-window:not([mouse-active]) &:focus {
-            @include border($color-a);
-            animation: $focus-anim-bg;
-        }
-
-        &:hover {
-            background-color: $color-text;
-            cursor: pointer;
-        }
-    }
-    
-    input.range sliderbar:active,
-    input.range slidertrack:active + sliderbar {
-        background-color: $color-secondary;
-    }
-
-    input.range sliderarrowdec,
-    input.range sliderarrowinc {
-        display: none;
-    }
-}
-
-.config-option__details {
-    @extend %label-xs;
-    height: space(18);
-    margin: space(14) space(12) 0;
-    color: $color-primary;
-}
-
-.config-option-color {
-    width: 100%;
-    max-width: space(360);
-    height: auto;
-    margin-top: space(4);
-    margin-left: space(12);
-    padding: 0;
-
-    &__preview-wrapper {
-        display: flex;
-        flex-direction: row;
-        width: 100%;
-        height: space(8 * 9);
-    }
-
-    &__preview-block {
-        display: block;
-        width:  space(8 * 11);
-        height: 100%;
-        border-width: $border-width-thickness;
-        border-radius: $border-radius-lg;
-        border-color: $color-border;
-    }
-
-    &__hsv-wrapper {
-        display: flex;
-        flex: 1 1 100%;
-        flex-direction: column;
-        width: auto;
-        height: auto;
-        padding-left: space(8);
-
-        .config-option-range {
-            flex: 1 1 auto;
-
-            label {
-                min-width: space(72);
-            }
-
-            input {
-                flex: 1 1 auto;
-            }
-        }
-    }
-}
-
-.config-option-range {
-    display: flex;
-    flex-direction: row;
-    align-items: flex-start;
-    justify-content: flex-start;
-    width: 100%;
-    max-width: space(360);
-    height: auto;
-    margin-top: space(4);
-    padding: 0;
-
-    &__label {
-        @extend %label-sm;
-
-        display: block;
-        width: space(56);
-        margin: 0 12dp;
-        margin-right: space(16);
-        padding: 0;
-        color: $color-text;
-        tab-index: none;
-    }
-
-    &__range-input {
-        flex: 1;
-
-        slidertrack {
-            @include trans-colors;
-            height: 2dp;
-            margin-top: space(8);
-            background-color: $color-border;
-        }
-        
-        sliderbar {
-            @include trans-colors;
-            width: space(16);
-            height: space(16);
-            margin-top: space(1);
-            margin-right: space(-8);
-            margin-left: space(-8);
-            transition: background-color $transition-quick;
-            border-radius: 8dp;
-            background-color: $color-text-dim;
-            
-            .rmlui-window:not([mouse-active]) &:focus {
-                @include border($color-a);
-                animation: $focus-anim-bg;
-            }
-
-            &:hover {
-                background-color: $color-text;
-                cursor: pointer;
-            }
-        }
-        
-        sliderbar:active,
-        slidertrack:active + sliderbar {
-            background-color: $color-secondary;
-        }
-
-        sliderarrowdec,
-        sliderarrowinc {
-            display: none;
-        }
-    }
-
-}
-
-.config-option__range-wrapper {
-    max-width: space(360);
-    margin-top: space(4);
-}
-
-.config-option__range-label {
-    @extend %label-sm;
-
-    display: block;
-    // flex: 0 0 space(32);
-    width: space(56);
-    margin: 0 12dp;
-    margin-right: space(16);
-    padding: 0;
-    color: $color-text;
-    tab-index: none;
-}
-
-.config-option-dropdown, .config-option-textfield {
-    display: flex;
-    position: relative;
-    flex: 1 1 100%;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-    width: auto;
-    height: auto;
-    padding: space(8) space(24) space(8) space(12);
-
-    &__select {
-        display: block;
-        height: space(48);
-        padding: space(14);
-        cursor: pointer;
-    }
-
-    &__wrapper {
-        // Cursed guess & check so that this appears to be the same height as the select
-        $extra-space: 2;
-
-        display: flex;
-        align-items: center;
-        justify-content: flex-start;
-        width: 100%;
-        height: auto;
-        padding: space(0 + $extra-space) 0 space(10 + $extra-space);
-        cursor: text;
-
-        input {
-            width: 100%;
-            height: auto;
-            vertical-align: middle;
-        }
-    }
-
-    &__select, &__wrapper {
-        @extend %body;
-        @extend %nav-all;
-        @include trans-colors-border;
-        @include border($color-white-a50);
-        position: relative;
-        box-sizing: border-box;
-        flex: 1 1 100%;
-
-        width: auto;
-        border-radius: $border-radius-md;
-        background-color: $color-white-a5;
-
-        &:hover, &:focus {
-            @include border($color-white-a80);
-            background-color: $color-white-a20;
-        }
-
-        selectvalue {
-            display: inline;
-            height: auto;
-            margin: auto 0;
-        }
-
-        selectbox {
-            @include border($color-border);
-            margin-top: space(2);
-            padding: space(4) 0;
-            border-radius: $border-radius-md;
-            background-color: $color-background-3;
-            
-            option {
-                @extend %nav-all;
-                @include trans-colors;
-                padding: space(8) space(12);
-                background-color: $color-transparent;
-                color: $color-text-dim;
-                font-weight: 400;
-
-                &:hover, &:focus {
-                    background-color: $color-white-a20;
-                }
-
-                &:hover:not(:checked) {
-                    cursor: pointer;
-                }
-
-                &:checked {
-                    background-color: $color-white-a5;
-                    color: $color-white;
-                }
-            }
-        }
-    }
-}
diff --git a/assets/scss/styles/components/ControlOption.scss b/assets/scss/styles/components/ControlOption.scss
deleted file mode 100644
index 662fd63..0000000
--- a/assets/scss/styles/components/ControlOption.scss
+++ /dev/null
@@ -1,170 +0,0 @@
-@use 'sass:color';
-@use 'sass:math';
-
-.control-option {
-    @include set-color($color-text-dim);
-    @include trans-colors-svg;
-    display: flex;
-    position: relative;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    height: auto;
-    padding: space(4) space(16) space(4) space(20);
-    border-radius: $border-radius-sm;
-    background-color: rgba(0, 0, 0, 0);
-
-    &:focus-visible:not(:disabled, [disabled]),
-    &:hover:not(:disabled, [disabled]) {
-        @include set-color($color-text);
-        background-color: $color-bg-overlay;
-    }
-
-    &:disabled, &[disabled] {
-        opacity: 0.5;
-    }
-
-    &--active {
-        // while actively looking for inputs, set styles to the correct slots
-        $valid-binding-slots: 0, 1;
-        @each $slot in $valid-binding-slots {
-            // global attr -> this active row -> binding slot
-            [cur-binding-slot="#{$slot}"] & .control-option__binding[bind-slot="#{$slot}"] {
-                border-color: $color-error;
-
-                .control-option__binding-icon {
-                    opacity: 0;
-                }
-
-                .control-option__binding-recording {
-                    opacity: 1;
-                }
-            }
-        }
-    }
-
-    .icon-button {
-        flex: 1 1 auto;
-    }
-}
-
-.control-option__label {
-    @extend %label-md;
-    flex: 2 1 space(300);
-    height: auto;
-    white-space: nowrap;
-}
-
-.control-option__bindings {
-    display: flex;
-    position: relative;
-    flex: 2 1 space(400);
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    width: 100%;
-    height: space(56);
-    padding: 0 space(12) 0 space(4);
-}
-
-.control-option__binding {
-    @include set-color($color-text-dim);
-    @include trans-colors-border;
-    display: flex;
-    position: relative;
-
-    flex: 1 1 100%;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: space(56);
-    margin: 0 space(4);
-    padding: space(8);
-    border-width: $border-width-thickness;
-    border-radius: $border-radius-sm;
-    border-color: $color-bg-overlay;
-    background-color: $color-bg-overlay;
-
-    &:focus, &:hover {
-        @include set-color($color-text);
-        border-color: $color-text;
-        background-color: $color-border-soft;
-    }
-
-    &:active {
-        @include set-color(color.scale($color-text, $lightness: 20%));
-    }
-
-    &:disabled, &[disabled] {
-        @include set-color($color-text-dim);
-        opacity: 0.5;
-    }
-
-    &:not([disabled]) {
-        @extend %nav-all;
-        cursor: pointer;
-    }
-}
-
-.control-option__binding-icon {
-    @include trans-colors-opa;
-    opacity: 1;
-}
-
-@keyframes control-option__binding-recording-scale {
-	0% {
-		transform: scale(1);
-	}
-
-	50% {
-		transform: scale(0.85);
-	}
-
-	100% { 
-		transform: scale(1);
-	}
-}
-
-.control-option__binding-recording {
-    @include trans-colors-opa;
-    display: flex;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    align-items: center;
-    justify-content: center;
-    opacity: 0;
-
-    .control-option__binding-circle {
-        $rec-size: 24;
-
-        width: space($rec-size);
-        height: space($rec-size);
-        animation: 1.5s sine-in-out infinite control-option__binding-recording-scale;
-        border-radius: space($rec-size);
-        background-color: $color-error;
-    }
-
-    .control-option__binding-edge {
-        $edge-size: 36;
-        $h-edge-size: math.div($edge-size, 2);
-
-        position: absolute;
-
-        top: 50%;
-        left: 50%;
-        width: space($edge-size);
-        height: space($edge-size);
-
-        transform: translate(-50%, -50%);
-        
-        > svg.control-option__binding-edge-svg {
-            width: space($edge-size);
-            height: space($edge-size);
-            image-color: $color-error;
-        }
-    }
-}
diff --git a/assets/scss/styles/components/IconButton.scss b/assets/scss/styles/components/IconButton.scss
deleted file mode 100644
index 4e1822a..0000000
--- a/assets/scss/styles/components/IconButton.scss
+++ /dev/null
@@ -1,92 +0,0 @@
-@use 'sass:color';
-
-/*
-    <button
-        class="icon-button icon-button--error"
-    >
-        <svg src="icons/Trash.svg" />
-    </button>
-*/
-@mixin create-icon-button-variation($base-col) {
-    border-color: rgba($base-col, 0.8);
-    background-color: rgba($base-col, 0.05);
-
-    &:focus, &:hover {
-        border-color: $base-col;
-        background-color: rgba($base-col, 0.3);
-    }
-
-    &:active {
-        background-color: rgba($base-col, 0.2);
-    }
-}
-
-$icon-button-size: 56 - ($border-width-thickness-num * 2);
-
-.icon-button {
-    @include set-color($color-text-dim);
-    @include trans-colors-border;
-
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: space($icon-button-size);
-    min-width: space($icon-button-size);
-    max-width: space($icon-button-size);
-    height: space($icon-button-size);
-    min-height: space($icon-button-size);
-    max-height: space($icon-button-size);
-    border-width: $border-width-thickness;
-    border-radius: space($icon-button-size * 0.5);
-    border-color: $color-transparent;
-    background-color: $color-transparent;
-
-    &:focus, &:hover {
-        @include set-color($color-text);
-        background-color: $color-border;
-    }
-
-    &:active {
-        @include set-color(color.scale($color-text, $lightness: 20%));
-        background-color: $color-border-soft;
-    }
-
-    &:disabled,&[disabled] {
-        @include set-color($color-text-dim);
-        opacity: 0.5;
-    }
-
-    &:not([disabled]) {
-        @extend %nav-all;
-        cursor: pointer;
-    }
-
-    svg {
-        width: space(32);
-        height: space(32);
-    }
-
-    &--primary {
-        @include create-icon-button-variation($color-primary);
-    }
-
-    &--secondary {
-        @include create-icon-button-variation($color-secondary);
-    }
-
-    &--tertiary {
-        @include create-icon-button-variation($color-text);
-    }
-
-    &--success {
-        @include create-icon-button-variation($color-success);
-    }
-
-    &--error {
-        @include create-icon-button-variation($color-error);
-    }
-
-    &--warning {
-        @include create-icon-button-variation($color-warning);
-    }
-}
diff --git a/assets/scss/styles/components/InputConfig.scss b/assets/scss/styles/components/InputConfig.scss
deleted file mode 100644
index c01374e..0000000
--- a/assets/scss/styles/components/InputConfig.scss
+++ /dev/null
@@ -1,349 +0,0 @@
-@use 'sass:math';
-
-// Probably will need to adjust for other langs...
-$mapping-min-width: 80 * 8;
-$visual-max-width: $base-modal-max-width - $mapping-min-width - $scrollbar-width;
-
-.input-config {
-    padding: 0;
-}
-
-.input-config__horizontal-split {
-    display: flex;
-    position: relative;
-    flex-direction: row;
-    height: 100%;
-}
-
-.input-config__mappings {
-    display: block;
-    flex: 1 1 auto;
-    min-width: space($mapping-min-width);
-    height: 100%;
-}
-
-.input-config__mappings-scroll {
-    display: block;
-    width: 100%;
-    max-height: 100%;
-    overflow-y: auto;
-}
-
-.input-config__mappings-wrapper {
-    padding: space(8);
-}
-
-.input-config__visual-wrapper {
-    display: block;
-    flex: 1 1 100%;
-    width: auto;
-    max-width: space($visual-max-width);
-    height: auto;
-    max-height: space(math.div($visual-max-width, 4) * 3);
-    margin: auto 0;
-}
-
-.input-config__visual-aspect {
-    position: relative;
-    width: 100%;
-    margin: auto 0;
-    padding-bottom: 75%;
-    background-color: $color-bg-shadow;
-}
-
-.input-config__visual {
-    display: flex;
-    position: absolute;
-    top: space(16);
-    right: space(16);
-    bottom: space(16);
-    left: space(16);
-    flex-direction: column;
-    border-radius: space(108);
-    background-color: $color-white-a5;
-}
-
-.input-config__visual-half {
-    display: flex;
-    position: relative;
-    flex: 1 1 100%;
-    flex-direction: row;
-    padding: 6%;
-
-    &--bottom {
-        align-items: flex-end;
-        justify-content: space-between;
-    }
-}
-
-.input-config__visual-quarter-left {
-    display: flex;
-    flex: 1 1 50%;
-    align-items: flex-start;
-    justify-content: flex-start;
-    width: auto;
-}
-
-.input-config__visual-quarter-right {
-    display: flex;
-    flex: 1 1 100%;
-    align-items: flex-start;
-    justify-content: flex-end;
-}
-
-.input-config__visual-stick-wrapper {
-    display: flex;
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    align-items: center;
-    justify-content: center;
-}
-
-.input-viz {
-    @include trans-colors-opa;
-    display: flex;
-    position: relative;
-    align-items: center;
-    justify-content: center;
-
-    > svg:not(.input-viz__dpad-arrow) {
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-    }
-
-    &__mappings div {
-        @extend %prompt-font-sm;
-    }
-}
-
-$all-inputs: A,
-    B,
-    Z,
-    START,
-    DPAD_UP,
-    DPAD_DOWN,
-    DPAD_LEFT,
-    DPAD_RIGHT,
-    L,
-    R,
-    C_UP,
-    C_DOWN,
-    C_LEFT,
-    C_RIGHT,
-    X_AXIS_NEG,
-    X_AXIS_POS,
-    Y_AXIS_NEG,
-    Y_AXIS_POS;
-
-// Show default state while no inputs are active
-[cur-input="NONE"] .input-viz[visual-input] {
-    opacity: 1;
-}
-
-@each $inp in $all-inputs {
-    .input-viz[visual-input~="#{$inp}"] {
-        opacity: 0.25;
-
-        [cur-input="#{$inp}"] & {
-            opacity: 1.0;
-        }
-    }
-}
-
-@mixin set-sizes($sz) {
-    width: space($sz);
-    height: space($sz);
-    
-    > svg {
-        width: space($sz);
-        height: space($sz);
-    }
-}
-
-.input-viz__button {
-    @include set-color($color-text);
-
-    &--sm {
-        @include set-sizes(64);
-    }
-
-    &--md {
-        @include set-sizes(76);
-    }
-
-    &--lg {
-        @include set-sizes(84);
-    }
-
-    &--C {
-        @include set-svgs-color($color-warning);
-    }
-
-    &--A {
-        @include set-svgs-color($color-a);
-        margin-top: auto;
-    }
-
-    &--B {
-        @include set-svgs-color($color-success);
-    }
-
-    &--Start {
-        @include set-svgs-color($color-error);
-    }
-}
-
-.input-viz__Z {
-    @include set-svgs-color($color-warning);
-    @include set-sizes(136);
-}
-
-$dpad-size: 192;
-
-.input-viz.input-viz__dpad {
-    @include set-svgs-color($color-text);
-    @include set-sizes($dpad-size);
-    position: relative;
-}
-
-$stick-size: 200;
-
-.input-config__visual-stick {
-    display: flex;
-    position: relative;
-    align-items: center;
-    justify-content: center;
-    width: space($stick-size);
-    height: space($stick-size);
-    border-radius: space(math.div($stick-size, 2));
-    background-color: $color-white-a5;
-}
-
-.input-viz__dpad-split,
-.input-viz__stick-split {
-    @include inset-block(0);
-    display: flex;
-    width: 100%;
-    height: 100%;
-
-    &--vertical {
-        flex-direction: column;
-        align-items: center;
-        justify-content: space-between;
-    }
-
-    &--horizontal {
-        flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
-    }
-
-    > div {
-        display: flex;
-        flex: 1 1 100%;
-        flex-direction: row;
-        align-items: center;
-        justify-content: center;
-    }
-}
-
-.input-viz__dpad-split > div {
-    width: space(math.div($dpad-size, 3));
-    height: space(math.div($dpad-size, 3));
-}
-
-.input-viz__stick-split > div {
-    width: space(math.div($stick-size, 3));
-    height: space(math.div($stick-size, 3));
-}
-
-.input-viz__dpad-arrow {
-    $edge-dist: space(4);
-    position: absolute;
-    width: space(60);
-    height: space(60);
-
-    &--up {
-        top: $edge-dist;
-        margin: 0 auto;
-    }
-
-    &--down {
-        bottom: $edge-dist;
-        margin: 0 auto;
-        transform: rotate(180deg);
-    }
-
-    &--left {
-        left: $edge-dist;
-        margin: auto 0;
-        transform: rotate(-90deg);
-    }
-
-    &--right {
-        right: $edge-dist;
-        margin: auto 0;
-        transform: rotate(90deg);
-    }
-}
-
-.input-viz__R {
-    @include set-svgs-color($color-white);
-    @include set-sizes(96);
-}
-
-.input-viz__L {
-    @include set-svgs-color($color-secondary);
-    @include set-sizes(136);
-}
-
-.input-config__c-buttons {
-    position: relative;
-    width: space(76 + 76 + 56);
-    height: space(76 + 56);
-
-    &-lr, &-du {
-        display: flex;
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-    }
-
-    &-lr {
-        flex-direction: row;
-        align-items: flex-start;
-        justify-content: space-between;
-    }
-
-    &-du {
-        flex-direction: column-reverse;
-        align-items: center;
-        justify-content: space-between;
-    }
-
-    .input-viz {
-        &[visual-input="C_UP"] {
-            margin-top: space(-32);
-        }
-    }
-}
-
-.input-config__main-buttons {
-    display: flex;
-    position: relative;
-    flex-direction: row;
-    justify-content: space-between;
-    width: space(268);
-    // WORKAROUND FIX: prevents RMLui assert error
-    min-width: 1dp;
-    height: space(128);
-    margin-right: space(10);
-}
diff --git a/assets/scss/styles/components/Launcher.scss b/assets/scss/styles/components/Launcher.scss
deleted file mode 100644
index 89e4fce..0000000
--- a/assets/scss/styles/components/Launcher.scss
+++ /dev/null
@@ -1,108 +0,0 @@
-
-// TODO: Affect all elements with launcher fade-in
-// @keyframes fade-launcher-in {
-// 	0% {
-// 		opacity: 0;
-// 	}
-// 	to { 
-// 		opacity: 1;
-// 	}
-// }
-
-.launcher {
-    display: block;
-    position: relative;
-    flex-direction: row;
-    justify-content: space-between;
-    width: 100%;
-    height: 100%;
-    background-color: $color-background-1;
-}
-
-.launcher__vertical-split {
-    display: flex;
-    position: absolute;
-    top: 0;
-    right: 50%;
-    bottom: 0;
-    left: 0;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: space-between;
-
-    &--right {
-        right: 0;
-        left: 50%;
-        align-items: flex-end;  
-    }
-}
-
-
-@keyframes slide-mm-bg-over {
-	0% {
-		transform: translateX(space(100));
-	}
-
-	100% { 
-		transform: translateX(space(0));
-	}
-}
-
-.launcher__background-wrapper {
-    display: flex;
-    position: absolute;
-    top: -55vw;
-    right: -100%;
-    bottom: -50vw;
-    left: -70vw;
-    align-items: center;
-    justify-content: flex-start;
-    transform: translateX(space(0));
-    animation: 25s cubic-out 1 slide-mm-bg-over;
-}
-
-@keyframes fade-mm-in {
-	0% {
-		opacity: 0;
-	}
-
-	100% { 
-		opacity: 0.1;
-	}
-}
-
-.launcher__background-mm {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    width: auto;
-    height: 100%;
-    animation: 2.5s cubic-in-out 1 fade-mm-in;
-    opacity: 0.1;
-}
-
-.launcher__title-quadrant {
-    flex: 1 1 auto;
-    width: auto;
-    height: auto;
-    padding-top: space(96);
-    padding-left: space(96);
-
-    &--right {
-        padding-right: space(96);
-        padding-left: 0;
-    }
-}
-
-.launcher__content-quadrant {
-    display: flex;
-    position: relative;
-    flex: 1 1 100%;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: flex-end;
-    width: 100%;
-    height: auto;
-    padding: space(32);
-}
diff --git a/assets/scss/styles/components/MenuListItem.scss b/assets/scss/styles/components/MenuListItem.scss
deleted file mode 100644
index 657f0ef..0000000
--- a/assets/scss/styles/components/MenuListItem.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-
-/*
-    Example layout:
-        <button class="menu-list-item menu-list-item--right">
-            <div class="menu-list-item__bullet">•</div>
-            <div class="menu-list-item__label">Setup controls</div>
-        </button>
-    - Variants:
-        .menu-list-item--right (align to right side)
-    - Optional:
-        - <div class="subtitle-title__disclaimer">Coming Soon™</div>
-
-*/
-
-.menu-list-item {
-    @include set-color($color-text-dim);
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    width: 100%;
-    height: auto;
-    padding: space(16);
-    border-radius: $border-radius-sm;
-    background-color: rgba(0, 0, 0, 0);
-    cursor: pointer;
-
-    &--right {
-        flex-direction: row-reverse;
-        align-content: flex-end;
-
-        .menu-list-item__bullet {
-            margin-left: space(12);
-            opacity: 1;
-        }
-
-        &.menu-list-item:focus:not(:disabled, [disabled]),
-        &.menu-list-item:hover:not(:disabled, [disabled]) {
-            decorator: $primary-rl-fade;
-        }
-    }
-
-    &:focus:not(:disabled, [disabled]),
-    &:hover:not(:disabled, [disabled]) {
-        @include set-color($color-primary);
-        decorator: $primary-lr-fade;
-
-        .menu-list-item__bullet {
-            opacity: 1;
-        }
-    }
-
-    &:not(:disabled, [disabled]) {
-        @extend %nav-all;
-    }
-
-    &:disabled, &[disabled] {
-        opacity: 0.5;
-        tab-index: none;
-        cursor: default;
-    }
-
-}
-
-.menu-list-item__label {
-    @extend %label-lg;
-}
-
-.menu-list-item__bullet {
-    margin-right: space(12);
-    opacity: 0;
-}
diff --git a/assets/scss/styles/components/Prompt.scss b/assets/scss/styles/components/Prompt.scss
deleted file mode 100644
index d7b4a1d..0000000
--- a/assets/scss/styles/components/Prompt.scss
+++ /dev/null
@@ -1,70 +0,0 @@
-@use 'sass:math';
-
-$prompt-space: 24;
-
-.prompt {
-    &__overlay {
-        background-color: $color-bg-overlay;
-        pointer-events: auto;
-    }
-
-    &__overlay,
-    &__content-wrapper {
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-    }
-
-    &__content-wrapper {
-        display: flex;
-        position: absolute;
-        top: 0;
-        right: 0;
-        bottom: 0;
-        left: 0;
-        align-items: center;
-        justify-content: center;
-    }
-    
-    &__content {
-        display: flex;
-        position: relative;
-        flex: 1 1 100%;
-        flex-direction: column;
-        width: 100%;
-        max-width: space(700);
-        height: auto;
-        margin: auto;
-        border-width: $border-width-thickness;
-        border-radius: $border-radius-modal;
-        border-color: $color-border;
-        background: $color-modal-overlay;
-
-        h3, p {
-            margin: space($prompt-space);
-        }
-
-        p {
-            margin-top: 0;
-        }
-    }
-
-    &__controls {
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        padding: space($prompt-space) space(math.div($prompt-space, 2));
-        border-top-width: $border-width-thickness;
-        border-top-color: $color-border-soft;
-
-        .button {
-            min-width: space(math.div(700, 3));
-            margin: 0 space(math.div($prompt-space, 2));
-            text-align: center;
-            nav-up: none;
-            nav-down: none;
-        }
-    }
-}
diff --git a/assets/scss/styles/components/SubtitleTitle.scss b/assets/scss/styles/components/SubtitleTitle.scss
deleted file mode 100644
index c04def6..0000000
--- a/assets/scss/styles/components/SubtitleTitle.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-    Example layout:
-
-        <button class="subtitle-title" disabled>
-            <h3>Zelda 64: Recompiled</h3>
-            <h1>Ocarina of Time</h1>
-            <div class="subtitle-title__disclaimer">Coming Soon™</div>
-        </button>
-    - Variants:
-        .subtitle-title--right (align to right side)
-    - Optional:
-        - <div class="subtitle-title__disclaimer">Coming Soon™</div>
-
-*/
-
-.subtitle-title {
-    display: block;
-    position: relative;
-    flex-direction: column;
-    align-content: flex-start;
-    align-items: flex-start;
-    width: auto;
-    height: auto;
-    padding: 0;
-    background-color: rgba(0, 0, 0, 0);
-    color: $color-text-dim;
-    text-align: left;
-    cursor: pointer;
-
-    &--right {
-        align-content: flex-end;
-    }
-
-    &--right, &--right > * {
-        text-align: right;
-    }
-
-    &[selected] {
-        color: $color-text;
-        cursor: default;
-    }
-    
-    &:focus:not(:disabled, [disabled]),
-    &:hover:not(:disabled, [disabled], [selected]) {
-        color: $color-primary;
-    }
-
-    &:not(:disabled, [disabled]) {
-        @extend %nav-all;
-    }
-
-    &:disabled, &[disabled] {
-        opacity: 0.5;
-        cursor: default;
-        tab-index: none;
-    }
-
-    h3 {
-        margin-bottom: space(6);
-    }
-
-    h1 {
-        margin-top: space(6);
-    }
-
-    &__disclaimer {
-        @extend %label-sm;
-
-        margin-top: space(16);
-    }
-}
diff --git a/assets/scss/styles/components/Tabs.scss b/assets/scss/styles/components/Tabs.scss
deleted file mode 100644
index 53f09dc..0000000
--- a/assets/scss/styles/components/Tabs.scss
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-    Example:
-        <tab class="tab">
-            <div>Graphics</div>
-            <div class="tab__indicator"></div>
-        </tab>
-*/
-
-.tabs tabs {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-}
-
-.tab {
-    @extend %nav-all;
-    @extend %header-3;
-    display: block;
-    position: relative;
-    margin: 0;
-    padding: space(20) space(24);
-    opacity: 0.9;
-    background-color: rgba(0,0,0,0);
-    color: $color-text-inactive;
-
-    &:selected {
-        color: $color-text;
-
-        .tab__indicator {
-            background-color: $color-border-solid;
-        }
-
-        &:hover {
-            cursor: default;
-        }
-    }
-
-    .rmlui-window:not([mouse-active]) &:focus {
-        transition: none;
-        animation: $focus-anim-border;
-
-        &:selected .tab__indicator {
-            animation: $focus-anim-bg;
-        }
-    }
-
-    &:focus, &:hover {
-        opacity: 1;
-        color: $color-text;
-        cursor: pointer;
-    }
-}
-
-.tab__indicator {
-    position: absolute;
-    right: 0;
-    bottom: 2dp;
-    left: 0;
-    height: 2dp;
-    background-color: rgba(0, 0, 0, 0);
-}
diff --git a/assets/scss/styles/components/Toggle.scss b/assets/scss/styles/components/Toggle.scss
deleted file mode 100644
index 065f92d..0000000
--- a/assets/scss/styles/components/Toggle.scss
+++ /dev/null
@@ -1,97 +0,0 @@
-@use "sass:math";
-
-$toggle-width: 162;
-$toggle-height: 72;
-
-$toggle-floater-width: 80;
-$toggle-floater-height: 64;
-$toggle-floater-margin: 4;
-$toggle-checked-left-offset: $toggle-width - $toggle-floater-margin - $toggle-floater-width;
-
-.toggle {
-    @extend %nav-all;
-    @include trans-colors-opa;
-    display: flex;
-    position: relative;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-    width: space($toggle-width);
-    height: space($toggle-height);
-    border-radius: space(math.div($toggle-height, 2));
-    opacity: 0.9;
-    background: $color-transparent;
-    cursor: pointer;
-
-    &:hover, &:focus-visible, &:focus {
-        opacity: 1;
-        background-color: $color-secondary-a30;
-    }
-
-    &:active {
-        opacity: 1;
-        background-color: $color-secondary-a5;
-    }
-
-    .toggle__border {
-        @include inner-border-block($color-secondary-l);
-        border-radius: space(math.div($toggle-height, 2));
-    }
-
-    .toggle__floater {
-        position: absolute;
-        top: 50%;
-        left: space($toggle-floater-margin);
-        width: space($toggle-floater-width);
-        height: space($toggle-floater-height);
-        transform: translateY(-50%);
-        border-radius: space(math.div($toggle-floater-height, 2));
-        background: $color-secondary-d;
-    }
-    
-    &--checked {
-        .toggle__floater {
-            left: space($toggle-checked-left-offset);
-        }
-
-        .toggle__icon {
-            &.toggle__icon--left {
-                opacity: 0.9;
-                color: $color-secondary-l;
-            }
-
-            &.toggle__icon--right {
-                opacity: 1.0;
-                color: $color-text;
-            }
-        }
-    }
-}
-
-.toggle__icons {
-    display: flex;
-    position: absolute;
-    top: 50%;
-    right: space(16);
-    left: space(16);
-    align-items: center;
-    justify-content: space-between;
-    height: space(56);
-    transform: translateY(-50%);
-}
-
-.toggle__icon {
-    @extend %prompt-font-lg;
-    @include trans-colors;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: space(56);
-    height: space(56);
-    color: $color-text;
-
-    &--right {
-        opacity: 1;
-        color: $color-secondary-l;
-    }
-}
diff --git a/assets/scss/styles/components/_components.scss b/assets/scss/styles/components/_components.scss
deleted file mode 100644
index b4a936e..0000000
--- a/assets/scss/styles/components/_components.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-@import "./CenteredPage";
-@import "./ControlOption";
-@import "./Tabs";
-@import "./Config";
-@import "./ConfigGroup";
-@import "./ConfigOption";
-@import "./ConfigDescription";
-@import "./InputConfig";
-@import "./Button";
-@import "./IconButton";
-@import "./Launcher";
-@import "./MenuListItem";
-@import "./SubtitleTitle";
-@import "./Toggle";
-@import "./BottomLeft";
-@import "./Prompt";
diff --git a/assets/scss/styles/functions/_spacing.scss b/assets/scss/styles/functions/_spacing.scss
deleted file mode 100644
index 437a7ac..0000000
--- a/assets/scss/styles/functions/_spacing.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-
-@function space($amt) {
-    @return #{$amt}dp;
-}
diff --git a/assets/scss/styles/global.scss b/assets/scss/styles/global.scss
deleted file mode 100644
index 2e98925..0000000
--- a/assets/scss/styles/global.scss
+++ /dev/null
@@ -1,132 +0,0 @@
-@import "./base";
-@import "./globals/old";
-@import "./globals/scrollbars";
-@import "./components/components";
-@import "./pages/pages";
-
-$font-size: 20dp;
-
-body
-{
-    @extend %body;
-    box-sizing: border-box;
-	color: $color-text;
-	font-family: $font-stack;
-}
-
-.rmlui-window {
-    opacity: 1;
-
-    &--hidden {
-        opacity: 0;
-    }
-
-    &:not([mouse-active]) {
-        pointer-events: none;
-    }
-}
-
-.nav-vert {
-    @extend %nav-vert;
-}
-
-.nav-horiz {
-    @extend %nav-horiz;
-}
-
-.nav-dir {
-    @extend %nav-dir;
-}
-
-.nav-foc {
-    @extend %nav-foc;
-}
-
-.nav-all {
-    @extend %nav-all;
-}
-
-*, *:before, *:after {
-    box-sizing: border-box;
-}
-
-h1 {
-    @extend %header-1;
-}
-
-h2 {
-    @extend %header-2;
-}
-
-h3 {
-    @extend %header-3;
-}
-
-.label-lg {
-    @extend %label-lg;
-}
-
-.label-md {
-    @extend %label-md;
-}
-
-.label-sm {
-    @extend %label-sm;
-}
-
-.prompt-font {
-    @extend %prompt-font;
-}
-
-.prompt-font-sm {
-    @extend %prompt-font-sm;
-}
-
-button {
-    background-color: $color-primary-d;
-}
-
-@keyframes blue-pulse {
-	0% {
-		color: $color-secondary;
-	}
-
-	50% {
-		color: $color-secondary-l;
-	}
-
-	100% { 
-		color: $color-secondary;
-	}
-}
-
-@keyframes blue-pulse-with-border {
-	0% {
-		border-color: $color-secondary;
-		color: $color-secondary;
-	}
-
-	50% {
-		border-color: $color-secondary-l;
-		color: $color-secondary-l;
-	}
-
-	100% {
-		border-color: $color-secondary; 
-		color: $color-secondary;
-	}
-}
-
-@keyframes blue-pulse-background {
-	0% {
-		background-color: $color-secondary;
-	}
-
-	50% {
-		background-color: $color-secondary-l;
-	}
-
-	100% { 
-		background-color: $color-secondary;
-	}
-}
diff --git a/assets/scss/styles/globals/_old.scss b/assets/scss/styles/globals/_old.scss
deleted file mode 100644
index 20351d9..0000000
--- a/assets/scss/styles/globals/_old.scss
+++ /dev/null
@@ -1,212 +0,0 @@
-/* stylelint-disable color-no-hex */
-/* stylelint-disable selector-max-id */
-
-* {
-    box-sizing:border-box;
-}
-
-hr {
-    display:block;
-    padding:1.5dp;
-    background: $color-background-1;
-}
-
-body {
-    color: #fff;
-    font-family: chiaro;
-    font-size: 20dp;
-    font-style: normal;
-    font-weight: normal
-}
-
-/* div { 
-    focus:none;
-    tab-index:none;
-} */
-
-div#window {
-    position: relative;
-    box-sizing: border-box;
-    width: 100%;
-    height: 100%;
-    border-color: $color-border;
-    background-color: $color-background-2;
-}
-
-div#content {
-    z-index: 2;
-    width: auto;
-    height: 100%;
-    overflow: hidden auto;
-    text-align: center
-}
-
-p {
-    text-align: left;
-}
-
-input.submit {
-    margin-left: 0
-}
-
-
-input.text,
-input.password {
-    box-sizing: border-box;
-    height: 31dp;
-    padding: 11dp 10dp 0;
-    text-align: left;
-    cursor: text
-}
-
-textarea {
-    padding: 14dp 12dp 10dp;
-    text-align: left;
-    cursor: text
-}
-
-input.text,
-input.password,
-select,
-textarea {
-    /* color: #333; */
-
-    /* font-size: 13dp */
-    height: auto;
-}
-
-table input.text {
-    box-sizing: border-box;
-    width: 100%;
-    height: auto;
-
-    /* height: 18dp; */
-    margin: 0;
-    border-width: $border-width-thickness;
-    border-color: #000;
-    background-color: #fff;
-    font-size: 15dp;
-
-    /* padding: 0 5dp; */
-    line-height: 1;
-    decorator: none;
-
-    /* vertical-align: center; */
-}
-
-select {
-    // display: inline-block;
-    // /* width: 175dp; */
-    // /* height: 37dp; */
-    // /* height: auto; */
-    // text-align: left;
-    // box-sizing:border-box;
-    // /* padding: 4dp; */
-    // vertical-align: center;
-    // padding: 4dp;
-    // border-radius: 5dp;
-    // background-color: rgb(120, 120, 120);
-    // width: 100%;
-}
-// select {
-//     @extend %body;
-//     display: flex;
-//     align-items: center;
-//     justify-content: flex-start;
-//     box-sizing: border-box;
-//     padding: space(16);
-//     flex: 1 1 100%;
-//     // width: auto;
-//     height: space(1000);
-//     border-radius: $border-radius-lg;
-//     background-color: $color-white-a20;
-// }
-
-// select selectvalue {
-//     height: auto;
-//     /* padding: 4dp; */
-//     /* margin-right: 30dp; */
-//     /* height: 25dp; */
-//     /* padding: 4dp; */
-//     /* decorator: image(selectvalue) */
-// }
-
-// select:hover selectvalue {
-//     /* margin-right: 30dp; */
-//     /* height: 25dp; */
-//     /* padding: 4dp; */
-//     background-color: rgb(150, 150, 150);
-//     /* decorator: image(selectvalue) */
-// }
-
-// select selectarrow {
-//     /* width: 30dp; */
-//     /* height: 37dp; */
-//     /* decorator: image(selectarrow) */
-//     /* background-color: black; */
-//     /* appearance: none; */
-// }
-
-// select:hover selectarrow {
-//     /* decorator: image(selectarrow-hover) */
-// }
-
-// select:active selectarrow,
-// select selectarrow:checked {
-//     /* decorator: image(selectarrow-active) */
-// }
-
-// select selectbox {
-//     /* margin-left: 1dp; */
-//     /* margin-top: -7dp; */
-//     /* margin-bottom: -10dp; */
-//     /* width: 162dp; */
-//     /* padding: 1dp 4dp 4dp 4dp */
-// }
-
-// select selectbox,
-// tbody {
-//     background-color: rgb(120,120,120);
-//     /* decorator: tiled-box(selectbox-tl, selectbox-t, selectbox-tr, selectbox-l, selectbox-c, auto, selectbox-bl, selectbox-b, selectbox-br) */
-// }
-
-// select selectbox option {
-//     width: auto;
-//     background-color: rgb(120, 120, 120)
-// }
-
-// select selectbox option:nth-child(even),
-// tr:nth-child(even) {
-//     background-color: rgb(100, 100, 100)
-// }
-
-// select selectbox option:checked {
-//     font-weight:bold;
-//     color:rgb(255,255,255);
-// }
-
-// select selectbox option:hover {
-//     background: rgb(150,150,150)
-// }
-
-input.radio {
-    flex: 0;
-    width:0dp;
-    nav-up:auto;
-    nav-right:auto;
-    nav-down:auto;
-    nav-left:auto;
-    tab-index:auto;
-    focus:auto;
-}
-
-input.checkbox {
-    width: space(20);
-    height: space(20);
-    nav-up:auto;
-    nav-right:auto;
-    nav-down:auto;
-    nav-left:auto;
-    tab-index:auto;
-    focus:auto;
-}
diff --git a/assets/scss/styles/globals/_scrollbars.scss b/assets/scss/styles/globals/_scrollbars.scss
deleted file mode 100644
index 375c164..0000000
--- a/assets/scss/styles/globals/_scrollbars.scss
+++ /dev/null
@@ -1,52 +0,0 @@
-@use 'sass:math';
-
-$scrollbar-width: 12;
-
-@mixin _set-scroll-size($size-key) {
-    #{$size-key}: space($scrollbar-width);
-    
-    slidertrack {
-        #{$size-key}: space($scrollbar-width);
-    }
-    
-    sliderbar {
-        #{$size-key}: space($scrollbar-width);
-    }
-}
-
-scrollbarvertical,scrollbarhorizontal {
-    margin: 0;
-    border: 0;
-    
-    slidertrack {
-        background: $color-primary-l;
-        opacity: 0.05;
-    }
-    
-    sliderbar {
-        border-radius: space(math.div($scrollbar-width, 2) - 1);
-        background: $color-primary-l;
-        opacity: 0.1;
-
-        &:hover:not(:active) {
-            opacity: 0.2;
-        }
-
-        &:active {
-            opacity: 0.3;
-        }
-    }
-    
-    sliderarrowdec, sliderarrowinc {
-        width: 0;
-        height: 0;
-    }
-}
-
-scrollbarvertical {
-    @include _set-scroll-size(width);
-}
-
-scrollbarhorizontal {
-    @include _set-scroll-size(height);
-}
diff --git a/assets/scss/styles/mixins/_helpers.scss b/assets/scss/styles/mixins/_helpers.scss
deleted file mode 100644
index 9759630..0000000
--- a/assets/scss/styles/mixins/_helpers.scss
+++ /dev/null
@@ -1,39 +0,0 @@
-
-%nav-vert {
-    nav-up: auto;
-    nav-down: auto;
-}
-
-%nav-horiz {
-    nav-right: auto;
-    nav-left: auto;
-}
-
-%nav-dir {
-    @extend %nav-vert;
-    @extend %nav-horiz;
-}
-
-%nav-foc {
-    focus: auto;
-    tab-index: auto;
-}
-
-%nav-all {
-    @extend %nav-dir;
-    @extend %nav-foc;
-}
-
-@mixin set-svgs-color($col) {
-    svg {
-        image-color: $col;
-    }
-}
-
-/*
-@include set-color(COLOR);
-*/
-@mixin set-color($col) {
-    @include set-svgs-color($col);
-    color: $col;
-}
diff --git a/assets/scss/styles/mixins/_transitions.scss b/assets/scss/styles/mixins/_transitions.scss
deleted file mode 100644
index 06c8677..0000000
--- a/assets/scss/styles/mixins/_transitions.scss
+++ /dev/null
@@ -1,36 +0,0 @@
-
-/*
-@include trans-colors;
-*/
-@mixin trans-colors {
-    transition: color $transition-quick, background-color $transition-quick;
-}
-
-/*
-@include trans-colors-opa;
-*/
-@mixin trans-colors-opa {
-    transition: color $transition-quick, background-color $transition-quick, opacity $transition-quick;
-}
-
-/*
-@include trans-colors-svg;
-*/
-@mixin trans-colors-svg {
-    transition: color $transition-quick, background-color $transition-quick, opacity $transition-quick;
-
-    svg {
-        transition: image-color $transition-quick, background-color $transition-quick;
-    }
-}
-
-/*
-@include trans-colors-border;
-*/
-@mixin trans-colors-border {
-    transition: color $transition-quick, background-color $transition-quick, opacity $transition-quick, border-color $transition-quick;
-
-    svg {
-        transition: image-color $transition-quick, background-color $transition-quick;
-    }
-}
diff --git a/assets/scss/styles/mixins/_typography.scss b/assets/scss/styles/mixins/_typography.scss
deleted file mode 100644
index a638b1a..0000000
--- a/assets/scss/styles/mixins/_typography.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-
-$font-stack: chiaro;
-
-@mixin set-font-sizing($sz, $spacing) {
-    // font-family: $font-stack;
-    $sz-add: $sz + 4;
-    font-size: space($sz-add);
-    letter-spacing: space($sz-add * $spacing);
-    line-height: space($sz-add);
-}
-
-%header-1 {
-    @include set-font-sizing(64, 0.07);
-    font-style: normal;
-	font-weight: 700;
-}
-
-%header-2 {
-    @include set-font-sizing(48, 0.07);
-    font-style: normal;
-	font-weight: 700;
-}
-
-%header-3 {
-    @include set-font-sizing(32, 0.07);
-    font-style: normal;
-	font-weight: 700;
-}
-
-%label-lg {
-    @include set-font-sizing(32, 0.11);
-    font-style: normal;
-	font-weight: 700;
-}
-
-%label-md {
-    @include set-font-sizing(24, 0.11);
-    font-style: normal;
-	font-weight: 700;
-}
-
-%label-sm {
-    @include set-font-sizing(16, 0.14);
-    font-style: normal;
-	font-weight: 700;
-    text-transform: uppercase;
-}
-
-%label-xs {
-    @include set-font-sizing(14, 0.14);
-    font-style: normal;
-	font-weight: 400;
-}
-
-%body {
-    @include set-font-sizing(16, 0.0);
-    font-style: normal;
-	font-weight: 400;
-}
-
-%prompt-font-lg {
-    font-family: promptfont;
-    font-size: space(56);
-    font-style: normal;
-    font-weight: 400;
-    line-height: space(56);
-}
-
-%prompt-font {
-    font-family: promptfont;
-    font-size: space(40);
-    font-style: normal;
-    font-weight: 400;
-    line-height: space(40);
-}
-
-%prompt-font-sm {
-    font-family: promptfont;
-    font-size: space(32);
-    font-style: normal;
-    font-weight: 400;
-    line-height: space(32);
-}
diff --git a/assets/scss/styles/pages/_pages.scss b/assets/scss/styles/pages/_pages.scss
deleted file mode 100644
index 16e2e18..0000000
--- a/assets/scss/styles/pages/_pages.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "./config/config";
diff --git a/assets/scss/styles/pages/config/_config.scss b/assets/scss/styles/pages/config/_config.scss
deleted file mode 100644
index c4e69bc..0000000
--- a/assets/scss/styles/pages/config/_config.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "./debug";
diff --git a/assets/scss/styles/pages/config/debug.scss b/assets/scss/styles/pages/config/debug.scss
deleted file mode 100644
index 997bfc0..0000000
--- a/assets/scss/styles/pages/config/debug.scss
+++ /dev/null
@@ -1,178 +0,0 @@
-
-.config-debug {
-    display: block;
-    position: relative;
-    width: 100%;
-    max-height: 100%;
-    padding: space(8);
-}
-
-.config-debug__scroll {
-    display: block;
-    position: relative;
-    width: 100%;
-    max-height: 100%;
-    overflow-y: auto;
-}
-
-.config-debug-option {
-    @include set-color($color-text-dim);
-    @include trans-colors-svg;
-    @include border-bottom($color-border-soft);
-    display: block;
-    position: relative;
-    flex-direction: column;
-    width: 100%;
-    height: auto;
-    padding: space(12) space(4);
-    background-color: rgba(0, 0, 0, 0);
-
-    &:focus:not(:disabled, [disabled]),
-    &:focus-visible:not(:disabled, [disabled]),
-    &:hover:not(:disabled, [disabled]) {
-        @include set-color($color-text);
-        background-color: $color-bg-overlay;
-    }
-
-    &:disabled, &[disabled] {
-        opacity: 0.5;
-    }
-
-    .icon-button {
-        margin-left: space(8);
-    }
-}
-
-.config-debug__option-split {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: space-between;
-}
-
-.config-debug-option__label {
-    @extend %label-md;
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-    padding: space(4) space(16) space(12);
-    width: auto;
-    height: auto;
-    white-space: nowrap;
-}
-
-.config-debug__option-controls {
-    display: block;
-    position: relative;
-    flex: 1 1 auto;
-    height: auto;
-    width: auto;
-    max-width: space(800);
-    padding: 0 space(12);
-}
-
-.config-debug__option-trigger {
-    flex: 1 1 auto;
-}
-
-.config-debug__select-wrapper {
-    display: flex;
-    position: relative;
-    flex-direction: row;
-    align-items: center;
-    justify-content: flex-start;
-    flex: 1 1 100%;
-    width: auto;
-    max-width: space(800);
-    height: auto;
-    padding: space(4);
-
-    .config-debug__select-label {
-        @extend %label-sm;
-        padding-right: space(16);
-        flex: auto;
-        width: space(196);
-
-        > div {
-            display: inline;
-            width: auto;
-            height: auto;
-        }
-    }
-
-    input {
-        @extend %body;
-        @extend %nav-all;
-        display: block;
-        position: relative;
-        box-sizing: border-box;
-        padding: 0;
-        flex: 1 1 100%;
-        width: auto;
-        height: space(20);
-        margin: auto 0;
-    }
-
-    select {
-        @extend %body;
-        @extend %nav-all;
-        @include trans-colors-border;
-        @include border($color-white-a50);
-        display: block;
-        position: relative;
-        box-sizing: border-box;
-        padding: 0;
-        flex: 1 1 100%;
-        width: auto;
-        height: space(48);
-        border-radius: $border-radius-md;
-        background-color: $color-white-a5;
-        cursor: pointer;
-
-        align-items: center;
-        justify-content: flex-start;
-        padding: space(14);
-
-        &:hover, &:focus {
-            @include border($color-white-a80);
-            background-color: $color-white-a20;
-        }
-
-        selectvalue {
-            display: inline;
-            margin: auto 0;
-            height: auto;
-        }
-
-        selectbox {
-            @include border($color-white-a80);
-            background-color: $color-background-3;
-            padding: space(4) 0;
-            margin-top: space(2);
-            border-radius: $border-radius-md;
-            
-            option {
-                @extend %nav-all;
-                @include trans-colors;
-                padding: space(8) space(12);
-                background-color: $color-transparent;
-                color: $color-text-dim;
-                font-weight: 400;
-
-                &:hover, &:focus {
-                    background-color: $color-white-a20;
-                }
-
-                &:hover:not(:checked) {
-                    cursor: pointer;
-                }
-
-                &:checked {
-                    color: $color-white;
-                    background-color: $color-white-a5;
-                }
-            }
-        }
-    }
-}
diff --git a/assets/scss/styles/vars/_animations.scss b/assets/scss/styles/vars/_animations.scss
deleted file mode 100644
index 9315f4d..0000000
--- a/assets/scss/styles/vars/_animations.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-
-$focus-anim: blue-pulse-with-border 0.75s infinite;
-$focus-anim-border: blue-pulse 0.75s infinite;
-$focus-anim-bg: blue-pulse-background 0.75s infinite;
diff --git a/assets/scss/styles/vars/_borders.scss b/assets/scss/styles/vars/_borders.scss
deleted file mode 100644
index 5088285..0000000
--- a/assets/scss/styles/vars/_borders.scss
+++ /dev/null
@@ -1,42 +0,0 @@
-
-$border-radius-sm: 8dp;
-$border-radius-md: 12dp;
-// modals/pages
-$border-radius-lg: 16dp;
-
-$border-radius-modal: $border-radius-lg;
-
-$border-width-thickness-num: 1.1;
-// $border-width-thickness-num: 1.5;
-$border-width-thickness: space($border-width-thickness-num);
-
-@mixin border($col: $color-border) {
-    border-width: $border-width-thickness;
-    border-color: $col;
-}
-
-@mixin border-top($col: $color-border) {
-    border-top-width: $border-width-thickness;
-    border-top-color: $col;
-}
-
-@mixin border-bottom($col: $color-border) {
-    border-bottom-width: $border-width-thickness;
-    border-bottom-color: $col;
-}
-
-@mixin inset-block($inset-amt) {
-    position: absolute;
-    top: $inset-amt;
-    right: $inset-amt;
-    bottom: $inset-amt;
-    left: $inset-amt;
-}
-
-// add this to a child of the container that needs a border.
-// parent must have `position: relative` 
-@mixin inner-border-block($col: $color-border) {
-    @include inset-block($border-width-thickness);
-    @include border($col);
-    display: block;
-}
diff --git a/assets/scss/styles/vars/_colors.scss b/assets/scss/styles/vars/_colors.scss
deleted file mode 100644
index 0b5cfd7..0000000
--- a/assets/scss/styles/vars/_colors.scss
+++ /dev/null
@@ -1,71 +0,0 @@
-/* stylelint-disable color-no-hex, color-hex-length */
-
-$color-background-1: #08070D;
-$color-background-2: #121018;
-$color-background-3: #191622;
-$color-bg-overlay: rgba(190, 184, 219, 0.1000);
-$color-modal-overlay: rgba(8, 7, 13, 0.9000);
-$color-bg-shadow: rgba(0, 0, 0, 0.3500);
-$color-bg-shadow-2: rgba(8, 7, 13, 0.7200);
-$color-text: #F2F2F2;
-$color-text-dim: #CCCCCC;
-$color-text-inactive: rgba(255, 255, 255, 0.6000);
-$color-primary: #B97DF2;
-$color-primary-l: #DABAF7;
-$color-primary-d: #7A2AC6;
-$color-primary-a5: rgba(185, 125, 242, 0.0500);
-$color-primary-a20: rgba(185, 125, 242, 0.2000);
-$color-primary-a30: rgba(185, 125, 242, 0.3000);
-$color-primary-a50: rgba(185, 125, 242, 0.5000);
-$color-primary-a80: rgba(185, 125, 242, 0.8000);
-$color-secondary: #17D6E8;
-$color-secondary-l: #A2EFF6;
-$color-secondary-d: #25A1AD;
-$color-secondary-a5: rgba(23, 214, 232, 0.0500);
-$color-secondary-a20: rgba(23, 214, 232, 0.2000);
-$color-secondary-a30: rgba(23, 214, 232, 0.3000);
-$color-secondary-a50: rgba(23, 214, 232, 0.5000);
-$color-secondary-a80: rgba(23, 214, 232, 0.8000);
-$color-warning: #E9CD35;
-$color-warning-l: #F9E57C;
-$color-warning-d: #C5AA16;
-$color-warning-a5: rgba(233, 205, 53, 0.0500);
-$color-warning-a20: rgba(233, 205, 53, 0.2000);
-$color-warning-a30: rgba(233, 205, 53, 0.3000);
-$color-warning-a50: rgba(233, 205, 53, 0.5000);
-$color-warning-a80: rgba(233, 205, 53, 0.8000);
-$color-error: #F86039;
-$color-error-l: #FE8667;
-$color-error-d: #B23919;
-$color-error-a5: rgba(248, 96, 57, 0.0500);
-$color-error-a20: rgba(248, 96, 57, 0.2000);
-$color-error-a30: rgba(248, 96, 57, 0.3000);
-$color-error-a50: rgba(248, 96, 57, 0.5000);
-$color-error-a80: rgba(248, 96, 57, 0.8000);
-$color-success: #45D043;
-$color-success-l: #AAEAA9;
-$color-success-d: #2CA72A;
-$color-success-a5: rgba(69, 208, 67, 0.0500);
-$color-success-a20: rgba(69, 208, 67, 0.2000);
-$color-success-a30: rgba(69, 208, 67, 0.3000);
-$color-success-a50: rgba(69, 208, 67, 0.5000);
-$color-success-a80: rgba(69, 208, 67, 0.8000);
-$color-border: rgba(255, 255, 255, 0.2000);
-$color-border-soft: rgba(255, 255, 255, 0.1000);
-$color-border-hard: rgba(255, 255, 255, 0.3000);
-$color-border-solid: rgba(255, 255, 255, 0.6000);
-$color-transparent: rgba(0, 0, 0, 0.0000);
-$color-a: #3333FF;
-$color-a-l: #B2B2FF;
-$color-a-d: #2020AC;
-$color-a-a5: rgba(51, 51, 255, 0.0500);
-$color-a-a20: rgba(51, 51, 255, 0.2000);
-$color-a-a30: rgba(51, 51, 255, 0.3000);
-$color-a-a50: rgba(51, 51, 255, 0.5000);
-$color-a-a80: rgba(51, 51, 255, 0.8000);
-$color-white: #FFFFFF;
-$color-white-a5: rgba(255, 255, 255, 0.0500);
-$color-white-a20: rgba(255, 255, 255, 0.2000);
-$color-white-a30: rgba(255, 255, 255, 0.3000);
-$color-white-a50: rgba(255, 255, 255, 0.5000);
-$color-white-a80: rgba(255, 255, 255, 0.8000);
diff --git a/assets/scss/styles/vars/_gradients.scss b/assets/scss/styles/vars/_gradients.scss
deleted file mode 100644
index 1cdebd5..0000000
--- a/assets/scss/styles/vars/_gradients.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-
-// Not supported yet, need to use decorator: gradient atm
-// $primary-lr-fade: linear-gradient(90deg, rgba($color-primary-l, 0.08) 0%, rgba($color-primary-l, 0.00) 100%);
-// $primary-rl-fade: linear-gradient(90deg, rgba($color-primary-l, 0.00) 0%, rgba($color-primary-l, 0.08) 100%);
-
-$primary-lr-fade: horizontal-gradient(#{$color-primary-d}14 #{$color-primary-l}00);
-$primary-rl-fade: horizontal-gradient(#{$color-primary-d}00 #{$color-primary-l}14);
diff --git a/assets/scss/styles/vars/_spacing.scss b/assets/scss/styles/vars/_spacing.scss
deleted file mode 100644
index b61c8e1..0000000
--- a/assets/scss/styles/vars/_spacing.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@use 'sass:math';
-
-// $page-margin: 32;
-$page-margin: 64;
-$base-height: 1080;
-$base-modal-height: $base-height - ($page-margin * 2);
-$base-modal-max-width: math.div($base-modal-height * 16, 9);
diff --git a/assets/scss/styles/vars/_transitions.scss b/assets/scss/styles/vars/_transitions.scss
deleted file mode 100644
index 0586d88..0000000
--- a/assets/scss/styles/vars/_transitions.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-// see: lib/RmlUi/Source/Core/PropertyParserAnimation.cpp
-$transition-quick: 0.05s linear-in-out;
-// $transition-quick: 0.033s linear-in-out;
diff --git a/include/recomp_input.h b/include/recomp_input.h
deleted file mode 100644
index 8599628..0000000
--- a/include/recomp_input.h
+++ /dev/null
@@ -1,202 +0,0 @@
-#ifndef __RECOMP_INPUT_H__
-#define __RECOMP_INPUT_H__
-
-#include <cstdint>
-#include <variant>
-#include <vector>
-#include <type_traits>
-#include <span>
-#include <string>
-#include <string_view>
-
-#include "ultramodern/input.hpp"
-
-#include "json/json.hpp"
-
-namespace recomp {
-    // x-macros to build input enums and arrays.
-    // First parameter is the enum name, second parameter is the bit field for the input (or 0 if there is no associated one), third is the readable name.
-    // TODO refactor this to allow projects to rename these, or get rid of the readable name and leave that up to individual projects to map.
-    #define DEFINE_N64_BUTTON_INPUTS() \
-        DEFINE_INPUT(A, 0x8000, "Action") \
-        DEFINE_INPUT(B, 0x4000, "Attack/Cancel") \
-        DEFINE_INPUT(Z, 0x2000, "Target") \
-        DEFINE_INPUT(START, 0x1000, "Start") \
-        DEFINE_INPUT(L, 0x0020, "Toggle map") \
-        DEFINE_INPUT(R, 0x0010, "Shield") \
-        DEFINE_INPUT(C_UP, 0x0008, "Look/Fairy") \
-        DEFINE_INPUT(C_LEFT, 0x0002, "Item 1") \
-        DEFINE_INPUT(C_DOWN, 0x0004, "Item 2") \
-        DEFINE_INPUT(C_RIGHT, 0x0001, "Item 3") \
-        DEFINE_INPUT(DPAD_UP, 0x0800, "Special Item 1") \
-        DEFINE_INPUT(DPAD_RIGHT, 0x0100, "Special Item 2") \
-        DEFINE_INPUT(DPAD_DOWN, 0x0400, "Special Item 3") \
-        DEFINE_INPUT(DPAD_LEFT, 0x0200, "Special Item 4")
-
-    #define DEFINE_N64_AXIS_INPUTS() \
-        DEFINE_INPUT(Y_AXIS_POS, 0, "Up") \
-        DEFINE_INPUT(Y_AXIS_NEG, 0, "Down") \
-        DEFINE_INPUT(X_AXIS_NEG, 0, "Left") \
-        DEFINE_INPUT(X_AXIS_POS, 0, "Right") \
-
-    #define DEFINE_RECOMP_UI_INPUTS() \
-        DEFINE_INPUT(TOGGLE_MENU, 0, "Toggle Menu") \
-        DEFINE_INPUT(ACCEPT_MENU, 0, "Accept (Menu)") \
-        DEFINE_INPUT(APPLY_MENU, 0, "Apply (Menu)")
-
-    #define DEFINE_ALL_INPUTS() \
-        DEFINE_N64_BUTTON_INPUTS() \
-        DEFINE_N64_AXIS_INPUTS() \
-        DEFINE_RECOMP_UI_INPUTS()
-
-    // Enum containing every recomp input.
-    #define DEFINE_INPUT(name, value, readable) name,
-    enum class GameInput {
-        DEFINE_ALL_INPUTS()
-
-        COUNT,
-        N64_BUTTON_START = A,
-        N64_BUTTON_COUNT = C_RIGHT - N64_BUTTON_START + 1,
-        N64_AXIS_START = X_AXIS_NEG,
-        N64_AXIS_COUNT = Y_AXIS_POS - N64_AXIS_START + 1,
-    };
-    #undef DEFINE_INPUT
-
-    struct InputField {
-        uint32_t input_type;
-        int32_t input_id;
-        std::string to_string() const;
-        auto operator<=>(const InputField& rhs) const = default;
-    };
-
-    void poll_inputs();
-    float get_input_analog(const InputField& field);
-    float get_input_analog(const std::span<const recomp::InputField> fields);
-    bool get_input_digital(const InputField& field);
-    bool get_input_digital(const std::span<const recomp::InputField> fields);
-    void get_gyro_deltas(float* x, float* y);
-    void get_mouse_deltas(float* x, float* y);
-    void get_right_analog(float* x, float* y);
-
-    enum class InputDevice {
-        Controller,
-        Keyboard,
-        COUNT
-    };
-
-    void start_scanning_input(InputDevice device);
-    void stop_scanning_input();
-    void finish_scanning_input(InputField scanned_field);
-    void cancel_scanning_input();
-    void config_menu_set_cont_or_kb(bool cont_interacted);
-    InputField get_scanned_input();
-    int get_scanned_input_index();
-    
-    struct DefaultN64Mappings {
-        std::vector<InputField> a;
-        std::vector<InputField> b;
-        std::vector<InputField> l;
-        std::vector<InputField> r;
-        std::vector<InputField> z;
-        std::vector<InputField> start;
-
-        std::vector<InputField> c_left;
-        std::vector<InputField> c_right;
-        std::vector<InputField> c_up;
-        std::vector<InputField> c_down;
-
-        std::vector<InputField> dpad_left;
-        std::vector<InputField> dpad_right;
-        std::vector<InputField> dpad_up;
-        std::vector<InputField> dpad_down;
-
-        std::vector<InputField> analog_left;
-        std::vector<InputField> analog_right;
-        std::vector<InputField> analog_up;
-        std::vector<InputField> analog_down;
-
-        std::vector<InputField> toggle_menu;
-        std::vector<InputField> accept_menu;
-        std::vector<InputField> apply_menu;
-    };
-
-    inline const std::vector<InputField>& get_default_mapping_for_input(const DefaultN64Mappings& defaults, const GameInput input) {
-        static const std::vector<InputField> empty_input_field{};
-        switch (input) {
-            case GameInput::A: return defaults.a;
-            case GameInput::B: return defaults.b;
-            case GameInput::L: return defaults.l;
-            case GameInput::R: return defaults.r;
-            case GameInput::Z: return defaults.z;
-            case GameInput::START: return defaults.start;
-            case GameInput::C_LEFT: return defaults.c_left;
-            case GameInput::C_RIGHT: return defaults.c_right;
-            case GameInput::C_UP: return defaults.c_up;
-            case GameInput::C_DOWN: return defaults.c_down;
-            case GameInput::DPAD_LEFT: return defaults.dpad_left;
-            case GameInput::DPAD_RIGHT: return defaults.dpad_right;
-            case GameInput::DPAD_UP: return defaults.dpad_up;
-            case GameInput::DPAD_DOWN: return defaults.dpad_down;
-            case GameInput::X_AXIS_NEG: return defaults.analog_left;
-            case GameInput::X_AXIS_POS: return defaults.analog_right;
-            case GameInput::Y_AXIS_POS: return defaults.analog_up;
-            case GameInput::Y_AXIS_NEG: return defaults.analog_down;
-            case GameInput::TOGGLE_MENU: return defaults.toggle_menu;
-            case GameInput::ACCEPT_MENU: return defaults.accept_menu;
-            case GameInput::APPLY_MENU: return defaults.apply_menu;
-            default: return empty_input_field;
-        }
-    }
-
-    extern const DefaultN64Mappings default_n64_keyboard_mappings;
-    extern const DefaultN64Mappings default_n64_controller_mappings;
-
-    constexpr size_t bindings_per_input = 2;
-
-    size_t get_num_inputs();
-    const std::string& get_input_name(GameInput input);
-    const std::string& get_input_enum_name(GameInput input);
-    GameInput get_input_from_enum_name(const std::string_view name);
-    InputField& get_input_binding(GameInput input, size_t binding_index, InputDevice device);
-    void set_input_binding(GameInput input, size_t binding_index, InputDevice device, InputField value);
-
-    bool get_n64_input(int controller_num, uint16_t* buttons_out, float* x_out, float* y_out);
-    void set_rumble(int controller_num, bool);
-    void update_rumble();
-    void handle_events();
-
-    ultramodern::input::connected_device_info_t get_connected_device_info(int controller_num);
-    
-    // Rumble strength ranges from 0 to 100.
-    int get_rumble_strength();
-    void set_rumble_strength(int strength);
-    
-    // Gyro and mouse sensitivities range from 0 to 100.
-    int get_gyro_sensitivity();
-    int get_mouse_sensitivity();
-    int get_joystick_deadzone();
-    void set_gyro_sensitivity(int strength);
-    void set_mouse_sensitivity(int strength);
-    void set_joystick_deadzone(int strength);
-    void apply_joystick_deadzone(float x_in, float y_in, float* x_out, float* y_out);
-    void set_right_analog_suppressed(bool suppressed);
-
-    enum class BackgroundInputMode {
-        On,
-        Off,
-		OptionCount
-    };
-
-    NLOHMANN_JSON_SERIALIZE_ENUM(recomp::BackgroundInputMode, {
-        {recomp::BackgroundInputMode::On, "On"},
-        {recomp::BackgroundInputMode::Off, "Off"}
-    });
-
-    BackgroundInputMode get_background_input_mode();
-    void set_background_input_mode(BackgroundInputMode mode);
-
-    bool game_input_disabled();
-    bool all_input_disabled();
-}
-
-#endif
diff --git a/include/recomp_ui.h b/include/recomp_ui.h
deleted file mode 100644
index f609a52..0000000
--- a/include/recomp_ui.h
+++ /dev/null
@@ -1,146 +0,0 @@
-#ifndef __RECOMP_UI__
-#define __RECOMP_UI__
-
-#include <memory>
-#include <string>
-#include <string_view>
-#include <list>
-
-// TODO move this file into src/ui
-
-#include "SDL.h"
-#include "RmlUi/Core.h"
-
-#include "../src/ui/util/hsv.h"
-#include "../src/ui/util/bem.h"
-
-#include "../src/ui/core/ui_context.h"
-
-namespace Rml {
-    class ElementDocument;
-    class EventListenerInstancer;
-    class Context;
-    class Event;
-}
-
-namespace recompui {
-    class UiEventListenerInstancer;
-
-    // TODO remove this once the UI has been ported over to the new system.
-    class MenuController {
-    public:
-        virtual ~MenuController() {}
-        virtual void load_document() = 0;
-        virtual void register_events(UiEventListenerInstancer& listener) = 0;
-        virtual void make_bindings(Rml::Context* context) = 0;
-    };
-
-    std::unique_ptr<MenuController> create_launcher_menu();
-    std::unique_ptr<MenuController> create_config_menu();
-
-    using event_handler_t = void(const std::string& param, Rml::Event&);
-
-    void queue_event(const SDL_Event& event);
-    bool try_deque_event(SDL_Event& out);
-
-    std::unique_ptr<UiEventListenerInstancer> make_event_listener_instancer();
-    void register_event(UiEventListenerInstancer& listener, const std::string& name, event_handler_t* handler);
-
-    void show_context(ContextId context, std::string_view param);
-    void hide_context(ContextId context);
-    void hide_all_contexts();
-    bool is_context_shown(ContextId context);
-    bool is_context_capturing_input();
-    bool is_context_capturing_mouse();
-    bool is_any_context_shown();
-    ContextId try_close_current_context();
-
-    ContextId get_launcher_context_id();
-    ContextId get_config_context_id();
-    ContextId get_config_sub_menu_context_id();
-
-    enum class ConfigTab {
-        General,
-        Controls,
-        Graphics,
-        Sound,
-        Mods,
-        Debug,
-    };
-
-    void set_config_tab(ConfigTab tab);
-    int config_tab_to_index(ConfigTab tab);
-    Rml::ElementTabSet* get_config_tabset();
-    Rml::Element* get_mod_tab();
-    void set_config_tabset_mod_nav();
-    void focus_mod_configure_button();
-
-    enum class ButtonVariant {
-        Primary,
-        Secondary,
-        Tertiary,
-        Success,
-        Error,
-        Warning,
-        NumVariants,
-    };
-
-    void init_styling(const std::filesystem::path& rcss_file);
-    void init_prompt_context();
-    void open_choice_prompt(
-        const std::string& header_text,
-        const std::string& content_text,
-        const std::string& confirm_label_text,
-        const std::string& cancel_label_text,
-        std::function<void()> confirm_action,
-        std::function<void()> cancel_action,
-        ButtonVariant confirm_variant = ButtonVariant::Success,
-        ButtonVariant cancel_variant = ButtonVariant::Error,
-        bool focus_on_cancel = true,
-        const std::string& return_element_id = ""
-    );
-    void open_info_prompt(
-        const std::string& header_text,
-        const std::string& content_text,
-        const std::string& okay_label_text,
-        std::function<void()> okay_action,
-        ButtonVariant okay_variant = ButtonVariant::Error,
-        const std::string& return_element_id = ""
-    );
-    void open_notification(
-        const std::string& header_text,
-        const std::string& content_text,
-        const std::string& return_element_id = ""
-    );
-    void close_prompt();
-    bool is_prompt_open();
-    void update_mod_list(bool scan_mods = true);
-    void process_game_started();
-
-    void apply_color_hack();
-    void get_window_size(int& width, int& height);
-    void set_cursor_visible(bool visible);
-    void update_supported_options();
-    void toggle_fullscreen();
-
-    bool get_cont_active(void);
-    void set_cont_active(bool active);
-    void activate_mouse();
-
-    void message_box(const char* msg);
-
-    void set_render_hooks();
-
-    Rml::ElementPtr create_custom_element(Rml::Element* parent, std::string tag);
-    Rml::ElementDocument* load_document(const std::filesystem::path& path);
-    Rml::ElementDocument* create_empty_document();
-    Rml::Element* get_child_by_tag(Rml::Element* parent, const std::string& tag);
-
-    void queue_image_from_bytes_rgba32(const std::string &src, const std::vector<char> &bytes, uint32_t width, uint32_t height);
-    void queue_image_from_bytes_file(const std::string &src, const std::vector<char> &bytes);
-    void release_image(const std::string &src);
-
-    void drop_files(const std::list<std::filesystem::path> &file_list);
-}
-
-#endif
diff --git a/include/zelda_config.h b/include/zelda_config.h
index 59b41f0..d15da18 100644
--- a/include/zelda_config.h
+++ b/include/zelda_config.h
@@ -2,92 +2,71 @@
 #define __ZELDA_CONFIG_H__
 
 #include <filesystem>
-#include <string_view>
-#include "ultramodern/config.hpp"
-#include "recomp_input.h"
+#include <string>
 
 namespace zelda64 {
-    constexpr std::u8string_view program_id = u8"Zelda64Recompiled";
-    constexpr std::string_view program_name = "Zelda 64: Recompiled";
+    inline const std::u8string program_id = u8"Zelda64Recompiled";
+    inline const std::string program_name = "Zelda 64: Recompiled";
+
+    namespace configkeys {
+        namespace general {
+            inline const std::string debug_mode = "debug_mode";
+            inline const std::string targeting_mode = "targeting_mode";
+            inline const std::string autosave_mode = "autosave_mode";
+            inline const std::string camera_invert_mode = "camera_invert_mode";
+            inline const std::string analog_cam_mode = "analog_cam_mode";
+            inline const std::string analog_camera_invert_mode = "analog_camera_invert_mode";
+        }
+
+        namespace sound {
+            inline const std::string bgm_volume = "bgm_volume";
+            inline const std::string low_health_beeps = "low_health_beeps";
+        }
+
+        namespace graphics {
+        }
+    }
 
     // TODO: Move loading configs to the runtime once we have a way to allow per-project customization.
-    void load_config();
-    void save_config();
-    
-    void reset_input_bindings();
-    void reset_cont_input_bindings();
-    void reset_kb_input_bindings();
-    void reset_single_input_binding(recomp::InputDevice device, recomp::GameInput input);
-
-    std::filesystem::path get_app_folder_path();
+    void init_config();
     
     bool get_debug_mode_enabled();
-    void set_debug_mode_enabled(bool enabled);
-    
+
     enum class AutosaveMode {
-        On,
         Off,
-        OptionCount
+        On,
     };
 
-    NLOHMANN_JSON_SERIALIZE_ENUM(zelda64::AutosaveMode, {
-        {zelda64::AutosaveMode::On, "On"},
-        {zelda64::AutosaveMode::Off, "Off"}
-    });
+    AutosaveMode get_autosave_mode();
 
     enum class TargetingMode {
         Switch,
-        Hold,
-        OptionCount
+        Hold
     };
-
-    NLOHMANN_JSON_SERIALIZE_ENUM(zelda64::TargetingMode, {
-        {zelda64::TargetingMode::Switch, "Switch"},
-        {zelda64::TargetingMode::Hold, "Hold"}
-    });
-
+    
     TargetingMode get_targeting_mode();
-    void set_targeting_mode(TargetingMode mode);
 
     enum class CameraInvertMode {
         InvertNone,
         InvertX,
         InvertY,
-        InvertBoth,
-        OptionCount
+        InvertBoth
     };
-
-    NLOHMANN_JSON_SERIALIZE_ENUM(zelda64::CameraInvertMode, {
-        {zelda64::CameraInvertMode::InvertNone, "InvertNone"},
-        {zelda64::CameraInvertMode::InvertX, "InvertX"},
-        {zelda64::CameraInvertMode::InvertY, "InvertY"},
-        {zelda64::CameraInvertMode::InvertBoth, "InvertBoth"}
-    });
-
+    
     CameraInvertMode get_camera_invert_mode();
-    void set_camera_invert_mode(CameraInvertMode mode);
-
     CameraInvertMode get_analog_camera_invert_mode();
-    void set_analog_camera_invert_mode(CameraInvertMode mode);
 
     enum class AnalogCamMode {
-        On,
         Off,
-		OptionCount
+        On,
     };
-
-    NLOHMANN_JSON_SERIALIZE_ENUM(zelda64::AnalogCamMode, {
-        {zelda64::AnalogCamMode::On, "On"},
-        {zelda64::AnalogCamMode::Off, "Off"}
-    });
-
-    AutosaveMode get_autosave_mode();
-    void set_autosave_mode(AutosaveMode mode);
-
+    
     AnalogCamMode get_analog_cam_mode();
-    void set_analog_cam_mode(AnalogCamMode mode);
 
-    void open_quit_game_prompt();
+    enum class LowHealthBeepsMode {
+        Off,
+        On,
+    };
 };
 
 #endif
diff --git a/include/zelda_debug.h b/include/zelda_debug.h
index 4c0743e..26552f4 100644
--- a/include/zelda_debug.h
+++ b/include/zelda_debug.h
@@ -5,6 +5,11 @@
 #include <string>
 
 namespace zelda64 {
+    namespace debug {
+        inline const std::string tab_id = "debug";
+        inline const std::string tab_name = "Debug";
+    }
+
     struct SceneWarps {
         int index;
         std::string name;
diff --git a/include/zelda_launcher.h b/include/zelda_launcher.h
new file mode 100644
index 0000000..f88f7ee
--- /dev/null
+++ b/include/zelda_launcher.h
@@ -0,0 +1,11 @@
+#ifndef __ZELDA_LAUNCHER_H__
+#define __ZELDA_LAUNCHER_H__
+
+#include "recompui/recompui.h"
+
+namespace zelda64 {
+    void launcher_animation_setup(recompui::LauncherMenu *menu);
+    void launcher_animation_update(recompui::LauncherMenu *menu);
+}
+
+#endif
diff --git a/include/zelda_render.h b/include/zelda_render.h
deleted file mode 100644
index 15397f9..0000000
--- a/include/zelda_render.h
+++ /dev/null
@@ -1,61 +0,0 @@
-#ifndef __ZELDA_RENDER_H__
-#define __ZELDA_RENDER_H__
-
-#include <unordered_set>
-#include <filesystem>
-
-#include "common/rt64_user_configuration.h"
-#include "ultramodern/renderer_context.hpp"
-#include "librecomp/mods.hpp"
-
-namespace RT64 {
-    struct Application;
-}
-
-namespace zelda64 {
-    namespace renderer {
-        inline const std::string special_option_texture_pack_enabled = "_recomp_texture_pack_enabled";
-
-        class RT64Context final : public ultramodern::renderer::RendererContext {
-        public:
-            ~RT64Context() override;
-            RT64Context(uint8_t *rdram, ultramodern::renderer::WindowHandle window_handle, bool developer_mode);
-
-            bool valid() override { return static_cast<bool>(app); }
-
-            bool update_config(const ultramodern::renderer::GraphicsConfig &old_config, const ultramodern::renderer::GraphicsConfig &new_config) override;
-
-            void enable_instant_present() override;
-            void send_dl(const OSTask *task) override;
-            void update_screen() override;
-            void shutdown() override;
-            uint32_t get_display_framerate() const override;
-            float get_resolution_scale() const override;
-
-        private:
-            std::unique_ptr<RT64::Application> app;
-            std::unordered_set<std::string> enabled_texture_packs;
-            std::unordered_set<std::string> secondary_disabled_texture_packs;
-
-            void check_texture_pack_actions();
-        };
-
-        std::unique_ptr<ultramodern::renderer::RendererContext> create_render_context(uint8_t *rdram, ultramodern::renderer::WindowHandle window_handle, bool developer_mode);
-
-        RT64::UserConfiguration::Antialiasing RT64MaxMSAA();
-        bool RT64SamplePositionsSupported();
-        bool RT64HighPrecisionFBEnabled();
-
-        void trigger_texture_pack_update();
-        void enable_texture_pack(const recomp::mods::ModContext& context, const recomp::mods::ModHandle& mod);
-        void disable_texture_pack(const recomp::mods::ModHandle& mod);
-        void secondary_enable_texture_pack(const std::string& mod_id);
-        void secondary_disable_texture_pack(const std::string& mod_id);
-
-        // Texture pack enable option. Must be an enum with two options.
-        // The first option is treated as disabled and the second option is treated as enabled.
-        bool is_texture_pack_enable_config_option(const recomp::mods::ConfigOption& option, bool show_errors);
-    }
-}
-
-#endif
diff --git a/include/zelda_sound.h b/include/zelda_sound.h
index 33bec01..07f0aaf 100644
--- a/include/zelda_sound.h
+++ b/include/zelda_sound.h
@@ -3,11 +3,7 @@
 
 namespace zelda64 {
     void reset_sound_settings();
-    void set_main_volume(int volume);
-    int get_main_volume();
-    void set_bgm_volume(int volume);
     int get_bgm_volume();
-    void set_low_health_beeps_enabled(bool enabled);
     bool get_low_health_beeps_enabled();
 }
 
diff --git a/lib/FindFreetype.cmake b/lib/FindFreetype.cmake
deleted file mode 100644
index 1e50bcd..0000000
--- a/lib/FindFreetype.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-set(FREETYPE_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/include)
-set(FREETYPE_LIBRARIES "${CMAKE_SOURCE_DIR}/lib/freetype-windows-binaries/release static/vs2015-2022/win64/freetype.lib")
-add_library(Freetype::Freetype STATIC IMPORTED)
-set_target_properties(Freetype::Freetype PROPERTIES
-	IMPORTED_LOCATION ${FREETYPE_LIBRARIES}
-)
-target_include_directories(Freetype::Freetype INTERFACE
-	${FREETYPE_INCLUDE_DIRS}
-)
diff --git a/lib/GamepadMotionHelpers/.gitignore b/lib/GamepadMotionHelpers/.gitignore
deleted file mode 100644
index 259148f..0000000
--- a/lib/GamepadMotionHelpers/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# Prerequisites
-*.d
-
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Fortran module files
-*.mod
-*.smod
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-*.app
diff --git a/lib/GamepadMotionHelpers/CMakeLists.txt b/lib/GamepadMotionHelpers/CMakeLists.txt
deleted file mode 100644
index 27f7748..0000000
--- a/lib/GamepadMotionHelpers/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 3.8)
-
-project(GamepadMotionHelpers LANGUAGES CXX)
-
-add_library(${PROJECT_NAME} INTERFACE)
-add_library(${PROJECT_NAME}::${PROJECT_NAME} ALIAS ${PROJECT_NAME})
-target_include_directories(${PROJECT_NAME}
-        INTERFACE
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-            $<INSTALL_INTERFACE:include>)
-		
\ No newline at end of file
diff --git a/lib/GamepadMotionHelpers/GamepadMotion.hpp b/lib/GamepadMotionHelpers/GamepadMotion.hpp
deleted file mode 100644
index 02497ac..0000000
--- a/lib/GamepadMotionHelpers/GamepadMotion.hpp
+++ /dev/null
@@ -1,1312 +0,0 @@
-// Copyright (c) 2020-2023 Julian "Jibb" Smart
-// Released under the MIT license. See https://github.com/JibbSmart/GamepadMotionHelpers/blob/main/LICENSE for more info
-// Version 9
-
-#pragma once
-
-#define _USE_MATH_DEFINES
-#include <math.h>
-#include <algorithm> // std::min, std::max and std::clamp
-
-// You don't need to look at these. These will just be used internally by the GamepadMotion class declared below.
-// You can ignore anything in namespace GamepadMotionHelpers.
-class GamepadMotionSettings;
-class GamepadMotion;
-
-namespace GamepadMotionHelpers
-{
-	struct GyroCalibration
-	{
-		float X;
-		float Y;
-		float Z;
-		float AccelMagnitude;
-		int NumSamples;
-	};
-
-	struct Quat
-	{
-		float w;
-		float x;
-		float y;
-		float z;
-
-		Quat();
-		Quat(float inW, float inX, float inY, float inZ);
-		void Set(float inW, float inX, float inY, float inZ);
-		Quat& operator*=(const Quat& rhs);
-		friend Quat operator*(Quat lhs, const Quat& rhs);
-		void Normalize();
-		Quat Normalized() const;
-		void Invert();
-		Quat Inverse() const;
-	};
-
-	struct Vec
-	{
-		float x;
-		float y;
-		float z;
-
-		Vec();
-		Vec(float inValue);
-		Vec(float inX, float inY, float inZ);
-		void Set(float inX, float inY, float inZ);
-		float Length() const;
-		float LengthSquared() const;
-		void Normalize();
-		Vec Normalized() const;
-		float Dot(const Vec& other) const;
-		Vec Cross(const Vec& other) const;
-		Vec Min(const Vec& other) const;
-		Vec Max(const Vec& other) const;
-		Vec Abs() const;
-		Vec Lerp(const Vec& other, float factor) const;
-		Vec Lerp(const Vec& other, const Vec& factor) const;
-		Vec& operator+=(const Vec& rhs);
-		friend Vec operator+(Vec lhs, const Vec& rhs);
-		Vec& operator-=(const Vec& rhs);
-		friend Vec operator-(Vec lhs, const Vec& rhs);
-		Vec& operator*=(const float rhs);
-		friend Vec operator*(Vec lhs, const float rhs);
-		Vec& operator/=(const float rhs);
-		friend Vec operator/(Vec lhs, const float rhs);
-		Vec& operator*=(const Quat& rhs);
-		friend Vec operator*(Vec lhs, const Quat& rhs);
-		Vec operator-() const;
-	};
-
-	struct SensorMinMaxWindow
-	{
-		Vec MinGyro;
-		Vec MaxGyro;
-		Vec MeanGyro;
-		Vec MinAccel;
-		Vec MaxAccel;
-		Vec MeanAccel;
-		Vec StartAccel;
-		int NumSamples = 0;
-		float TimeSampled = 0.f;
-
-		SensorMinMaxWindow();
-		void Reset(float remainder);
-		void AddSample(const Vec& inGyro, const Vec& inAccel, float deltaTime);
-		Vec GetMidGyro();
-	};
-
-	struct AutoCalibration
-	{
-		SensorMinMaxWindow MinMaxWindow;
-		Vec SmoothedAngularVelocityGyro;
-		Vec SmoothedAngularVelocityAccel;
-		Vec SmoothedPreviousAccel;
-		Vec PreviousAccel;
-
-		AutoCalibration();
-		void Reset();
-		bool AddSampleStillness(const Vec& inGyro, const Vec& inAccel, float deltaTime, bool doSensorFusion);
-		void NoSampleStillness();
-		bool AddSampleSensorFusion(const Vec& inGyro, const Vec& inAccel, float deltaTime);
-		void NoSampleSensorFusion();
-		void SetCalibrationData(GyroCalibration* calibrationData);
-		void SetSettings(GamepadMotionSettings* settings);
-		
-		float Confidence = 0.f;
-		bool IsSteady() { return bIsSteady; }
-
-	private:
-		Vec MinDeltaGyro = Vec(1.f);
-		Vec MinDeltaAccel = Vec(0.25f);
-		float RecalibrateThreshold = 1.f;
-		float SensorFusionSkippedTime = 0.f;
-		float TimeSteadySensorFusion = 0.f;
-		float TimeSteadyStillness = 0.f;
-		bool bIsSteady = false;
-
-		GyroCalibration* CalibrationData;
-		GamepadMotionSettings* Settings;
-	};
-
-	struct Motion
-	{
-		Quat Quaternion;
-		Vec Accel;
-		Vec Grav;
-
-		Vec SmoothAccel = Vec();
-		float Shakiness = 0.f;
-		const float ShortSteadinessHalfTime = 0.25f;
-		const float LongSteadinessHalfTime = 1.f;
-
-		Motion();
-		void Reset();
-		void Update(float inGyroX, float inGyroY, float inGyroZ, float inAccelX, float inAccelY, float inAccelZ, float gravityLength, float deltaTime);
-		void SetSettings(GamepadMotionSettings* settings);
-
-	private:
-		GamepadMotionSettings* Settings;
-	};
-
-	enum CalibrationMode
-	{
-		Manual = 0,
-		Stillness = 1,
-		SensorFusion = 2,
-	};
-	
-	// https://stackoverflow.com/a/1448478/1130520
-	inline CalibrationMode operator|(CalibrationMode a, CalibrationMode b)
-	{
-	    return static_cast<CalibrationMode>(static_cast<int>(a) | static_cast<int>(b));
-	}
-	
-	inline CalibrationMode operator&(CalibrationMode a, CalibrationMode b)
-	{
-	    return static_cast<CalibrationMode>(static_cast<int>(a) & static_cast<int>(b));
-	}
-	
-	inline CalibrationMode operator~(CalibrationMode a)
-	{
-		return static_cast<CalibrationMode>(~static_cast<int>(a));
-	}
-	
-	// https://stackoverflow.com/a/23152590/1130520
-	inline CalibrationMode& operator|=(CalibrationMode& a, CalibrationMode b)
-	{
-		return (CalibrationMode&)((int&)(a) |= static_cast<int>(b));
-	}
-	
-	inline CalibrationMode& operator&=(CalibrationMode& a, CalibrationMode b)
-	{
-		return (CalibrationMode&)((int&)(a) &= static_cast<int>(b));
-	}
-}
-
-// Note that I'm using a Y-up coordinate system. This is to follow the convention set by the motion sensors in
-// PlayStation controllers, which was what I was using when writing in this. But for the record, Z-up is
-// better for most games (XY ground-plane in 3D games simplifies using 2D vectors in navigation, for example).
-
-// Gyro units should be degrees per second. Accelerometer should be g-force (approx. 9.8 m/s^2 = 1 g). If you're using
-// radians per second, meters per second squared, etc, conversion should be simple.
-
-class GamepadMotionSettings
-{
-public:
-	int MinStillnessSamples = 10;
-	float MinStillnessCollectionTime = 0.5f;
-	float MinStillnessCorrectionTime = 2.f;
-	float MaxStillnessError = 2.f;
-	float StillnessSampleDeteriorationRate = 0.2f;
-	float StillnessErrorClimbRate = 0.1f;
-	float StillnessErrorDropOnRecalibrate = 0.1f;
-	float StillnessCalibrationEaseInTime = 3.f;
-	float StillnessCalibrationHalfTime = 0.1f;
-	float StillnessConfidenceRate = 1.f;
-
-	float StillnessGyroDelta = -1.f;
-	float StillnessAccelDelta = -1.f;
-
-	float SensorFusionCalibrationSmoothingStrength = 2.f;
-	float SensorFusionAngularAccelerationThreshold = 20.f;
-	float SensorFusionCalibrationEaseInTime = 3.f;
-	float SensorFusionCalibrationHalfTime = 0.1f;
-	float SensorFusionConfidenceRate = 1.f;
-
-	float GravityCorrectionShakinessMaxThreshold = 0.4f;
-	float GravityCorrectionShakinessMinThreshold = 0.01f;
-
-	float GravityCorrectionStillSpeed = 1.f;
-	float GravityCorrectionShakySpeed = 0.1f;
-
-	float GravityCorrectionGyroFactor = 0.1f;
-	float GravityCorrectionGyroMinThreshold = 0.05f;
-	float GravityCorrectionGyroMaxThreshold = 0.25f;
-
-	float GravityCorrectionMinimumSpeed = 0.01f;
-};
-
-class GamepadMotion
-{
-public:
-	GamepadMotion();
-
-	void Reset();
-
-	void ProcessMotion(float gyroX, float gyroY, float gyroZ,
-		float accelX, float accelY, float accelZ, float deltaTime);
-
-	// reading the current state
-	void GetCalibratedGyro(float& x, float& y, float& z);
-	void GetGravity(float& x, float& y, float& z);
-	void GetProcessedAcceleration(float& x, float& y, float& z);
-	void GetOrientation(float& w, float& x, float& y, float& z);
-	void GetPlayerSpaceGyro(float& x, float& y, const float yawRelaxFactor = 1.41f);
-	static void CalculatePlayerSpaceGyro(float& x, float& y, const float gyroX, const float gyroY, const float gyroZ, const float gravX, const float gravY, const float gravZ, const float yawRelaxFactor = 1.41f);
-	void GetWorldSpaceGyro(float& x, float& y, const float sideReductionThreshold = 0.125f);
-	static void CalculateWorldSpaceGyro(float& x, float& y, const float gyroX, const float gyroY, const float gyroZ, const float gravX, const float gravY, const float gravZ, const float sideReductionThreshold = 0.125f);
-
-	// gyro calibration functions
-	void StartContinuousCalibration();
-	void PauseContinuousCalibration();
-	void ResetContinuousCalibration();
-	void GetCalibrationOffset(float& xOffset, float& yOffset, float& zOffset);
-	void SetCalibrationOffset(float xOffset, float yOffset, float zOffset, int weight);
-	float GetAutoCalibrationConfidence();
-	void SetAutoCalibrationConfidence(float newConfidence);
-	bool GetAutoCalibrationIsSteady();
-
-	GamepadMotionHelpers::CalibrationMode GetCalibrationMode();
-	void SetCalibrationMode(GamepadMotionHelpers::CalibrationMode calibrationMode);
-
-	void ResetMotion();
-
-	GamepadMotionSettings Settings;
-
-private:
-	GamepadMotionHelpers::Vec Gyro;
-	GamepadMotionHelpers::Vec RawAccel;
-	GamepadMotionHelpers::Motion Motion;
-	GamepadMotionHelpers::GyroCalibration GyroCalibration;
-	GamepadMotionHelpers::AutoCalibration AutoCalibration;
-	GamepadMotionHelpers::CalibrationMode CurrentCalibrationMode;
-
-	bool IsCalibrating;
-	void PushSensorSamples(float gyroX, float gyroY, float gyroZ, float accelMagnitude);
-	void GetCalibratedSensor(float& gyroOffsetX, float& gyroOffsetY, float& gyroOffsetZ, float& accelMagnitude);
-};
-
-///////////// Everything below here are just implementation details /////////////
-
-namespace GamepadMotionHelpers
-{
-	inline Quat::Quat()
-	{
-		w = 1.0f;
-		x = 0.0f;
-		y = 0.0f;
-		z = 0.0f;
-	}
-
-	inline Quat::Quat(float inW, float inX, float inY, float inZ)
-	{
-		w = inW;
-		x = inX;
-		y = inY;
-		z = inZ;
-	}
-
-	inline static Quat AngleAxis(float inAngle, float inX, float inY, float inZ)
-	{
-		const float sinHalfAngle = sinf(inAngle * 0.5f);
-		Vec inAxis = Vec(inX, inY, inZ);
-		inAxis.Normalize();
-		inAxis *= sinHalfAngle;
-		Quat result = Quat(cosf(inAngle * 0.5f), inAxis.x, inAxis.y, inAxis.z);
-		return result;
-	}
-
-	inline void Quat::Set(float inW, float inX, float inY, float inZ)
-	{
-		w = inW;
-		x = inX;
-		y = inY;
-		z = inZ;
-	}
-
-	inline Quat& Quat::operator*=(const Quat& rhs)
-	{
-		Set(w * rhs.w - x * rhs.x - y * rhs.y - z * rhs.z,
-			w * rhs.x + x * rhs.w + y * rhs.z - z * rhs.y,
-			w * rhs.y - x * rhs.z + y * rhs.w + z * rhs.x,
-			w * rhs.z + x * rhs.y - y * rhs.x + z * rhs.w);
-		return *this;
-	}
-
-	inline Quat operator*(Quat lhs, const Quat& rhs)
-	{
-		lhs *= rhs;
-		return lhs;
-	}
-
-	inline void Quat::Normalize()
-	{
-		const float length = sqrtf(w * w + x * x + y * y + z * z);
-		const float fixFactor = 1.0f / length;
-
-		w *= fixFactor;
-		x *= fixFactor;
-		y *= fixFactor;
-		z *= fixFactor;
-
-		return;
-	}
-
-	inline Quat Quat::Normalized() const
-	{
-		Quat result = *this;
-		result.Normalize();
-		return result;
-	}
-
-	inline void Quat::Invert()
-	{
-		x = -x;
-		y = -y;
-		z = -z;
-		return;
-	}
-
-	inline Quat Quat::Inverse() const
-	{
-		Quat result = *this;
-		result.Invert();
-		return result;
-	}
-
-	inline Vec::Vec()
-	{
-		x = 0.0f;
-		y = 0.0f;
-		z = 0.0f;
-	}
-
-	inline Vec::Vec(float inValue)
-	{
-		x = inValue;
-		y = inValue;
-		z = inValue;
-	}
-
-	inline Vec::Vec(float inX, float inY, float inZ)
-	{
-		x = inX;
-		y = inY;
-		z = inZ;
-	}
-
-	inline void Vec::Set(float inX, float inY, float inZ)
-	{
-		x = inX;
-		y = inY;
-		z = inZ;
-	}
-
-	inline float Vec::Length() const
-	{
-		return sqrtf(x * x + y * y + z * z);
-	}
-
-	inline float Vec::LengthSquared() const
-	{
-		return x * x + y * y + z * z;
-	}
-
-	inline void Vec::Normalize()
-	{
-		const float length = Length();
-		if (length == 0.0)
-		{
-			return;
-		}
-		const float fixFactor = 1.0f / length;
-
-		x *= fixFactor;
-		y *= fixFactor;
-		z *= fixFactor;
-		return;
-	}
-
-	inline Vec Vec::Normalized() const
-	{
-		Vec result = *this;
-		result.Normalize();
-		return result;
-	}
-
-	inline Vec& Vec::operator+=(const Vec& rhs)
-	{
-		Set(x + rhs.x, y + rhs.y, z + rhs.z);
-		return *this;
-	}
-
-	inline Vec operator+(Vec lhs, const Vec& rhs)
-	{
-		lhs += rhs;
-		return lhs;
-	}
-
-	inline Vec& Vec::operator-=(const Vec& rhs)
-	{
-		Set(x - rhs.x, y - rhs.y, z - rhs.z);
-		return *this;
-	}
-
-	inline Vec operator-(Vec lhs, const Vec& rhs)
-	{
-		lhs -= rhs;
-		return lhs;
-	}
-
-	inline Vec& Vec::operator*=(const float rhs)
-	{
-		Set(x * rhs, y * rhs, z * rhs);
-		return *this;
-	}
-
-	inline Vec operator*(Vec lhs, const float rhs)
-	{
-		lhs *= rhs;
-		return lhs;
-	}
-
-	inline Vec& Vec::operator/=(const float rhs)
-	{
-		Set(x / rhs, y / rhs, z / rhs);
-		return *this;
-	}
-
-	inline Vec operator/(Vec lhs, const float rhs)
-	{
-		lhs /= rhs;
-		return lhs;
-	}
-
-	inline Vec& Vec::operator*=(const Quat& rhs)
-	{
-		Quat temp = rhs * Quat(0.0f, x, y, z) * rhs.Inverse();
-		Set(temp.x, temp.y, temp.z);
-		return *this;
-	}
-
-	inline Vec operator*(Vec lhs, const Quat& rhs)
-	{
-		lhs *= rhs;
-		return lhs;
-	}
-
-	inline Vec Vec::operator-() const
-	{
-		Vec result = Vec(-x, -y, -z);
-		return result;
-	}
-
-	inline float Vec::Dot(const Vec& other) const
-	{
-		return x * other.x + y * other.y + z * other.z;
-	}
-
-	inline Vec Vec::Cross(const Vec& other) const
-	{
-		return Vec(y * other.z - z * other.y,
-			z * other.x - x * other.z,
-			x * other.y - y * other.x);
-	}
-
-	inline Vec Vec::Min(const Vec& other) const
-	{
-		return Vec(x < other.x ? x : other.x,
-			y < other.y ? y : other.y,
-			z < other.z ? z : other.z);
-	}
-	
-	inline Vec Vec::Max(const Vec& other) const
-	{
-		return Vec(x > other.x ? x : other.x,
-			y > other.y ? y : other.y,
-			z > other.z ? z : other.z);
-	}
-
-	inline Vec Vec::Abs() const
-	{
-		return Vec(x > 0 ? x : -x,
-			y > 0 ? y : -y,
-			z > 0 ? z : -z);
-	}
-
-	inline Vec Vec::Lerp(const Vec& other, float factor) const
-	{
-		return *this + (other - *this) * factor;
-	}
-
-	inline Vec Vec::Lerp(const Vec& other, const Vec& factor) const
-	{
-		return Vec(this->x + (other.x - this->x) * factor.x,
-			this->y + (other.y - this->y) * factor.y,
-			this->z + (other.z - this->z) * factor.z);
-	}
-
-	inline Motion::Motion()
-	{
-		Reset();
-	}
-
-	inline void Motion::Reset()
-	{
-		Quaternion.Set(1.f, 0.f, 0.f, 0.f);
-		Accel.Set(0.f, 0.f, 0.f);
-		Grav.Set(0.f, 0.f, 0.f);
-		SmoothAccel.Set(0.f, 0.f, 0.f);
-		Shakiness = 0.f;
-	}
-
-	/// <summary>
-	/// The gyro inputs should be calibrated degrees per second but have no other processing. Acceleration is in G units (1 = approx. 9.8m/s^2)
-	/// </summary>
-	inline void Motion::Update(float inGyroX, float inGyroY, float inGyroZ, float inAccelX, float inAccelY, float inAccelZ, float gravityLength, float deltaTime)
-	{
-		if (!Settings)
-		{
-			return;
-		}
-
-		// get settings
-		const float gravityCorrectionShakinessMinThreshold = Settings->GravityCorrectionShakinessMinThreshold;
-		const float gravityCorrectionShakinessMaxThreshold = Settings->GravityCorrectionShakinessMaxThreshold;
-		const float gravityCorrectionStillSpeed = Settings->GravityCorrectionStillSpeed;
-		const float gravityCorrectionShakySpeed = Settings->GravityCorrectionShakySpeed;
-		const float gravityCorrectionGyroFactor = Settings->GravityCorrectionGyroFactor;
-		const float gravityCorrectionGyroMinThreshold = Settings->GravityCorrectionGyroMinThreshold;
-		const float gravityCorrectionGyroMaxThreshold = Settings->GravityCorrectionGyroMaxThreshold;
-		const float gravityCorrectionMinimumSpeed = Settings->GravityCorrectionMinimumSpeed;
-
-		const Vec axis = Vec(inGyroX, inGyroY, inGyroZ);
-		const Vec accel = Vec(inAccelX, inAccelY, inAccelZ);
-		const float angleSpeed = axis.Length() * (float)M_PI / 180.0f;
-		const float angle = angleSpeed * deltaTime;
-
-		// rotate
-		Quat rotation = AngleAxis(angle, axis.x, axis.y, axis.z);
-		Quaternion *= rotation; // do it this way because it's a local rotation, not global
-
-		//printf("Quat: %.4f %.4f %.4f %.4f\n",
-		//	Quaternion.w, Quaternion.x, Quaternion.y, Quaternion.z);
-		float accelMagnitude = accel.Length();
-		if (accelMagnitude > 0.0f)
-		{
-			const Vec accelNorm = accel / accelMagnitude;
-			// account for rotation when tracking smoothed acceleration
-			SmoothAccel *= rotation.Inverse();
-			//printf("Absolute Accel: %.4f %.4f %.4f\n",
-			//	absoluteAccel.x, absoluteAccel.y, absoluteAccel.z);
-			const float smoothFactor = ShortSteadinessHalfTime <= 0.f ? 0.f : exp2f(-deltaTime / ShortSteadinessHalfTime);
-			Shakiness *= smoothFactor;
-			Shakiness = std::max(Shakiness, (accel - SmoothAccel).Length());
-			SmoothAccel = accel.Lerp(SmoothAccel, smoothFactor);
-
-			//printf("Shakiness: %.4f\n", Shakiness);
-
-			// update grav by rotation
-			Grav *= rotation.Inverse();
-			// we want to close the gap between grav and raw acceleration. What's the difference
-			const Vec gravToAccel = (accelNorm * -gravityLength) - Grav;
-			const Vec gravToAccelDir = gravToAccel.Normalized();
-			// adjustment rate
-			float gravCorrectionSpeed;
-			if (gravityCorrectionShakinessMinThreshold < gravityCorrectionShakinessMaxThreshold)
-			{
-				gravCorrectionSpeed = gravityCorrectionStillSpeed + (gravityCorrectionShakySpeed - gravityCorrectionStillSpeed) * std::clamp((Shakiness - gravityCorrectionShakinessMinThreshold) / (gravityCorrectionShakinessMaxThreshold - gravityCorrectionShakinessMinThreshold), 0.f, 1.f);
-			}
-			else
-			{
-				gravCorrectionSpeed = Shakiness < gravityCorrectionShakinessMaxThreshold ? gravityCorrectionStillSpeed : gravityCorrectionShakySpeed;
-			}
-			// we also limit it to be no faster than a given proportion of the gyro rate, or the minimum gravity correction speed
-			const float gyroGravCorrectionLimit = std::max(angleSpeed * gravityCorrectionGyroFactor, gravityCorrectionMinimumSpeed);
-			if (gravCorrectionSpeed > gyroGravCorrectionLimit)
-			{
-				float closeEnoughFactor;
-				if (gravityCorrectionGyroMinThreshold < gravityCorrectionGyroMaxThreshold)
-				{
-					closeEnoughFactor = std::clamp((gravToAccel.Length() - gravityCorrectionGyroMinThreshold) / (gravityCorrectionGyroMaxThreshold - gravityCorrectionGyroMinThreshold), 0.f, 1.f);
-				}
-				else
-				{
-					closeEnoughFactor = gravToAccel.Length() < gravityCorrectionGyroMaxThreshold ? 0.f : 1.f;
-				}
-				gravCorrectionSpeed = gyroGravCorrectionLimit + (gravCorrectionSpeed - gyroGravCorrectionLimit) * closeEnoughFactor;
-			}
-			const Vec gravToAccelDelta = gravToAccelDir * gravCorrectionSpeed * deltaTime;
-			if (gravToAccelDelta.LengthSquared() < gravToAccel.LengthSquared())
-			{
-				Grav += gravToAccelDelta;
-			}
-			else
-			{
-				Grav = accelNorm * -gravityLength;
-			}
-
-			const Vec gravityDirection = Grav.Normalized() * Quaternion.Inverse(); // absolute gravity direction
-			const float errorAngle = acosf(std::clamp(Vec(0.0f, -1.0f, 0.0f).Dot(gravityDirection), -1.f, 1.f));
-			const Vec flattened = Vec(0.0f, -1.0f, 0.0f).Cross(gravityDirection);
-			Quat correctionQuat = AngleAxis(errorAngle, flattened.x, flattened.y, flattened.z);
-			Quaternion = Quaternion * correctionQuat;
-			
-			Accel = accel + Grav;
-		}
-		else
-		{
-			Grav *= rotation.Inverse();
-			Accel = Grav;
-		}
-		Quaternion.Normalize();
-	}
-
-	inline void Motion::SetSettings(GamepadMotionSettings* settings)
-	{
-		Settings = settings;
-	}
-
-	inline SensorMinMaxWindow::SensorMinMaxWindow()
-	{
-		Reset(0.f);
-	}
-
-	inline void SensorMinMaxWindow::Reset(float remainder)
-	{
-		NumSamples = 0;
-		TimeSampled = remainder;
-	}
-
-	inline void SensorMinMaxWindow::AddSample(const Vec& inGyro, const Vec& inAccel, float deltaTime)
-	{
-		if (NumSamples == 0)
-		{
-			MaxGyro = inGyro;
-			MinGyro = inGyro;
-			MeanGyro = inGyro;
-			MaxAccel = inAccel;
-			MinAccel = inAccel;
-			MeanAccel = inAccel;
-			StartAccel = inAccel;
-			NumSamples = 1;
-			TimeSampled += deltaTime;
-			return;
-		}
-
-		MaxGyro = MaxGyro.Max(inGyro);
-		MinGyro = MinGyro.Min(inGyro);
-		MaxAccel = MaxAccel.Max(inAccel);
-		MinAccel = MinAccel.Min(inAccel);
-
-		NumSamples++;
-		TimeSampled += deltaTime;
-
-		Vec delta = inGyro - MeanGyro;
-		MeanGyro += delta * (1.f / NumSamples);
-		delta = inAccel - MeanAccel;
-		MeanAccel += delta * (1.f / NumSamples);
-	}
-
-	inline Vec SensorMinMaxWindow::GetMidGyro()
-	{
-		return MeanGyro;
-	}
-
-	inline AutoCalibration::AutoCalibration()
-	{
-		CalibrationData = nullptr;
-		Reset();
-	}
-
-	inline void AutoCalibration::Reset()
-	{
-		MinMaxWindow.Reset(0.f);
-		Confidence = 0.f;
-		bIsSteady = false;
-		MinDeltaGyro = Vec(1.f);
-		MinDeltaAccel = Vec(0.25f);
-		RecalibrateThreshold = 1.f;
-		SensorFusionSkippedTime = 0.f;
-		TimeSteadySensorFusion = 0.f;
-		TimeSteadyStillness = 0.f;
-	}
-
-	inline bool AutoCalibration::AddSampleStillness(const Vec& inGyro, const Vec& inAccel, float deltaTime, bool doSensorFusion)
-	{
-		if (inGyro.x == 0.f && inGyro.y == 0.f && inGyro.z == 0.f &&
-			inAccel.x == 0.f && inAccel.y == 0.f && inAccel.z == 0.f)
-		{
-			// zeroes are almost certainly not valid inputs
-			return false;
-		}
-
-		if (!Settings)
-		{
-			return false;
-		}
-
-		if (!CalibrationData)
-		{
-			return false;
-		}
-
-		// get settings
-		const int minStillnessSamples = Settings->MinStillnessSamples;
-		const float minStillnessCollectionTime = Settings->MinStillnessCollectionTime;
-		const float minStillnessCorrectionTime = Settings->MinStillnessCorrectionTime;
-		const float maxStillnessError = Settings->MaxStillnessError;
-		const float stillnessSampleDeteriorationRate = Settings->StillnessSampleDeteriorationRate;
-		const float stillnessErrorClimbRate = Settings->StillnessErrorClimbRate;
-		const float stillnessErrorDropOnRecalibrate = Settings->StillnessErrorDropOnRecalibrate;
-		const float stillnessCalibrationEaseInTime = Settings->StillnessCalibrationEaseInTime;
-		const float stillnessCalibrationHalfTime = Settings->StillnessCalibrationHalfTime * Confidence;
-		const float stillnessConfidenceRate = Settings->StillnessConfidenceRate;
-		const float stillnessGyroDelta = Settings->StillnessGyroDelta;
-		const float stillnessAccelDelta = Settings->StillnessAccelDelta;
-
-		MinMaxWindow.AddSample(inGyro, inAccel, deltaTime);
-		// get deltas
-		const Vec gyroDelta = MinMaxWindow.MaxGyro - MinMaxWindow.MinGyro;
-		const Vec accelDelta = MinMaxWindow.MaxAccel - MinMaxWindow.MinAccel;
-
-		bool calibrated = false;
-		bool isSteady = false;
-		const Vec climbThisTick = Vec(stillnessSampleDeteriorationRate * deltaTime);
-		if (stillnessGyroDelta < 0.f)
-		{
-			if (Confidence < 1.f)
-			{
-				MinDeltaGyro += climbThisTick;
-			}
-		}
-		else
-		{
-			MinDeltaGyro = Vec(stillnessGyroDelta);
-		}
-		if (stillnessAccelDelta < 0.f)
-		{
-			if (Confidence < 1.f)
-			{
-				MinDeltaAccel += climbThisTick;
-			}
-		}
-		else
-		{
-			MinDeltaAccel = Vec(stillnessAccelDelta);
-		}
-
-		//printf("Deltas: %.4f %.4f %.4f; %.4f %.4f %.4f\n",
-		//	gyroDelta.x, gyroDelta.y, gyroDelta.z,
-		//	accelDelta.x, accelDelta.y, accelDelta.z);
-
-		if (MinMaxWindow.NumSamples >= minStillnessSamples && MinMaxWindow.TimeSampled >= minStillnessCollectionTime)
-		{
-			MinDeltaGyro = MinDeltaGyro.Min(gyroDelta);
-			MinDeltaAccel = MinDeltaAccel.Min(accelDelta);
-		}
-		else
-		{
-			RecalibrateThreshold = std::min(RecalibrateThreshold + stillnessErrorClimbRate * deltaTime, maxStillnessError);
-			return false;
-		}
-
-		// check that all inputs are below appropriate thresholds to be considered "still"
-		if (gyroDelta.x <= MinDeltaGyro.x * RecalibrateThreshold &&
-			gyroDelta.y <= MinDeltaGyro.y * RecalibrateThreshold &&
-			gyroDelta.z <= MinDeltaGyro.z * RecalibrateThreshold &&
-			accelDelta.x <= MinDeltaAccel.x * RecalibrateThreshold &&
-			accelDelta.y <= MinDeltaAccel.y * RecalibrateThreshold &&
-			accelDelta.z <= MinDeltaAccel.z * RecalibrateThreshold)
-		{
-			if (MinMaxWindow.NumSamples >= minStillnessSamples && MinMaxWindow.TimeSampled >= minStillnessCorrectionTime)
-			{
-				/*if (TimeSteadyStillness == 0.f)
-				{
-					printf("Still!\n");
-				}/**/
-
-				TimeSteadyStillness = std::min(TimeSteadyStillness + deltaTime, stillnessCalibrationEaseInTime);
-				const float calibrationEaseIn = stillnessCalibrationEaseInTime <= 0.f ? 1.f : TimeSteadyStillness / stillnessCalibrationEaseInTime;
-
-				const Vec calibratedGyro = MinMaxWindow.GetMidGyro();
-
-				const Vec oldGyroBias = Vec(CalibrationData->X, CalibrationData->Y, CalibrationData->Z) / std::max((float)CalibrationData->NumSamples, 1.f);
-				const float stillnessLerpFactor = stillnessCalibrationHalfTime <= 0.f ? 0.f : exp2f(-calibrationEaseIn * deltaTime / stillnessCalibrationHalfTime);
-				Vec newGyroBias = calibratedGyro.Lerp(oldGyroBias, stillnessLerpFactor);
-				Confidence = std::min(Confidence + deltaTime * stillnessConfidenceRate, 1.f);
-				isSteady = true;
-
-				if (doSensorFusion)
-				{
-					const Vec previousNormal = MinMaxWindow.StartAccel.Normalized();
-					const Vec thisNormal = inAccel.Normalized();
-					Vec angularVelocity = thisNormal.Cross(previousNormal);
-					const float crossLength = angularVelocity.Length();
-					if (crossLength > 0.f)
-					{
-						const float thisDotPrev = std::clamp(thisNormal.Dot(previousNormal), -1.f, 1.f);
-						const float angleChange = acosf(thisDotPrev) * 180.0f / (float)M_PI;
-						const float anglePerSecond = angleChange / MinMaxWindow.TimeSampled;
-						angularVelocity *= anglePerSecond / crossLength;
-					}
-
-					Vec axisCalibrationStrength = thisNormal.Abs();
-					Vec sensorFusionBias = (calibratedGyro - angularVelocity).Lerp(oldGyroBias, stillnessLerpFactor);
-					if (axisCalibrationStrength.x <= 0.7f)
-					{
-						newGyroBias.x = sensorFusionBias.x;
-					}
-					if (axisCalibrationStrength.y <= 0.7f)
-					{
-						newGyroBias.y = sensorFusionBias.y;
-					}
-					if (axisCalibrationStrength.z <= 0.7f)
-					{
-						newGyroBias.z = sensorFusionBias.z;
-					}
-				}
-
-				CalibrationData->X = newGyroBias.x;
-				CalibrationData->Y = newGyroBias.y;
-				CalibrationData->Z = newGyroBias.z;
-
-				CalibrationData->AccelMagnitude = MinMaxWindow.MeanAccel.Length();
-				CalibrationData->NumSamples = 1;
-
-				calibrated = true;
-			}
-			else
-			{
-				RecalibrateThreshold = std::min(RecalibrateThreshold + stillnessErrorClimbRate * deltaTime, maxStillnessError);
-			}
-		}
-		else if (TimeSteadyStillness > 0.f)
-		{
-			//printf("Moved!\n");
-			RecalibrateThreshold -= stillnessErrorDropOnRecalibrate;
-			if (RecalibrateThreshold < 1.f) RecalibrateThreshold = 1.f;
-
-			TimeSteadyStillness = 0.f;
-			MinMaxWindow.Reset(0.f);
-		}
-		else
-		{
-			RecalibrateThreshold = std::min(RecalibrateThreshold + stillnessErrorClimbRate * deltaTime, maxStillnessError);
-			MinMaxWindow.Reset(0.f);
-		}
-
-		bIsSteady = isSteady;
-		return calibrated;
-	}
-
-	inline void AutoCalibration::NoSampleStillness()
-	{
-		MinMaxWindow.Reset(0.f);
-	}
-
-	inline bool AutoCalibration::AddSampleSensorFusion(const Vec& inGyro, const Vec& inAccel, float deltaTime)
-	{
-		if (deltaTime <= 0.f)
-		{
-			return false;
-		}
-
-		if (inGyro.x == 0.f && inGyro.y == 0.f && inGyro.z == 0.f &&
-			inAccel.x == 0.f && inAccel.y == 0.f && inAccel.z == 0.f)
-		{
-			// all zeroes are almost certainly not valid inputs
-			TimeSteadySensorFusion = 0.f;
-			SensorFusionSkippedTime = 0.f;
-			PreviousAccel = inAccel;
-			SmoothedPreviousAccel = inAccel;
-			SmoothedAngularVelocityGyro = GamepadMotionHelpers::Vec();
-			SmoothedAngularVelocityAccel = GamepadMotionHelpers::Vec();
-			return false;
-		}
-
-		if (PreviousAccel.x == 0.f && PreviousAccel.y == 0.f && PreviousAccel.z == 0.f)
-		{
-			TimeSteadySensorFusion = 0.f;
-			SensorFusionSkippedTime = 0.f;
-			PreviousAccel = inAccel;
-			SmoothedPreviousAccel = inAccel;
-			SmoothedAngularVelocityGyro = GamepadMotionHelpers::Vec();
-			SmoothedAngularVelocityAccel = GamepadMotionHelpers::Vec();
-			return false;
-		}
-
-		// in case the controller state hasn't updated between samples
-		if (inAccel.x == PreviousAccel.x && inAccel.y == PreviousAccel.y && inAccel.z == PreviousAccel.z)
-		{
-			SensorFusionSkippedTime += deltaTime;
-			return false;
-		}
-
-		if (!Settings)
-		{
-			return false;
-		}
-
-		// get settings
-		const float sensorFusionCalibrationSmoothingStrength = Settings->SensorFusionCalibrationSmoothingStrength;
-		const float sensorFusionAngularAccelerationThreshold = Settings->SensorFusionAngularAccelerationThreshold;
-		const float sensorFusionCalibrationEaseInTime = Settings->SensorFusionCalibrationEaseInTime;
-		const float sensorFusionCalibrationHalfTime = Settings->SensorFusionCalibrationHalfTime * Confidence;
-		const float sensorFusionConfidenceRate = Settings->SensorFusionConfidenceRate;
-
-		deltaTime += SensorFusionSkippedTime;
-		SensorFusionSkippedTime = 0.f;
-		bool calibrated = false;
-		bool isSteady = false;
-		
-		// framerate independent lerp smoothing: https://www.gamasutra.com/blogs/ScottLembcke/20180404/316046/Improved_Lerp_Smoothing.php
-		const float smoothingLerpFactor = exp2f(-sensorFusionCalibrationSmoothingStrength * deltaTime);
-		// velocity from smoothed accel matches better if we also smooth gyro
-		const Vec previousGyro = SmoothedAngularVelocityGyro;
-		SmoothedAngularVelocityGyro = inGyro.Lerp(SmoothedAngularVelocityGyro, smoothingLerpFactor); // smooth what remains
-		const float gyroAccelerationMag = (SmoothedAngularVelocityGyro - previousGyro).Length() / deltaTime;
-		// get angle between old and new accel
-		const Vec previousNormal = SmoothedPreviousAccel.Normalized();
-		const Vec thisAccel = inAccel.Lerp(SmoothedPreviousAccel, smoothingLerpFactor);
-		const Vec thisNormal = thisAccel.Normalized();
-		Vec angularVelocity = thisNormal.Cross(previousNormal);
-		const float crossLength = angularVelocity.Length();
-		if (crossLength > 0.f)
-		{
-			const float thisDotPrev = std::clamp(thisNormal.Dot(previousNormal), -1.f, 1.f);
-			const float angleChange = acosf(thisDotPrev) * 180.0f / (float)M_PI;
-			const float anglePerSecond = angleChange / deltaTime;
-			angularVelocity *= anglePerSecond / crossLength;
-		}
-		SmoothedAngularVelocityAccel = angularVelocity;
-
-		// apply corrections
-		if (gyroAccelerationMag > sensorFusionAngularAccelerationThreshold || CalibrationData == nullptr)
-		{
-			/*if (TimeSteadySensorFusion > 0.f)
-			{
-				printf("Shaken!\n");
-			}/**/
-			TimeSteadySensorFusion = 0.f;
-			//printf("No calibration due to acceleration of %.4f\n", gyroAccelerationMag);
-		}
-		else
-		{
-			/*if (TimeSteadySensorFusion == 0.f)
-			{
-				printf("Steady!\n");
-			}/**/
-
-			TimeSteadySensorFusion = std::min(TimeSteadySensorFusion + deltaTime, sensorFusionCalibrationEaseInTime);
-			const float calibrationEaseIn = sensorFusionCalibrationEaseInTime <= 0.f ? 1.f : TimeSteadySensorFusion / sensorFusionCalibrationEaseInTime;
-			const Vec oldGyroBias = Vec(CalibrationData->X, CalibrationData->Y, CalibrationData->Z) / std::max((float)CalibrationData->NumSamples, 1.f);
-			// recalibrate over time proportional to the difference between the calculated bias and the current assumed bias
-			const float sensorFusionLerpFactor = sensorFusionCalibrationHalfTime <= 0.f ? 0.f : exp2f(-calibrationEaseIn * deltaTime / sensorFusionCalibrationHalfTime);
-			Vec newGyroBias = (SmoothedAngularVelocityGyro - SmoothedAngularVelocityAccel).Lerp(oldGyroBias, sensorFusionLerpFactor);
-			Confidence = std::min(Confidence + deltaTime * sensorFusionConfidenceRate, 1.f);
-			isSteady = true;
-			// don't change bias in axes that can't be affected by the gravity direction
-			Vec axisCalibrationStrength = thisNormal.Abs();
-			if (axisCalibrationStrength.x > 0.7f)
-			{
-				axisCalibrationStrength.x = 1.f;
-			}
-			if (axisCalibrationStrength.y > 0.7f)
-			{
-				axisCalibrationStrength.y = 1.f;
-			}
-			if (axisCalibrationStrength.z > 0.7f)
-			{
-				axisCalibrationStrength.z = 1.f;
-			}
-			newGyroBias = newGyroBias.Lerp(oldGyroBias, axisCalibrationStrength.Min(Vec(1.f)));
-
-			CalibrationData->X = newGyroBias.x;
-			CalibrationData->Y = newGyroBias.y;
-			CalibrationData->Z = newGyroBias.z;
-
-			CalibrationData->AccelMagnitude = thisAccel.Length();
-
-			CalibrationData->NumSamples = 1;
-
-			calibrated = true;
-
-			//printf("Recalibrating at a strength of %.4f\n", calibrationEaseIn);
-		}
-
-		SmoothedPreviousAccel = thisAccel;
-		PreviousAccel = inAccel;
-
-		//printf("Gyro: %.4f, %.4f, %.4f | Accel: %.4f, %.4f, %.4f\n",
-		//	SmoothedAngularVelocityGyro.x, SmoothedAngularVelocityGyro.y, SmoothedAngularVelocityGyro.z,
-		//	SmoothedAngularVelocityAccel.x, SmoothedAngularVelocityAccel.y, SmoothedAngularVelocityAccel.z);
-
-		bIsSteady = isSteady;
-
-		return calibrated;
-	}
-
-	inline void AutoCalibration::NoSampleSensorFusion()
-	{
-		TimeSteadySensorFusion = 0.f;
-		SensorFusionSkippedTime = 0.f;
-		PreviousAccel = GamepadMotionHelpers::Vec();
-		SmoothedPreviousAccel = GamepadMotionHelpers::Vec();
-		SmoothedAngularVelocityGyro = GamepadMotionHelpers::Vec();
-		SmoothedAngularVelocityAccel = GamepadMotionHelpers::Vec();
-	}
-
-	inline void AutoCalibration::SetCalibrationData(GyroCalibration* calibrationData)
-	{
-		CalibrationData = calibrationData;
-	}
-
-	inline void AutoCalibration::SetSettings(GamepadMotionSettings* settings)
-	{
-		Settings = settings;
-	}
-
-} // namespace GamepadMotionHelpers
-
-inline GamepadMotion::GamepadMotion()
-{
-	IsCalibrating = false;
-	CurrentCalibrationMode = GamepadMotionHelpers::CalibrationMode::Manual;
-	Reset();
-	AutoCalibration.SetCalibrationData(&GyroCalibration);
-	AutoCalibration.SetSettings(&Settings);
-	Motion.SetSettings(&Settings);
-}
-
-inline void GamepadMotion::Reset()
-{
-	GyroCalibration = {};
-	Gyro = {};
-	RawAccel = {};
-	Settings = GamepadMotionSettings();
-	Motion.Reset();
-}
-
-inline void GamepadMotion::ProcessMotion(float gyroX, float gyroY, float gyroZ,
-	float accelX, float accelY, float accelZ, float deltaTime)
-{
-	if (gyroX == 0.f && gyroY == 0.f && gyroZ == 0.f &&
-		accelX == 0.f && accelY == 0.f && accelZ == 0.f)
-	{
-		// all zeroes are almost certainly not valid inputs
-		return;
-	}
-
-	float accelMagnitude = sqrtf(accelX * accelX + accelY * accelY + accelZ * accelZ);
-
-	if (IsCalibrating)
-	{
-		// manual calibration
-		PushSensorSamples(gyroX, gyroY, gyroZ, accelMagnitude);
-		AutoCalibration.NoSampleSensorFusion();
-		AutoCalibration.NoSampleStillness();
-	}
-	else if (CurrentCalibrationMode & GamepadMotionHelpers::CalibrationMode::Stillness)
-	{
-		AutoCalibration.AddSampleStillness(GamepadMotionHelpers::Vec(gyroX, gyroY, gyroZ), GamepadMotionHelpers::Vec(accelX, accelY, accelZ), deltaTime, CurrentCalibrationMode & GamepadMotionHelpers::CalibrationMode::SensorFusion);
-		AutoCalibration.NoSampleSensorFusion();
-	}
-	else
-	{
-		AutoCalibration.NoSampleStillness();
-		if (CurrentCalibrationMode & GamepadMotionHelpers::CalibrationMode::SensorFusion)
-		{
-			AutoCalibration.AddSampleSensorFusion(GamepadMotionHelpers::Vec(gyroX, gyroY, gyroZ), GamepadMotionHelpers::Vec(accelX, accelY, accelZ), deltaTime);
-		}
-		else
-		{
-			AutoCalibration.NoSampleSensorFusion();
-		}
-	}
-
-	float gyroOffsetX, gyroOffsetY, gyroOffsetZ;
-	GetCalibratedSensor(gyroOffsetX, gyroOffsetY, gyroOffsetZ, accelMagnitude);
-
-	gyroX -= gyroOffsetX;
-	gyroY -= gyroOffsetY;
-	gyroZ -= gyroOffsetZ;
-
-	Motion.Update(gyroX, gyroY, gyroZ, accelX, accelY, accelZ, accelMagnitude, deltaTime);
-
-	Gyro.x = gyroX;
-	Gyro.y = gyroY;
-	Gyro.z = gyroZ;
-	RawAccel.x = accelX;
-	RawAccel.y = accelY;
-	RawAccel.z = accelZ;
-}
-
-// reading the current state
-inline void GamepadMotion::GetCalibratedGyro(float& x, float& y, float& z)
-{
-	x = Gyro.x;
-	y = Gyro.y;
-	z = Gyro.z;
-}
-
-inline void GamepadMotion::GetGravity(float& x, float& y, float& z)
-{
-	x = Motion.Grav.x;
-	y = Motion.Grav.y;
-	z = Motion.Grav.z;
-}
-
-inline void GamepadMotion::GetProcessedAcceleration(float& x, float& y, float& z)
-{
-	x = Motion.Accel.x;
-	y = Motion.Accel.y;
-	z = Motion.Accel.z;
-}
-
-inline void GamepadMotion::GetOrientation(float& w, float& x, float& y, float& z)
-{
-	w = Motion.Quaternion.w;
-	x = Motion.Quaternion.x;
-	y = Motion.Quaternion.y;
-	z = Motion.Quaternion.z;
-}
-
-inline void GamepadMotion::GetPlayerSpaceGyro(float& x, float& y, const float yawRelaxFactor)
-{
-	CalculatePlayerSpaceGyro(x, y, Gyro.x, Gyro.y, Gyro.z, Motion.Grav.x, Motion.Grav.y, Motion.Grav.z, yawRelaxFactor);
-}
-
-inline void GamepadMotion::CalculatePlayerSpaceGyro(float& x, float& y, const float gyroX, const float gyroY, const float gyroZ, const float gravX, const float gravY, const float gravZ, const float yawRelaxFactor)
-{
-	// take gravity into account without taking on any error from gravity. Explained in depth at http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc7
-	const float worldYaw = -(gravY * gyroY + gravZ * gyroZ);
-	const float worldYawSign = worldYaw < 0.f ? -1.f : 1.f;
-	y = worldYawSign * std::min(std::abs(worldYaw) * yawRelaxFactor, sqrtf(gyroY * gyroY + gyroZ * gyroZ));
-	x = gyroX;
-}
-
-inline void GamepadMotion::GetWorldSpaceGyro(float& x, float& y, const float sideReductionThreshold)
-{
-	CalculateWorldSpaceGyro(x, y, Gyro.x, Gyro.y, Gyro.z, Motion.Grav.x, Motion.Grav.y, Motion.Grav.z, sideReductionThreshold);
-}
-
-inline void GamepadMotion::CalculateWorldSpaceGyro(float& x, float& y, const float gyroX, const float gyroY, const float gyroZ, const float gravX, const float gravY, const float gravZ, const float sideReductionThreshold)
-{
-	// use the gravity direction as the yaw axis, and derive an appropriate pitch axis. Explained in depth at http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc6
-	const float worldYaw = -gravX * gyroX - gravY * gyroY - gravZ * gyroZ;
-	// project local pitch axis (X) onto gravity plane
-	const float gravDotPitchAxis = gravX;
-	GamepadMotionHelpers::Vec pitchAxis(1.f - gravX * gravDotPitchAxis,
-		-gravY * gravDotPitchAxis,
-		-gravZ * gravDotPitchAxis);
-	// normalize
-	const float pitchAxisLengthSquared = pitchAxis.LengthSquared();
-	if (pitchAxisLengthSquared > 0.f)
-	{
-		const float pitchAxisLength = sqrtf(pitchAxisLengthSquared);
-		const float lengthReciprocal = 1.f / pitchAxisLength;
-		pitchAxis *= lengthReciprocal;
-
-		const float flatness = std::abs(gravY);
-		const float upness = std::abs(gravZ);
-		const float sideReduction = sideReductionThreshold <= 0.f ? 1.f : std::clamp((std::max(flatness, upness) - sideReductionThreshold) / sideReductionThreshold, 0.f, 1.f);
-
-		x = sideReduction * pitchAxis.Dot(GamepadMotionHelpers::Vec(gyroX, gyroY, gyroZ));
-	}
-	else
-	{
-		x = 0.f;
-	}
-
-	y = worldYaw;
-}
-
-// gyro calibration functions
-inline void GamepadMotion::StartContinuousCalibration()
-{
-	IsCalibrating = true;
-}
-
-inline void GamepadMotion::PauseContinuousCalibration()
-{
-	IsCalibrating = false;
-}
-
-inline void GamepadMotion::ResetContinuousCalibration()
-{
-	GyroCalibration = {};
-	AutoCalibration.Reset();
-}
-
-inline void GamepadMotion::GetCalibrationOffset(float& xOffset, float& yOffset, float& zOffset)
-{
-	float accelMagnitude;
-	GetCalibratedSensor(xOffset, yOffset, zOffset, accelMagnitude);
-}
-
-inline void GamepadMotion::SetCalibrationOffset(float xOffset, float yOffset, float zOffset, int weight)
-{
-	if (GyroCalibration.NumSamples > 1)
-	{
-		GyroCalibration.AccelMagnitude *= ((float)weight) / GyroCalibration.NumSamples;
-	}
-	else
-	{
-		GyroCalibration.AccelMagnitude = (float)weight;
-	}
-
-	GyroCalibration.NumSamples = weight;
-	GyroCalibration.X = xOffset * weight;
-	GyroCalibration.Y = yOffset * weight;
-	GyroCalibration.Z = zOffset * weight;
-}
-
-inline float GamepadMotion::GetAutoCalibrationConfidence()
-{
-	return AutoCalibration.Confidence;
-}
-
-inline void GamepadMotion::SetAutoCalibrationConfidence(float newConfidence)
-{
-	AutoCalibration.Confidence = newConfidence;
-}
-
-inline bool GamepadMotion::GetAutoCalibrationIsSteady()
-{
-	return AutoCalibration.IsSteady();
-}
-
-inline GamepadMotionHelpers::CalibrationMode GamepadMotion::GetCalibrationMode()
-{
-	return CurrentCalibrationMode;
-}
-
-inline void GamepadMotion::SetCalibrationMode(GamepadMotionHelpers::CalibrationMode calibrationMode)
-{
-	CurrentCalibrationMode = calibrationMode;
-}
-
-inline void GamepadMotion::ResetMotion()
-{
-	Motion.Reset();
-}
-
-// Private Methods
-
-inline void GamepadMotion::PushSensorSamples(float gyroX, float gyroY, float gyroZ, float accelMagnitude)
-{
-	// accumulate
-	GyroCalibration.NumSamples++;
-	GyroCalibration.X += gyroX;
-	GyroCalibration.Y += gyroY;
-	GyroCalibration.Z += gyroZ;
-	GyroCalibration.AccelMagnitude += accelMagnitude;
-}
-
-inline void GamepadMotion::GetCalibratedSensor(float& gyroOffsetX, float& gyroOffsetY, float& gyroOffsetZ, float& accelMagnitude)
-{
-	if (GyroCalibration.NumSamples <= 0)
-	{
-		gyroOffsetX = 0.f;
-		gyroOffsetY = 0.f;
-		gyroOffsetZ = 0.f;
-		accelMagnitude = 1.f;
-		return;
-	}
-
-	const float inverseSamples = 1.f / GyroCalibration.NumSamples;
-	gyroOffsetX = GyroCalibration.X * inverseSamples;
-	gyroOffsetY = GyroCalibration.Y * inverseSamples;
-	gyroOffsetZ = GyroCalibration.Z * inverseSamples;
-	accelMagnitude = GyroCalibration.AccelMagnitude * inverseSamples;
-}
diff --git a/lib/GamepadMotionHelpers/LICENSE b/lib/GamepadMotionHelpers/LICENSE
deleted file mode 100644
index a46396a..0000000
--- a/lib/GamepadMotionHelpers/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2020-2023 Julian "Jibb" Smart
-
-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.
diff --git a/lib/GamepadMotionHelpers/README.md b/lib/GamepadMotionHelpers/README.md
deleted file mode 100644
index c5c1bc9..0000000
--- a/lib/GamepadMotionHelpers/README.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# GamepadMotionHelpers
-GamepadMotionHelpers is a lightweight header-only library for sensor fusion, gyro calibration, etc. BYO input library (eg [SDL2](https://github.com/libsdl-org/SDL)).
-
-## Units
-Convert your gyro units into **degrees per second** and accelerometer units to **g-force** (1 g = 9.8 m/s^2). You don't have to use these units in your application, but convert to these units when writing to GamepadMotionHelpers and convert back when reading from it. Your input reader might prefer radians per second and metres per second squared, but the datasheets for every IMU I've seen talk about degrees per second and g-force.
-
-## Coordinate Space
-This library uses a Y-up coordinate system. While Z-up is (only slightly) preferable for many games, PlayStation controllers use Y-up, and have set the standard for input libraries like [SDL2](https://github.com/libsdl-org/SDL) and [JSL](https://github.com/JibbSmart/JoyShockLibrary). These libraries convert inputs from other controller types to the same space used by PlayStation's DualShock 4 and DualSense, so that's what's used here.
-
-## Basic Use
-Include the GamepadMotion.hpp file in your C++ project. That's it! Everything you need is in that file, and its only dependency is ```<math.h>```.
-
-For each controller with gyro (and optionally accelerometer), create a ```GamepadMotion``` object. At regular intervals, whether when a new report comes in from the controller or when polling the controller's state, you should call ```ProcessMotion(...)```. This is when you tell your GamepadMotion object the latest gyro (in degrees per second) and accelerometer (in g-force) inputs. You'll also give it the time since the last update for this controller (in seconds).
-
-ProcessMotion takes these inputs, updates some internal values, and then you can use any of the following to read its current state:
-- ```GetCalibratedGyro(float& x, float& y, float& z)``` - Get the controller's angular velocity in degrees per second. This is just the raw gyro you gave it minus the gyro's bias as determined by your calibration settings (more on that below).
-- ```GetGravity(float& x, float& y, float& z)``` - Get the gravity direction in the controller's local space. When the controller is still on a flat surface it'll be approximately (0, -1, 0). The controller can't detect the gravity direction when it's in freefall or being shaken around, but it can make a pretty good guess if its gyro is correctly calibrated and then make further corrections when the controller is still again.
-- ```GetProcessedAcceleration(float& x, float& y, float& z)``` - Get the controller's current acceleration in g-force with gravity removed. Raw accelerometer input includes gravity -- it is only (0, 0, 0) when the controller is in freefall. However, using the gravity direction as calculated for GetGravity, it can remove that component and detect how you're shaking the controller about. This function gives you that acceleration vector with the gravity removed.
-- ```GetOrientation(float& w, float& x, float& y, float& z)``` - Get the controller's orientation. Gyro and accelerometer input are combined to give a good estimate of the controller's orientation.
-
-Additional helper functions are available for taking gravity into account and returning a "world space" or "player space" rotation in two axes. Bear in mind that the **X** and **Y** set by these functions is still around the controller's axes. This means **Y** is the *horizontal* part of the rotation, and **X** is the vertical part. To convert to a mouse-like input, you'll treat the **Y** as the horizontal or yaw input and **X** as the vertical or pitch input. This might be unintuitive, but since it's also true of the "local space" angular velocities obtained from GetCalibratedGyro, this makes it simple to let the user choose between *local space*, *world space*, and *player space* in your game or application by just swapping GetCalibratedGyro for these functions depending on that selection:
-- ```GetWorldSpaceGyro(float& x, float& y, const float sideReductionThreshold = 0.125f)``` - Get the controller's angular velocity in *world space* as described on GyroWiki in the [player space article here](http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc6). Yaw input will be derived from motion around the gravity axis, and pitch input from an appropriate pitch axis calculated from the controller's orientation with respect to the gravity axis. Any errors in the calculated gravity axis (though likely very small) will be taken on by the calculated world space gyro rotation, making it slightly less robust than using calibrated gyro directly ("local space" gyro) or using *player space* gyro below. More info in the linked article.
-- ```GetPlayerSpaceGyro(float& x, float& y, const float yawRelaxFactor = 1.41f)``` - Get the controller's angular velocity in *player space* as described on GyroWiki in the [player space article here](http://gyrowiki.jibbsmart.com/blog:player-space-gyro-and-alternatives-explained#toc7). Yaw input will be derived from motion approximately around the gravity axis, without any impact from errors in the gravity calculation. Pitch is just local pitch. It is robust, accommodates players who are used to both local space and world space gyro, while taking on most of the advantages of each. It is proven in popular games and is an ideal default for players using a standalone controller. For handheld (where the screen is part of the controller, such as mobile, Switch, or Steam Deck) local space (using the calibrated gyro input directly) may be preferable. More info in the linked article.
-
-If you want to plug in the gyro and gravity values yourself (perhaps you're using an externally calculated gravity), you can use ```CalculateWorldSpaceGyro``` and ```CalculatePlayerSpaceGyro``` instead. Make sure you use this GamepadMotionHelpers' coordinate space, units, and gravity is normalized, since those are all assumed for these functions.
-
-## Sensor Fusion
-Combining multiple types of sensor like this to get a better picture of the controller's state is called "sensor fusion". Moment-to-moment changes in orientation are detected using the gyro, but that only gives local angular velocity and needs to be correctly calibrated. Errors can accumulate over time. The gravity vector as detected by the accelerometer is used to make corrections to the relevant components of the controller's orientation.
-
-But this cannot be used to correct the controller's orientation around the gravity vector (the **yaw** axis). If you're using the controller's absolute orientation for some reason, this "yaw drift" may need to be accounted for somehow. Some devices also have a magnetometer (compass) to counter yaw drift, but since popular game controllers don't have a magnetometer, I haven't tried it myself. In future, if I get such a device, I'd like to add the option for GamepadMotionHelpers to accept magnetometer input and account for it when calculating values for the above functions.
-
-## Gyro Calibration
-Modern gyroscopes often need calibration. This is like how a [weighing scale](https://en.wikipedia.org/wiki/Weighing_scale) can need calibration to tell it what 'zero' is. Like a weighing scale, a correctly calibrated gyroscope will give an accurate reading. If you're using the gyro input as a mouse, which is the simplest application of a controller's gyro, you can find essential reading on [GyroWiki here](http://gyrowiki.jibbsmart.com/blog:good-gyro-controls-part-1:the-gyro-is-a-mouse).
-
-Calibration just means having the controller sit still and remembering the average reported angular velocity in each axis. This is the gyro's "bias". In GamepadMotionHelpers, I call our best guess at the controller's bias the "calibration offset". GamepadMotionHelpers has some options to help with calibrating:
-
-At any time, you can begin manually calibrating a controller by calling ```StartContinuousCalibration()```. This will start recording the average angular velocity and apply it immediately to any subsequent **GetGalibratedGyro(...)** call. At any time you can ```PauseContinuousCalibration()``` to no longer add current values to the average angular velocity being recorded. You can ```ResetContinousCalibration()``` to remove the recorded average before starting over with **StartContinuousCalibration** again.
-
-You can read the stored calibration values using ```GetCalibrationOffset(float& xOffset, float& yOffset, float& zOffset)```. You can manually set the calibration offset yourself with ```SetCalibrationOffset(float xOffset, float yOffset, float zOffset, int weight)```. This will override all stored values. The **weight** argument at the end determines how strongly these values should be considered over time if Continuous Calibration is still active (new values are still being added to the average). Each new sample has a weight of 1, so if you **SetCalibrationOffset** with a weight of 10, it'll have the weight of 10 samples when calculating the average. If you're not continuing to add samples (Continuous Calibration is not active), the weight will be meaningless. Setting this manually is unusual, so don't worry about it too much if that sounds complicated.
-
-Most games don't ask the user to calibrate the gyro themselves. They have built-in automatic calibration, which I like to call "auto-calibration". There's no such thing as a "good enough" auto-calibration solution -- at least not with only gyro and accelerometer. Every game that has an auto-calibration solution would be made better for more serious players with the option to manually calibrate their gyro, so I urge you to provide players the option to do the same in your game. Having said that, auto-calibration is a useful option for casual players, and you may choose to have it enabled in your game by default.
-
-So GamepadMotionHelpers provides some auto-calibration options. You can call ```SetCalibrationMode(CalibrationMode)``` on each GamepadMotion instance with the following options:
-- ```CalibrationMode::Manual``` - No auto-calibration. This is the default.
-- ```CalibrationMode::Stillness``` - Automatically try to detect when the controller is being held still and update the calibration offset accordingly.
-- ```CalibrationMode::SensorFusion``` - Calculate an angular velocity from changes in the gravity direction as detected by the accelerometer. If these are steady enough, use them to make corrections to the calibration offset. This will only apply to relevant axes.
-
-Many players are already aware of the shortcomings of trying to automatically detect stillness to automatically calibrate the gyro. Whether on Switch, PlayStation, or using PlayStation controllers on PC, players have tried to track a slow or distant target only to have the aimer suddenly stop moving! The game or the platform has **misinterpreted their slow and steady input as the controller being held still**, and they've incorrectly recalibrated accordingly. Players *hate it* when this happens.
-
-**This is why it's important to let players manually calibrate their gyro** if they want to.
-
-Auto-calibration is used so widely in console games that it's speculated that game developers may not have the option to disable it on these platforms. If this is the case, GamepadMotionHelpers offers a big advantage over those platforms: you can disable it and enable it at any time.
-
-You, the game developer, can have your game tell if the player is tracking a distant or slow-moving target. You can tell if the player's aimer is moving towards a visible target or roughly following the movement of one. When it is, maybe disabling the auto-calibration (```SetCalibrationMode(CalibrationMode::Manual)```) could be the difference between good and bad auto-calibration. I don't know if the GamepadMotionHelpers auto-calibration functions are better or worse than their Switch and PlayStation counterparts generally, but by letting you take the game's context into account, you may be able to offer players a way better experience without them having to manually calibrate.
-
-But still give them the option to calibrate manually, please :)
-
-The **SensorFusion** calibration mode has shortcomings of its own. It's much harder to accidentally trick the game into incorrectly calibrating, but the angular velocity calculated from the accelerometer moment-to-moment is generally much less precise. Leaving the controller still, you'll notice the calibrated gyro moving slightly up and down over time. So while the **Stillness** mode is characterised by good behaviour occasionally punctuated by frustrating errors, the **SensorFusion** mode will tend to be more consistently not-quite-right without being terrible.
-
-Secondly, this library currently only combines accelerometer and gyro, so the **SensorFusion** auto-calibration cannot correct the gyro in all axes at the same time. The **SensorFusion**-only mode will be more useful in future when magnetometer input is supported, which can account for the axes that the accelerometer can't.
-
-Both auto-calibration modes can be combined by passing ```CalibrationMode::Stillness | CalibrationMode::SensorFusion``` to **SetCalibrationMode**. In this case, it'll use **Stillness** auto-calibration, but it'll adjust the calibration offset based on any angular velocity implied by changes in the accelerometer input. This tends to give better results than just using **Stillness** or **SensorFusion** on their own.
-
-If you aren't sure what to choose, I'd suggest using the combined ```CalibrationMode::Stillness | CalibrationMode::SensorFusion``` when auto calibration is enabled, but also allowing the player to manually calibrate.
-
-**TODO** This is a clunky way to let the user set up what is obviously the best solution. Maybe I should just call it "hybrid" or something and be done with it?
-
-Auto-calibration can also be used to communicate manual calibration to the player. ```GetAutoCalibrationIsSteady()``` will tell you whether GamepadMotionHelpers thinks the controller is currently being held steady (if auto-calibration is enabled). ```GetAutoCalibrationConfidence()``` will tell you how confident GamepadMotionHelpers is that it has a good calibration value from auto-calibration, from 0-1. Higher confidence means that new calibration changes will be applied more gradually. You can use these functions to detect when a controller needs to be calibrated, prompt the player to put their controller down, detect when they have put their controller down, and show progress for calibration (default 1 second once it starts). You can also override the confidence yourself (```SetAutoCalibrationConfidence()```), and resetting calibration will reset confidence to 0. How quickly confidence grows as well as other calibration settings can be customised in **GamepadMotionSettings**.
-
-## In the Wild
-GamepadMotionHelpers is currently used in:
-- [JoyShockMapper](https://github.com/Electronicks/JoyShockMapper)
-- [JoyShockLibrary](https://github.com/JibbSmart/JoyShockLibrary)
-- JoyShockOverlay
-
-If you know of any other games or applications using GamepadMotionHelpers, please let me know!
\ No newline at end of file
diff --git a/lib/N64ModernRuntime b/lib/N64ModernRuntime
index df7e820..589bbf0 160000
--- a/lib/N64ModernRuntime
+++ b/lib/N64ModernRuntime
@@ -1 +1 @@
-Subproject commit df7e820d8c55e4fcb4616c210cbb2c01b25cd48c
+Subproject commit 589bbf018a3e6d3646ddf7de1e7919f1b7e99bb1
diff --git a/lib/RecompFrontend b/lib/RecompFrontend
new file mode 160000
index 0000000..b1a1477
--- /dev/null
+++ b/lib/RecompFrontend
@@ -0,0 +1 @@
+Subproject commit b1a1477c6556aeb7ed45defbfb5924f721efebc1
diff --git a/lib/RmlUi b/lib/RmlUi
deleted file mode 160000
index 7a06f27..0000000
--- a/lib/RmlUi
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7a06f27db04fe5d13a5dacc19b2b4544673a4eca
diff --git a/lib/concurrentqueue/blockingconcurrentqueue.h b/lib/concurrentqueue/blockingconcurrentqueue.h
deleted file mode 100644
index 205a4db..0000000
--- a/lib/concurrentqueue/blockingconcurrentqueue.h
+++ /dev/null
@@ -1,582 +0,0 @@
-// Provides an efficient blocking version of moodycamel::ConcurrentQueue.
-// ©2015-2020 Cameron Desrochers. Distributed under the terms of the simplified
-// BSD license, available at the top of concurrentqueue.h.
-// Also dual-licensed under the Boost Software License (see LICENSE.md)
-// Uses Jeff Preshing's semaphore implementation (under the terms of its
-// separate zlib license, see lightweightsemaphore.h).
-
-#pragma once
-
-#include "concurrentqueue.h"
-#include "lightweightsemaphore.h"
-
-#include <type_traits>
-#include <cerrno>
-#include <memory>
-#include <chrono>
-#include <ctime>
-
-namespace moodycamel
-{
-// This is a blocking version of the queue. It has an almost identical interface to
-// the normal non-blocking version, with the addition of various wait_dequeue() methods
-// and the removal of producer-specific dequeue methods.
-template<typename T, typename Traits = ConcurrentQueueDefaultTraits>
-class BlockingConcurrentQueue
-{
-private:
-	typedef ::moodycamel::ConcurrentQueue<T, Traits> ConcurrentQueue;
-	typedef ::moodycamel::LightweightSemaphore LightweightSemaphore;
-
-public:
-	typedef typename ConcurrentQueue::producer_token_t producer_token_t;
-	typedef typename ConcurrentQueue::consumer_token_t consumer_token_t;
-	
-	typedef typename ConcurrentQueue::index_t index_t;
-	typedef typename ConcurrentQueue::size_t size_t;
-	typedef typename std::make_signed<size_t>::type ssize_t;
-	
-	static const size_t BLOCK_SIZE = ConcurrentQueue::BLOCK_SIZE;
-	static const size_t EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD = ConcurrentQueue::EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD;
-	static const size_t EXPLICIT_INITIAL_INDEX_SIZE = ConcurrentQueue::EXPLICIT_INITIAL_INDEX_SIZE;
-	static const size_t IMPLICIT_INITIAL_INDEX_SIZE = ConcurrentQueue::IMPLICIT_INITIAL_INDEX_SIZE;
-	static const size_t INITIAL_IMPLICIT_PRODUCER_HASH_SIZE = ConcurrentQueue::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE;
-	static const std::uint32_t EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE = ConcurrentQueue::EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE;
-	static const size_t MAX_SUBQUEUE_SIZE = ConcurrentQueue::MAX_SUBQUEUE_SIZE;
-	
-public:
-	// Creates a queue with at least `capacity` element slots; note that the
-	// actual number of elements that can be inserted without additional memory
-	// allocation depends on the number of producers and the block size (e.g. if
-	// the block size is equal to `capacity`, only a single block will be allocated
-	// up-front, which means only a single producer will be able to enqueue elements
-	// without an extra allocation -- blocks aren't shared between producers).
-	// This method is not thread safe -- it is up to the user to ensure that the
-	// queue is fully constructed before it starts being used by other threads (this
-	// includes making the memory effects of construction visible, possibly with a
-	// memory barrier).
-	explicit BlockingConcurrentQueue(size_t capacity = 6 * BLOCK_SIZE)
-		: inner(capacity), sema(create<LightweightSemaphore, ssize_t, int>(0, (int)Traits::MAX_SEMA_SPINS), &BlockingConcurrentQueue::template destroy<LightweightSemaphore>)
-	{
-		assert(reinterpret_cast<ConcurrentQueue*>((BlockingConcurrentQueue*)1) == &((BlockingConcurrentQueue*)1)->inner && "BlockingConcurrentQueue must have ConcurrentQueue as its first member");
-		if (!sema) {
-			MOODYCAMEL_THROW(std::bad_alloc());
-		}
-	}
-	
-	BlockingConcurrentQueue(size_t minCapacity, size_t maxExplicitProducers, size_t maxImplicitProducers)
-		: inner(minCapacity, maxExplicitProducers, maxImplicitProducers), sema(create<LightweightSemaphore, ssize_t, int>(0, (int)Traits::MAX_SEMA_SPINS), &BlockingConcurrentQueue::template destroy<LightweightSemaphore>)
-	{
-		assert(reinterpret_cast<ConcurrentQueue*>((BlockingConcurrentQueue*)1) == &((BlockingConcurrentQueue*)1)->inner && "BlockingConcurrentQueue must have ConcurrentQueue as its first member");
-		if (!sema) {
-			MOODYCAMEL_THROW(std::bad_alloc());
-		}
-	}
-	
-	// Disable copying and copy assignment
-	BlockingConcurrentQueue(BlockingConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-	BlockingConcurrentQueue& operator=(BlockingConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-	
-	// Moving is supported, but note that it is *not* a thread-safe operation.
-	// Nobody can use the queue while it's being moved, and the memory effects
-	// of that move must be propagated to other threads before they can use it.
-	// Note: When a queue is moved, its tokens are still valid but can only be
-	// used with the destination queue (i.e. semantically they are moved along
-	// with the queue itself).
-	BlockingConcurrentQueue(BlockingConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
-		: inner(std::move(other.inner)), sema(std::move(other.sema))
-	{ }
-	
-	inline BlockingConcurrentQueue& operator=(BlockingConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
-	{
-		return swap_internal(other);
-	}
-	
-	// Swaps this queue's state with the other's. Not thread-safe.
-	// Swapping two queues does not invalidate their tokens, however
-	// the tokens that were created for one queue must be used with
-	// only the swapped queue (i.e. the tokens are tied to the
-	// queue's movable state, not the object itself).
-	inline void swap(BlockingConcurrentQueue& other) MOODYCAMEL_NOEXCEPT
-	{
-		swap_internal(other);
-	}
-	
-private:
-	BlockingConcurrentQueue& swap_internal(BlockingConcurrentQueue& other)
-	{
-		if (this == &other) {
-			return *this;
-		}
-		
-		inner.swap(other.inner);
-		sema.swap(other.sema);
-		return *this;
-	}
-	
-public:
-	// Enqueues a single item (by copying it).
-	// Allocates memory if required. Only fails if memory allocation fails (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-	// or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(T const& item)
-	{
-		if ((details::likely)(inner.enqueue(item))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by moving it, if possible).
-	// Allocates memory if required. Only fails if memory allocation fails (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-	// or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(T&& item)
-	{
-		if ((details::likely)(inner.enqueue(std::move(item)))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by copying it) using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(producer_token_t const& token, T const& item)
-	{
-		if ((details::likely)(inner.enqueue(token, item))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by moving it, if possible) using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(producer_token_t const& token, T&& item)
-	{
-		if ((details::likely)(inner.enqueue(token, std::move(item)))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues several items.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// implicit production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-	// is 0, or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Note: Use std::make_move_iterator if the elements should be moved instead of copied.
-	// Thread-safe.
-	template<typename It>
-	inline bool enqueue_bulk(It itemFirst, size_t count)
-	{
-		if ((details::likely)(inner.enqueue_bulk(std::forward<It>(itemFirst), count))) {
-			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues several items using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails
-	// (or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	inline bool enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-	{
-		if ((details::likely)(inner.enqueue_bulk(token, std::forward<It>(itemFirst), count))) {
-			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by copying it).
-	// Does not allocate memory. Fails if not enough room to enqueue (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-	// is 0).
-	// Thread-safe.
-	inline bool try_enqueue(T const& item)
-	{
-		if (inner.try_enqueue(item)) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by moving it, if possible).
-	// Does not allocate memory (except for one-time implicit producer).
-	// Fails if not enough room to enqueue (or implicit production is
-	// disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-	// Thread-safe.
-	inline bool try_enqueue(T&& item)
-	{
-		if (inner.try_enqueue(std::move(item))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by copying it) using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Thread-safe.
-	inline bool try_enqueue(producer_token_t const& token, T const& item)
-	{
-		if (inner.try_enqueue(token, item)) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues a single item (by moving it, if possible) using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Thread-safe.
-	inline bool try_enqueue(producer_token_t const& token, T&& item)
-	{
-		if (inner.try_enqueue(token, std::move(item))) {
-			sema->signal();
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues several items.
-	// Does not allocate memory (except for one-time implicit producer).
-	// Fails if not enough room to enqueue (or implicit production is
-	// disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	inline bool try_enqueue_bulk(It itemFirst, size_t count)
-	{
-		if (inner.try_enqueue_bulk(std::forward<It>(itemFirst), count)) {
-			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-			return true;
-		}
-		return false;
-	}
-	
-	// Enqueues several items using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	inline bool try_enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-	{
-		if (inner.try_enqueue_bulk(token, std::forward<It>(itemFirst), count)) {
-			sema->signal((LightweightSemaphore::ssize_t)(ssize_t)count);
-			return true;
-		}
-		return false;
-	}
-	
-	
-	// Attempts to dequeue from the queue.
-	// Returns false if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool try_dequeue(U& item)
-	{
-		if (sema->tryWait()) {
-			while (!inner.try_dequeue(item)) {
-				continue;
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	// Attempts to dequeue from the queue using an explicit consumer token.
-	// Returns false if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool try_dequeue(consumer_token_t& token, U& item)
-	{
-		if (sema->tryWait()) {
-			while (!inner.try_dequeue(token, item)) {
-				continue;
-			}
-			return true;
-		}
-		return false;
-	}
-	
-	// Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued.
-	// Returns 0 if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t try_dequeue_bulk(It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		max = (size_t)sema->tryWaitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued.
-	// Returns 0 if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t try_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		max = (size_t)sema->tryWaitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	
-	
-	// Blocks the current thread until there's something to dequeue, then
-	// dequeues it.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline void wait_dequeue(U& item)
-	{
-		while (!sema->wait()) {
-			continue;
-		}
-		while (!inner.try_dequeue(item)) {
-			continue;
-		}
-	}
-
-	// Blocks the current thread until either there's something to dequeue
-	// or the timeout (specified in microseconds) expires. Returns false
-	// without setting `item` if the timeout expires, otherwise assigns
-	// to `item` and returns true.
-	// Using a negative timeout indicates an indefinite timeout,
-	// and is thus functionally equivalent to calling wait_dequeue.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool wait_dequeue_timed(U& item, std::int64_t timeout_usecs)
-	{
-		if (!sema->wait(timeout_usecs)) {
-			return false;
-		}
-		while (!inner.try_dequeue(item)) {
-			continue;
-		}
-		return true;
-	}
-    
-    // Blocks the current thread until either there's something to dequeue
-	// or the timeout expires. Returns false without setting `item` if the
-    // timeout expires, otherwise assigns to `item` and returns true.
-	// Never allocates. Thread-safe.
-	template<typename U, typename Rep, typename Period>
-	inline bool wait_dequeue_timed(U& item, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_timed(item, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-	
-	// Blocks the current thread until there's something to dequeue, then
-	// dequeues it using an explicit consumer token.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline void wait_dequeue(consumer_token_t& token, U& item)
-	{
-		while (!sema->wait()) {
-			continue;
-		}
-		while (!inner.try_dequeue(token, item)) {
-			continue;
-		}
-	}
-	
-	// Blocks the current thread until either there's something to dequeue
-	// or the timeout (specified in microseconds) expires. Returns false
-	// without setting `item` if the timeout expires, otherwise assigns
-	// to `item` and returns true.
-	// Using a negative timeout indicates an indefinite timeout,
-	// and is thus functionally equivalent to calling wait_dequeue.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool wait_dequeue_timed(consumer_token_t& token, U& item, std::int64_t timeout_usecs)
-	{
-		if (!sema->wait(timeout_usecs)) {
-			return false;
-		}
-		while (!inner.try_dequeue(token, item)) {
-			continue;
-		}
-		return true;
-	}
-    
-    // Blocks the current thread until either there's something to dequeue
-	// or the timeout expires. Returns false without setting `item` if the
-    // timeout expires, otherwise assigns to `item` and returns true.
-	// Never allocates. Thread-safe.
-	template<typename U, typename Rep, typename Period>
-	inline bool wait_dequeue_timed(consumer_token_t& token, U& item, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_timed(token, item, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-	
-	// Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued, which will
-	// always be at least one (this method blocks until the queue
-	// is non-empty) and at most max.
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t wait_dequeue_bulk(It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued, which can
-	// be 0 if the timeout expires while waiting for elements,
-	// and at most max.
-	// Using a negative timeout indicates an indefinite timeout,
-	// and is thus functionally equivalent to calling wait_dequeue_bulk.
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t wait_dequeue_bulk_timed(It itemFirst, size_t max, std::int64_t timeout_usecs)
-	{
-		size_t count = 0;
-		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max, timeout_usecs);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(itemFirst, max - count);
-		}
-		return count;
-	}
-    
-    // Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued, which can
-	// be 0 if the timeout expires while waiting for elements,
-	// and at most max.
-	// Never allocates. Thread-safe.
-	template<typename It, typename Rep, typename Period>
-	inline size_t wait_dequeue_bulk_timed(It itemFirst, size_t max, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_bulk_timed<It&>(itemFirst, max, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued, which will
-	// always be at least one (this method blocks until the queue
-	// is non-empty) and at most max.
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t wait_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued, which can
-	// be 0 if the timeout expires while waiting for elements,
-	// and at most max.
-	// Using a negative timeout indicates an indefinite timeout,
-	// and is thus functionally equivalent to calling wait_dequeue_bulk.
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t wait_dequeue_bulk_timed(consumer_token_t& token, It itemFirst, size_t max, std::int64_t timeout_usecs)
-	{
-		size_t count = 0;
-		max = (size_t)sema->waitMany((LightweightSemaphore::ssize_t)(ssize_t)max, timeout_usecs);
-		while (count != max) {
-			count += inner.template try_dequeue_bulk<It&>(token, itemFirst, max - count);
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued, which can
-	// be 0 if the timeout expires while waiting for elements,
-	// and at most max.
-	// Never allocates. Thread-safe.
-	template<typename It, typename Rep, typename Period>
-	inline size_t wait_dequeue_bulk_timed(consumer_token_t& token, It itemFirst, size_t max, std::chrono::duration<Rep, Period> const& timeout)
-    {
-        return wait_dequeue_bulk_timed<It&>(token, itemFirst, max, std::chrono::duration_cast<std::chrono::microseconds>(timeout).count());
-    }
-	
-	
-	// Returns an estimate of the total number of elements currently in the queue. This
-	// estimate is only accurate if the queue has completely stabilized before it is called
-	// (i.e. all enqueue and dequeue operations have completed and their memory effects are
-	// visible on the calling thread, and no further operations start while this method is
-	// being called).
-	// Thread-safe.
-	inline size_t size_approx() const
-	{
-		return (size_t)sema->availableApprox();
-	}
-	
-	
-	// Returns true if the underlying atomic variables used by
-	// the queue are lock-free (they should be on most platforms).
-	// Thread-safe.
-	static constexpr bool is_lock_free()
-	{
-		return ConcurrentQueue::is_lock_free();
-	}
-	
-
-private:
-	template<typename U, typename A1, typename A2>
-	static inline U* create(A1&& a1, A2&& a2)
-	{
-		void* p = (Traits::malloc)(sizeof(U));
-		return p != nullptr ? new (p) U(std::forward<A1>(a1), std::forward<A2>(a2)) : nullptr;
-	}
-	
-	template<typename U>
-	static inline void destroy(U* p)
-	{
-		if (p != nullptr) {
-			p->~U();
-		}
-		(Traits::free)(p);
-	}
-	
-private:
-	ConcurrentQueue inner;
-	std::unique_ptr<LightweightSemaphore, void (*)(LightweightSemaphore*)> sema;
-};
-
-
-template<typename T, typename Traits>
-inline void swap(BlockingConcurrentQueue<T, Traits>& a, BlockingConcurrentQueue<T, Traits>& b) MOODYCAMEL_NOEXCEPT
-{
-	a.swap(b);
-}
-
-}	// end namespace moodycamel
diff --git a/lib/concurrentqueue/concurrentqueue.h b/lib/concurrentqueue/concurrentqueue.h
deleted file mode 100644
index bcb06a1..0000000
--- a/lib/concurrentqueue/concurrentqueue.h
+++ /dev/null
@@ -1,3747 +0,0 @@
-// Provides a C++11 implementation of a multi-producer, multi-consumer lock-free queue.
-// An overview, including benchmark results, is provided here:
-//     http://moodycamel.com/blog/2014/a-fast-general-purpose-lock-free-queue-for-c++
-// The full design is also described in excruciating detail at:
-//    http://moodycamel.com/blog/2014/detailed-design-of-a-lock-free-queue
-
-// Simplified BSD license:
-// Copyright (c) 2013-2020, Cameron Desrochers.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// - Redistributions of source code must retain the above copyright notice, this list of
-// conditions and the following disclaimer.
-// - Redistributions in binary form must reproduce the above copyright notice, this list of
-// conditions and the following disclaimer in the documentation and/or other materials
-// provided with the distribution.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
-// OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-// TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
-// EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Also dual-licensed under the Boost Software License (see LICENSE.md)
-
-#pragma once
-
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-// Disable -Wconversion warnings (spuriously triggered when Traits::size_t and
-// Traits::index_t are set to < 32 bits, causing integer promotion, causing warnings
-// upon assigning any computed values)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wconversion"
-
-#ifdef MCDBGQ_USE_RELACY
-#pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
-#endif
-#endif
-
-#if defined(_MSC_VER) && (!defined(_HAS_CXX17) || !_HAS_CXX17)
-// VS2019 with /W4 warns about constant conditional expressions but unless /std=c++17 or higher
-// does not support `if constexpr`, so we have no choice but to simply disable the warning
-#pragma warning(push)
-#pragma warning(disable: 4127)  // conditional expression is constant
-#endif
-
-#if defined(__APPLE__)
-#include "TargetConditionals.h"
-#endif
-
-#ifdef MCDBGQ_USE_RELACY
-#include "relacy/relacy_std.hpp"
-#include "relacy_shims.h"
-// We only use malloc/free anyway, and the delete macro messes up `= delete` method declarations.
-// We'll override the default trait malloc ourselves without a macro.
-#undef new
-#undef delete
-#undef malloc
-#undef free
-#else
-#include <atomic>		// Requires C++11. Sorry VS2010.
-#include <cassert>
-#endif
-#include <cstddef>              // for max_align_t
-#include <cstdint>
-#include <cstdlib>
-#include <type_traits>
-#include <algorithm>
-#include <utility>
-#include <limits>
-#include <climits>		// for CHAR_BIT
-#include <array>
-#include <thread>		// partly for __WINPTHREADS_VERSION if on MinGW-w64 w/ POSIX threading
-#include <mutex>        // used for thread exit synchronization
-
-// Platform-specific definitions of a numeric thread ID type and an invalid value
-namespace moodycamel { namespace details {
-	template<typename thread_id_t> struct thread_id_converter {
-		typedef thread_id_t thread_id_numeric_size_t;
-		typedef thread_id_t thread_id_hash_t;
-		static thread_id_hash_t prehash(thread_id_t const& x) { return x; }
-	};
-} }
-#if defined(MCDBGQ_USE_RELACY)
-namespace moodycamel { namespace details {
-	typedef std::uint32_t thread_id_t;
-	static const thread_id_t invalid_thread_id  = 0xFFFFFFFFU;
-	static const thread_id_t invalid_thread_id2 = 0xFFFFFFFEU;
-	static inline thread_id_t thread_id() { return rl::thread_index(); }
-} }
-#elif defined(_WIN32) || defined(__WINDOWS__) || defined(__WIN32__)
-// No sense pulling in windows.h in a header, we'll manually declare the function
-// we use and rely on backwards-compatibility for this not to break
-extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId(void);
-namespace moodycamel { namespace details {
-	static_assert(sizeof(unsigned long) == sizeof(std::uint32_t), "Expected size of unsigned long to be 32 bits on Windows");
-	typedef std::uint32_t thread_id_t;
-	static const thread_id_t invalid_thread_id  = 0;			// See http://blogs.msdn.com/b/oldnewthing/archive/2004/02/23/78395.aspx
-	static const thread_id_t invalid_thread_id2 = 0xFFFFFFFFU;	// Not technically guaranteed to be invalid, but is never used in practice. Note that all Win32 thread IDs are presently multiples of 4.
-	static inline thread_id_t thread_id() { return static_cast<thread_id_t>(::GetCurrentThreadId()); }
-} }
-#elif defined(__arm__) || defined(_M_ARM) || defined(__aarch64__) || (defined(__APPLE__) && TARGET_OS_IPHONE) || defined(MOODYCAMEL_NO_THREAD_LOCAL)
-namespace moodycamel { namespace details {
-	static_assert(sizeof(std::thread::id) == 4 || sizeof(std::thread::id) == 8, "std::thread::id is expected to be either 4 or 8 bytes");
-	
-	typedef std::thread::id thread_id_t;
-	static const thread_id_t invalid_thread_id;         // Default ctor creates invalid ID
-
-	// Note we don't define a invalid_thread_id2 since std::thread::id doesn't have one; it's
-	// only used if MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED is defined anyway, which it won't
-	// be.
-	static inline thread_id_t thread_id() { return std::this_thread::get_id(); }
-
-	template<std::size_t> struct thread_id_size { };
-	template<> struct thread_id_size<4> { typedef std::uint32_t numeric_t; };
-	template<> struct thread_id_size<8> { typedef std::uint64_t numeric_t; };
-
-	template<> struct thread_id_converter<thread_id_t> {
-		typedef thread_id_size<sizeof(thread_id_t)>::numeric_t thread_id_numeric_size_t;
-#ifndef __APPLE__
-		typedef std::size_t thread_id_hash_t;
-#else
-		typedef thread_id_numeric_size_t thread_id_hash_t;
-#endif
-
-		static thread_id_hash_t prehash(thread_id_t const& x)
-		{
-#ifndef __APPLE__
-			return std::hash<std::thread::id>()(x);
-#else
-			return *reinterpret_cast<thread_id_hash_t const*>(&x);
-#endif
-		}
-	};
-} }
-#else
-// Use a nice trick from this answer: http://stackoverflow.com/a/8438730/21475
-// In order to get a numeric thread ID in a platform-independent way, we use a thread-local
-// static variable's address as a thread identifier :-)
-#if defined(__GNUC__) || defined(__INTEL_COMPILER)
-#define MOODYCAMEL_THREADLOCAL __thread
-#elif defined(_MSC_VER)
-#define MOODYCAMEL_THREADLOCAL __declspec(thread)
-#else
-// Assume C++11 compliant compiler
-#define MOODYCAMEL_THREADLOCAL thread_local
-#endif
-namespace moodycamel { namespace details {
-	typedef std::uintptr_t thread_id_t;
-	static const thread_id_t invalid_thread_id  = 0;		// Address can't be nullptr
-	static const thread_id_t invalid_thread_id2 = 1;		// Member accesses off a null pointer are also generally invalid. Plus it's not aligned.
-	inline thread_id_t thread_id() { static MOODYCAMEL_THREADLOCAL int x; return reinterpret_cast<thread_id_t>(&x); }
-} }
-#endif
-
-// Constexpr if
-#ifndef MOODYCAMEL_CONSTEXPR_IF
-#if (defined(_MSC_VER) && defined(_HAS_CXX17) && _HAS_CXX17) || __cplusplus > 201402L
-#define MOODYCAMEL_CONSTEXPR_IF if constexpr
-#define MOODYCAMEL_MAYBE_UNUSED [[maybe_unused]]
-#else
-#define MOODYCAMEL_CONSTEXPR_IF if
-#define MOODYCAMEL_MAYBE_UNUSED
-#endif
-#endif
-
-// Exceptions
-#ifndef MOODYCAMEL_EXCEPTIONS_ENABLED
-#if (defined(_MSC_VER) && defined(_CPPUNWIND)) || (defined(__GNUC__) && defined(__EXCEPTIONS)) || (!defined(_MSC_VER) && !defined(__GNUC__))
-#define MOODYCAMEL_EXCEPTIONS_ENABLED
-#endif
-#endif
-#ifdef MOODYCAMEL_EXCEPTIONS_ENABLED
-#define MOODYCAMEL_TRY try
-#define MOODYCAMEL_CATCH(...) catch(__VA_ARGS__)
-#define MOODYCAMEL_RETHROW throw
-#define MOODYCAMEL_THROW(expr) throw (expr)
-#else
-#define MOODYCAMEL_TRY MOODYCAMEL_CONSTEXPR_IF (true)
-#define MOODYCAMEL_CATCH(...) else MOODYCAMEL_CONSTEXPR_IF (false)
-#define MOODYCAMEL_RETHROW
-#define MOODYCAMEL_THROW(expr)
-#endif
-
-#ifndef MOODYCAMEL_NOEXCEPT
-#if !defined(MOODYCAMEL_EXCEPTIONS_ENABLED)
-#define MOODYCAMEL_NOEXCEPT
-#define MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr) true
-#define MOODYCAMEL_NOEXCEPT_ASSIGN(type, valueType, expr) true
-#elif defined(_MSC_VER) && defined(_NOEXCEPT) && _MSC_VER < 1800
-// VS2012's std::is_nothrow_[move_]constructible is broken and returns true when it shouldn't :-(
-// We have to assume *all* non-trivial constructors may throw on VS2012!
-#define MOODYCAMEL_NOEXCEPT _NOEXCEPT
-#define MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr) (std::is_rvalue_reference<valueType>::value && std::is_move_constructible<type>::value ? std::is_trivially_move_constructible<type>::value : std::is_trivially_copy_constructible<type>::value)
-#define MOODYCAMEL_NOEXCEPT_ASSIGN(type, valueType, expr) ((std::is_rvalue_reference<valueType>::value && std::is_move_assignable<type>::value ? std::is_trivially_move_assignable<type>::value || std::is_nothrow_move_assignable<type>::value : std::is_trivially_copy_assignable<type>::value || std::is_nothrow_copy_assignable<type>::value) && MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr))
-#elif defined(_MSC_VER) && defined(_NOEXCEPT) && _MSC_VER < 1900
-#define MOODYCAMEL_NOEXCEPT _NOEXCEPT
-#define MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr) (std::is_rvalue_reference<valueType>::value && std::is_move_constructible<type>::value ? std::is_trivially_move_constructible<type>::value || std::is_nothrow_move_constructible<type>::value : std::is_trivially_copy_constructible<type>::value || std::is_nothrow_copy_constructible<type>::value)
-#define MOODYCAMEL_NOEXCEPT_ASSIGN(type, valueType, expr) ((std::is_rvalue_reference<valueType>::value && std::is_move_assignable<type>::value ? std::is_trivially_move_assignable<type>::value || std::is_nothrow_move_assignable<type>::value : std::is_trivially_copy_assignable<type>::value || std::is_nothrow_copy_assignable<type>::value) && MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr))
-#else
-#define MOODYCAMEL_NOEXCEPT noexcept
-#define MOODYCAMEL_NOEXCEPT_CTOR(type, valueType, expr) noexcept(expr)
-#define MOODYCAMEL_NOEXCEPT_ASSIGN(type, valueType, expr) noexcept(expr)
-#endif
-#endif
-
-#ifndef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-#ifdef MCDBGQ_USE_RELACY
-#define MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-#else
-// VS2013 doesn't support `thread_local`, and MinGW-w64 w/ POSIX threading has a crippling bug: http://sourceforge.net/p/mingw-w64/bugs/445
-// g++ <=4.7 doesn't support thread_local either.
-// Finally, iOS/ARM doesn't have support for it either, and g++/ARM allows it to compile but it's unconfirmed to actually work
-#if (!defined(_MSC_VER) || _MSC_VER >= 1900) && (!defined(__MINGW32__) && !defined(__MINGW64__) || !defined(__WINPTHREADS_VERSION)) && (!defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && (!defined(__APPLE__) || !TARGET_OS_IPHONE) && !defined(__arm__) && !defined(_M_ARM) && !defined(__aarch64__)
-// Assume `thread_local` is fully supported in all other C++11 compilers/platforms
-#define MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED    // tentatively enabled for now; years ago several users report having problems with it on
-#endif
-#endif
-#endif
-
-// VS2012 doesn't support deleted functions. 
-// In this case, we declare the function normally but don't define it. A link error will be generated if the function is called.
-#ifndef MOODYCAMEL_DELETE_FUNCTION
-#if defined(_MSC_VER) && _MSC_VER < 1800
-#define MOODYCAMEL_DELETE_FUNCTION
-#else
-#define MOODYCAMEL_DELETE_FUNCTION = delete
-#endif
-#endif
-
-namespace moodycamel { namespace details {
-#ifndef MOODYCAMEL_ALIGNAS
-// VS2013 doesn't support alignas or alignof, and align() requires a constant literal
-#if defined(_MSC_VER) && _MSC_VER <= 1800
-#define MOODYCAMEL_ALIGNAS(alignment) __declspec(align(alignment))
-#define MOODYCAMEL_ALIGNOF(obj) __alignof(obj)
-#define MOODYCAMEL_ALIGNED_TYPE_LIKE(T, obj) typename details::Vs2013Aligned<std::alignment_of<obj>::value, T>::type
-	template<int Align, typename T> struct Vs2013Aligned { };  // default, unsupported alignment
-	template<typename T> struct Vs2013Aligned<1, T> { typedef __declspec(align(1)) T type; };
-	template<typename T> struct Vs2013Aligned<2, T> { typedef __declspec(align(2)) T type; };
-	template<typename T> struct Vs2013Aligned<4, T> { typedef __declspec(align(4)) T type; };
-	template<typename T> struct Vs2013Aligned<8, T> { typedef __declspec(align(8)) T type; };
-	template<typename T> struct Vs2013Aligned<16, T> { typedef __declspec(align(16)) T type; };
-	template<typename T> struct Vs2013Aligned<32, T> { typedef __declspec(align(32)) T type; };
-	template<typename T> struct Vs2013Aligned<64, T> { typedef __declspec(align(64)) T type; };
-	template<typename T> struct Vs2013Aligned<128, T> { typedef __declspec(align(128)) T type; };
-	template<typename T> struct Vs2013Aligned<256, T> { typedef __declspec(align(256)) T type; };
-#else
-	template<typename T> struct identity { typedef T type; };
-#define MOODYCAMEL_ALIGNAS(alignment) alignas(alignment)
-#define MOODYCAMEL_ALIGNOF(obj) alignof(obj)
-#define MOODYCAMEL_ALIGNED_TYPE_LIKE(T, obj) alignas(alignof(obj)) typename details::identity<T>::type
-#endif
-#endif
-} }
-
-
-// TSAN can false report races in lock-free code.  To enable TSAN to be used from projects that use this one,
-// we can apply per-function compile-time suppression.
-// See https://clang.llvm.org/docs/ThreadSanitizer.html#has-feature-thread-sanitizer
-#define MOODYCAMEL_NO_TSAN
-#if defined(__has_feature)
- #if __has_feature(thread_sanitizer)
-  #undef MOODYCAMEL_NO_TSAN
-  #define MOODYCAMEL_NO_TSAN __attribute__((no_sanitize("thread")))
- #endif // TSAN
-#endif // TSAN
-
-// Compiler-specific likely/unlikely hints
-namespace moodycamel { namespace details {
-#if defined(__GNUC__)
-	static inline bool (likely)(bool x) { return __builtin_expect((x), true); }
-	static inline bool (unlikely)(bool x) { return __builtin_expect((x), false); }
-#else
-	static inline bool (likely)(bool x) { return x; }
-	static inline bool (unlikely)(bool x) { return x; }
-#endif
-} }
-
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-#include "internal/concurrentqueue_internal_debug.h"
-#endif
-
-namespace moodycamel {
-namespace details {
-	template<typename T>
-	struct const_numeric_max {
-		static_assert(std::is_integral<T>::value, "const_numeric_max can only be used with integers");
-		static const T value = std::numeric_limits<T>::is_signed
-			? (static_cast<T>(1) << (sizeof(T) * CHAR_BIT - 1)) - static_cast<T>(1)
-			: static_cast<T>(-1);
-	};
-
-#if defined(__GLIBCXX__)
-	typedef ::max_align_t std_max_align_t;      // libstdc++ forgot to add it to std:: for a while
-#else
-	typedef std::max_align_t std_max_align_t;   // Others (e.g. MSVC) insist it can *only* be accessed via std::
-#endif
-
-	// Some platforms have incorrectly set max_align_t to a type with <8 bytes alignment even while supporting
-	// 8-byte aligned scalar values (*cough* 32-bit iOS). Work around this with our own union. See issue #64.
-	typedef union {
-		std_max_align_t x;
-		long long y;
-		void* z;
-	} max_align_t;
-}
-
-// Default traits for the ConcurrentQueue. To change some of the
-// traits without re-implementing all of them, inherit from this
-// struct and shadow the declarations you wish to be different;
-// since the traits are used as a template type parameter, the
-// shadowed declarations will be used where defined, and the defaults
-// otherwise.
-struct ConcurrentQueueDefaultTraits
-{
-	// General-purpose size type. std::size_t is strongly recommended.
-	typedef std::size_t size_t;
-	
-	// The type used for the enqueue and dequeue indices. Must be at least as
-	// large as size_t. Should be significantly larger than the number of elements
-	// you expect to hold at once, especially if you have a high turnover rate;
-	// for example, on 32-bit x86, if you expect to have over a hundred million
-	// elements or pump several million elements through your queue in a very
-	// short space of time, using a 32-bit type *may* trigger a race condition.
-	// A 64-bit int type is recommended in that case, and in practice will
-	// prevent a race condition no matter the usage of the queue. Note that
-	// whether the queue is lock-free with a 64-int type depends on the whether
-	// std::atomic<std::uint64_t> is lock-free, which is platform-specific.
-	typedef std::size_t index_t;
-	
-	// Internally, all elements are enqueued and dequeued from multi-element
-	// blocks; this is the smallest controllable unit. If you expect few elements
-	// but many producers, a smaller block size should be favoured. For few producers
-	// and/or many elements, a larger block size is preferred. A sane default
-	// is provided. Must be a power of 2.
-	static const size_t BLOCK_SIZE = 32;
-	
-	// For explicit producers (i.e. when using a producer token), the block is
-	// checked for being empty by iterating through a list of flags, one per element.
-	// For large block sizes, this is too inefficient, and switching to an atomic
-	// counter-based approach is faster. The switch is made for block sizes strictly
-	// larger than this threshold.
-	static const size_t EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD = 32;
-	
-	// How many full blocks can be expected for a single explicit producer? This should
-	// reflect that number's maximum for optimal performance. Must be a power of 2.
-	static const size_t EXPLICIT_INITIAL_INDEX_SIZE = 32;
-	
-	// How many full blocks can be expected for a single implicit producer? This should
-	// reflect that number's maximum for optimal performance. Must be a power of 2.
-	static const size_t IMPLICIT_INITIAL_INDEX_SIZE = 32;
-	
-	// The initial size of the hash table mapping thread IDs to implicit producers.
-	// Note that the hash is resized every time it becomes half full.
-	// Must be a power of two, and either 0 or at least 1. If 0, implicit production
-	// (using the enqueue methods without an explicit producer token) is disabled.
-	static const size_t INITIAL_IMPLICIT_PRODUCER_HASH_SIZE = 32;
-	
-	// Controls the number of items that an explicit consumer (i.e. one with a token)
-	// must consume before it causes all consumers to rotate and move on to the next
-	// internal queue.
-	static const std::uint32_t EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE = 256;
-	
-	// The maximum number of elements (inclusive) that can be enqueued to a sub-queue.
-	// Enqueue operations that would cause this limit to be surpassed will fail. Note
-	// that this limit is enforced at the block level (for performance reasons), i.e.
-	// it's rounded up to the nearest block size.
-	static const size_t MAX_SUBQUEUE_SIZE = details::const_numeric_max<size_t>::value;
-
-	// The number of times to spin before sleeping when waiting on a semaphore.
-	// Recommended values are on the order of 1000-10000 unless the number of
-	// consumer threads exceeds the number of idle cores (in which case try 0-100).
-	// Only affects instances of the BlockingConcurrentQueue.
-	static const int MAX_SEMA_SPINS = 100;
-
-	// Whether to recycle dynamically-allocated blocks into an internal free list or
-	// not. If false, only pre-allocated blocks (controlled by the constructor
-	// arguments) will be recycled, and all others will be `free`d back to the heap.
-	// Note that blocks consumed by explicit producers are only freed on destruction
-	// of the queue (not following destruction of the token) regardless of this trait.
-	static const bool RECYCLE_ALLOCATED_BLOCKS = false;
-
-	
-#ifndef MCDBGQ_USE_RELACY
-	// Memory allocation can be customized if needed.
-	// malloc should return nullptr on failure, and handle alignment like std::malloc.
-#if defined(malloc) || defined(free)
-	// Gah, this is 2015, stop defining macros that break standard code already!
-	// Work around malloc/free being special macros:
-	static inline void* WORKAROUND_malloc(size_t size) { return malloc(size); }
-	static inline void WORKAROUND_free(void* ptr) { return free(ptr); }
-	static inline void* (malloc)(size_t size) { return WORKAROUND_malloc(size); }
-	static inline void (free)(void* ptr) { return WORKAROUND_free(ptr); }
-#else
-	static inline void* malloc(size_t size) { return std::malloc(size); }
-	static inline void free(void* ptr) { return std::free(ptr); }
-#endif
-#else
-	// Debug versions when running under the Relacy race detector (ignore
-	// these in user code)
-	static inline void* malloc(size_t size) { return rl::rl_malloc(size, $); }
-	static inline void free(void* ptr) { return rl::rl_free(ptr, $); }
-#endif
-};
-
-
-// When producing or consuming many elements, the most efficient way is to:
-//    1) Use one of the bulk-operation methods of the queue with a token
-//    2) Failing that, use the bulk-operation methods without a token
-//    3) Failing that, create a token and use that with the single-item methods
-//    4) Failing that, use the single-parameter methods of the queue
-// Having said that, don't create tokens willy-nilly -- ideally there should be
-// a maximum of one token per thread (of each kind).
-struct ProducerToken;
-struct ConsumerToken;
-
-template<typename T, typename Traits> class ConcurrentQueue;
-template<typename T, typename Traits> class BlockingConcurrentQueue;
-class ConcurrentQueueTests;
-
-
-namespace details
-{
-	struct ConcurrentQueueProducerTypelessBase
-	{
-		ConcurrentQueueProducerTypelessBase* next;
-		std::atomic<bool> inactive;
-		ProducerToken* token;
-		
-		ConcurrentQueueProducerTypelessBase()
-			: next(nullptr), inactive(false), token(nullptr)
-		{
-		}
-	};
-	
-	template<bool use32> struct _hash_32_or_64 {
-		static inline std::uint32_t hash(std::uint32_t h)
-		{
-			// MurmurHash3 finalizer -- see https://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp
-			// Since the thread ID is already unique, all we really want to do is propagate that
-			// uniqueness evenly across all the bits, so that we can use a subset of the bits while
-			// reducing collisions significantly
-			h ^= h >> 16;
-			h *= 0x85ebca6b;
-			h ^= h >> 13;
-			h *= 0xc2b2ae35;
-			return h ^ (h >> 16);
-		}
-	};
-	template<> struct _hash_32_or_64<1> {
-		static inline std::uint64_t hash(std::uint64_t h)
-		{
-			h ^= h >> 33;
-			h *= 0xff51afd7ed558ccd;
-			h ^= h >> 33;
-			h *= 0xc4ceb9fe1a85ec53;
-			return h ^ (h >> 33);
-		}
-	};
-	template<std::size_t size> struct hash_32_or_64 : public _hash_32_or_64<(size > 4)> {  };
-	
-	static inline size_t hash_thread_id(thread_id_t id)
-	{
-		static_assert(sizeof(thread_id_t) <= 8, "Expected a platform where thread IDs are at most 64-bit values");
-		return static_cast<size_t>(hash_32_or_64<sizeof(thread_id_converter<thread_id_t>::thread_id_hash_t)>::hash(
-			thread_id_converter<thread_id_t>::prehash(id)));
-	}
-	
-	template<typename T>
-	static inline bool circular_less_than(T a, T b)
-	{
-		static_assert(std::is_integral<T>::value && !std::numeric_limits<T>::is_signed, "circular_less_than is intended to be used only with unsigned integer types");
-		return static_cast<T>(a - b) > static_cast<T>(static_cast<T>(1) << (static_cast<T>(sizeof(T) * CHAR_BIT - 1)));
-		// Note: extra parens around rhs of operator<< is MSVC bug: https://developercommunity2.visualstudio.com/t/C4554-triggers-when-both-lhs-and-rhs-is/10034931
-		//       silencing the bug requires #pragma warning(disable: 4554) around the calling code and has no effect when done here.
-	}
-	
-	template<typename U>
-	static inline char* align_for(char* ptr)
-	{
-		const std::size_t alignment = std::alignment_of<U>::value;
-		return ptr + (alignment - (reinterpret_cast<std::uintptr_t>(ptr) % alignment)) % alignment;
-	}
-
-	template<typename T>
-	static inline T ceil_to_pow_2(T x)
-	{
-		static_assert(std::is_integral<T>::value && !std::numeric_limits<T>::is_signed, "ceil_to_pow_2 is intended to be used only with unsigned integer types");
-
-		// Adapted from http://graphics.stanford.edu/~seander/bithacks.html#RoundUpPowerOf2
-		--x;
-		x |= x >> 1;
-		x |= x >> 2;
-		x |= x >> 4;
-		for (std::size_t i = 1; i < sizeof(T); i <<= 1) {
-			x |= x >> (i << 3);
-		}
-		++x;
-		return x;
-	}
-	
-	template<typename T>
-	static inline void swap_relaxed(std::atomic<T>& left, std::atomic<T>& right)
-	{
-		T temp = std::move(left.load(std::memory_order_relaxed));
-		left.store(std::move(right.load(std::memory_order_relaxed)), std::memory_order_relaxed);
-		right.store(std::move(temp), std::memory_order_relaxed);
-	}
-	
-	template<typename T>
-	static inline T const& nomove(T const& x)
-	{
-		return x;
-	}
-	
-	template<bool Enable>
-	struct nomove_if
-	{
-		template<typename T>
-		static inline T const& eval(T const& x)
-		{
-			return x;
-		}
-	};
-	
-	template<>
-	struct nomove_if<false>
-	{
-		template<typename U>
-		static inline auto eval(U&& x)
-			-> decltype(std::forward<U>(x))
-		{
-			return std::forward<U>(x);
-		}
-	};
-	
-	template<typename It>
-	static inline auto deref_noexcept(It& it) MOODYCAMEL_NOEXCEPT -> decltype(*it)
-	{
-		return *it;
-	}
-	
-#if defined(__clang__) || !defined(__GNUC__) || __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
-	template<typename T> struct is_trivially_destructible : std::is_trivially_destructible<T> { };
-#else
-	template<typename T> struct is_trivially_destructible : std::has_trivial_destructor<T> { };
-#endif
-	
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-#ifdef MCDBGQ_USE_RELACY
-	typedef RelacyThreadExitListener ThreadExitListener;
-	typedef RelacyThreadExitNotifier ThreadExitNotifier;
-#else
-	class ThreadExitNotifier;
-
-	struct ThreadExitListener
-	{
-		typedef void (*callback_t)(void*);
-		callback_t callback;
-		void* userData;
-		
-		ThreadExitListener* next;		// reserved for use by the ThreadExitNotifier
-		ThreadExitNotifier* chain;		// reserved for use by the ThreadExitNotifier
-	};
-
-	class ThreadExitNotifier
-	{
-	public:
-		static void subscribe(ThreadExitListener* listener)
-		{
-			auto& tlsInst = instance();
-			std::lock_guard<std::mutex> guard(mutex());
-			listener->next = tlsInst.tail;
-			listener->chain = &tlsInst;
-			tlsInst.tail = listener;
-		}
-		
-		static void unsubscribe(ThreadExitListener* listener)
-		{
-			std::lock_guard<std::mutex> guard(mutex());
-			if (!listener->chain) {
-				return;  // race with ~ThreadExitNotifier
-			}
-			auto& tlsInst = *listener->chain;
-			listener->chain = nullptr;
-			ThreadExitListener** prev = &tlsInst.tail;
-			for (auto ptr = tlsInst.tail; ptr != nullptr; ptr = ptr->next) {
-				if (ptr == listener) {
-					*prev = ptr->next;
-					break;
-				}
-				prev = &ptr->next;
-			}
-		}
-		
-	private:
-		ThreadExitNotifier() : tail(nullptr) { }
-		ThreadExitNotifier(ThreadExitNotifier const&) MOODYCAMEL_DELETE_FUNCTION;
-		ThreadExitNotifier& operator=(ThreadExitNotifier const&) MOODYCAMEL_DELETE_FUNCTION;
-		
-		~ThreadExitNotifier()
-		{
-			// This thread is about to exit, let everyone know!
-			assert(this == &instance() && "If this assert fails, you likely have a buggy compiler! Change the preprocessor conditions such that MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED is no longer defined.");
-			std::lock_guard<std::mutex> guard(mutex());
-			for (auto ptr = tail; ptr != nullptr; ptr = ptr->next) {
-				ptr->chain = nullptr;
-				ptr->callback(ptr->userData);
-			}
-		}
-		
-		// Thread-local
-		static inline ThreadExitNotifier& instance()
-		{
-			static thread_local ThreadExitNotifier notifier;
-			return notifier;
-		}
-
-		static inline std::mutex& mutex()
-		{
-			// Must be static because the ThreadExitNotifier could be destroyed while unsubscribe is called
-			static std::mutex mutex;
-			return mutex;
-		}
-		
-	private:
-		ThreadExitListener* tail;
-	};
-#endif
-#endif
-	
-	template<typename T> struct static_is_lock_free_num { enum { value = 0 }; };
-	template<> struct static_is_lock_free_num<signed char> { enum { value = ATOMIC_CHAR_LOCK_FREE }; };
-	template<> struct static_is_lock_free_num<short> { enum { value = ATOMIC_SHORT_LOCK_FREE }; };
-	template<> struct static_is_lock_free_num<int> { enum { value = ATOMIC_INT_LOCK_FREE }; };
-	template<> struct static_is_lock_free_num<long> { enum { value = ATOMIC_LONG_LOCK_FREE }; };
-	template<> struct static_is_lock_free_num<long long> { enum { value = ATOMIC_LLONG_LOCK_FREE }; };
-	template<typename T> struct static_is_lock_free : static_is_lock_free_num<typename std::make_signed<T>::type> {  };
-	template<> struct static_is_lock_free<bool> { enum { value = ATOMIC_BOOL_LOCK_FREE }; };
-	template<typename U> struct static_is_lock_free<U*> { enum { value = ATOMIC_POINTER_LOCK_FREE }; };
-}
-
-
-struct ProducerToken
-{
-	template<typename T, typename Traits>
-	explicit ProducerToken(ConcurrentQueue<T, Traits>& queue);
-	
-	template<typename T, typename Traits>
-	explicit ProducerToken(BlockingConcurrentQueue<T, Traits>& queue);
-	
-	ProducerToken(ProducerToken&& other) MOODYCAMEL_NOEXCEPT
-		: producer(other.producer)
-	{
-		other.producer = nullptr;
-		if (producer != nullptr) {
-			producer->token = this;
-		}
-	}
-	
-	inline ProducerToken& operator=(ProducerToken&& other) MOODYCAMEL_NOEXCEPT
-	{
-		swap(other);
-		return *this;
-	}
-	
-	void swap(ProducerToken& other) MOODYCAMEL_NOEXCEPT
-	{
-		std::swap(producer, other.producer);
-		if (producer != nullptr) {
-			producer->token = this;
-		}
-		if (other.producer != nullptr) {
-			other.producer->token = &other;
-		}
-	}
-	
-	// A token is always valid unless:
-	//     1) Memory allocation failed during construction
-	//     2) It was moved via the move constructor
-	//        (Note: assignment does a swap, leaving both potentially valid)
-	//     3) The associated queue was destroyed
-	// Note that if valid() returns true, that only indicates
-	// that the token is valid for use with a specific queue,
-	// but not which one; that's up to the user to track.
-	inline bool valid() const { return producer != nullptr; }
-	
-	~ProducerToken()
-	{
-		if (producer != nullptr) {
-			producer->token = nullptr;
-			producer->inactive.store(true, std::memory_order_release);
-		}
-	}
-	
-	// Disable copying and assignment
-	ProducerToken(ProducerToken const&) MOODYCAMEL_DELETE_FUNCTION;
-	ProducerToken& operator=(ProducerToken const&) MOODYCAMEL_DELETE_FUNCTION;
-	
-private:
-	template<typename T, typename Traits> friend class ConcurrentQueue;
-	friend class ConcurrentQueueTests;
-	
-protected:
-	details::ConcurrentQueueProducerTypelessBase* producer;
-};
-
-
-struct ConsumerToken
-{
-	template<typename T, typename Traits>
-	explicit ConsumerToken(ConcurrentQueue<T, Traits>& q);
-	
-	template<typename T, typename Traits>
-	explicit ConsumerToken(BlockingConcurrentQueue<T, Traits>& q);
-	
-	ConsumerToken(ConsumerToken&& other) MOODYCAMEL_NOEXCEPT
-		: initialOffset(other.initialOffset), lastKnownGlobalOffset(other.lastKnownGlobalOffset), itemsConsumedFromCurrent(other.itemsConsumedFromCurrent), currentProducer(other.currentProducer), desiredProducer(other.desiredProducer)
-	{
-	}
-	
-	inline ConsumerToken& operator=(ConsumerToken&& other) MOODYCAMEL_NOEXCEPT
-	{
-		swap(other);
-		return *this;
-	}
-	
-	void swap(ConsumerToken& other) MOODYCAMEL_NOEXCEPT
-	{
-		std::swap(initialOffset, other.initialOffset);
-		std::swap(lastKnownGlobalOffset, other.lastKnownGlobalOffset);
-		std::swap(itemsConsumedFromCurrent, other.itemsConsumedFromCurrent);
-		std::swap(currentProducer, other.currentProducer);
-		std::swap(desiredProducer, other.desiredProducer);
-	}
-	
-	// Disable copying and assignment
-	ConsumerToken(ConsumerToken const&) MOODYCAMEL_DELETE_FUNCTION;
-	ConsumerToken& operator=(ConsumerToken const&) MOODYCAMEL_DELETE_FUNCTION;
-
-private:
-	template<typename T, typename Traits> friend class ConcurrentQueue;
-	friend class ConcurrentQueueTests;
-	
-private: // but shared with ConcurrentQueue
-	std::uint32_t initialOffset;
-	std::uint32_t lastKnownGlobalOffset;
-	std::uint32_t itemsConsumedFromCurrent;
-	details::ConcurrentQueueProducerTypelessBase* currentProducer;
-	details::ConcurrentQueueProducerTypelessBase* desiredProducer;
-};
-
-// Need to forward-declare this swap because it's in a namespace.
-// See http://stackoverflow.com/questions/4492062/why-does-a-c-friend-class-need-a-forward-declaration-only-in-other-namespaces
-template<typename T, typename Traits>
-inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a, typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& b) MOODYCAMEL_NOEXCEPT;
-
-
-template<typename T, typename Traits = ConcurrentQueueDefaultTraits>
-class ConcurrentQueue
-{
-public:
-	typedef ::moodycamel::ProducerToken producer_token_t;
-	typedef ::moodycamel::ConsumerToken consumer_token_t;
-	
-	typedef typename Traits::index_t index_t;
-	typedef typename Traits::size_t size_t;
-	
-	static const size_t BLOCK_SIZE = static_cast<size_t>(Traits::BLOCK_SIZE);
-	static const size_t EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD = static_cast<size_t>(Traits::EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD);
-	static const size_t EXPLICIT_INITIAL_INDEX_SIZE = static_cast<size_t>(Traits::EXPLICIT_INITIAL_INDEX_SIZE);
-	static const size_t IMPLICIT_INITIAL_INDEX_SIZE = static_cast<size_t>(Traits::IMPLICIT_INITIAL_INDEX_SIZE);
-	static const size_t INITIAL_IMPLICIT_PRODUCER_HASH_SIZE = static_cast<size_t>(Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE);
-	static const std::uint32_t EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE = static_cast<std::uint32_t>(Traits::EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE);
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4307)		// + integral constant overflow (that's what the ternary expression is for!)
-#pragma warning(disable: 4309)		// static_cast: Truncation of constant value
-#endif
-	static const size_t MAX_SUBQUEUE_SIZE = (details::const_numeric_max<size_t>::value - static_cast<size_t>(Traits::MAX_SUBQUEUE_SIZE) < BLOCK_SIZE) ? details::const_numeric_max<size_t>::value : ((static_cast<size_t>(Traits::MAX_SUBQUEUE_SIZE) + (BLOCK_SIZE - 1)) / BLOCK_SIZE * BLOCK_SIZE);
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-	static_assert(!std::numeric_limits<size_t>::is_signed && std::is_integral<size_t>::value, "Traits::size_t must be an unsigned integral type");
-	static_assert(!std::numeric_limits<index_t>::is_signed && std::is_integral<index_t>::value, "Traits::index_t must be an unsigned integral type");
-	static_assert(sizeof(index_t) >= sizeof(size_t), "Traits::index_t must be at least as wide as Traits::size_t");
-	static_assert((BLOCK_SIZE > 1) && !(BLOCK_SIZE & (BLOCK_SIZE - 1)), "Traits::BLOCK_SIZE must be a power of 2 (and at least 2)");
-	static_assert((EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD > 1) && !(EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD & (EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD - 1)), "Traits::EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD must be a power of 2 (and greater than 1)");
-	static_assert((EXPLICIT_INITIAL_INDEX_SIZE > 1) && !(EXPLICIT_INITIAL_INDEX_SIZE & (EXPLICIT_INITIAL_INDEX_SIZE - 1)), "Traits::EXPLICIT_INITIAL_INDEX_SIZE must be a power of 2 (and greater than 1)");
-	static_assert((IMPLICIT_INITIAL_INDEX_SIZE > 1) && !(IMPLICIT_INITIAL_INDEX_SIZE & (IMPLICIT_INITIAL_INDEX_SIZE - 1)), "Traits::IMPLICIT_INITIAL_INDEX_SIZE must be a power of 2 (and greater than 1)");
-	static_assert((INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) || !(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE & (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE - 1)), "Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE must be a power of 2");
-	static_assert(INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0 || INITIAL_IMPLICIT_PRODUCER_HASH_SIZE >= 1, "Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE must be at least 1 (or 0 to disable implicit enqueueing)");
-
-public:
-	// Creates a queue with at least `capacity` element slots; note that the
-	// actual number of elements that can be inserted without additional memory
-	// allocation depends on the number of producers and the block size (e.g. if
-	// the block size is equal to `capacity`, only a single block will be allocated
-	// up-front, which means only a single producer will be able to enqueue elements
-	// without an extra allocation -- blocks aren't shared between producers).
-	// This method is not thread safe -- it is up to the user to ensure that the
-	// queue is fully constructed before it starts being used by other threads (this
-	// includes making the memory effects of construction visible, possibly with a
-	// memory barrier).
-	explicit ConcurrentQueue(size_t capacity = 32 * BLOCK_SIZE)
-		: producerListTail(nullptr),
-		producerCount(0),
-		initialBlockPoolIndex(0),
-		nextExplicitConsumerId(0),
-		globalExplicitConsumerOffset(0)
-	{
-		implicitProducerHashResizeInProgress.clear(std::memory_order_relaxed);
-		populate_initial_implicit_producer_hash();
-		populate_initial_block_list(capacity / BLOCK_SIZE + ((capacity & (BLOCK_SIZE - 1)) == 0 ? 0 : 1));
-		
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-		// Track all the producers using a fully-resolved typed list for
-		// each kind; this makes it possible to debug them starting from
-		// the root queue object (otherwise wacky casts are needed that
-		// don't compile in the debugger's expression evaluator).
-		explicitProducers.store(nullptr, std::memory_order_relaxed);
-		implicitProducers.store(nullptr, std::memory_order_relaxed);
-#endif
-	}
-	
-	// Computes the correct amount of pre-allocated blocks for you based
-	// on the minimum number of elements you want available at any given
-	// time, and the maximum concurrent number of each type of producer.
-	ConcurrentQueue(size_t minCapacity, size_t maxExplicitProducers, size_t maxImplicitProducers)
-		: producerListTail(nullptr),
-		producerCount(0),
-		initialBlockPoolIndex(0),
-		nextExplicitConsumerId(0),
-		globalExplicitConsumerOffset(0)
-	{
-		implicitProducerHashResizeInProgress.clear(std::memory_order_relaxed);
-		populate_initial_implicit_producer_hash();
-		size_t blocks = (((minCapacity + BLOCK_SIZE - 1) / BLOCK_SIZE) - 1) * (maxExplicitProducers + 1) + 2 * (maxExplicitProducers + maxImplicitProducers);
-		populate_initial_block_list(blocks);
-		
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-		explicitProducers.store(nullptr, std::memory_order_relaxed);
-		implicitProducers.store(nullptr, std::memory_order_relaxed);
-#endif
-	}
-	
-	// Note: The queue should not be accessed concurrently while it's
-	// being deleted. It's up to the user to synchronize this.
-	// This method is not thread safe.
-	~ConcurrentQueue()
-	{
-		// Destroy producers
-		auto ptr = producerListTail.load(std::memory_order_relaxed);
-		while (ptr != nullptr) {
-			auto next = ptr->next_prod();
-			if (ptr->token != nullptr) {
-				ptr->token->producer = nullptr;
-			}
-			destroy(ptr);
-			ptr = next;
-		}
-		
-		// Destroy implicit producer hash tables
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE != 0) {
-			auto hash = implicitProducerHash.load(std::memory_order_relaxed);
-			while (hash != nullptr) {
-				auto prev = hash->prev;
-				if (prev != nullptr) {		// The last hash is part of this object and was not allocated dynamically
-					for (size_t i = 0; i != hash->capacity; ++i) {
-						hash->entries[i].~ImplicitProducerKVP();
-					}
-					hash->~ImplicitProducerHash();
-					(Traits::free)(hash);
-				}
-				hash = prev;
-			}
-		}
-		
-		// Destroy global free list
-		auto block = freeList.head_unsafe();
-		while (block != nullptr) {
-			auto next = block->freeListNext.load(std::memory_order_relaxed);
-			if (block->dynamicallyAllocated) {
-				destroy(block);
-			}
-			block = next;
-		}
-		
-		// Destroy initial free list
-		destroy_array(initialBlockPool, initialBlockPoolSize);
-	}
-
-	// Disable copying and copy assignment
-	ConcurrentQueue(ConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-	ConcurrentQueue& operator=(ConcurrentQueue const&) MOODYCAMEL_DELETE_FUNCTION;
-	
-	// Moving is supported, but note that it is *not* a thread-safe operation.
-	// Nobody can use the queue while it's being moved, and the memory effects
-	// of that move must be propagated to other threads before they can use it.
-	// Note: When a queue is moved, its tokens are still valid but can only be
-	// used with the destination queue (i.e. semantically they are moved along
-	// with the queue itself).
-	ConcurrentQueue(ConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
-		: producerListTail(other.producerListTail.load(std::memory_order_relaxed)),
-		producerCount(other.producerCount.load(std::memory_order_relaxed)),
-		initialBlockPoolIndex(other.initialBlockPoolIndex.load(std::memory_order_relaxed)),
-		initialBlockPool(other.initialBlockPool),
-		initialBlockPoolSize(other.initialBlockPoolSize),
-		freeList(std::move(other.freeList)),
-		nextExplicitConsumerId(other.nextExplicitConsumerId.load(std::memory_order_relaxed)),
-		globalExplicitConsumerOffset(other.globalExplicitConsumerOffset.load(std::memory_order_relaxed))
-	{
-		// Move the other one into this, and leave the other one as an empty queue
-		implicitProducerHashResizeInProgress.clear(std::memory_order_relaxed);
-		populate_initial_implicit_producer_hash();
-		swap_implicit_producer_hashes(other);
-		
-		other.producerListTail.store(nullptr, std::memory_order_relaxed);
-		other.producerCount.store(0, std::memory_order_relaxed);
-		other.nextExplicitConsumerId.store(0, std::memory_order_relaxed);
-		other.globalExplicitConsumerOffset.store(0, std::memory_order_relaxed);
-		
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-		explicitProducers.store(other.explicitProducers.load(std::memory_order_relaxed), std::memory_order_relaxed);
-		other.explicitProducers.store(nullptr, std::memory_order_relaxed);
-		implicitProducers.store(other.implicitProducers.load(std::memory_order_relaxed), std::memory_order_relaxed);
-		other.implicitProducers.store(nullptr, std::memory_order_relaxed);
-#endif
-		
-		other.initialBlockPoolIndex.store(0, std::memory_order_relaxed);
-		other.initialBlockPoolSize = 0;
-		other.initialBlockPool = nullptr;
-		
-		reown_producers();
-	}
-	
-	inline ConcurrentQueue& operator=(ConcurrentQueue&& other) MOODYCAMEL_NOEXCEPT
-	{
-		return swap_internal(other);
-	}
-	
-	// Swaps this queue's state with the other's. Not thread-safe.
-	// Swapping two queues does not invalidate their tokens, however
-	// the tokens that were created for one queue must be used with
-	// only the swapped queue (i.e. the tokens are tied to the
-	// queue's movable state, not the object itself).
-	inline void swap(ConcurrentQueue& other) MOODYCAMEL_NOEXCEPT
-	{
-		swap_internal(other);
-	}
-	
-private:
-	ConcurrentQueue& swap_internal(ConcurrentQueue& other)
-	{
-		if (this == &other) {
-			return *this;
-		}
-		
-		details::swap_relaxed(producerListTail, other.producerListTail);
-		details::swap_relaxed(producerCount, other.producerCount);
-		details::swap_relaxed(initialBlockPoolIndex, other.initialBlockPoolIndex);
-		std::swap(initialBlockPool, other.initialBlockPool);
-		std::swap(initialBlockPoolSize, other.initialBlockPoolSize);
-		freeList.swap(other.freeList);
-		details::swap_relaxed(nextExplicitConsumerId, other.nextExplicitConsumerId);
-		details::swap_relaxed(globalExplicitConsumerOffset, other.globalExplicitConsumerOffset);
-		
-		swap_implicit_producer_hashes(other);
-		
-		reown_producers();
-		other.reown_producers();
-		
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-		details::swap_relaxed(explicitProducers, other.explicitProducers);
-		details::swap_relaxed(implicitProducers, other.implicitProducers);
-#endif
-		
-		return *this;
-	}
-	
-public:
-	// Enqueues a single item (by copying it).
-	// Allocates memory if required. Only fails if memory allocation fails (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-	// or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(T const& item)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-		else return inner_enqueue<CanAlloc>(item);
-	}
-	
-	// Enqueues a single item (by moving it, if possible).
-	// Allocates memory if required. Only fails if memory allocation fails (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0,
-	// or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(T&& item)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-		else return inner_enqueue<CanAlloc>(std::move(item));
-	}
-	
-	// Enqueues a single item (by copying it) using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(producer_token_t const& token, T const& item)
-	{
-		return inner_enqueue<CanAlloc>(token, item);
-	}
-	
-	// Enqueues a single item (by moving it, if possible) using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Thread-safe.
-	inline bool enqueue(producer_token_t const& token, T&& item)
-	{
-		return inner_enqueue<CanAlloc>(token, std::move(item));
-	}
-	
-	// Enqueues several items.
-	// Allocates memory if required. Only fails if memory allocation fails (or
-	// implicit production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-	// is 0, or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Note: Use std::make_move_iterator if the elements should be moved instead of copied.
-	// Thread-safe.
-	template<typename It>
-	bool enqueue_bulk(It itemFirst, size_t count)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-		else return inner_enqueue_bulk<CanAlloc>(itemFirst, count);
-	}
-	
-	// Enqueues several items using an explicit producer token.
-	// Allocates memory if required. Only fails if memory allocation fails
-	// (or Traits::MAX_SUBQUEUE_SIZE has been defined and would be surpassed).
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	bool enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-	{
-		return inner_enqueue_bulk<CanAlloc>(token, itemFirst, count);
-	}
-	
-	// Enqueues a single item (by copying it).
-	// Does not allocate memory. Fails if not enough room to enqueue (or implicit
-	// production is disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE
-	// is 0).
-	// Thread-safe.
-	inline bool try_enqueue(T const& item)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-		else return inner_enqueue<CannotAlloc>(item);
-	}
-	
-	// Enqueues a single item (by moving it, if possible).
-	// Does not allocate memory (except for one-time implicit producer).
-	// Fails if not enough room to enqueue (or implicit production is
-	// disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-	// Thread-safe.
-	inline bool try_enqueue(T&& item)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-		else return inner_enqueue<CannotAlloc>(std::move(item));
-	}
-	
-	// Enqueues a single item (by copying it) using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Thread-safe.
-	inline bool try_enqueue(producer_token_t const& token, T const& item)
-	{
-		return inner_enqueue<CannotAlloc>(token, item);
-	}
-	
-	// Enqueues a single item (by moving it, if possible) using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Thread-safe.
-	inline bool try_enqueue(producer_token_t const& token, T&& item)
-	{
-		return inner_enqueue<CannotAlloc>(token, std::move(item));
-	}
-	
-	// Enqueues several items.
-	// Does not allocate memory (except for one-time implicit producer).
-	// Fails if not enough room to enqueue (or implicit production is
-	// disabled because Traits::INITIAL_IMPLICIT_PRODUCER_HASH_SIZE is 0).
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	bool try_enqueue_bulk(It itemFirst, size_t count)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) return false;
-		else return inner_enqueue_bulk<CannotAlloc>(itemFirst, count);
-	}
-	
-	// Enqueues several items using an explicit producer token.
-	// Does not allocate memory. Fails if not enough room to enqueue.
-	// Note: Use std::make_move_iterator if the elements should be moved
-	// instead of copied.
-	// Thread-safe.
-	template<typename It>
-	bool try_enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-	{
-		return inner_enqueue_bulk<CannotAlloc>(token, itemFirst, count);
-	}
-	
-	
-	
-	// Attempts to dequeue from the queue.
-	// Returns false if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename U>
-	bool try_dequeue(U& item)
-	{
-		// Instead of simply trying each producer in turn (which could cause needless contention on the first
-		// producer), we score them heuristically.
-		size_t nonEmptyCount = 0;
-		ProducerBase* best = nullptr;
-		size_t bestSize = 0;
-		for (auto ptr = producerListTail.load(std::memory_order_acquire); nonEmptyCount < 3 && ptr != nullptr; ptr = ptr->next_prod()) {
-			auto size = ptr->size_approx();
-			if (size > 0) {
-				if (size > bestSize) {
-					bestSize = size;
-					best = ptr;
-				}
-				++nonEmptyCount;
-			}
-		}
-		
-		// If there was at least one non-empty queue but it appears empty at the time
-		// we try to dequeue from it, we need to make sure every queue's been tried
-		if (nonEmptyCount > 0) {
-			if ((details::likely)(best->dequeue(item))) {
-				return true;
-			}
-			for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-				if (ptr != best && ptr->dequeue(item)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	// Attempts to dequeue from the queue.
-	// Returns false if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// This differs from the try_dequeue(item) method in that this one does
-	// not attempt to reduce contention by interleaving the order that producer
-	// streams are dequeued from. So, using this method can reduce overall throughput
-	// under contention, but will give more predictable results in single-threaded
-	// consumer scenarios. This is mostly only useful for internal unit tests.
-	// Never allocates. Thread-safe.
-	template<typename U>
-	bool try_dequeue_non_interleaved(U& item)
-	{
-		for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-			if (ptr->dequeue(item)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	// Attempts to dequeue from the queue using an explicit consumer token.
-	// Returns false if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename U>
-	bool try_dequeue(consumer_token_t& token, U& item)
-	{
-		// The idea is roughly as follows:
-		// Every 256 items from one producer, make everyone rotate (increase the global offset) -> this means the highest efficiency consumer dictates the rotation speed of everyone else, more or less
-		// If you see that the global offset has changed, you must reset your consumption counter and move to your designated place
-		// If there's no items where you're supposed to be, keep moving until you find a producer with some items
-		// If the global offset has not changed but you've run out of items to consume, move over from your current position until you find an producer with something in it
-		
-		if (token.desiredProducer == nullptr || token.lastKnownGlobalOffset != globalExplicitConsumerOffset.load(std::memory_order_relaxed)) {
-			if (!update_current_producer_after_rotation(token)) {
-				return false;
-			}
-		}
-		
-		// If there was at least one non-empty queue but it appears empty at the time
-		// we try to dequeue from it, we need to make sure every queue's been tried
-		if (static_cast<ProducerBase*>(token.currentProducer)->dequeue(item)) {
-			if (++token.itemsConsumedFromCurrent == EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE) {
-				globalExplicitConsumerOffset.fetch_add(1, std::memory_order_relaxed);
-			}
-			return true;
-		}
-		
-		auto tail = producerListTail.load(std::memory_order_acquire);
-		auto ptr = static_cast<ProducerBase*>(token.currentProducer)->next_prod();
-		if (ptr == nullptr) {
-			ptr = tail;
-		}
-		while (ptr != static_cast<ProducerBase*>(token.currentProducer)) {
-			if (ptr->dequeue(item)) {
-				token.currentProducer = ptr;
-				token.itemsConsumedFromCurrent = 1;
-				return true;
-			}
-			ptr = ptr->next_prod();
-			if (ptr == nullptr) {
-				ptr = tail;
-			}
-		}
-		return false;
-	}
-	
-	// Attempts to dequeue several elements from the queue.
-	// Returns the number of items actually dequeued.
-	// Returns 0 if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename It>
-	size_t try_dequeue_bulk(It itemFirst, size_t max)
-	{
-		size_t count = 0;
-		for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-			count += ptr->dequeue_bulk(itemFirst, max - count);
-			if (count == max) {
-				break;
-			}
-		}
-		return count;
-	}
-	
-	// Attempts to dequeue several elements from the queue using an explicit consumer token.
-	// Returns the number of items actually dequeued.
-	// Returns 0 if all producer streams appeared empty at the time they
-	// were checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename It>
-	size_t try_dequeue_bulk(consumer_token_t& token, It itemFirst, size_t max)
-	{
-		if (token.desiredProducer == nullptr || token.lastKnownGlobalOffset != globalExplicitConsumerOffset.load(std::memory_order_relaxed)) {
-			if (!update_current_producer_after_rotation(token)) {
-				return 0;
-			}
-		}
-		
-		size_t count = static_cast<ProducerBase*>(token.currentProducer)->dequeue_bulk(itemFirst, max);
-		if (count == max) {
-			if ((token.itemsConsumedFromCurrent += static_cast<std::uint32_t>(max)) >= EXPLICIT_CONSUMER_CONSUMPTION_QUOTA_BEFORE_ROTATE) {
-				globalExplicitConsumerOffset.fetch_add(1, std::memory_order_relaxed);
-			}
-			return max;
-		}
-		token.itemsConsumedFromCurrent += static_cast<std::uint32_t>(count);
-		max -= count;
-		
-		auto tail = producerListTail.load(std::memory_order_acquire);
-		auto ptr = static_cast<ProducerBase*>(token.currentProducer)->next_prod();
-		if (ptr == nullptr) {
-			ptr = tail;
-		}
-		while (ptr != static_cast<ProducerBase*>(token.currentProducer)) {
-			auto dequeued = ptr->dequeue_bulk(itemFirst, max);
-			count += dequeued;
-			if (dequeued != 0) {
-				token.currentProducer = ptr;
-				token.itemsConsumedFromCurrent = static_cast<std::uint32_t>(dequeued);
-			}
-			if (dequeued == max) {
-				break;
-			}
-			max -= dequeued;
-			ptr = ptr->next_prod();
-			if (ptr == nullptr) {
-				ptr = tail;
-			}
-		}
-		return count;
-	}
-	
-	
-	
-	// Attempts to dequeue from a specific producer's inner queue.
-	// If you happen to know which producer you want to dequeue from, this
-	// is significantly faster than using the general-case try_dequeue methods.
-	// Returns false if the producer's queue appeared empty at the time it
-	// was checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename U>
-	inline bool try_dequeue_from_producer(producer_token_t const& producer, U& item)
-	{
-		return static_cast<ExplicitProducer*>(producer.producer)->dequeue(item);
-	}
-	
-	// Attempts to dequeue several elements from a specific producer's inner queue.
-	// Returns the number of items actually dequeued.
-	// If you happen to know which producer you want to dequeue from, this
-	// is significantly faster than using the general-case try_dequeue methods.
-	// Returns 0 if the producer's queue appeared empty at the time it
-	// was checked (so, the queue is likely but not guaranteed to be empty).
-	// Never allocates. Thread-safe.
-	template<typename It>
-	inline size_t try_dequeue_bulk_from_producer(producer_token_t const& producer, It itemFirst, size_t max)
-	{
-		return static_cast<ExplicitProducer*>(producer.producer)->dequeue_bulk(itemFirst, max);
-	}
-	
-	
-	// Returns an estimate of the total number of elements currently in the queue. This
-	// estimate is only accurate if the queue has completely stabilized before it is called
-	// (i.e. all enqueue and dequeue operations have completed and their memory effects are
-	// visible on the calling thread, and no further operations start while this method is
-	// being called).
-	// Thread-safe.
-	size_t size_approx() const
-	{
-		size_t size = 0;
-		for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-			size += ptr->size_approx();
-		}
-		return size;
-	}
-	
-	
-	// Returns true if the underlying atomic variables used by
-	// the queue are lock-free (they should be on most platforms).
-	// Thread-safe.
-	static constexpr bool is_lock_free()
-	{
-		return
-			details::static_is_lock_free<bool>::value == 2 &&
-			details::static_is_lock_free<size_t>::value == 2 &&
-			details::static_is_lock_free<std::uint32_t>::value == 2 &&
-			details::static_is_lock_free<index_t>::value == 2 &&
-			details::static_is_lock_free<void*>::value == 2 &&
-			details::static_is_lock_free<typename details::thread_id_converter<details::thread_id_t>::thread_id_numeric_size_t>::value == 2;
-	}
-
-
-private:
-	friend struct ProducerToken;
-	friend struct ConsumerToken;
-	struct ExplicitProducer;
-	friend struct ExplicitProducer;
-	struct ImplicitProducer;
-	friend struct ImplicitProducer;
-	friend class ConcurrentQueueTests;
-		
-	enum AllocationMode { CanAlloc, CannotAlloc };
-	
-	
-	///////////////////////////////
-	// Queue methods
-	///////////////////////////////
-	
-	template<AllocationMode canAlloc, typename U>
-	inline bool inner_enqueue(producer_token_t const& token, U&& element)
-	{
-		return static_cast<ExplicitProducer*>(token.producer)->ConcurrentQueue::ExplicitProducer::template enqueue<canAlloc>(std::forward<U>(element));
-	}
-	
-	template<AllocationMode canAlloc, typename U>
-	inline bool inner_enqueue(U&& element)
-	{
-		auto producer = get_or_add_implicit_producer();
-		return producer == nullptr ? false : producer->ConcurrentQueue::ImplicitProducer::template enqueue<canAlloc>(std::forward<U>(element));
-	}
-	
-	template<AllocationMode canAlloc, typename It>
-	inline bool inner_enqueue_bulk(producer_token_t const& token, It itemFirst, size_t count)
-	{
-		return static_cast<ExplicitProducer*>(token.producer)->ConcurrentQueue::ExplicitProducer::template enqueue_bulk<canAlloc>(itemFirst, count);
-	}
-	
-	template<AllocationMode canAlloc, typename It>
-	inline bool inner_enqueue_bulk(It itemFirst, size_t count)
-	{
-		auto producer = get_or_add_implicit_producer();
-		return producer == nullptr ? false : producer->ConcurrentQueue::ImplicitProducer::template enqueue_bulk<canAlloc>(itemFirst, count);
-	}
-	
-	inline bool update_current_producer_after_rotation(consumer_token_t& token)
-	{
-		// Ah, there's been a rotation, figure out where we should be!
-		auto tail = producerListTail.load(std::memory_order_acquire);
-		if (token.desiredProducer == nullptr && tail == nullptr) {
-			return false;
-		}
-		auto prodCount = producerCount.load(std::memory_order_relaxed);
-		auto globalOffset = globalExplicitConsumerOffset.load(std::memory_order_relaxed);
-		if ((details::unlikely)(token.desiredProducer == nullptr)) {
-			// Aha, first time we're dequeueing anything.
-			// Figure out our local position
-			// Note: offset is from start, not end, but we're traversing from end -- subtract from count first
-			std::uint32_t offset = prodCount - 1 - (token.initialOffset % prodCount);
-			token.desiredProducer = tail;
-			for (std::uint32_t i = 0; i != offset; ++i) {
-				token.desiredProducer = static_cast<ProducerBase*>(token.desiredProducer)->next_prod();
-				if (token.desiredProducer == nullptr) {
-					token.desiredProducer = tail;
-				}
-			}
-		}
-		
-		std::uint32_t delta = globalOffset - token.lastKnownGlobalOffset;
-		if (delta >= prodCount) {
-			delta = delta % prodCount;
-		}
-		for (std::uint32_t i = 0; i != delta; ++i) {
-			token.desiredProducer = static_cast<ProducerBase*>(token.desiredProducer)->next_prod();
-			if (token.desiredProducer == nullptr) {
-				token.desiredProducer = tail;
-			}
-		}
-		
-		token.lastKnownGlobalOffset = globalOffset;
-		token.currentProducer = token.desiredProducer;
-		token.itemsConsumedFromCurrent = 0;
-		return true;
-	}
-	
-	
-	///////////////////////////
-	// Free list
-	///////////////////////////
-	
-	template <typename N>
-	struct FreeListNode
-	{
-		FreeListNode() : freeListRefs(0), freeListNext(nullptr) { }
-		
-		std::atomic<std::uint32_t> freeListRefs;
-		std::atomic<N*> freeListNext;
-	};
-	
-	// A simple CAS-based lock-free free list. Not the fastest thing in the world under heavy contention, but
-	// simple and correct (assuming nodes are never freed until after the free list is destroyed), and fairly
-	// speedy under low contention.
-	template<typename N>		// N must inherit FreeListNode or have the same fields (and initialization of them)
-	struct FreeList
-	{
-		FreeList() : freeListHead(nullptr) { }
-		FreeList(FreeList&& other) : freeListHead(other.freeListHead.load(std::memory_order_relaxed)) { other.freeListHead.store(nullptr, std::memory_order_relaxed); }
-		void swap(FreeList& other) { details::swap_relaxed(freeListHead, other.freeListHead); }
-		
-		FreeList(FreeList const&) MOODYCAMEL_DELETE_FUNCTION;
-		FreeList& operator=(FreeList const&) MOODYCAMEL_DELETE_FUNCTION;
-		
-		inline void add(N* node)
-		{
-#ifdef MCDBGQ_NOLOCKFREE_FREELIST
-			debug::DebugLock lock(mutex);
-#endif		
-			// We know that the should-be-on-freelist bit is 0 at this point, so it's safe to
-			// set it using a fetch_add
-			if (node->freeListRefs.fetch_add(SHOULD_BE_ON_FREELIST, std::memory_order_acq_rel) == 0) {
-				// Oh look! We were the last ones referencing this node, and we know
-				// we want to add it to the free list, so let's do it!
-		 		add_knowing_refcount_is_zero(node);
-			}
-		}
-		
-		inline N* try_get()
-		{
-#ifdef MCDBGQ_NOLOCKFREE_FREELIST
-			debug::DebugLock lock(mutex);
-#endif		
-			auto head = freeListHead.load(std::memory_order_acquire);
-			while (head != nullptr) {
-				auto prevHead = head;
-				auto refs = head->freeListRefs.load(std::memory_order_relaxed);
-				if ((refs & REFS_MASK) == 0 || !head->freeListRefs.compare_exchange_strong(refs, refs + 1, std::memory_order_acquire, std::memory_order_relaxed)) {
-					head = freeListHead.load(std::memory_order_acquire);
-					continue;
-				}
-				
-				// Good, reference count has been incremented (it wasn't at zero), which means we can read the
-				// next and not worry about it changing between now and the time we do the CAS
-				auto next = head->freeListNext.load(std::memory_order_relaxed);
-				if (freeListHead.compare_exchange_strong(head, next, std::memory_order_acquire, std::memory_order_relaxed)) {
-					// Yay, got the node. This means it was on the list, which means shouldBeOnFreeList must be false no
-					// matter the refcount (because nobody else knows it's been taken off yet, it can't have been put back on).
-					assert((head->freeListRefs.load(std::memory_order_relaxed) & SHOULD_BE_ON_FREELIST) == 0);
-					
-					// Decrease refcount twice, once for our ref, and once for the list's ref
-					head->freeListRefs.fetch_sub(2, std::memory_order_release);
-					return head;
-				}
-				
-				// OK, the head must have changed on us, but we still need to decrease the refcount we increased.
-				// Note that we don't need to release any memory effects, but we do need to ensure that the reference
-				// count decrement happens-after the CAS on the head.
-				refs = prevHead->freeListRefs.fetch_sub(1, std::memory_order_acq_rel);
-				if (refs == SHOULD_BE_ON_FREELIST + 1) {
-					add_knowing_refcount_is_zero(prevHead);
-				}
-			}
-			
-			return nullptr;
-		}
-		
-		// Useful for traversing the list when there's no contention (e.g. to destroy remaining nodes)
-		N* head_unsafe() const { return freeListHead.load(std::memory_order_relaxed); }
-		
-	private:
-		inline void add_knowing_refcount_is_zero(N* node)
-		{
-			// Since the refcount is zero, and nobody can increase it once it's zero (except us, and we run
-			// only one copy of this method per node at a time, i.e. the single thread case), then we know
-			// we can safely change the next pointer of the node; however, once the refcount is back above
-			// zero, then other threads could increase it (happens under heavy contention, when the refcount
-			// goes to zero in between a load and a refcount increment of a node in try_get, then back up to
-			// something non-zero, then the refcount increment is done by the other thread) -- so, if the CAS
-			// to add the node to the actual list fails, decrease the refcount and leave the add operation to
-			// the next thread who puts the refcount back at zero (which could be us, hence the loop).
-			auto head = freeListHead.load(std::memory_order_relaxed);
-			while (true) {
-				node->freeListNext.store(head, std::memory_order_relaxed);
-				node->freeListRefs.store(1, std::memory_order_release);
-				if (!freeListHead.compare_exchange_strong(head, node, std::memory_order_release, std::memory_order_relaxed)) {
-					// Hmm, the add failed, but we can only try again when the refcount goes back to zero
-					if (node->freeListRefs.fetch_add(SHOULD_BE_ON_FREELIST - 1, std::memory_order_release) == 1) {
-						continue;
-					}
-				}
-				return;
-			}
-		}
-		
-	private:
-		// Implemented like a stack, but where node order doesn't matter (nodes are inserted out of order under contention)
-		std::atomic<N*> freeListHead;
-	
-	static const std::uint32_t REFS_MASK = 0x7FFFFFFF;
-	static const std::uint32_t SHOULD_BE_ON_FREELIST = 0x80000000;
-		
-#ifdef MCDBGQ_NOLOCKFREE_FREELIST
-		debug::DebugMutex mutex;
-#endif
-	};
-	
-	
-	///////////////////////////
-	// Block
-	///////////////////////////
-	
-	enum InnerQueueContext { implicit_context = 0, explicit_context = 1 };
-	
-	struct Block
-	{
-		Block()
-			: next(nullptr), elementsCompletelyDequeued(0), freeListRefs(0), freeListNext(nullptr), dynamicallyAllocated(true)
-		{
-#ifdef MCDBGQ_TRACKMEM
-			owner = nullptr;
-#endif
-		}
-		
-		template<InnerQueueContext context>
-		inline bool is_empty() const
-		{
-			MOODYCAMEL_CONSTEXPR_IF (context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD) {
-				// Check flags
-				for (size_t i = 0; i < BLOCK_SIZE; ++i) {
-					if (!emptyFlags[i].load(std::memory_order_relaxed)) {
-						return false;
-					}
-				}
-				
-				// Aha, empty; make sure we have all other memory effects that happened before the empty flags were set
-				std::atomic_thread_fence(std::memory_order_acquire);
-				return true;
-			}
-			else {
-				// Check counter
-				if (elementsCompletelyDequeued.load(std::memory_order_relaxed) == BLOCK_SIZE) {
-					std::atomic_thread_fence(std::memory_order_acquire);
-					return true;
-				}
-				assert(elementsCompletelyDequeued.load(std::memory_order_relaxed) <= BLOCK_SIZE);
-				return false;
-			}
-		}
-		
-		// Returns true if the block is now empty (does not apply in explicit context)
-		template<InnerQueueContext context>
-		inline bool set_empty(MOODYCAMEL_MAYBE_UNUSED index_t i)
-		{
-			MOODYCAMEL_CONSTEXPR_IF (context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD) {
-				// Set flag
-				assert(!emptyFlags[BLOCK_SIZE - 1 - static_cast<size_t>(i & static_cast<index_t>(BLOCK_SIZE - 1))].load(std::memory_order_relaxed));
-				emptyFlags[BLOCK_SIZE - 1 - static_cast<size_t>(i & static_cast<index_t>(BLOCK_SIZE - 1))].store(true, std::memory_order_release);
-				return false;
-			}
-			else {
-				// Increment counter
-				auto prevVal = elementsCompletelyDequeued.fetch_add(1, std::memory_order_release);
-				assert(prevVal < BLOCK_SIZE);
-				return prevVal == BLOCK_SIZE - 1;
-			}
-		}
-		
-		// Sets multiple contiguous item statuses to 'empty' (assumes no wrapping and count > 0).
-		// Returns true if the block is now empty (does not apply in explicit context).
-		template<InnerQueueContext context>
-		inline bool set_many_empty(MOODYCAMEL_MAYBE_UNUSED index_t i, size_t count)
-		{
-			MOODYCAMEL_CONSTEXPR_IF (context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD) {
-				// Set flags
-				std::atomic_thread_fence(std::memory_order_release);
-				i = BLOCK_SIZE - 1 - static_cast<size_t>(i & static_cast<index_t>(BLOCK_SIZE - 1)) - count + 1;
-				for (size_t j = 0; j != count; ++j) {
-					assert(!emptyFlags[i + j].load(std::memory_order_relaxed));
-					emptyFlags[i + j].store(true, std::memory_order_relaxed);
-				}
-				return false;
-			}
-			else {
-				// Increment counter
-				auto prevVal = elementsCompletelyDequeued.fetch_add(count, std::memory_order_release);
-				assert(prevVal + count <= BLOCK_SIZE);
-				return prevVal + count == BLOCK_SIZE;
-			}
-		}
-		
-		template<InnerQueueContext context>
-		inline void set_all_empty()
-		{
-			MOODYCAMEL_CONSTEXPR_IF (context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD) {
-				// Set all flags
-				for (size_t i = 0; i != BLOCK_SIZE; ++i) {
-					emptyFlags[i].store(true, std::memory_order_relaxed);
-				}
-			}
-			else {
-				// Reset counter
-				elementsCompletelyDequeued.store(BLOCK_SIZE, std::memory_order_relaxed);
-			}
-		}
-		
-		template<InnerQueueContext context>
-		inline void reset_empty()
-		{
-			MOODYCAMEL_CONSTEXPR_IF (context == explicit_context && BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD) {
-				// Reset flags
-				for (size_t i = 0; i != BLOCK_SIZE; ++i) {
-					emptyFlags[i].store(false, std::memory_order_relaxed);
-				}
-			}
-			else {
-				// Reset counter
-				elementsCompletelyDequeued.store(0, std::memory_order_relaxed);
-			}
-		}
-		
-		inline T* operator[](index_t idx) MOODYCAMEL_NOEXCEPT { return static_cast<T*>(static_cast<void*>(elements)) + static_cast<size_t>(idx & static_cast<index_t>(BLOCK_SIZE - 1)); }
-		inline T const* operator[](index_t idx) const MOODYCAMEL_NOEXCEPT { return static_cast<T const*>(static_cast<void const*>(elements)) + static_cast<size_t>(idx & static_cast<index_t>(BLOCK_SIZE - 1)); }
-		
-	private:
-		static_assert(std::alignment_of<T>::value <= sizeof(T), "The queue does not support types with an alignment greater than their size at this time");
-		MOODYCAMEL_ALIGNED_TYPE_LIKE(char[sizeof(T) * BLOCK_SIZE], T) elements;
-	public:
-		Block* next;
-		std::atomic<size_t> elementsCompletelyDequeued;
-		std::atomic<bool> emptyFlags[BLOCK_SIZE <= EXPLICIT_BLOCK_EMPTY_COUNTER_THRESHOLD ? BLOCK_SIZE : 1];
-	public:
-		std::atomic<std::uint32_t> freeListRefs;
-		std::atomic<Block*> freeListNext;
-		bool dynamicallyAllocated;		// Perhaps a better name for this would be 'isNotPartOfInitialBlockPool'
-		
-#ifdef MCDBGQ_TRACKMEM
-		void* owner;
-#endif
-	};
-	static_assert(std::alignment_of<Block>::value >= std::alignment_of<T>::value, "Internal error: Blocks must be at least as aligned as the type they are wrapping");
-
-
-#ifdef MCDBGQ_TRACKMEM
-public:
-	struct MemStats;
-private:
-#endif
-	
-	///////////////////////////
-	// Producer base
-	///////////////////////////
-	
-	struct ProducerBase : public details::ConcurrentQueueProducerTypelessBase
-	{
-		ProducerBase(ConcurrentQueue* parent_, bool isExplicit_) :
-			tailIndex(0),
-			headIndex(0),
-			dequeueOptimisticCount(0),
-			dequeueOvercommit(0),
-			tailBlock(nullptr),
-			isExplicit(isExplicit_),
-			parent(parent_)
-		{
-		}
-		
-		virtual ~ProducerBase() { }
-		
-		template<typename U>
-		inline bool dequeue(U& element)
-		{
-			if (isExplicit) {
-				return static_cast<ExplicitProducer*>(this)->dequeue(element);
-			}
-			else {
-				return static_cast<ImplicitProducer*>(this)->dequeue(element);
-			}
-		}
-		
-		template<typename It>
-		inline size_t dequeue_bulk(It& itemFirst, size_t max)
-		{
-			if (isExplicit) {
-				return static_cast<ExplicitProducer*>(this)->dequeue_bulk(itemFirst, max);
-			}
-			else {
-				return static_cast<ImplicitProducer*>(this)->dequeue_bulk(itemFirst, max);
-			}
-		}
-		
-		inline ProducerBase* next_prod() const { return static_cast<ProducerBase*>(next); }
-		
-		inline size_t size_approx() const
-		{
-			auto tail = tailIndex.load(std::memory_order_relaxed);
-			auto head = headIndex.load(std::memory_order_relaxed);
-			return details::circular_less_than(head, tail) ? static_cast<size_t>(tail - head) : 0;
-		}
-		
-		inline index_t getTail() const { return tailIndex.load(std::memory_order_relaxed); }
-	protected:
-		std::atomic<index_t> tailIndex;		// Where to enqueue to next
-		std::atomic<index_t> headIndex;		// Where to dequeue from next
-		
-		std::atomic<index_t> dequeueOptimisticCount;
-		std::atomic<index_t> dequeueOvercommit;
-		
-		Block* tailBlock;
-		
-	public:
-		bool isExplicit;
-		ConcurrentQueue* parent;
-		
-	protected:
-#ifdef MCDBGQ_TRACKMEM
-		friend struct MemStats;
-#endif
-	};
-	
-	
-	///////////////////////////
-	// Explicit queue
-	///////////////////////////
-		
-	struct ExplicitProducer : public ProducerBase
-	{
-		explicit ExplicitProducer(ConcurrentQueue* parent_) :
-			ProducerBase(parent_, true),
-			blockIndex(nullptr),
-			pr_blockIndexSlotsUsed(0),
-			pr_blockIndexSize(EXPLICIT_INITIAL_INDEX_SIZE >> 1),
-			pr_blockIndexFront(0),
-			pr_blockIndexEntries(nullptr),
-			pr_blockIndexRaw(nullptr)
-		{
-			size_t poolBasedIndexSize = details::ceil_to_pow_2(parent_->initialBlockPoolSize) >> 1;
-			if (poolBasedIndexSize > pr_blockIndexSize) {
-				pr_blockIndexSize = poolBasedIndexSize;
-			}
-			
-			new_block_index(0);		// This creates an index with double the number of current entries, i.e. EXPLICIT_INITIAL_INDEX_SIZE
-		}
-		
-		~ExplicitProducer()
-		{
-			// Destruct any elements not yet dequeued.
-			// Since we're in the destructor, we can assume all elements
-			// are either completely dequeued or completely not (no halfways).
-			if (this->tailBlock != nullptr) {		// Note this means there must be a block index too
-				// First find the block that's partially dequeued, if any
-				Block* halfDequeuedBlock = nullptr;
-				if ((this->headIndex.load(std::memory_order_relaxed) & static_cast<index_t>(BLOCK_SIZE - 1)) != 0) {
-					// The head's not on a block boundary, meaning a block somewhere is partially dequeued
-					// (or the head block is the tail block and was fully dequeued, but the head/tail are still not on a boundary)
-					size_t i = (pr_blockIndexFront - pr_blockIndexSlotsUsed) & (pr_blockIndexSize - 1);
-					while (details::circular_less_than<index_t>(pr_blockIndexEntries[i].base + BLOCK_SIZE, this->headIndex.load(std::memory_order_relaxed))) {
-						i = (i + 1) & (pr_blockIndexSize - 1);
-					}
-					assert(details::circular_less_than<index_t>(pr_blockIndexEntries[i].base, this->headIndex.load(std::memory_order_relaxed)));
-					halfDequeuedBlock = pr_blockIndexEntries[i].block;
-				}
-				
-				// Start at the head block (note the first line in the loop gives us the head from the tail on the first iteration)
-				auto block = this->tailBlock;
-				do {
-					block = block->next;
-					if (block->ConcurrentQueue::Block::template is_empty<explicit_context>()) {
-						continue;
-					}
-					
-					size_t i = 0;	// Offset into block
-					if (block == halfDequeuedBlock) {
-						i = static_cast<size_t>(this->headIndex.load(std::memory_order_relaxed) & static_cast<index_t>(BLOCK_SIZE - 1));
-					}
-					
-					// Walk through all the items in the block; if this is the tail block, we need to stop when we reach the tail index
-					auto lastValidIndex = (this->tailIndex.load(std::memory_order_relaxed) & static_cast<index_t>(BLOCK_SIZE - 1)) == 0 ? BLOCK_SIZE : static_cast<size_t>(this->tailIndex.load(std::memory_order_relaxed) & static_cast<index_t>(BLOCK_SIZE - 1));
-					while (i != BLOCK_SIZE && (block != this->tailBlock || i != lastValidIndex)) {
-						(*block)[i++]->~T();
-					}
-				} while (block != this->tailBlock);
-			}
-			
-			// Destroy all blocks that we own
-			if (this->tailBlock != nullptr) {
-				auto block = this->tailBlock;
-				do {
-					auto nextBlock = block->next;
-					this->parent->add_block_to_free_list(block);
-					block = nextBlock;
-				} while (block != this->tailBlock);
-			}
-			
-			// Destroy the block indices
-			auto header = static_cast<BlockIndexHeader*>(pr_blockIndexRaw);
-			while (header != nullptr) {
-				auto prev = static_cast<BlockIndexHeader*>(header->prev);
-				header->~BlockIndexHeader();
-				(Traits::free)(header);
-				header = prev;
-			}
-		}
-		
-		template<AllocationMode allocMode, typename U>
-		inline bool enqueue(U&& element)
-		{
-			index_t currentTailIndex = this->tailIndex.load(std::memory_order_relaxed);
-			index_t newTailIndex = 1 + currentTailIndex;
-			if ((currentTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0) {
-				// We reached the end of a block, start a new one
-				auto startBlock = this->tailBlock;
-				auto originalBlockIndexSlotsUsed = pr_blockIndexSlotsUsed;
-				if (this->tailBlock != nullptr && this->tailBlock->next->ConcurrentQueue::Block::template is_empty<explicit_context>()) {
-					// We can re-use the block ahead of us, it's empty!					
-					this->tailBlock = this->tailBlock->next;
-					this->tailBlock->ConcurrentQueue::Block::template reset_empty<explicit_context>();
-					
-					// We'll put the block on the block index (guaranteed to be room since we're conceptually removing the
-					// last block from it first -- except instead of removing then adding, we can just overwrite).
-					// Note that there must be a valid block index here, since even if allocation failed in the ctor,
-					// it would have been re-attempted when adding the first block to the queue; since there is such
-					// a block, a block index must have been successfully allocated.
-				}
-				else {
-					// Whatever head value we see here is >= the last value we saw here (relatively),
-					// and <= its current value. Since we have the most recent tail, the head must be
-					// <= to it.
-					auto head = this->headIndex.load(std::memory_order_relaxed);
-					assert(!details::circular_less_than<index_t>(currentTailIndex, head));
-					if (!details::circular_less_than<index_t>(head, currentTailIndex + BLOCK_SIZE)
-						|| (MAX_SUBQUEUE_SIZE != details::const_numeric_max<size_t>::value && (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head))) {
-						// We can't enqueue in another block because there's not enough leeway -- the
-						// tail could surpass the head by the time the block fills up! (Or we'll exceed
-						// the size limit, if the second part of the condition was true.)
-						return false;
-					}
-					// We're going to need a new block; check that the block index has room
-					if (pr_blockIndexRaw == nullptr || pr_blockIndexSlotsUsed == pr_blockIndexSize) {
-						// Hmm, the circular block index is already full -- we'll need
-						// to allocate a new index. Note pr_blockIndexRaw can only be nullptr if
-						// the initial allocation failed in the constructor.
-						
-						MOODYCAMEL_CONSTEXPR_IF (allocMode == CannotAlloc) {
-							return false;
-						}
-						else if (!new_block_index(pr_blockIndexSlotsUsed)) {
-							return false;
-						}
-					}
-					
-					// Insert a new block in the circular linked list
-					auto newBlock = this->parent->ConcurrentQueue::template requisition_block<allocMode>();
-					if (newBlock == nullptr) {
-						return false;
-					}
-#ifdef MCDBGQ_TRACKMEM
-					newBlock->owner = this;
-#endif
-					newBlock->ConcurrentQueue::Block::template reset_empty<explicit_context>();
-					if (this->tailBlock == nullptr) {
-						newBlock->next = newBlock;
-					}
-					else {
-						newBlock->next = this->tailBlock->next;
-						this->tailBlock->next = newBlock;
-					}
-					this->tailBlock = newBlock;
-					++pr_blockIndexSlotsUsed;
-				}
-
-				MOODYCAMEL_CONSTEXPR_IF (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (static_cast<T*>(nullptr)) T(std::forward<U>(element)))) {
-					// The constructor may throw. We want the element not to appear in the queue in
-					// that case (without corrupting the queue):
-					MOODYCAMEL_TRY {
-						new ((*this->tailBlock)[currentTailIndex]) T(std::forward<U>(element));
-					}
-					MOODYCAMEL_CATCH (...) {
-						// Revert change to the current block, but leave the new block available
-						// for next time
-						pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-						this->tailBlock = startBlock == nullptr ? this->tailBlock : startBlock;
-						MOODYCAMEL_RETHROW;
-					}
-				}
-				else {
-					(void)startBlock;
-					(void)originalBlockIndexSlotsUsed;
-				}
-				
-				// Add block to block index
-				auto& entry = blockIndex.load(std::memory_order_relaxed)->entries[pr_blockIndexFront];
-				entry.base = currentTailIndex;
-				entry.block = this->tailBlock;
-				blockIndex.load(std::memory_order_relaxed)->front.store(pr_blockIndexFront, std::memory_order_release);
-				pr_blockIndexFront = (pr_blockIndexFront + 1) & (pr_blockIndexSize - 1);
-				
-				MOODYCAMEL_CONSTEXPR_IF (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (static_cast<T*>(nullptr)) T(std::forward<U>(element)))) {
-					this->tailIndex.store(newTailIndex, std::memory_order_release);
-					return true;
-				}
-			}
-			
-			// Enqueue
-			new ((*this->tailBlock)[currentTailIndex]) T(std::forward<U>(element));
-			
-			this->tailIndex.store(newTailIndex, std::memory_order_release);
-			return true;
-		}
-		
-		template<typename U>
-		bool dequeue(U& element)
-		{
-			auto tail = this->tailIndex.load(std::memory_order_relaxed);
-			auto overcommit = this->dequeueOvercommit.load(std::memory_order_relaxed);
-			if (details::circular_less_than<index_t>(this->dequeueOptimisticCount.load(std::memory_order_relaxed) - overcommit, tail)) {
-				// Might be something to dequeue, let's give it a try
-				
-				// Note that this if is purely for performance purposes in the common case when the queue is
-				// empty and the values are eventually consistent -- we may enter here spuriously.
-				
-				// Note that whatever the values of overcommit and tail are, they are not going to change (unless we
-				// change them) and must be the same value at this point (inside the if) as when the if condition was
-				// evaluated.
-
-				// We insert an acquire fence here to synchronize-with the release upon incrementing dequeueOvercommit below.
-				// This ensures that whatever the value we got loaded into overcommit, the load of dequeueOptisticCount in
-				// the fetch_add below will result in a value at least as recent as that (and therefore at least as large).
-				// Note that I believe a compiler (signal) fence here would be sufficient due to the nature of fetch_add (all
-				// read-modify-write operations are guaranteed to work on the latest value in the modification order), but
-				// unfortunately that can't be shown to be correct using only the C++11 standard.
-				// See http://stackoverflow.com/questions/18223161/what-are-the-c11-memory-ordering-guarantees-in-this-corner-case
-				std::atomic_thread_fence(std::memory_order_acquire);
-				
-				// Increment optimistic counter, then check if it went over the boundary
-				auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(1, std::memory_order_relaxed);
-				
-				// Note that since dequeueOvercommit must be <= dequeueOptimisticCount (because dequeueOvercommit is only ever
-				// incremented after dequeueOptimisticCount -- this is enforced in the `else` block below), and since we now
-				// have a version of dequeueOptimisticCount that is at least as recent as overcommit (due to the release upon
-				// incrementing dequeueOvercommit and the acquire above that synchronizes with it), overcommit <= myDequeueCount.
-				// However, we can't assert this since both dequeueOptimisticCount and dequeueOvercommit may (independently)
-				// overflow; in such a case, though, the logic still holds since the difference between the two is maintained.
-				
-				// Note that we reload tail here in case it changed; it will be the same value as before or greater, since
-				// this load is sequenced after (happens after) the earlier load above. This is supported by read-read
-				// coherency (as defined in the standard), explained here: http://en.cppreference.com/w/cpp/atomic/memory_order
-				tail = this->tailIndex.load(std::memory_order_acquire);
-				if ((details::likely)(details::circular_less_than<index_t>(myDequeueCount - overcommit, tail))) {
-					// Guaranteed to be at least one element to dequeue!
-					
-					// Get the index. Note that since there's guaranteed to be at least one element, this
-					// will never exceed tail. We need to do an acquire-release fence here since it's possible
-					// that whatever condition got us to this point was for an earlier enqueued element (that
-					// we already see the memory effects for), but that by the time we increment somebody else
-					// has incremented it, and we need to see the memory effects for *that* element, which is
-					// in such a case is necessarily visible on the thread that incremented it in the first
-					// place with the more current condition (they must have acquired a tail that is at least
-					// as recent).
-					auto index = this->headIndex.fetch_add(1, std::memory_order_acq_rel);
-					
-					
-					// Determine which block the element is in
-					
-					auto localBlockIndex = blockIndex.load(std::memory_order_acquire);
-					auto localBlockIndexHead = localBlockIndex->front.load(std::memory_order_acquire);
-					
-					// We need to be careful here about subtracting and dividing because of index wrap-around.
-					// When an index wraps, we need to preserve the sign of the offset when dividing it by the
-					// block size (in order to get a correct signed block count offset in all cases):
-					auto headBase = localBlockIndex->entries[localBlockIndexHead].base;
-					auto blockBaseIndex = index & ~static_cast<index_t>(BLOCK_SIZE - 1);
-					auto offset = static_cast<size_t>(static_cast<typename std::make_signed<index_t>::type>(blockBaseIndex - headBase) / static_cast<typename std::make_signed<index_t>::type>(BLOCK_SIZE));
-					auto block = localBlockIndex->entries[(localBlockIndexHead + offset) & (localBlockIndex->size - 1)].block;
-					
-					// Dequeue
-					auto& el = *((*block)[index]);
-					if (!MOODYCAMEL_NOEXCEPT_ASSIGN(T, T&&, element = std::move(el))) {
-						// Make sure the element is still fully dequeued and destroyed even if the assignment
-						// throws
-						struct Guard {
-							Block* block;
-							index_t index;
-							
-							~Guard()
-							{
-								(*block)[index]->~T();
-								block->ConcurrentQueue::Block::template set_empty<explicit_context>(index);
-							}
-						} guard = { block, index };
-
-						element = std::move(el); // NOLINT
-					}
-					else {
-						element = std::move(el); // NOLINT
-						el.~T(); // NOLINT
-						block->ConcurrentQueue::Block::template set_empty<explicit_context>(index);
-					}
-					
-					return true;
-				}
-				else {
-					// Wasn't anything to dequeue after all; make the effective dequeue count eventually consistent
-					this->dequeueOvercommit.fetch_add(1, std::memory_order_release);		// Release so that the fetch_add on dequeueOptimisticCount is guaranteed to happen before this write
-				}
-			}
-		
-			return false;
-		}
-		
-		template<AllocationMode allocMode, typename It>
-		bool MOODYCAMEL_NO_TSAN enqueue_bulk(It itemFirst, size_t count)
-		{
-			// First, we need to make sure we have enough room to enqueue all of the elements;
-			// this means pre-allocating blocks and putting them in the block index (but only if
-			// all the allocations succeeded).
-			index_t startTailIndex = this->tailIndex.load(std::memory_order_relaxed);
-			auto startBlock = this->tailBlock;
-			auto originalBlockIndexFront = pr_blockIndexFront;
-			auto originalBlockIndexSlotsUsed = pr_blockIndexSlotsUsed;
-			
-			Block* firstAllocatedBlock = nullptr;
-			
-			// Figure out how many blocks we'll need to allocate, and do so
-			size_t blockBaseDiff = ((startTailIndex + count - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1)) - ((startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1));
-			index_t currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
-			if (blockBaseDiff > 0) {
-				// Allocate as many blocks as possible from ahead
-				while (blockBaseDiff > 0 && this->tailBlock != nullptr && this->tailBlock->next != firstAllocatedBlock && this->tailBlock->next->ConcurrentQueue::Block::template is_empty<explicit_context>()) {
-					blockBaseDiff -= static_cast<index_t>(BLOCK_SIZE);
-					currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-					
-					this->tailBlock = this->tailBlock->next;
-					firstAllocatedBlock = firstAllocatedBlock == nullptr ? this->tailBlock : firstAllocatedBlock;
-					
-					auto& entry = blockIndex.load(std::memory_order_relaxed)->entries[pr_blockIndexFront];
-					entry.base = currentTailIndex;
-					entry.block = this->tailBlock;
-					pr_blockIndexFront = (pr_blockIndexFront + 1) & (pr_blockIndexSize - 1);
-				}
-				
-				// Now allocate as many blocks as necessary from the block pool
-				while (blockBaseDiff > 0) {
-					blockBaseDiff -= static_cast<index_t>(BLOCK_SIZE);
-					currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-					
-					auto head = this->headIndex.load(std::memory_order_relaxed);
-					assert(!details::circular_less_than<index_t>(currentTailIndex, head));
-					bool full = !details::circular_less_than<index_t>(head, currentTailIndex + BLOCK_SIZE) || (MAX_SUBQUEUE_SIZE != details::const_numeric_max<size_t>::value && (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head));
-					if (pr_blockIndexRaw == nullptr || pr_blockIndexSlotsUsed == pr_blockIndexSize || full) {
-						MOODYCAMEL_CONSTEXPR_IF (allocMode == CannotAlloc) {
-							// Failed to allocate, undo changes (but keep injected blocks)
-							pr_blockIndexFront = originalBlockIndexFront;
-							pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-							this->tailBlock = startBlock == nullptr ? firstAllocatedBlock : startBlock;
-							return false;
-						}
-						else if (full || !new_block_index(originalBlockIndexSlotsUsed)) {
-							// Failed to allocate, undo changes (but keep injected blocks)
-							pr_blockIndexFront = originalBlockIndexFront;
-							pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-							this->tailBlock = startBlock == nullptr ? firstAllocatedBlock : startBlock;
-							return false;
-						}
-						
-						// pr_blockIndexFront is updated inside new_block_index, so we need to
-						// update our fallback value too (since we keep the new index even if we
-						// later fail)
-						originalBlockIndexFront = originalBlockIndexSlotsUsed;
-					}
-					
-					// Insert a new block in the circular linked list
-					auto newBlock = this->parent->ConcurrentQueue::template requisition_block<allocMode>();
-					if (newBlock == nullptr) {
-						pr_blockIndexFront = originalBlockIndexFront;
-						pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-						this->tailBlock = startBlock == nullptr ? firstAllocatedBlock : startBlock;
-						return false;
-					}
-					
-#ifdef MCDBGQ_TRACKMEM
-					newBlock->owner = this;
-#endif
-					newBlock->ConcurrentQueue::Block::template set_all_empty<explicit_context>();
-					if (this->tailBlock == nullptr) {
-						newBlock->next = newBlock;
-					}
-					else {
-						newBlock->next = this->tailBlock->next;
-						this->tailBlock->next = newBlock;
-					}
-					this->tailBlock = newBlock;
-					firstAllocatedBlock = firstAllocatedBlock == nullptr ? this->tailBlock : firstAllocatedBlock;
-					
-					++pr_blockIndexSlotsUsed;
-					
-					auto& entry = blockIndex.load(std::memory_order_relaxed)->entries[pr_blockIndexFront];
-					entry.base = currentTailIndex;
-					entry.block = this->tailBlock;
-					pr_blockIndexFront = (pr_blockIndexFront + 1) & (pr_blockIndexSize - 1);
-				}
-				
-				// Excellent, all allocations succeeded. Reset each block's emptiness before we fill them up, and
-				// publish the new block index front
-				auto block = firstAllocatedBlock;
-				while (true) {
-					block->ConcurrentQueue::Block::template reset_empty<explicit_context>();
-					if (block == this->tailBlock) {
-						break;
-					}
-					block = block->next;
-				}
-				
-				MOODYCAMEL_CONSTEXPR_IF (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst)))) {
-					blockIndex.load(std::memory_order_relaxed)->front.store((pr_blockIndexFront - 1) & (pr_blockIndexSize - 1), std::memory_order_release);
-				}
-			}
-			
-			// Enqueue, one block at a time
-			index_t newTailIndex = startTailIndex + static_cast<index_t>(count);
-			currentTailIndex = startTailIndex;
-			auto endBlock = this->tailBlock;
-			this->tailBlock = startBlock;
-			assert((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) != 0 || firstAllocatedBlock != nullptr || count == 0);
-			if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0 && firstAllocatedBlock != nullptr) {
-				this->tailBlock = firstAllocatedBlock;
-			}
-			while (true) {
-				index_t stopIndex = (currentTailIndex & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-				if (details::circular_less_than<index_t>(newTailIndex, stopIndex)) {
-					stopIndex = newTailIndex;
-				}
-				MOODYCAMEL_CONSTEXPR_IF (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst)))) {
-					while (currentTailIndex != stopIndex) {
-						new ((*this->tailBlock)[currentTailIndex++]) T(*itemFirst++);
-					}
-				}
-				else {
-					MOODYCAMEL_TRY {
-						while (currentTailIndex != stopIndex) {
-							// Must use copy constructor even if move constructor is available
-							// because we may have to revert if there's an exception.
-							// Sorry about the horrible templated next line, but it was the only way
-							// to disable moving *at compile time*, which is important because a type
-							// may only define a (noexcept) move constructor, and so calls to the
-							// cctor will not compile, even if they are in an if branch that will never
-							// be executed
-							new ((*this->tailBlock)[currentTailIndex]) T(details::nomove_if<!MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst));
-							++currentTailIndex;
-							++itemFirst;
-						}
-					}
-					MOODYCAMEL_CATCH (...) {
-						// Oh dear, an exception's been thrown -- destroy the elements that
-						// were enqueued so far and revert the entire bulk operation (we'll keep
-						// any allocated blocks in our linked list for later, though).
-						auto constructedStopIndex = currentTailIndex;
-						auto lastBlockEnqueued = this->tailBlock;
-						
-						pr_blockIndexFront = originalBlockIndexFront;
-						pr_blockIndexSlotsUsed = originalBlockIndexSlotsUsed;
-						this->tailBlock = startBlock == nullptr ? firstAllocatedBlock : startBlock;
-						
-						if (!details::is_trivially_destructible<T>::value) {
-							auto block = startBlock;
-							if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0) {
-								block = firstAllocatedBlock;
-							}
-							currentTailIndex = startTailIndex;
-							while (true) {
-								stopIndex = (currentTailIndex & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-								if (details::circular_less_than<index_t>(constructedStopIndex, stopIndex)) {
-									stopIndex = constructedStopIndex;
-								}
-								while (currentTailIndex != stopIndex) {
-									(*block)[currentTailIndex++]->~T();
-								}
-								if (block == lastBlockEnqueued) {
-									break;
-								}
-								block = block->next;
-							}
-						}
-						MOODYCAMEL_RETHROW;
-					}
-				}
-				
-				if (this->tailBlock == endBlock) {
-					assert(currentTailIndex == newTailIndex);
-					break;
-				}
-				this->tailBlock = this->tailBlock->next;
-			}
-			
-			MOODYCAMEL_CONSTEXPR_IF (!MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst)))) {
-				if (firstAllocatedBlock != nullptr)
-					blockIndex.load(std::memory_order_relaxed)->front.store((pr_blockIndexFront - 1) & (pr_blockIndexSize - 1), std::memory_order_release);
-			}
-			
-			this->tailIndex.store(newTailIndex, std::memory_order_release);
-			return true;
-		}
-		
-		template<typename It>
-		size_t dequeue_bulk(It& itemFirst, size_t max)
-		{
-			auto tail = this->tailIndex.load(std::memory_order_relaxed);
-			auto overcommit = this->dequeueOvercommit.load(std::memory_order_relaxed);
-			auto desiredCount = static_cast<size_t>(tail - (this->dequeueOptimisticCount.load(std::memory_order_relaxed) - overcommit));
-			if (details::circular_less_than<size_t>(0, desiredCount)) {
-				desiredCount = desiredCount < max ? desiredCount : max;
-				std::atomic_thread_fence(std::memory_order_acquire);
-				
-				auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(desiredCount, std::memory_order_relaxed);
-				
-				tail = this->tailIndex.load(std::memory_order_acquire);
-				auto actualCount = static_cast<size_t>(tail - (myDequeueCount - overcommit));
-				if (details::circular_less_than<size_t>(0, actualCount)) {
-					actualCount = desiredCount < actualCount ? desiredCount : actualCount;
-					if (actualCount < desiredCount) {
-						this->dequeueOvercommit.fetch_add(desiredCount - actualCount, std::memory_order_release);
-					}
-					
-					// Get the first index. Note that since there's guaranteed to be at least actualCount elements, this
-					// will never exceed tail.
-					auto firstIndex = this->headIndex.fetch_add(actualCount, std::memory_order_acq_rel);
-					
-					// Determine which block the first element is in
-					auto localBlockIndex = blockIndex.load(std::memory_order_acquire);
-					auto localBlockIndexHead = localBlockIndex->front.load(std::memory_order_acquire);
-					
-					auto headBase = localBlockIndex->entries[localBlockIndexHead].base;
-					auto firstBlockBaseIndex = firstIndex & ~static_cast<index_t>(BLOCK_SIZE - 1);
-					auto offset = static_cast<size_t>(static_cast<typename std::make_signed<index_t>::type>(firstBlockBaseIndex - headBase) / static_cast<typename std::make_signed<index_t>::type>(BLOCK_SIZE));
-					auto indexIndex = (localBlockIndexHead + offset) & (localBlockIndex->size - 1);
-					
-					// Iterate the blocks and dequeue
-					auto index = firstIndex;
-					do {
-						auto firstIndexInBlock = index;
-						index_t endIndex = (index & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-						endIndex = details::circular_less_than<index_t>(firstIndex + static_cast<index_t>(actualCount), endIndex) ? firstIndex + static_cast<index_t>(actualCount) : endIndex;
-						auto block = localBlockIndex->entries[indexIndex].block;
-						if (MOODYCAMEL_NOEXCEPT_ASSIGN(T, T&&, details::deref_noexcept(itemFirst) = std::move((*(*block)[index])))) {
-							while (index != endIndex) {
-								auto& el = *((*block)[index]);
-								*itemFirst++ = std::move(el);
-								el.~T();
-								++index;
-							}
-						}
-						else {
-							MOODYCAMEL_TRY {
-								while (index != endIndex) {
-									auto& el = *((*block)[index]);
-									*itemFirst = std::move(el);
-									++itemFirst;
-									el.~T();
-									++index;
-								}
-							}
-							MOODYCAMEL_CATCH (...) {
-								// It's too late to revert the dequeue, but we can make sure that all
-								// the dequeued objects are properly destroyed and the block index
-								// (and empty count) are properly updated before we propagate the exception
-								do {
-									block = localBlockIndex->entries[indexIndex].block;
-									while (index != endIndex) {
-										(*block)[index++]->~T();
-									}
-									block->ConcurrentQueue::Block::template set_many_empty<explicit_context>(firstIndexInBlock, static_cast<size_t>(endIndex - firstIndexInBlock));
-									indexIndex = (indexIndex + 1) & (localBlockIndex->size - 1);
-									
-									firstIndexInBlock = index;
-									endIndex = (index & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-									endIndex = details::circular_less_than<index_t>(firstIndex + static_cast<index_t>(actualCount), endIndex) ? firstIndex + static_cast<index_t>(actualCount) : endIndex;
-								} while (index != firstIndex + actualCount);
-								
-								MOODYCAMEL_RETHROW;
-							}
-						}
-						block->ConcurrentQueue::Block::template set_many_empty<explicit_context>(firstIndexInBlock, static_cast<size_t>(endIndex - firstIndexInBlock));
-						indexIndex = (indexIndex + 1) & (localBlockIndex->size - 1);
-					} while (index != firstIndex + actualCount);
-					
-					return actualCount;
-				}
-				else {
-					// Wasn't anything to dequeue after all; make the effective dequeue count eventually consistent
-					this->dequeueOvercommit.fetch_add(desiredCount, std::memory_order_release);
-				}
-			}
-			
-			return 0;
-		}
-		
-	private:
-		struct BlockIndexEntry
-		{
-			index_t base;
-			Block* block;
-		};
-		
-		struct BlockIndexHeader
-		{
-			size_t size;
-			std::atomic<size_t> front;		// Current slot (not next, like pr_blockIndexFront)
-			BlockIndexEntry* entries;
-			void* prev;
-		};
-		
-		
-		bool new_block_index(size_t numberOfFilledSlotsToExpose)
-		{
-			auto prevBlockSizeMask = pr_blockIndexSize - 1;
-			
-			// Create the new block
-			pr_blockIndexSize <<= 1;
-			auto newRawPtr = static_cast<char*>((Traits::malloc)(sizeof(BlockIndexHeader) + std::alignment_of<BlockIndexEntry>::value - 1 + sizeof(BlockIndexEntry) * pr_blockIndexSize));
-			if (newRawPtr == nullptr) {
-				pr_blockIndexSize >>= 1;		// Reset to allow graceful retry
-				return false;
-			}
-			
-			auto newBlockIndexEntries = reinterpret_cast<BlockIndexEntry*>(details::align_for<BlockIndexEntry>(newRawPtr + sizeof(BlockIndexHeader)));
-			
-			// Copy in all the old indices, if any
-			size_t j = 0;
-			if (pr_blockIndexSlotsUsed != 0) {
-				auto i = (pr_blockIndexFront - pr_blockIndexSlotsUsed) & prevBlockSizeMask;
-				do {
-					newBlockIndexEntries[j++] = pr_blockIndexEntries[i];
-					i = (i + 1) & prevBlockSizeMask;
-				} while (i != pr_blockIndexFront);
-			}
-			
-			// Update everything
-			auto header = new (newRawPtr) BlockIndexHeader;
-			header->size = pr_blockIndexSize;
-			header->front.store(numberOfFilledSlotsToExpose - 1, std::memory_order_relaxed);
-			header->entries = newBlockIndexEntries;
-			header->prev = pr_blockIndexRaw;		// we link the new block to the old one so we can free it later
-			
-			pr_blockIndexFront = j;
-			pr_blockIndexEntries = newBlockIndexEntries;
-			pr_blockIndexRaw = newRawPtr;
-			blockIndex.store(header, std::memory_order_release);
-			
-			return true;
-		}
-		
-	private:
-		std::atomic<BlockIndexHeader*> blockIndex;
-		
-		// To be used by producer only -- consumer must use the ones in referenced by blockIndex
-		size_t pr_blockIndexSlotsUsed;
-		size_t pr_blockIndexSize;
-		size_t pr_blockIndexFront;		// Next slot (not current)
-		BlockIndexEntry* pr_blockIndexEntries;
-		void* pr_blockIndexRaw;
-		
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-	public:
-		ExplicitProducer* nextExplicitProducer;
-	private:
-#endif
-		
-#ifdef MCDBGQ_TRACKMEM
-		friend struct MemStats;
-#endif
-	};
-	
-	
-	//////////////////////////////////
-	// Implicit queue
-	//////////////////////////////////
-	
-	struct ImplicitProducer : public ProducerBase
-	{			
-		ImplicitProducer(ConcurrentQueue* parent_) :
-			ProducerBase(parent_, false),
-			nextBlockIndexCapacity(IMPLICIT_INITIAL_INDEX_SIZE),
-			blockIndex(nullptr)
-		{
-			new_block_index();
-		}
-		
-		~ImplicitProducer()
-		{
-			// Note that since we're in the destructor we can assume that all enqueue/dequeue operations
-			// completed already; this means that all undequeued elements are placed contiguously across
-			// contiguous blocks, and that only the first and last remaining blocks can be only partially
-			// empty (all other remaining blocks must be completely full).
-			
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-			// Unregister ourselves for thread termination notification
-			if (!this->inactive.load(std::memory_order_relaxed)) {
-				details::ThreadExitNotifier::unsubscribe(&threadExitListener);
-			}
-#endif
-			
-			// Destroy all remaining elements!
-			auto tail = this->tailIndex.load(std::memory_order_relaxed);
-			auto index = this->headIndex.load(std::memory_order_relaxed);
-			Block* block = nullptr;
-			assert(index == tail || details::circular_less_than(index, tail));
-			bool forceFreeLastBlock = index != tail;		// If we enter the loop, then the last (tail) block will not be freed
-			while (index != tail) {
-				if ((index & static_cast<index_t>(BLOCK_SIZE - 1)) == 0 || block == nullptr) {
-					if (block != nullptr) {
-						// Free the old block
-						this->parent->add_block_to_free_list(block);
-					}
-					
-					block = get_block_index_entry_for_index(index)->value.load(std::memory_order_relaxed);
-				}
-				
-				((*block)[index])->~T();
-				++index;
-			}
-			// Even if the queue is empty, there's still one block that's not on the free list
-			// (unless the head index reached the end of it, in which case the tail will be poised
-			// to create a new block).
-			if (this->tailBlock != nullptr && (forceFreeLastBlock || (tail & static_cast<index_t>(BLOCK_SIZE - 1)) != 0)) {
-				this->parent->add_block_to_free_list(this->tailBlock);
-			}
-			
-			// Destroy block index
-			auto localBlockIndex = blockIndex.load(std::memory_order_relaxed);
-			if (localBlockIndex != nullptr) {
-				for (size_t i = 0; i != localBlockIndex->capacity; ++i) {
-					localBlockIndex->index[i]->~BlockIndexEntry();
-				}
-				do {
-					auto prev = localBlockIndex->prev;
-					localBlockIndex->~BlockIndexHeader();
-					(Traits::free)(localBlockIndex);
-					localBlockIndex = prev;
-				} while (localBlockIndex != nullptr);
-			}
-		}
-		
-		template<AllocationMode allocMode, typename U>
-		inline bool enqueue(U&& element)
-		{
-			index_t currentTailIndex = this->tailIndex.load(std::memory_order_relaxed);
-			index_t newTailIndex = 1 + currentTailIndex;
-			if ((currentTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0) {
-				// We reached the end of a block, start a new one
-				auto head = this->headIndex.load(std::memory_order_relaxed);
-				assert(!details::circular_less_than<index_t>(currentTailIndex, head));
-				if (!details::circular_less_than<index_t>(head, currentTailIndex + BLOCK_SIZE) || (MAX_SUBQUEUE_SIZE != details::const_numeric_max<size_t>::value && (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head))) {
-					return false;
-				}
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-				debug::DebugLock lock(mutex);
-#endif
-				// Find out where we'll be inserting this block in the block index
-				BlockIndexEntry* idxEntry;
-				if (!insert_block_index_entry<allocMode>(idxEntry, currentTailIndex)) {
-					return false;
-				}
-				
-				// Get ahold of a new block
-				auto newBlock = this->parent->ConcurrentQueue::template requisition_block<allocMode>();
-				if (newBlock == nullptr) {
-					rewind_block_index_tail();
-					idxEntry->value.store(nullptr, std::memory_order_relaxed);
-					return false;
-				}
-#ifdef MCDBGQ_TRACKMEM
-				newBlock->owner = this;
-#endif
-				newBlock->ConcurrentQueue::Block::template reset_empty<implicit_context>();
-
-				MOODYCAMEL_CONSTEXPR_IF (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (static_cast<T*>(nullptr)) T(std::forward<U>(element)))) {
-					// May throw, try to insert now before we publish the fact that we have this new block
-					MOODYCAMEL_TRY {
-						new ((*newBlock)[currentTailIndex]) T(std::forward<U>(element));
-					}
-					MOODYCAMEL_CATCH (...) {
-						rewind_block_index_tail();
-						idxEntry->value.store(nullptr, std::memory_order_relaxed);
-						this->parent->add_block_to_free_list(newBlock);
-						MOODYCAMEL_RETHROW;
-					}
-				}
-				
-				// Insert the new block into the index
-				idxEntry->value.store(newBlock, std::memory_order_relaxed);
-				
-				this->tailBlock = newBlock;
-				
-				MOODYCAMEL_CONSTEXPR_IF (!MOODYCAMEL_NOEXCEPT_CTOR(T, U, new (static_cast<T*>(nullptr)) T(std::forward<U>(element)))) {
-					this->tailIndex.store(newTailIndex, std::memory_order_release);
-					return true;
-				}
-			}
-			
-			// Enqueue
-			new ((*this->tailBlock)[currentTailIndex]) T(std::forward<U>(element));
-			
-			this->tailIndex.store(newTailIndex, std::memory_order_release);
-			return true;
-		}
-		
-		template<typename U>
-		bool dequeue(U& element)
-		{
-			// See ExplicitProducer::dequeue for rationale and explanation
-			index_t tail = this->tailIndex.load(std::memory_order_relaxed);
-			index_t overcommit = this->dequeueOvercommit.load(std::memory_order_relaxed);
-			if (details::circular_less_than<index_t>(this->dequeueOptimisticCount.load(std::memory_order_relaxed) - overcommit, tail)) {
-				std::atomic_thread_fence(std::memory_order_acquire);
-				
-				index_t myDequeueCount = this->dequeueOptimisticCount.fetch_add(1, std::memory_order_relaxed);
-				tail = this->tailIndex.load(std::memory_order_acquire);
-				if ((details::likely)(details::circular_less_than<index_t>(myDequeueCount - overcommit, tail))) {
-					index_t index = this->headIndex.fetch_add(1, std::memory_order_acq_rel);
-					
-					// Determine which block the element is in
-					auto entry = get_block_index_entry_for_index(index);
-					
-					// Dequeue
-					auto block = entry->value.load(std::memory_order_relaxed);
-					auto& el = *((*block)[index]);
-					
-					if (!MOODYCAMEL_NOEXCEPT_ASSIGN(T, T&&, element = std::move(el))) {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-						// Note: Acquiring the mutex with every dequeue instead of only when a block
-						// is released is very sub-optimal, but it is, after all, purely debug code.
-						debug::DebugLock lock(producer->mutex);
-#endif
-						struct Guard {
-							Block* block;
-							index_t index;
-							BlockIndexEntry* entry;
-							ConcurrentQueue* parent;
-							
-							~Guard()
-							{
-								(*block)[index]->~T();
-								if (block->ConcurrentQueue::Block::template set_empty<implicit_context>(index)) {
-									entry->value.store(nullptr, std::memory_order_relaxed);
-									parent->add_block_to_free_list(block);
-								}
-							}
-						} guard = { block, index, entry, this->parent };
-
-						element = std::move(el); // NOLINT
-					}
-					else {
-						element = std::move(el); // NOLINT
-						el.~T(); // NOLINT
-
-						if (block->ConcurrentQueue::Block::template set_empty<implicit_context>(index)) {
-							{
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-								debug::DebugLock lock(mutex);
-#endif
-								// Add the block back into the global free pool (and remove from block index)
-								entry->value.store(nullptr, std::memory_order_relaxed);
-							}
-							this->parent->add_block_to_free_list(block);		// releases the above store
-						}
-					}
-					
-					return true;
-				}
-				else {
-					this->dequeueOvercommit.fetch_add(1, std::memory_order_release);
-				}
-			}
-		
-			return false;
-		}
-		
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable: 4706)  // assignment within conditional expression
-#endif
-		template<AllocationMode allocMode, typename It>
-		bool enqueue_bulk(It itemFirst, size_t count)
-		{
-			// First, we need to make sure we have enough room to enqueue all of the elements;
-			// this means pre-allocating blocks and putting them in the block index (but only if
-			// all the allocations succeeded).
-			
-			// Note that the tailBlock we start off with may not be owned by us any more;
-			// this happens if it was filled up exactly to the top (setting tailIndex to
-			// the first index of the next block which is not yet allocated), then dequeued
-			// completely (putting it on the free list) before we enqueue again.
-			
-			index_t startTailIndex = this->tailIndex.load(std::memory_order_relaxed);
-			auto startBlock = this->tailBlock;
-			Block* firstAllocatedBlock = nullptr;
-			auto endBlock = this->tailBlock;
-			
-			// Figure out how many blocks we'll need to allocate, and do so
-			size_t blockBaseDiff = ((startTailIndex + count - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1)) - ((startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1));
-			index_t currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
-			if (blockBaseDiff > 0) {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-				debug::DebugLock lock(mutex);
-#endif
-				do {
-					blockBaseDiff -= static_cast<index_t>(BLOCK_SIZE);
-					currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-					
-					// Find out where we'll be inserting this block in the block index
-					BlockIndexEntry* idxEntry = nullptr;  // initialization here unnecessary but compiler can't always tell
-					Block* newBlock;
-					bool indexInserted = false;
-					auto head = this->headIndex.load(std::memory_order_relaxed);
-					assert(!details::circular_less_than<index_t>(currentTailIndex, head));
-					bool full = !details::circular_less_than<index_t>(head, currentTailIndex + BLOCK_SIZE) || (MAX_SUBQUEUE_SIZE != details::const_numeric_max<size_t>::value && (MAX_SUBQUEUE_SIZE == 0 || MAX_SUBQUEUE_SIZE - BLOCK_SIZE < currentTailIndex - head));
-
-					if (full || !(indexInserted = insert_block_index_entry<allocMode>(idxEntry, currentTailIndex)) || (newBlock = this->parent->ConcurrentQueue::template requisition_block<allocMode>()) == nullptr) {
-						// Index allocation or block allocation failed; revert any other allocations
-						// and index insertions done so far for this operation
-						if (indexInserted) {
-							rewind_block_index_tail();
-							idxEntry->value.store(nullptr, std::memory_order_relaxed);
-						}
-						currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
-						for (auto block = firstAllocatedBlock; block != nullptr; block = block->next) {
-							currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-							idxEntry = get_block_index_entry_for_index(currentTailIndex);
-							idxEntry->value.store(nullptr, std::memory_order_relaxed);
-							rewind_block_index_tail();
-						}
-						this->parent->add_blocks_to_free_list(firstAllocatedBlock);
-						this->tailBlock = startBlock;
-						
-						return false;
-					}
-					
-#ifdef MCDBGQ_TRACKMEM
-					newBlock->owner = this;
-#endif
-					newBlock->ConcurrentQueue::Block::template reset_empty<implicit_context>();
-					newBlock->next = nullptr;
-					
-					// Insert the new block into the index
-					idxEntry->value.store(newBlock, std::memory_order_relaxed);
-					
-					// Store the chain of blocks so that we can undo if later allocations fail,
-					// and so that we can find the blocks when we do the actual enqueueing
-					if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) != 0 || firstAllocatedBlock != nullptr) {
-						assert(this->tailBlock != nullptr);
-						this->tailBlock->next = newBlock;
-					}
-					this->tailBlock = newBlock;
-					endBlock = newBlock;
-					firstAllocatedBlock = firstAllocatedBlock == nullptr ? newBlock : firstAllocatedBlock;
-				} while (blockBaseDiff > 0);
-			}
-			
-			// Enqueue, one block at a time
-			index_t newTailIndex = startTailIndex + static_cast<index_t>(count);
-			currentTailIndex = startTailIndex;
-			this->tailBlock = startBlock;
-			assert((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) != 0 || firstAllocatedBlock != nullptr || count == 0);
-			if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0 && firstAllocatedBlock != nullptr) {
-				this->tailBlock = firstAllocatedBlock;
-			}
-			while (true) {
-				index_t stopIndex = (currentTailIndex & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-				if (details::circular_less_than<index_t>(newTailIndex, stopIndex)) {
-					stopIndex = newTailIndex;
-				}
-				MOODYCAMEL_CONSTEXPR_IF (MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst)))) {
-					while (currentTailIndex != stopIndex) {
-						new ((*this->tailBlock)[currentTailIndex++]) T(*itemFirst++);
-					}
-				}
-				else {
-					MOODYCAMEL_TRY {
-						while (currentTailIndex != stopIndex) {
-							new ((*this->tailBlock)[currentTailIndex]) T(details::nomove_if<!MOODYCAMEL_NOEXCEPT_CTOR(T, decltype(*itemFirst), new (static_cast<T*>(nullptr)) T(details::deref_noexcept(itemFirst)))>::eval(*itemFirst));
-							++currentTailIndex;
-							++itemFirst;
-						}
-					}
-					MOODYCAMEL_CATCH (...) {
-						auto constructedStopIndex = currentTailIndex;
-						auto lastBlockEnqueued = this->tailBlock;
-						
-						if (!details::is_trivially_destructible<T>::value) {
-							auto block = startBlock;
-							if ((startTailIndex & static_cast<index_t>(BLOCK_SIZE - 1)) == 0) {
-								block = firstAllocatedBlock;
-							}
-							currentTailIndex = startTailIndex;
-							while (true) {
-								stopIndex = (currentTailIndex & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-								if (details::circular_less_than<index_t>(constructedStopIndex, stopIndex)) {
-									stopIndex = constructedStopIndex;
-								}
-								while (currentTailIndex != stopIndex) {
-									(*block)[currentTailIndex++]->~T();
-								}
-								if (block == lastBlockEnqueued) {
-									break;
-								}
-								block = block->next;
-							}
-						}
-						
-						currentTailIndex = (startTailIndex - 1) & ~static_cast<index_t>(BLOCK_SIZE - 1);
-						for (auto block = firstAllocatedBlock; block != nullptr; block = block->next) {
-							currentTailIndex += static_cast<index_t>(BLOCK_SIZE);
-							auto idxEntry = get_block_index_entry_for_index(currentTailIndex);
-							idxEntry->value.store(nullptr, std::memory_order_relaxed);
-							rewind_block_index_tail();
-						}
-						this->parent->add_blocks_to_free_list(firstAllocatedBlock);
-						this->tailBlock = startBlock;
-						MOODYCAMEL_RETHROW;
-					}
-				}
-				
-				if (this->tailBlock == endBlock) {
-					assert(currentTailIndex == newTailIndex);
-					break;
-				}
-				this->tailBlock = this->tailBlock->next;
-			}
-			this->tailIndex.store(newTailIndex, std::memory_order_release);
-			return true;
-		}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-		
-		template<typename It>
-		size_t dequeue_bulk(It& itemFirst, size_t max)
-		{
-			auto tail = this->tailIndex.load(std::memory_order_relaxed);
-			auto overcommit = this->dequeueOvercommit.load(std::memory_order_relaxed);
-			auto desiredCount = static_cast<size_t>(tail - (this->dequeueOptimisticCount.load(std::memory_order_relaxed) - overcommit));
-			if (details::circular_less_than<size_t>(0, desiredCount)) {
-				desiredCount = desiredCount < max ? desiredCount : max;
-				std::atomic_thread_fence(std::memory_order_acquire);
-				
-				auto myDequeueCount = this->dequeueOptimisticCount.fetch_add(desiredCount, std::memory_order_relaxed);
-				
-				tail = this->tailIndex.load(std::memory_order_acquire);
-				auto actualCount = static_cast<size_t>(tail - (myDequeueCount - overcommit));
-				if (details::circular_less_than<size_t>(0, actualCount)) {
-					actualCount = desiredCount < actualCount ? desiredCount : actualCount;
-					if (actualCount < desiredCount) {
-						this->dequeueOvercommit.fetch_add(desiredCount - actualCount, std::memory_order_release);
-					}
-					
-					// Get the first index. Note that since there's guaranteed to be at least actualCount elements, this
-					// will never exceed tail.
-					auto firstIndex = this->headIndex.fetch_add(actualCount, std::memory_order_acq_rel);
-					
-					// Iterate the blocks and dequeue
-					auto index = firstIndex;
-					BlockIndexHeader* localBlockIndex;
-					auto indexIndex = get_block_index_index_for_index(index, localBlockIndex);
-					do {
-						auto blockStartIndex = index;
-						index_t endIndex = (index & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-						endIndex = details::circular_less_than<index_t>(firstIndex + static_cast<index_t>(actualCount), endIndex) ? firstIndex + static_cast<index_t>(actualCount) : endIndex;
-						
-						auto entry = localBlockIndex->index[indexIndex];
-						auto block = entry->value.load(std::memory_order_relaxed);
-						if (MOODYCAMEL_NOEXCEPT_ASSIGN(T, T&&, details::deref_noexcept(itemFirst) = std::move((*(*block)[index])))) {
-							while (index != endIndex) {
-								auto& el = *((*block)[index]);
-								*itemFirst++ = std::move(el);
-								el.~T();
-								++index;
-							}
-						}
-						else {
-							MOODYCAMEL_TRY {
-								while (index != endIndex) {
-									auto& el = *((*block)[index]);
-									*itemFirst = std::move(el);
-									++itemFirst;
-									el.~T();
-									++index;
-								}
-							}
-							MOODYCAMEL_CATCH (...) {
-								do {
-									entry = localBlockIndex->index[indexIndex];
-									block = entry->value.load(std::memory_order_relaxed);
-									while (index != endIndex) {
-										(*block)[index++]->~T();
-									}
-									
-									if (block->ConcurrentQueue::Block::template set_many_empty<implicit_context>(blockStartIndex, static_cast<size_t>(endIndex - blockStartIndex))) {
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-										debug::DebugLock lock(mutex);
-#endif
-										entry->value.store(nullptr, std::memory_order_relaxed);
-										this->parent->add_block_to_free_list(block);
-									}
-									indexIndex = (indexIndex + 1) & (localBlockIndex->capacity - 1);
-									
-									blockStartIndex = index;
-									endIndex = (index & ~static_cast<index_t>(BLOCK_SIZE - 1)) + static_cast<index_t>(BLOCK_SIZE);
-									endIndex = details::circular_less_than<index_t>(firstIndex + static_cast<index_t>(actualCount), endIndex) ? firstIndex + static_cast<index_t>(actualCount) : endIndex;
-								} while (index != firstIndex + actualCount);
-								
-								MOODYCAMEL_RETHROW;
-							}
-						}
-						if (block->ConcurrentQueue::Block::template set_many_empty<implicit_context>(blockStartIndex, static_cast<size_t>(endIndex - blockStartIndex))) {
-							{
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-								debug::DebugLock lock(mutex);
-#endif
-								// Note that the set_many_empty above did a release, meaning that anybody who acquires the block
-								// we're about to free can use it safely since our writes (and reads!) will have happened-before then.
-								entry->value.store(nullptr, std::memory_order_relaxed);
-							}
-							this->parent->add_block_to_free_list(block);		// releases the above store
-						}
-						indexIndex = (indexIndex + 1) & (localBlockIndex->capacity - 1);
-					} while (index != firstIndex + actualCount);
-					
-					return actualCount;
-				}
-				else {
-					this->dequeueOvercommit.fetch_add(desiredCount, std::memory_order_release);
-				}
-			}
-			
-			return 0;
-		}
-		
-	private:
-		// The block size must be > 1, so any number with the low bit set is an invalid block base index
-		static const index_t INVALID_BLOCK_BASE = 1;
-		
-		struct BlockIndexEntry
-		{
-			std::atomic<index_t> key;
-			std::atomic<Block*> value;
-		};
-		
-		struct BlockIndexHeader
-		{
-			size_t capacity;
-			std::atomic<size_t> tail;
-			BlockIndexEntry* entries;
-			BlockIndexEntry** index;
-			BlockIndexHeader* prev;
-		};
-		
-		template<AllocationMode allocMode>
-		inline bool insert_block_index_entry(BlockIndexEntry*& idxEntry, index_t blockStartIndex)
-		{
-			auto localBlockIndex = blockIndex.load(std::memory_order_relaxed);		// We're the only writer thread, relaxed is OK
-			if (localBlockIndex == nullptr) {
-				return false;  // this can happen if new_block_index failed in the constructor
-			}
-			size_t newTail = (localBlockIndex->tail.load(std::memory_order_relaxed) + 1) & (localBlockIndex->capacity - 1);
-			idxEntry = localBlockIndex->index[newTail];
-			if (idxEntry->key.load(std::memory_order_relaxed) == INVALID_BLOCK_BASE ||
-				idxEntry->value.load(std::memory_order_relaxed) == nullptr) {
-				
-				idxEntry->key.store(blockStartIndex, std::memory_order_relaxed);
-				localBlockIndex->tail.store(newTail, std::memory_order_release);
-				return true;
-			}
-			
-			// No room in the old block index, try to allocate another one!
-			MOODYCAMEL_CONSTEXPR_IF (allocMode == CannotAlloc) {
-				return false;
-			}
-			else if (!new_block_index()) {
-				return false;
-			}
-			else {
-				localBlockIndex = blockIndex.load(std::memory_order_relaxed);
-				newTail = (localBlockIndex->tail.load(std::memory_order_relaxed) + 1) & (localBlockIndex->capacity - 1);
-				idxEntry = localBlockIndex->index[newTail];
-				assert(idxEntry->key.load(std::memory_order_relaxed) == INVALID_BLOCK_BASE);
-				idxEntry->key.store(blockStartIndex, std::memory_order_relaxed);
-				localBlockIndex->tail.store(newTail, std::memory_order_release);
-				return true;
-			}
-		}
-		
-		inline void rewind_block_index_tail()
-		{
-			auto localBlockIndex = blockIndex.load(std::memory_order_relaxed);
-			localBlockIndex->tail.store((localBlockIndex->tail.load(std::memory_order_relaxed) - 1) & (localBlockIndex->capacity - 1), std::memory_order_relaxed);
-		}
-		
-		inline BlockIndexEntry* get_block_index_entry_for_index(index_t index) const
-		{
-			BlockIndexHeader* localBlockIndex;
-			auto idx = get_block_index_index_for_index(index, localBlockIndex);
-			return localBlockIndex->index[idx];
-		}
-		
-		inline size_t get_block_index_index_for_index(index_t index, BlockIndexHeader*& localBlockIndex) const
-		{
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-			debug::DebugLock lock(mutex);
-#endif
-			index &= ~static_cast<index_t>(BLOCK_SIZE - 1);
-			localBlockIndex = blockIndex.load(std::memory_order_acquire);
-			auto tail = localBlockIndex->tail.load(std::memory_order_acquire);
-			auto tailBase = localBlockIndex->index[tail]->key.load(std::memory_order_relaxed);
-			assert(tailBase != INVALID_BLOCK_BASE);
-			// Note: Must use division instead of shift because the index may wrap around, causing a negative
-			// offset, whose negativity we want to preserve
-			auto offset = static_cast<size_t>(static_cast<typename std::make_signed<index_t>::type>(index - tailBase) / static_cast<typename std::make_signed<index_t>::type>(BLOCK_SIZE));
-			size_t idx = (tail + offset) & (localBlockIndex->capacity - 1);
-			assert(localBlockIndex->index[idx]->key.load(std::memory_order_relaxed) == index && localBlockIndex->index[idx]->value.load(std::memory_order_relaxed) != nullptr);
-			return idx;
-		}
-		
-		bool new_block_index()
-		{
-			auto prev = blockIndex.load(std::memory_order_relaxed);
-			size_t prevCapacity = prev == nullptr ? 0 : prev->capacity;
-			auto entryCount = prev == nullptr ? nextBlockIndexCapacity : prevCapacity;
-			auto raw = static_cast<char*>((Traits::malloc)(
-				sizeof(BlockIndexHeader) +
-				std::alignment_of<BlockIndexEntry>::value - 1 + sizeof(BlockIndexEntry) * entryCount +
-				std::alignment_of<BlockIndexEntry*>::value - 1 + sizeof(BlockIndexEntry*) * nextBlockIndexCapacity));
-			if (raw == nullptr) {
-				return false;
-			}
-			
-			auto header = new (raw) BlockIndexHeader;
-			auto entries = reinterpret_cast<BlockIndexEntry*>(details::align_for<BlockIndexEntry>(raw + sizeof(BlockIndexHeader)));
-			auto index = reinterpret_cast<BlockIndexEntry**>(details::align_for<BlockIndexEntry*>(reinterpret_cast<char*>(entries) + sizeof(BlockIndexEntry) * entryCount));
-			if (prev != nullptr) {
-				auto prevTail = prev->tail.load(std::memory_order_relaxed);
-				auto prevPos = prevTail;
-				size_t i = 0;
-				do {
-					prevPos = (prevPos + 1) & (prev->capacity - 1);
-					index[i++] = prev->index[prevPos];
-				} while (prevPos != prevTail);
-				assert(i == prevCapacity);
-			}
-			for (size_t i = 0; i != entryCount; ++i) {
-				new (entries + i) BlockIndexEntry;
-				entries[i].key.store(INVALID_BLOCK_BASE, std::memory_order_relaxed);
-				index[prevCapacity + i] = entries + i;
-			}
-			header->prev = prev;
-			header->entries = entries;
-			header->index = index;
-			header->capacity = nextBlockIndexCapacity;
-			header->tail.store((prevCapacity - 1) & (nextBlockIndexCapacity - 1), std::memory_order_relaxed);
-			
-			blockIndex.store(header, std::memory_order_release);
-			
-			nextBlockIndexCapacity <<= 1;
-			
-			return true;
-		}
-		
-	private:
-		size_t nextBlockIndexCapacity;
-		std::atomic<BlockIndexHeader*> blockIndex;
-
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-	public:
-		details::ThreadExitListener threadExitListener;
-	private:
-#endif
-		
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-	public:
-		ImplicitProducer* nextImplicitProducer;
-	private:
-#endif
-
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODBLOCKINDEX
-		mutable debug::DebugMutex mutex;
-#endif
-#ifdef MCDBGQ_TRACKMEM
-		friend struct MemStats;
-#endif
-	};
-	
-	
-	//////////////////////////////////
-	// Block pool manipulation
-	//////////////////////////////////
-	
-	void populate_initial_block_list(size_t blockCount)
-	{
-		initialBlockPoolSize = blockCount;
-		if (initialBlockPoolSize == 0) {
-			initialBlockPool = nullptr;
-			return;
-		}
-		
-		initialBlockPool = create_array<Block>(blockCount);
-		if (initialBlockPool == nullptr) {
-			initialBlockPoolSize = 0;
-		}
-		for (size_t i = 0; i < initialBlockPoolSize; ++i) {
-			initialBlockPool[i].dynamicallyAllocated = false;
-		}
-	}
-	
-	inline Block* try_get_block_from_initial_pool()
-	{
-		if (initialBlockPoolIndex.load(std::memory_order_relaxed) >= initialBlockPoolSize) {
-			return nullptr;
-		}
-		
-		auto index = initialBlockPoolIndex.fetch_add(1, std::memory_order_relaxed);
-		
-		return index < initialBlockPoolSize ? (initialBlockPool + index) : nullptr;
-	}
-	
-	inline void add_block_to_free_list(Block* block)
-	{
-#ifdef MCDBGQ_TRACKMEM
-		block->owner = nullptr;
-#endif
-		if (!Traits::RECYCLE_ALLOCATED_BLOCKS && block->dynamicallyAllocated) {
-			destroy(block);
-		}
-		else {
-			freeList.add(block);
-		}
-	}
-	
-	inline void add_blocks_to_free_list(Block* block)
-	{
-		while (block != nullptr) {
-			auto next = block->next;
-			add_block_to_free_list(block);
-			block = next;
-		}
-	}
-	
-	inline Block* try_get_block_from_free_list()
-	{
-		return freeList.try_get();
-	}
-	
-	// Gets a free block from one of the memory pools, or allocates a new one (if applicable)
-	template<AllocationMode canAlloc>
-	Block* requisition_block()
-	{
-		auto block = try_get_block_from_initial_pool();
-		if (block != nullptr) {
-			return block;
-		}
-		
-		block = try_get_block_from_free_list();
-		if (block != nullptr) {
-			return block;
-		}
-		
-		MOODYCAMEL_CONSTEXPR_IF (canAlloc == CanAlloc) {
-			return create<Block>();
-		}
-		else {
-			return nullptr;
-		}
-	}
-	
-
-#ifdef MCDBGQ_TRACKMEM
-	public:
-		struct MemStats {
-			size_t allocatedBlocks;
-			size_t usedBlocks;
-			size_t freeBlocks;
-			size_t ownedBlocksExplicit;
-			size_t ownedBlocksImplicit;
-			size_t implicitProducers;
-			size_t explicitProducers;
-			size_t elementsEnqueued;
-			size_t blockClassBytes;
-			size_t queueClassBytes;
-			size_t implicitBlockIndexBytes;
-			size_t explicitBlockIndexBytes;
-			
-			friend class ConcurrentQueue;
-			
-		private:
-			static MemStats getFor(ConcurrentQueue* q)
-			{
-				MemStats stats = { 0 };
-				
-				stats.elementsEnqueued = q->size_approx();
-			
-				auto block = q->freeList.head_unsafe();
-				while (block != nullptr) {
-					++stats.allocatedBlocks;
-					++stats.freeBlocks;
-					block = block->freeListNext.load(std::memory_order_relaxed);
-				}
-				
-				for (auto ptr = q->producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-					bool implicit = dynamic_cast<ImplicitProducer*>(ptr) != nullptr;
-					stats.implicitProducers += implicit ? 1 : 0;
-					stats.explicitProducers += implicit ? 0 : 1;
-					
-					if (implicit) {
-						auto prod = static_cast<ImplicitProducer*>(ptr);
-						stats.queueClassBytes += sizeof(ImplicitProducer);
-						auto head = prod->headIndex.load(std::memory_order_relaxed);
-						auto tail = prod->tailIndex.load(std::memory_order_relaxed);
-						auto hash = prod->blockIndex.load(std::memory_order_relaxed);
-						if (hash != nullptr) {
-							for (size_t i = 0; i != hash->capacity; ++i) {
-								if (hash->index[i]->key.load(std::memory_order_relaxed) != ImplicitProducer::INVALID_BLOCK_BASE && hash->index[i]->value.load(std::memory_order_relaxed) != nullptr) {
-									++stats.allocatedBlocks;
-									++stats.ownedBlocksImplicit;
-								}
-							}
-							stats.implicitBlockIndexBytes += hash->capacity * sizeof(typename ImplicitProducer::BlockIndexEntry);
-							for (; hash != nullptr; hash = hash->prev) {
-								stats.implicitBlockIndexBytes += sizeof(typename ImplicitProducer::BlockIndexHeader) + hash->capacity * sizeof(typename ImplicitProducer::BlockIndexEntry*);
-							}
-						}
-						for (; details::circular_less_than<index_t>(head, tail); head += BLOCK_SIZE) {
-							//auto block = prod->get_block_index_entry_for_index(head);
-							++stats.usedBlocks;
-						}
-					}
-					else {
-						auto prod = static_cast<ExplicitProducer*>(ptr);
-						stats.queueClassBytes += sizeof(ExplicitProducer);
-						auto tailBlock = prod->tailBlock;
-						bool wasNonEmpty = false;
-						if (tailBlock != nullptr) {
-							auto block = tailBlock;
-							do {
-								++stats.allocatedBlocks;
-								if (!block->ConcurrentQueue::Block::template is_empty<explicit_context>() || wasNonEmpty) {
-									++stats.usedBlocks;
-									wasNonEmpty = wasNonEmpty || block != tailBlock;
-								}
-								++stats.ownedBlocksExplicit;
-								block = block->next;
-							} while (block != tailBlock);
-						}
-						auto index = prod->blockIndex.load(std::memory_order_relaxed);
-						while (index != nullptr) {
-							stats.explicitBlockIndexBytes += sizeof(typename ExplicitProducer::BlockIndexHeader) + index->size * sizeof(typename ExplicitProducer::BlockIndexEntry);
-							index = static_cast<typename ExplicitProducer::BlockIndexHeader*>(index->prev);
-						}
-					}
-				}
-				
-				auto freeOnInitialPool = q->initialBlockPoolIndex.load(std::memory_order_relaxed) >= q->initialBlockPoolSize ? 0 : q->initialBlockPoolSize - q->initialBlockPoolIndex.load(std::memory_order_relaxed);
-				stats.allocatedBlocks += freeOnInitialPool;
-				stats.freeBlocks += freeOnInitialPool;
-				
-				stats.blockClassBytes = sizeof(Block) * stats.allocatedBlocks;
-				stats.queueClassBytes += sizeof(ConcurrentQueue);
-				
-				return stats;
-			}
-		};
-		
-		// For debugging only. Not thread-safe.
-		MemStats getMemStats()
-		{
-			return MemStats::getFor(this);
-		}
-	private:
-		friend struct MemStats;
-#endif
-	
-	
-	//////////////////////////////////
-	// Producer list manipulation
-	//////////////////////////////////	
-	
-	ProducerBase* recycle_or_create_producer(bool isExplicit)
-	{
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
-		debug::DebugLock lock(implicitProdMutex);
-#endif
-		// Try to re-use one first
-		for (auto ptr = producerListTail.load(std::memory_order_acquire); ptr != nullptr; ptr = ptr->next_prod()) {
-			if (ptr->inactive.load(std::memory_order_relaxed) && ptr->isExplicit == isExplicit) {
-				bool expected = true;
-				if (ptr->inactive.compare_exchange_strong(expected, /* desired */ false, std::memory_order_acquire, std::memory_order_relaxed)) {
-					// We caught one! It's been marked as activated, the caller can have it
-					return ptr;
-				}
-			}
-		}
-
-		return add_producer(isExplicit ? static_cast<ProducerBase*>(create<ExplicitProducer>(this)) : create<ImplicitProducer>(this));
-	}
-	
-	ProducerBase* add_producer(ProducerBase* producer)
-	{
-		// Handle failed memory allocation
-		if (producer == nullptr) {
-			return nullptr;
-		}
-		
-		producerCount.fetch_add(1, std::memory_order_relaxed);
-		
-		// Add it to the lock-free list
-		auto prevTail = producerListTail.load(std::memory_order_relaxed);
-		do {
-			producer->next = prevTail;
-		} while (!producerListTail.compare_exchange_weak(prevTail, producer, std::memory_order_release, std::memory_order_relaxed));
-		
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-		if (producer->isExplicit) {
-			auto prevTailExplicit = explicitProducers.load(std::memory_order_relaxed);
-			do {
-				static_cast<ExplicitProducer*>(producer)->nextExplicitProducer = prevTailExplicit;
-			} while (!explicitProducers.compare_exchange_weak(prevTailExplicit, static_cast<ExplicitProducer*>(producer), std::memory_order_release, std::memory_order_relaxed));
-		}
-		else {
-			auto prevTailImplicit = implicitProducers.load(std::memory_order_relaxed);
-			do {
-				static_cast<ImplicitProducer*>(producer)->nextImplicitProducer = prevTailImplicit;
-			} while (!implicitProducers.compare_exchange_weak(prevTailImplicit, static_cast<ImplicitProducer*>(producer), std::memory_order_release, std::memory_order_relaxed));
-		}
-#endif
-		
-		return producer;
-	}
-	
-	void reown_producers()
-	{
-		// After another instance is moved-into/swapped-with this one, all the
-		// producers we stole still think their parents are the other queue.
-		// So fix them up!
-		for (auto ptr = producerListTail.load(std::memory_order_relaxed); ptr != nullptr; ptr = ptr->next_prod()) {
-			ptr->parent = this;
-		}
-	}
-	
-	
-	//////////////////////////////////
-	// Implicit producer hash
-	//////////////////////////////////
-	
-	struct ImplicitProducerKVP
-	{
-		std::atomic<details::thread_id_t> key;
-		ImplicitProducer* value;		// No need for atomicity since it's only read by the thread that sets it in the first place
-		
-		ImplicitProducerKVP() : value(nullptr) { }
-		
-		ImplicitProducerKVP(ImplicitProducerKVP&& other) MOODYCAMEL_NOEXCEPT
-		{
-			key.store(other.key.load(std::memory_order_relaxed), std::memory_order_relaxed);
-			value = other.value;
-		}
-		
-		inline ImplicitProducerKVP& operator=(ImplicitProducerKVP&& other) MOODYCAMEL_NOEXCEPT
-		{
-			swap(other);
-			return *this;
-		}
-		
-		inline void swap(ImplicitProducerKVP& other) MOODYCAMEL_NOEXCEPT
-		{
-			if (this != &other) {
-				details::swap_relaxed(key, other.key);
-				std::swap(value, other.value);
-			}
-		}
-	};
-	
-	template<typename XT, typename XTraits>
-	friend void moodycamel::swap(typename ConcurrentQueue<XT, XTraits>::ImplicitProducerKVP&, typename ConcurrentQueue<XT, XTraits>::ImplicitProducerKVP&) MOODYCAMEL_NOEXCEPT;
-	
-	struct ImplicitProducerHash
-	{
-		size_t capacity;
-		ImplicitProducerKVP* entries;
-		ImplicitProducerHash* prev;
-	};
-	
-	inline void populate_initial_implicit_producer_hash()
-	{
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) {
-			return;
-		}
-		else {
-			implicitProducerHashCount.store(0, std::memory_order_relaxed);
-			auto hash = &initialImplicitProducerHash;
-			hash->capacity = INITIAL_IMPLICIT_PRODUCER_HASH_SIZE;
-			hash->entries = &initialImplicitProducerHashEntries[0];
-			for (size_t i = 0; i != INITIAL_IMPLICIT_PRODUCER_HASH_SIZE; ++i) {
-				initialImplicitProducerHashEntries[i].key.store(details::invalid_thread_id, std::memory_order_relaxed);
-			}
-			hash->prev = nullptr;
-			implicitProducerHash.store(hash, std::memory_order_relaxed);
-		}
-	}
-	
-	void swap_implicit_producer_hashes(ConcurrentQueue& other)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (INITIAL_IMPLICIT_PRODUCER_HASH_SIZE == 0) {
-			return;
-		}
-		else {
-			// Swap (assumes our implicit producer hash is initialized)
-			initialImplicitProducerHashEntries.swap(other.initialImplicitProducerHashEntries);
-			initialImplicitProducerHash.entries = &initialImplicitProducerHashEntries[0];
-			other.initialImplicitProducerHash.entries = &other.initialImplicitProducerHashEntries[0];
-			
-			details::swap_relaxed(implicitProducerHashCount, other.implicitProducerHashCount);
-			
-			details::swap_relaxed(implicitProducerHash, other.implicitProducerHash);
-			if (implicitProducerHash.load(std::memory_order_relaxed) == &other.initialImplicitProducerHash) {
-				implicitProducerHash.store(&initialImplicitProducerHash, std::memory_order_relaxed);
-			}
-			else {
-				ImplicitProducerHash* hash;
-				for (hash = implicitProducerHash.load(std::memory_order_relaxed); hash->prev != &other.initialImplicitProducerHash; hash = hash->prev) {
-					continue;
-				}
-				hash->prev = &initialImplicitProducerHash;
-			}
-			if (other.implicitProducerHash.load(std::memory_order_relaxed) == &initialImplicitProducerHash) {
-				other.implicitProducerHash.store(&other.initialImplicitProducerHash, std::memory_order_relaxed);
-			}
-			else {
-				ImplicitProducerHash* hash;
-				for (hash = other.implicitProducerHash.load(std::memory_order_relaxed); hash->prev != &initialImplicitProducerHash; hash = hash->prev) {
-					continue;
-				}
-				hash->prev = &other.initialImplicitProducerHash;
-			}
-		}
-	}
-	
-	// Only fails (returns nullptr) if memory allocation fails
-	ImplicitProducer* get_or_add_implicit_producer()
-	{
-		// Note that since the data is essentially thread-local (key is thread ID),
-		// there's a reduced need for fences (memory ordering is already consistent
-		// for any individual thread), except for the current table itself.
-		
-		// Start by looking for the thread ID in the current and all previous hash tables.
-		// If it's not found, it must not be in there yet, since this same thread would
-		// have added it previously to one of the tables that we traversed.
-		
-		// Code and algorithm adapted from http://preshing.com/20130605/the-worlds-simplest-lock-free-hash-table
-		
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
-		debug::DebugLock lock(implicitProdMutex);
-#endif
-		
-		auto id = details::thread_id();
-		auto hashedId = details::hash_thread_id(id);
-		
-		auto mainHash = implicitProducerHash.load(std::memory_order_acquire);
-		assert(mainHash != nullptr);  // silence clang-tidy and MSVC warnings (hash cannot be null)
-		for (auto hash = mainHash; hash != nullptr; hash = hash->prev) {
-			// Look for the id in this hash
-			auto index = hashedId;
-			while (true) {		// Not an infinite loop because at least one slot is free in the hash table
-				index &= hash->capacity - 1u;
-				
-				auto probedKey = hash->entries[index].key.load(std::memory_order_relaxed);
-				if (probedKey == id) {
-					// Found it! If we had to search several hashes deep, though, we should lazily add it
-					// to the current main hash table to avoid the extended search next time.
-					// Note there's guaranteed to be room in the current hash table since every subsequent
-					// table implicitly reserves space for all previous tables (there's only one
-					// implicitProducerHashCount).
-					auto value = hash->entries[index].value;
-					if (hash != mainHash) {
-						index = hashedId;
-						while (true) {
-							index &= mainHash->capacity - 1u;
-							auto empty = details::invalid_thread_id;
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-							auto reusable = details::invalid_thread_id2;
-							if (mainHash->entries[index].key.compare_exchange_strong(empty,    id, std::memory_order_seq_cst, std::memory_order_relaxed) ||
-								mainHash->entries[index].key.compare_exchange_strong(reusable, id, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-#else
-							if (mainHash->entries[index].key.compare_exchange_strong(empty,    id, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-#endif
-								mainHash->entries[index].value = value;
-								break;
-							}
-							++index;
-						}
-					}
-					
-					return value;
-				}
-				if (probedKey == details::invalid_thread_id) {
-					break;		// Not in this hash table
-				}
-				++index;
-			}
-		}
-		
-		// Insert!
-		auto newCount = 1 + implicitProducerHashCount.fetch_add(1, std::memory_order_relaxed);
-		while (true) {
-			// NOLINTNEXTLINE(clang-analyzer-core.NullDereference)
-			if (newCount >= (mainHash->capacity >> 1) && !implicitProducerHashResizeInProgress.test_and_set(std::memory_order_acquire)) {
-				// We've acquired the resize lock, try to allocate a bigger hash table.
-				// Note the acquire fence synchronizes with the release fence at the end of this block, and hence when
-				// we reload implicitProducerHash it must be the most recent version (it only gets changed within this
-				// locked block).
-				mainHash = implicitProducerHash.load(std::memory_order_acquire);
-				if (newCount >= (mainHash->capacity >> 1)) {
-					size_t newCapacity = mainHash->capacity << 1;
-					while (newCount >= (newCapacity >> 1)) {
-						newCapacity <<= 1;
-					}
-					auto raw = static_cast<char*>((Traits::malloc)(sizeof(ImplicitProducerHash) + std::alignment_of<ImplicitProducerKVP>::value - 1 + sizeof(ImplicitProducerKVP) * newCapacity));
-					if (raw == nullptr) {
-						// Allocation failed
-						implicitProducerHashCount.fetch_sub(1, std::memory_order_relaxed);
-						implicitProducerHashResizeInProgress.clear(std::memory_order_relaxed);
-						return nullptr;
-					}
-					
-					auto newHash = new (raw) ImplicitProducerHash;
-					newHash->capacity = static_cast<size_t>(newCapacity);
-					newHash->entries = reinterpret_cast<ImplicitProducerKVP*>(details::align_for<ImplicitProducerKVP>(raw + sizeof(ImplicitProducerHash)));
-					for (size_t i = 0; i != newCapacity; ++i) {
-						new (newHash->entries + i) ImplicitProducerKVP;
-						newHash->entries[i].key.store(details::invalid_thread_id, std::memory_order_relaxed);
-					}
-					newHash->prev = mainHash;
-					implicitProducerHash.store(newHash, std::memory_order_release);
-					implicitProducerHashResizeInProgress.clear(std::memory_order_release);
-					mainHash = newHash;
-				}
-				else {
-					implicitProducerHashResizeInProgress.clear(std::memory_order_release);
-				}
-			}
-			
-			// If it's < three-quarters full, add to the old one anyway so that we don't have to wait for the next table
-			// to finish being allocated by another thread (and if we just finished allocating above, the condition will
-			// always be true)
-			if (newCount < (mainHash->capacity >> 1) + (mainHash->capacity >> 2)) {
-				auto producer = static_cast<ImplicitProducer*>(recycle_or_create_producer(false));
-				if (producer == nullptr) {
-					implicitProducerHashCount.fetch_sub(1, std::memory_order_relaxed);
-					return nullptr;
-				}
-				
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-				producer->threadExitListener.callback = &ConcurrentQueue::implicit_producer_thread_exited_callback;
-				producer->threadExitListener.userData = producer;
-				details::ThreadExitNotifier::subscribe(&producer->threadExitListener);
-#endif
-				
-				auto index = hashedId;
-				while (true) {
-					index &= mainHash->capacity - 1u;
-					auto empty = details::invalid_thread_id;
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-					auto reusable = details::invalid_thread_id2;
-					if (mainHash->entries[index].key.compare_exchange_strong(reusable, id, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-						implicitProducerHashCount.fetch_sub(1, std::memory_order_relaxed);  // already counted as a used slot
-						mainHash->entries[index].value = producer;
-						break;
-					}
-#endif
-					if (mainHash->entries[index].key.compare_exchange_strong(empty,    id, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-						mainHash->entries[index].value = producer;
-						break;
-					}
-					++index;
-				}
-				return producer;
-			}
-			
-			// Hmm, the old hash is quite full and somebody else is busy allocating a new one.
-			// We need to wait for the allocating thread to finish (if it succeeds, we add, if not,
-			// we try to allocate ourselves).
-			mainHash = implicitProducerHash.load(std::memory_order_acquire);
-		}
-	}
-	
-#ifdef MOODYCAMEL_CPP11_THREAD_LOCAL_SUPPORTED
-	void implicit_producer_thread_exited(ImplicitProducer* producer)
-	{
-		// Remove from hash
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
-		debug::DebugLock lock(implicitProdMutex);
-#endif
-		auto hash = implicitProducerHash.load(std::memory_order_acquire);
-		assert(hash != nullptr);		// The thread exit listener is only registered if we were added to a hash in the first place
-		auto id = details::thread_id();
-		auto hashedId = details::hash_thread_id(id);
-		details::thread_id_t probedKey;
-		
-		// We need to traverse all the hashes just in case other threads aren't on the current one yet and are
-		// trying to add an entry thinking there's a free slot (because they reused a producer)
-		for (; hash != nullptr; hash = hash->prev) {
-			auto index = hashedId;
-			do {
-				index &= hash->capacity - 1u;
-				probedKey = id;
-				if (hash->entries[index].key.compare_exchange_strong(probedKey, details::invalid_thread_id2, std::memory_order_seq_cst, std::memory_order_relaxed)) {
-					break;
-				}
-				++index;
-			} while (probedKey != details::invalid_thread_id);		// Can happen if the hash has changed but we weren't put back in it yet, or if we weren't added to this hash in the first place
-		}
-		
-		// Mark the queue as being recyclable
-		producer->inactive.store(true, std::memory_order_release);
-	}
-	
-	static void implicit_producer_thread_exited_callback(void* userData)
-	{
-		auto producer = static_cast<ImplicitProducer*>(userData);
-		auto queue = producer->parent;
-		queue->implicit_producer_thread_exited(producer);
-	}
-#endif
-	
-	//////////////////////////////////
-	// Utility functions
-	//////////////////////////////////
-
-	template<typename TAlign>
-	static inline void* aligned_malloc(size_t size)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (std::alignment_of<TAlign>::value <= std::alignment_of<details::max_align_t>::value)
-			return (Traits::malloc)(size);
-		else {
-			size_t alignment = std::alignment_of<TAlign>::value;
-			void* raw = (Traits::malloc)(size + alignment - 1 + sizeof(void*));
-			if (!raw)
-				return nullptr;
-			char* ptr = details::align_for<TAlign>(reinterpret_cast<char*>(raw) + sizeof(void*));
-			*(reinterpret_cast<void**>(ptr) - 1) = raw;
-			return ptr;
-		}
-	}
-
-	template<typename TAlign>
-	static inline void aligned_free(void* ptr)
-	{
-		MOODYCAMEL_CONSTEXPR_IF (std::alignment_of<TAlign>::value <= std::alignment_of<details::max_align_t>::value)
-			return (Traits::free)(ptr);
-		else
-			(Traits::free)(ptr ? *(reinterpret_cast<void**>(ptr) - 1) : nullptr);
-	}
-
-	template<typename U>
-	static inline U* create_array(size_t count)
-	{
-		assert(count > 0);
-		U* p = static_cast<U*>(aligned_malloc<U>(sizeof(U) * count));
-		if (p == nullptr)
-			return nullptr;
-
-		for (size_t i = 0; i != count; ++i)
-			new (p + i) U();
-		return p;
-	}
-
-	template<typename U>
-	static inline void destroy_array(U* p, size_t count)
-	{
-		if (p != nullptr) {
-			assert(count > 0);
-			for (size_t i = count; i != 0; )
-				(p + --i)->~U();
-		}
-		aligned_free<U>(p);
-	}
-
-	template<typename U>
-	static inline U* create()
-	{
-		void* p = aligned_malloc<U>(sizeof(U));
-		return p != nullptr ? new (p) U : nullptr;
-	}
-
-	template<typename U, typename A1>
-	static inline U* create(A1&& a1)
-	{
-		void* p = aligned_malloc<U>(sizeof(U));
-		return p != nullptr ? new (p) U(std::forward<A1>(a1)) : nullptr;
-	}
-
-	template<typename U>
-	static inline void destroy(U* p)
-	{
-		if (p != nullptr)
-			p->~U();
-		aligned_free<U>(p);
-	}
-
-private:
-	std::atomic<ProducerBase*> producerListTail;
-	std::atomic<std::uint32_t> producerCount;
-	
-	std::atomic<size_t> initialBlockPoolIndex;
-	Block* initialBlockPool;
-	size_t initialBlockPoolSize;
-	
-#ifndef MCDBGQ_USEDEBUGFREELIST
-	FreeList<Block> freeList;
-#else
-	debug::DebugFreeList<Block> freeList;
-#endif
-	
-	std::atomic<ImplicitProducerHash*> implicitProducerHash;
-	std::atomic<size_t> implicitProducerHashCount;		// Number of slots logically used
-	ImplicitProducerHash initialImplicitProducerHash;
-	std::array<ImplicitProducerKVP, INITIAL_IMPLICIT_PRODUCER_HASH_SIZE> initialImplicitProducerHashEntries;
-	std::atomic_flag implicitProducerHashResizeInProgress;
-	
-	std::atomic<std::uint32_t> nextExplicitConsumerId;
-	std::atomic<std::uint32_t> globalExplicitConsumerOffset;
-	
-#ifdef MCDBGQ_NOLOCKFREE_IMPLICITPRODHASH
-	debug::DebugMutex implicitProdMutex;
-#endif
-	
-#ifdef MOODYCAMEL_QUEUE_INTERNAL_DEBUG
-	std::atomic<ExplicitProducer*> explicitProducers;
-	std::atomic<ImplicitProducer*> implicitProducers;
-#endif
-};
-
-
-template<typename T, typename Traits>
-ProducerToken::ProducerToken(ConcurrentQueue<T, Traits>& queue)
-	: producer(queue.recycle_or_create_producer(true))
-{
-	if (producer != nullptr) {
-		producer->token = this;
-	}
-}
-
-template<typename T, typename Traits>
-ProducerToken::ProducerToken(BlockingConcurrentQueue<T, Traits>& queue)
-	: producer(reinterpret_cast<ConcurrentQueue<T, Traits>*>(&queue)->recycle_or_create_producer(true))
-{
-	if (producer != nullptr) {
-		producer->token = this;
-	}
-}
-
-template<typename T, typename Traits>
-ConsumerToken::ConsumerToken(ConcurrentQueue<T, Traits>& queue)
-	: itemsConsumedFromCurrent(0), currentProducer(nullptr), desiredProducer(nullptr)
-{
-	initialOffset = queue.nextExplicitConsumerId.fetch_add(1, std::memory_order_release);
-	lastKnownGlobalOffset = static_cast<std::uint32_t>(-1);
-}
-
-template<typename T, typename Traits>
-ConsumerToken::ConsumerToken(BlockingConcurrentQueue<T, Traits>& queue)
-	: itemsConsumedFromCurrent(0), currentProducer(nullptr), desiredProducer(nullptr)
-{
-	initialOffset = reinterpret_cast<ConcurrentQueue<T, Traits>*>(&queue)->nextExplicitConsumerId.fetch_add(1, std::memory_order_release);
-	lastKnownGlobalOffset = static_cast<std::uint32_t>(-1);
-}
-
-template<typename T, typename Traits>
-inline void swap(ConcurrentQueue<T, Traits>& a, ConcurrentQueue<T, Traits>& b) MOODYCAMEL_NOEXCEPT
-{
-	a.swap(b);
-}
-
-inline void swap(ProducerToken& a, ProducerToken& b) MOODYCAMEL_NOEXCEPT
-{
-	a.swap(b);
-}
-
-inline void swap(ConsumerToken& a, ConsumerToken& b) MOODYCAMEL_NOEXCEPT
-{
-	a.swap(b);
-}
-
-template<typename T, typename Traits>
-inline void swap(typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& a, typename ConcurrentQueue<T, Traits>::ImplicitProducerKVP& b) MOODYCAMEL_NOEXCEPT
-{
-	a.swap(b);
-}
-
-}
-
-#if defined(_MSC_VER) && (!defined(_HAS_CXX17) || !_HAS_CXX17)
-#pragma warning(pop)
-#endif
-
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
-#pragma GCC diagnostic pop
-#endif
diff --git a/lib/concurrentqueue/lightweightsemaphore.h b/lib/concurrentqueue/lightweightsemaphore.h
deleted file mode 100644
index 41ba094..0000000
--- a/lib/concurrentqueue/lightweightsemaphore.h
+++ /dev/null
@@ -1,425 +0,0 @@
-// Provides an efficient implementation of a semaphore (LightweightSemaphore).
-// This is an extension of Jeff Preshing's sempahore implementation (licensed 
-// under the terms of its separate zlib license) that has been adapted and
-// extended by Cameron Desrochers.
-
-#pragma once
-
-#include <cstddef> // For std::size_t
-#include <atomic>
-#include <type_traits> // For std::make_signed<T>
-
-#if defined(_WIN32)
-// Avoid including windows.h in a header; we only need a handful of
-// items, so we'll redeclare them here (this is relatively safe since
-// the API generally has to remain stable between Windows versions).
-// I know this is an ugly hack but it still beats polluting the global
-// namespace with thousands of generic names or adding a .cpp for nothing.
-extern "C" {
-	struct _SECURITY_ATTRIBUTES;
-	__declspec(dllimport) void* __stdcall CreateSemaphoreW(_SECURITY_ATTRIBUTES* lpSemaphoreAttributes, long lInitialCount, long lMaximumCount, const wchar_t* lpName);
-	__declspec(dllimport) int __stdcall CloseHandle(void* hObject);
-	__declspec(dllimport) unsigned long __stdcall WaitForSingleObject(void* hHandle, unsigned long dwMilliseconds);
-	__declspec(dllimport) int __stdcall ReleaseSemaphore(void* hSemaphore, long lReleaseCount, long* lpPreviousCount);
-}
-#elif defined(__MACH__)
-#include <mach/mach.h>
-#elif defined(__unix__)
-#include <semaphore.h>
-
-#if defined(__GLIBC_PREREQ) && defined(_GNU_SOURCE)
-#if __GLIBC_PREREQ(2,30)
-#define MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
-#endif
-#endif
-#endif
-
-namespace moodycamel
-{
-namespace details
-{
-
-// Code in the mpmc_sema namespace below is an adaptation of Jeff Preshing's
-// portable + lightweight semaphore implementations, originally from
-// https://github.com/preshing/cpp11-on-multicore/blob/master/common/sema.h
-// LICENSE:
-// Copyright (c) 2015 Jeff Preshing
-//
-// This software is provided 'as-is', without any express or implied
-// warranty. In no event will the authors be held liable for any damages
-// arising from the use of this software.
-//
-// Permission is granted to anyone to use this software for any purpose,
-// including commercial applications, and to alter it and redistribute it
-// freely, subject to the following restrictions:
-//
-// 1. The origin of this software must not be misrepresented; you must not
-//	claim that you wrote the original software. If you use this software
-//	in a product, an acknowledgement in the product documentation would be
-//	appreciated but is not required.
-// 2. Altered source versions must be plainly marked as such, and must not be
-//	misrepresented as being the original software.
-// 3. This notice may not be removed or altered from any source distribution.
-#if defined(_WIN32)
-class Semaphore
-{
-private:
-	void* m_hSema;
-	
-	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-public:
-	Semaphore(int initialCount = 0)
-	{
-		assert(initialCount >= 0);
-		const long maxLong = 0x7fffffff;
-		m_hSema = CreateSemaphoreW(nullptr, initialCount, maxLong, nullptr);
-		assert(m_hSema);
-	}
-
-	~Semaphore()
-	{
-		CloseHandle(m_hSema);
-	}
-
-	bool wait()
-	{
-		const unsigned long infinite = 0xffffffff;
-		return WaitForSingleObject(m_hSema, infinite) == 0;
-	}
-	
-	bool try_wait()
-	{
-		return WaitForSingleObject(m_hSema, 0) == 0;
-	}
-	
-	bool timed_wait(std::uint64_t usecs)
-	{
-		return WaitForSingleObject(m_hSema, (unsigned long)(usecs / 1000)) == 0;
-	}
-
-	void signal(int count = 1)
-	{
-		while (!ReleaseSemaphore(m_hSema, count, nullptr));
-	}
-};
-#elif defined(__MACH__)
-//---------------------------------------------------------
-// Semaphore (Apple iOS and OSX)
-// Can't use POSIX semaphores due to http://lists.apple.com/archives/darwin-kernel/2009/Apr/msg00010.html
-//---------------------------------------------------------
-class Semaphore
-{
-private:
-	semaphore_t m_sema;
-
-	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-public:
-	Semaphore(int initialCount = 0)
-	{
-		assert(initialCount >= 0);
-		kern_return_t rc = semaphore_create(mach_task_self(), &m_sema, SYNC_POLICY_FIFO, initialCount);
-		assert(rc == KERN_SUCCESS);
-		(void)rc;
-	}
-
-	~Semaphore()
-	{
-		semaphore_destroy(mach_task_self(), m_sema);
-	}
-
-	bool wait()
-	{
-		return semaphore_wait(m_sema) == KERN_SUCCESS;
-	}
-	
-	bool try_wait()
-	{
-		return timed_wait(0);
-	}
-	
-	bool timed_wait(std::uint64_t timeout_usecs)
-	{
-		mach_timespec_t ts;
-		ts.tv_sec = static_cast<unsigned int>(timeout_usecs / 1000000);
-		ts.tv_nsec = static_cast<int>((timeout_usecs % 1000000) * 1000);
-
-		// added in OSX 10.10: https://developer.apple.com/library/prerelease/mac/documentation/General/Reference/APIDiffsMacOSX10_10SeedDiff/modules/Darwin.html
-		kern_return_t rc = semaphore_timedwait(m_sema, ts);
-		return rc == KERN_SUCCESS;
-	}
-
-	void signal()
-	{
-		while (semaphore_signal(m_sema) != KERN_SUCCESS);
-	}
-
-	void signal(int count)
-	{
-		while (count-- > 0)
-		{
-			while (semaphore_signal(m_sema) != KERN_SUCCESS);
-		}
-	}
-};
-#elif defined(__unix__)
-//---------------------------------------------------------
-// Semaphore (POSIX, Linux)
-//---------------------------------------------------------
-class Semaphore
-{
-private:
-	sem_t m_sema;
-
-	Semaphore(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-	Semaphore& operator=(const Semaphore& other) MOODYCAMEL_DELETE_FUNCTION;
-
-public:
-	Semaphore(int initialCount = 0)
-	{
-		assert(initialCount >= 0);
-		int rc = sem_init(&m_sema, 0, static_cast<unsigned int>(initialCount));
-		assert(rc == 0);
-		(void)rc;
-	}
-
-	~Semaphore()
-	{
-		sem_destroy(&m_sema);
-	}
-
-	bool wait()
-	{
-		// http://stackoverflow.com/questions/2013181/gdb-causes-sem-wait-to-fail-with-eintr-error
-		int rc;
-		do {
-			rc = sem_wait(&m_sema);
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	bool try_wait()
-	{
-		int rc;
-		do {
-			rc = sem_trywait(&m_sema);
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	bool timed_wait(std::uint64_t usecs)
-	{
-		struct timespec ts;
-		const int usecs_in_1_sec = 1000000;
-		const int nsecs_in_1_sec = 1000000000;
-#ifdef MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
-		clock_gettime(CLOCK_MONOTONIC, &ts);
-#else
-		clock_gettime(CLOCK_REALTIME, &ts);
-#endif
-		ts.tv_sec += (time_t)(usecs / usecs_in_1_sec);
-		ts.tv_nsec += (long)(usecs % usecs_in_1_sec) * 1000;
-		// sem_timedwait bombs if you have more than 1e9 in tv_nsec
-		// so we have to clean things up before passing it in
-		if (ts.tv_nsec >= nsecs_in_1_sec) {
-			ts.tv_nsec -= nsecs_in_1_sec;
-			++ts.tv_sec;
-		}
-
-		int rc;
-		do {
-#ifdef MOODYCAMEL_LIGHTWEIGHTSEMAPHORE_MONOTONIC
-			rc = sem_clockwait(&m_sema, CLOCK_MONOTONIC, &ts);
-#else
-			rc = sem_timedwait(&m_sema, &ts);
-#endif
-		} while (rc == -1 && errno == EINTR);
-		return rc == 0;
-	}
-
-	void signal()
-	{
-		while (sem_post(&m_sema) == -1);
-	}
-
-	void signal(int count)
-	{
-		while (count-- > 0)
-		{
-			while (sem_post(&m_sema) == -1);
-		}
-	}
-};
-#else
-#error Unsupported platform! (No semaphore wrapper available)
-#endif
-
-}	// end namespace details
-
-
-//---------------------------------------------------------
-// LightweightSemaphore
-//---------------------------------------------------------
-class LightweightSemaphore
-{
-public:
-	typedef std::make_signed<std::size_t>::type ssize_t;
-
-private:
-	std::atomic<ssize_t> m_count;
-	details::Semaphore m_sema;
-	int m_maxSpins;
-
-	bool waitWithPartialSpinning(std::int64_t timeout_usecs = -1)
-	{
-		ssize_t oldCount;
-		int spin = m_maxSpins;
-		while (--spin >= 0)
-		{
-			oldCount = m_count.load(std::memory_order_relaxed);
-			if ((oldCount > 0) && m_count.compare_exchange_strong(oldCount, oldCount - 1, std::memory_order_acquire, std::memory_order_relaxed))
-				return true;
-			std::atomic_signal_fence(std::memory_order_acquire);	 // Prevent the compiler from collapsing the loop.
-		}
-		oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
-		if (oldCount > 0)
-			return true;
-		if (timeout_usecs < 0)
-		{
-			if (m_sema.wait())
-				return true;
-		}
-		if (timeout_usecs > 0 && m_sema.timed_wait((std::uint64_t)timeout_usecs))
-			return true;
-		// At this point, we've timed out waiting for the semaphore, but the
-		// count is still decremented indicating we may still be waiting on
-		// it. So we have to re-adjust the count, but only if the semaphore
-		// wasn't signaled enough times for us too since then. If it was, we
-		// need to release the semaphore too.
-		while (true)
-		{
-			oldCount = m_count.load(std::memory_order_acquire);
-			if (oldCount >= 0 && m_sema.try_wait())
-				return true;
-			if (oldCount < 0 && m_count.compare_exchange_strong(oldCount, oldCount + 1, std::memory_order_relaxed, std::memory_order_relaxed))
-				return false;
-		}
-	}
-
-	ssize_t waitManyWithPartialSpinning(ssize_t max, std::int64_t timeout_usecs = -1)
-	{
-		assert(max > 0);
-		ssize_t oldCount;
-		int spin = m_maxSpins;
-		while (--spin >= 0)
-		{
-			oldCount = m_count.load(std::memory_order_relaxed);
-			if (oldCount > 0)
-			{
-				ssize_t newCount = oldCount > max ? oldCount - max : 0;
-				if (m_count.compare_exchange_strong(oldCount, newCount, std::memory_order_acquire, std::memory_order_relaxed))
-					return oldCount - newCount;
-			}
-			std::atomic_signal_fence(std::memory_order_acquire);
-		}
-		oldCount = m_count.fetch_sub(1, std::memory_order_acquire);
-		if (oldCount <= 0)
-		{
-			if ((timeout_usecs == 0) || (timeout_usecs < 0 && !m_sema.wait()) || (timeout_usecs > 0 && !m_sema.timed_wait((std::uint64_t)timeout_usecs)))
-			{
-				while (true)
-				{
-					oldCount = m_count.load(std::memory_order_acquire);
-					if (oldCount >= 0 && m_sema.try_wait())
-						break;
-					if (oldCount < 0 && m_count.compare_exchange_strong(oldCount, oldCount + 1, std::memory_order_relaxed, std::memory_order_relaxed))
-						return 0;
-				}
-			}
-		}
-		if (max > 1)
-			return 1 + tryWaitMany(max - 1);
-		return 1;
-	}
-
-public:
-	LightweightSemaphore(ssize_t initialCount = 0, int maxSpins = 10000) : m_count(initialCount), m_maxSpins(maxSpins)
-	{
-		assert(initialCount >= 0);
-		assert(maxSpins >= 0);
-	}
-
-	bool tryWait()
-	{
-		ssize_t oldCount = m_count.load(std::memory_order_relaxed);
-		while (oldCount > 0)
-		{
-			if (m_count.compare_exchange_weak(oldCount, oldCount - 1, std::memory_order_acquire, std::memory_order_relaxed))
-				return true;
-		}
-		return false;
-	}
-
-	bool wait()
-	{
-		return tryWait() || waitWithPartialSpinning();
-	}
-
-	bool wait(std::int64_t timeout_usecs)
-	{
-		return tryWait() || waitWithPartialSpinning(timeout_usecs);
-	}
-
-	// Acquires between 0 and (greedily) max, inclusive
-	ssize_t tryWaitMany(ssize_t max)
-	{
-		assert(max >= 0);
-		ssize_t oldCount = m_count.load(std::memory_order_relaxed);
-		while (oldCount > 0)
-		{
-			ssize_t newCount = oldCount > max ? oldCount - max : 0;
-			if (m_count.compare_exchange_weak(oldCount, newCount, std::memory_order_acquire, std::memory_order_relaxed))
-				return oldCount - newCount;
-		}
-		return 0;
-	}
-
-	// Acquires at least one, and (greedily) at most max
-	ssize_t waitMany(ssize_t max, std::int64_t timeout_usecs)
-	{
-		assert(max >= 0);
-		ssize_t result = tryWaitMany(max);
-		if (result == 0 && max > 0)
-			result = waitManyWithPartialSpinning(max, timeout_usecs);
-		return result;
-	}
-	
-	ssize_t waitMany(ssize_t max)
-	{
-		ssize_t result = waitMany(max, -1);
-		assert(result > 0);
-		return result;
-	}
-
-	void signal(ssize_t count = 1)
-	{
-		assert(count >= 0);
-		ssize_t oldCount = m_count.fetch_add(count, std::memory_order_release);
-		ssize_t toRelease = -oldCount < count ? -oldCount : count;
-		if (toRelease > 0)
-		{
-			m_sema.signal((int)toRelease);
-		}
-	}
-	
-	std::size_t availableApprox() const
-	{
-		ssize_t count = m_count.load(std::memory_order_relaxed);
-		return count > 0 ? static_cast<std::size_t>(count) : 0;
-	}
-};
-
-}   // end namespace moodycamel
diff --git a/lib/freetype-windows-binaries b/lib/freetype-windows-binaries
deleted file mode 160000
index d6fb49d..0000000
--- a/lib/freetype-windows-binaries
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d6fb49d11a9d0011bf4ecfe7e570beaaa189838a
diff --git a/lib/lunasvg b/lib/lunasvg
deleted file mode 160000
index 4166d0c..0000000
--- a/lib/lunasvg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4166d0cccfc059b39d5ecfc372524375e59448f9
diff --git a/lib/rt64 b/lib/rt64
index 23cab60..5473732 160000
--- a/lib/rt64
+++ b/lib/rt64
@@ -1 +1 @@
-Subproject commit 23cab603c4f9f4a8b369b38e036f1aa484603878
+Subproject commit 5473732a822a4423b5696e7cb18fecc425a59875
diff --git a/patches/camera_transform_tagging.c b/patches/camera_transform_tagging.c
index 60f0d00..d8011f5 100644
--- a/patches/camera_transform_tagging.c
+++ b/patches/camera_transform_tagging.c
@@ -246,16 +246,20 @@ RECOMP_PATCH void View_Apply(View* view, s32 mask) {
     if (interpolate_camera) {
         // Simple interpolation works much better for cameras because they orbit around a focus.
         gEXMatrixGroupSimple(POLY_OPA_DISP++, CAMERA_TRANSFORM_ID, G_EX_NOPUSH, G_MTX_PROJECTION,
-            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
         gEXMatrixGroupSimple(POLY_XLU_DISP++, CAMERA_TRANSFORM_ID, G_EX_NOPUSH, G_MTX_PROJECTION,
-            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
     }
     else {
         // Skip interpolation for this frame.
         gEXMatrixGroupSimple(POLY_OPA_DISP++, CAMERA_TRANSFORM_ID, G_EX_NOPUSH, G_MTX_PROJECTION,
-            G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+            G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+            G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP);
         gEXMatrixGroupSimple(POLY_XLU_DISP++, CAMERA_TRANSFORM_ID, G_EX_NOPUSH, G_MTX_PROJECTION,
-            G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+            G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+            G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP);
     }
 
     // Record whether the camera was skipped for later use.
diff --git a/patches/effect_patches.c b/patches/effect_patches.c
index f267ff8..da0162f 100644
--- a/patches/effect_patches.c
+++ b/patches/effect_patches.c
@@ -179,9 +179,11 @@ RECOMP_PATCH void TransitionCircle_LoadAndSetTexture(Gfx** gfxp, TexturePtr text
     gEXPushProjectionMatrix(gfx++);
     gEXPushGeometryMode(gfx++);
     gEXMatrixGroupSimple(gfx++, CIRCLE_OVERLAY_TRANSFORM_PROJECTION_ID, G_EX_PUSH, G_MTX_PROJECTION,
-        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
     gEXMatrixGroupSimple(gfx++, CIRCLE_OVERLAY_TRANSFORM_ID, G_EX_PUSH, G_MTX_MODELVIEW,
-        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
 
     // @recomp Allocate a matrix and vertices in the displaylist because there's no handle to the GfxContext here.
     Mtx* ortho_matrix = (Mtx*)(gfx + 1);
diff --git a/patches/effect_transform_tagging.c b/patches/effect_transform_tagging.c
index 6ce4b7b..e039bb2 100644
--- a/patches/effect_transform_tagging.c
+++ b/patches/effect_transform_tagging.c
@@ -312,11 +312,13 @@ static inline void tag_skip_effect(GraphicsContext* gfxCtx, u32 id) {
 
     gEXMatrixGroupSimple(POLY_OPA_DISP++, id, G_EX_PUSH, G_MTX_MODELVIEW,
         G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP,
-        G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+        G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+        G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP);
     
     gEXMatrixGroupSimple(POLY_XLU_DISP++, id + EFFECT_TRANSFORM_ID_COUNT, G_EX_PUSH, G_MTX_MODELVIEW,
         G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP,
-        G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+        G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+        G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP);
 
     CLOSE_DISPS();
 }
diff --git a/patches/item_transform_tagging.c b/patches/item_transform_tagging.c
index 3f63edb..fd2c9f1 100644
--- a/patches/item_transform_tagging.c
+++ b/patches/item_transform_tagging.c
@@ -47,7 +47,8 @@ RECOMP_PATCH void ArmsHook_Draw(Actor* thisx, PlayState* play) {
         // @recomp Tag the matrices for the hookshot tip and chain.
         u32 cur_transform_id = actor_transform_id(thisx);
         gEXMatrixGroupSimple(POLY_OPA_DISP++, cur_transform_id, G_EX_PUSH, G_MTX_MODELVIEW,
-            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
     
         gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
         gSPDisplayList(POLY_OPA_DISP++, object_link_child_DL_01D960);
@@ -106,7 +107,8 @@ RECOMP_PATCH void Player_DrawHookshotReticle(PlayState* play, Player* player, f3
 
             // @recomp Tag the reticle's transform.
             gEXMatrixGroupSimple(OVERLAY_DISP++, HOOKSHOT_RETICLE_TRANSFORM_ID, G_EX_PUSH, G_MTX_MODELVIEW,
-            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
 
             gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
 
@@ -172,7 +174,8 @@ RECOMP_PATCH void Player_DrawGameplay(PlayState* play, Player* this, s32 lod, Gf
             gSPBranchList(enddl_command, bowstring_end_hook_dl);
             // Write the transform tag command. Use simple interpolation to avoid issues from decomposition failure due to a scale of zero.
             gEXMatrixGroupSimple(&bowstring_start_hook_dl[1], BOWSTRING_TRANSFORM_ID, G_EX_PUSH, G_MTX_MODELVIEW,
-                G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+                G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+                G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
             // Write the pop group command.
             gEXPopMatrixGroup(&bowstring_end_hook_dl[0], G_MTX_MODELVIEW);
         }
diff --git a/patches/patches.h b/patches/patches.h
index ec31b88..07f1495 100644
--- a/patches/patches.h
+++ b/patches/patches.h
@@ -45,28 +45,28 @@
 #endif
 
 #define gEXMatrixGroupNoInterpolation(cmd, push, proj, edit) \
-    gEXMatrixGroup(cmd, G_EX_ID_IGNORE, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, edit)
+    gEXMatrixGroup(cmd, G_EX_ID_IGNORE, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, edit, G_EX_ASPECT_AUTO, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP)
 
 #define gEXMatrixGroupInterpolateOnlyTiles(cmd, push, proj, edit) \
-    gEXMatrixGroup(cmd, G_EX_ID_IGNORE, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
+    gEXMatrixGroup(cmd, G_EX_ID_IGNORE, G_EX_INTERPOLATE_SIMPLE, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_ASPECT_AUTO, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP)
 
 #define gEXMatrixGroupDecomposedNormal(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_AUTO)
 
 #define gEXMatrixGroupDecomposedSkipRot(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_AUTO)
 
 #define gEXMatrixGroupDecomposedSkipPosRot(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_AUTO)
 
 #define gEXMatrixGroupDecomposedSkipAll(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP)
 
 #define gEXMatrixGroupDecomposedVerts(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, edit, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_AUTO)
 
 #define gEXMatrixGroupDecomposedVertsOrderAuto(cmd, id, push, proj, edit) \
-    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_AUTO, edit)
+    gEXMatrixGroupDecomposed(cmd, id, push, proj, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_AUTO, edit, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_AUTO)
 
 
 int recomp_printf(const char* fmt, ...);
diff --git a/patches/recompui_event_structs.h b/patches/recompui_event_structs.h
index 914160d..e2f91bc 100644
--- a/patches/recompui_event_structs.h
+++ b/patches/recompui_event_structs.h
@@ -1,7 +1,7 @@
 #ifndef __UI_FUNCS_H__
 #define __UI_FUNCS_H__
 
-// These two enums must be kept in sync with src/ui/elements/ui_types.h!
+// These three enums must be kept in sync with src/ui/elements/ui_types.h!
 typedef enum {
     UI_EVENT_NONE,
     UI_EVENT_CLICK,
@@ -11,6 +11,9 @@ typedef enum {
     UI_EVENT_DRAG,
     UI_EVENT_RESERVED1, // Would be UI_EVENT_TEXT but text events aren't usable in mods currently
     UI_EVENT_UPDATE,
+    UI_EVENT_NAVIGATE,
+    UI_EVENT_MOUSE_BUTTON,
+    UI_EVENT_MENU_ACTION,
     UI_EVENT_COUNT
 } RecompuiEventType;
 
@@ -21,6 +24,16 @@ typedef enum {
     UI_DRAG_END
 } RecompuiDragPhase;
 
+typedef enum {
+    UI_MENU_ACTION_NONE,
+    UI_MENU_ACTION_ACCEPT,
+    UI_MENU_ACTION_APPLY,
+    UI_MENU_ACTION_BACK,
+    UI_MENU_ACTION_TOGGLE,
+    UI_MENU_ACTION_TAB_LEFT,
+    UI_MENU_ACTION_TAB_RIGHT
+} RecompuiMenuAction;
+
 typedef struct {
     RecompuiEventType type;
     union {
@@ -30,15 +43,15 @@ typedef struct {
         } click;
 
         struct {
-            bool active;
+            int active;
         } focus;
 
         struct {
-            bool active;
+            int active;
         } hover;
 
         struct {
-            bool active;
+            int active;
         } enable;
 
         struct {
@@ -46,6 +59,10 @@ typedef struct {
             float y;
             RecompuiDragPhase phase;
         } drag;
+
+        struct {
+            RecompuiMenuAction action;
+        } menu_action;
     } data;
 } RecompuiEventData;
 
diff --git a/patches/sky_transform_tagging.c b/patches/sky_transform_tagging.c
index 5ae3c40..131ee27 100644
--- a/patches/sky_transform_tagging.c
+++ b/patches/sky_transform_tagging.c
@@ -275,11 +275,13 @@ RECOMP_PATCH void Environment_DrawSkyboxStarsImpl(PlayState* play, Gfx** gfxP) {
             // @recomp Tag the star.
             if (camera_was_skipped()) {
                 gEXMatrixGroupSimple(gfx++, STAR_TRANSFORM_ID_START + i, G_EX_PUSH, G_MTX_MODELVIEW,
-                    G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+                    G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+                    G_EX_COMPONENT_SKIP, G_EX_COMPONENT_SKIP);
             }
             else {
                 gEXMatrixGroupSimple(gfx++, STAR_TRANSFORM_ID_START + i, G_EX_PUSH, G_MTX_MODELVIEW,
-                    G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+                    G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+                    G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
             }
 
             // @recomp Draw the star in 3D with a billboarded matrix.
diff --git a/patches/specific_actor_transform_tagging.c b/patches/specific_actor_transform_tagging.c
index dc5dd3b..4fc36f8 100644
--- a/patches/specific_actor_transform_tagging.c
+++ b/patches/specific_actor_transform_tagging.c
@@ -86,7 +86,8 @@ RECOMP_PATCH void EnTanron2_Draw(Actor* thisx, PlayState* play2) {
             gEXMatrixGroupSimple(POLY_XLU_DISP++, actor_transform_id(&D_80BB8458[i]->actor) + 0,
                 G_EX_PUSH, G_MTX_MODELVIEW,
                 G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE,
-                G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+                G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+                G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
 
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gWartBubbleModelDL);
@@ -111,7 +112,8 @@ RECOMP_PATCH void EnTanron2_Draw(Actor* thisx, PlayState* play2) {
             gEXMatrixGroupSimple(POLY_XLU_DISP++, actor_transform_id(tanron2) + 1,
                 G_EX_PUSH, G_MTX_MODELVIEW,
                 G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE,
-                G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+                G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+                G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
 
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gWartShadowModelDL);
@@ -141,7 +143,8 @@ RECOMP_PATCH void EnTanron2_Draw(Actor* thisx, PlayState* play2) {
             gEXMatrixGroupSimple(POLY_XLU_DISP++, actor_transform_id(tanron2) + 2,
                 G_EX_PUSH, G_MTX_MODELVIEW,
                 G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE,
-                G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+                G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+                G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
 
             gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
             gSPDisplayList(POLY_XLU_DISP++, gEffWaterRippleDL);
diff --git a/patches/ui_patches.c b/patches/ui_patches.c
index 7bf8955..bfbef2c 100644
--- a/patches/ui_patches.c
+++ b/patches/ui_patches.c
@@ -932,9 +932,11 @@ RECOMP_PATCH void Message_DrawTextBox(PlayState* play, Gfx** gfxP) {
     gEXPushOtherMode(gfx++);
     gEXPushViewport(gfx++);
     gEXMatrixGroupSimple(gfx++, TEXTBOX_TRANSFORM_PROJECTION_ID, G_EX_PUSH, G_MTX_PROJECTION,
-        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
     gEXMatrixGroupSimple(gfx++, TEXTBOX_TRANSFORM_ID, G_EX_PUSH, G_MTX_MODELVIEW,
-        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+        G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
 
     // @recomp Set up the RSP params.
     gSPLoadGeometryMode(gfx++, 0);
@@ -1120,9 +1122,11 @@ RECOMP_PATCH void ShrinkWindow_Draw(GraphicsContext* gfxCtx) {
 
         // @recomp Set up the letterbox matrix groups.
         gEXMatrixGroupSimple(gfx++, TEXTBOX_TRANSFORM_PROJECTION_ID, G_EX_PUSH, G_MTX_PROJECTION,
-            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
         gEXMatrixGroupSimple(gfx++, TEXTBOX_TRANSFORM_ID, G_EX_PUSH, G_MTX_MODELVIEW,
-            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE);
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE, G_EX_ORDER_LINEAR, G_EX_EDIT_NONE,
+            G_EX_COMPONENT_INTERPOLATE, G_EX_COMPONENT_INTERPOLATE);
 
         // @recomp Allocate and build the matrices.
         Mtx* ortho_matrix = GRAPH_ALLOC(gfxCtx, sizeof(Mtx));
diff --git a/shadercache/.gitkeep b/shadercache/.gitkeep
deleted file mode 100644
index e69de29..0000000
diff --git a/shaders/InterfacePS.hlsl b/shaders/InterfacePS.hlsl
deleted file mode 100644
index b8ab340..0000000
--- a/shaders/InterfacePS.hlsl
+++ /dev/null
@@ -1,11 +0,0 @@
-SamplerState gSampler : register(s1, space0);
-Texture2D<float4> gTexture : register(t2, space1);
-
-void PSMain(
-    in float4 iColor : COLOR,
-    in float2 iUV : TEXCOORD,
-    out float4 oColor : SV_TARGET
-)
-{
-    oColor = gTexture.SampleLevel(gSampler, iUV, 0) * iColor;
-}
diff --git a/shaders/InterfaceVS.hlsl b/shaders/InterfaceVS.hlsl
deleted file mode 100644
index 05fd649..0000000
--- a/shaders/InterfaceVS.hlsl
+++ /dev/null
@@ -1,23 +0,0 @@
-struct Input {
-    float4x4 transform;
-    float2 translation;
-};
-
-[[vk::push_constant]]
-ConstantBuffer<Input> gInput : register(b0, space0);
-
-void VSMain(
-    in float2 iPosition : POSITION,
-    in float4 iColor : COLOR,
-    in float2 iUV : TEXCOORD,
-    out float4 oColor : COLOR,
-    out float2 oUV : TEXCOORD,
-    out float4 oPosition : SV_Position
-)
-{
-	float2 translatedPos = iPosition + gInput.translation;
-	oPosition = mul(gInput.transform, float4(translatedPos, 0, 1));
-
-	oColor = iColor;
-	oUV = iUV;
-}
diff --git a/src/game/config.cpp b/src/game/config.cpp
index 17ff9e4..a96c4a0 100644
--- a/src/game/config.cpp
+++ b/src/game/config.cpp
@@ -1,10 +1,14 @@
 #include "zelda_config.h"
-#include "recomp_input.h"
+#include "zelda_debug.h"
+#include "recompui/recompui.h"
+#include "recompui/config.h"
+#include "recompinput/recompinput.h"
 #include "zelda_sound.h"
-#include "zelda_render.h"
 #include "zelda_support.h"
 #include "ultramodern/config.hpp"
 #include "librecomp/files.hpp"
+#include "librecomp/config.hpp"
+#include "util/file.h"
 #include <filesystem>
 #include <fstream>
 #include <iomanip>
@@ -18,515 +22,256 @@
 #include "apple/rt64_apple.h"
 #endif
 
-constexpr std::u8string_view general_filename = u8"general.json";
-constexpr std::u8string_view graphics_filename = u8"graphics.json";
-constexpr std::u8string_view controls_filename = u8"controls.json";
-constexpr std::u8string_view sound_filename = u8"sound.json";
-
-constexpr auto res_default            = ultramodern::renderer::Resolution::Auto;
-constexpr auto hr_default             = ultramodern::renderer::HUDRatioMode::Clamp16x9;
-constexpr auto api_default            = ultramodern::renderer::GraphicsApi::Auto;
-constexpr auto ar_default             = ultramodern::renderer::AspectRatio::Expand;
-constexpr auto msaa_default           = ultramodern::renderer::Antialiasing::MSAA2X;
-constexpr auto rr_default             = ultramodern::renderer::RefreshRate::Display;
-constexpr auto hpfb_default           = ultramodern::renderer::HighPrecisionFramebuffer::Auto;
-constexpr int ds_default              = 1;
-constexpr int rr_manual_default       = 60;
-constexpr bool developer_mode_default = false;
-
-static bool is_steam_deck = false;
-
-ultramodern::renderer::WindowMode wm_default() {
-    return is_steam_deck ? ultramodern::renderer::WindowMode::Fullscreen : ultramodern::renderer::WindowMode::Windowed;
+bool get_general_config_bool_value(const std::string& option_id) {
+    return std::get<bool>(recompui::config::get_general_config().get_option_value(option_id));
 }
 
-#ifdef __gnu_linux__
-void detect_steam_deck() {
-    // Check if the board vendor is Valve.
-    std::ifstream board_vendor_file("/sys/devices/virtual/dmi/id/board_vendor");
-    std::string line;
-    if (std::getline(board_vendor_file, line).good() && line == "Valve") {
-        is_steam_deck = true;
-        return;
-    }
-
-    // Check if the SteamDeck variable is set to 1.
-    const char* steam_deck_env = getenv("SteamDeck");
-    if (steam_deck_env != nullptr && std::string{steam_deck_env} == "1") {
-        is_steam_deck = true;
-        return;
-    }
-
-    is_steam_deck = false;
-    return;
-}
-#else
-void detect_steam_deck() { is_steam_deck = false; }
-#endif
-
-template <typename T>
-T from_or_default(const json& j, const std::string& key, T default_value) {
-    T ret;
-    auto find_it = j.find(key);
-    if (find_it != j.end()) {
-        find_it->get_to(ret);
-    }
-    else {
-        ret = default_value;
-    }
-
-    return ret;
+template <typename T = uint32_t>
+T get_general_config_enum_value(const std::string& option_id) {
+    return static_cast<T>(std::get<uint32_t>(recompui::config::get_general_config().get_option_value(option_id)));
 }
 
-template <typename T>
-void call_if_key_exists(void (*func)(T), const json& j, const std::string& key) {
-    auto find_it = j.find(key);
-    if (find_it != j.end()) {
-        T val;
-        find_it->get_to(val);
-        func(val);
-    }
+template <typename T = uint32_t>
+T get_general_config_number_value(const std::string& option_id) {
+    return static_cast<T>(std::get<double>(recompui::config::get_general_config().get_option_value(option_id)));
 }
 
-namespace ultramodern {
-    void to_json(json& j, const renderer::GraphicsConfig& config) {
-        j = json{
-            {"res_option",      config.res_option},
-            {"wm_option",       config.wm_option},
-            {"hr_option",       config.hr_option},
-            {"api_option",      config.api_option},
-            {"ds_option",       config.ds_option},
-            {"ar_option",       config.ar_option},
-            {"msaa_option",     config.msaa_option},
-            {"rr_option",       config.rr_option},
-            {"hpfb_option",     config.hpfb_option},
-            {"rr_manual_value", config.rr_manual_value},
-            {"developer_mode",  config.developer_mode},
-        };
-    }
-
-    void from_json(const json& j, renderer::GraphicsConfig& config) {
-        config.res_option       = from_or_default(j, "res_option",      res_default);
-        config.wm_option        = from_or_default(j, "wm_option",       wm_default());
-        config.hr_option        = from_or_default(j, "hr_option",       hr_default);
-        config.api_option       = from_or_default(j, "api_option",      api_default);
-        config.ds_option        = from_or_default(j, "ds_option",       ds_default);
-        config.ar_option        = from_or_default(j, "ar_option",       ar_default);
-        config.msaa_option      = from_or_default(j, "msaa_option",     msaa_default);
-        config.rr_option        = from_or_default(j, "rr_option",       rr_default);
-        config.hpfb_option      = from_or_default(j, "hpfb_option",     hpfb_default);
-        config.rr_manual_value  = from_or_default(j, "rr_manual_value", rr_manual_default);
-        config.developer_mode   = from_or_default(j, "developer_mode",  developer_mode_default);
-    }
+template <typename T = uint32_t>
+T get_graphics_config_enum_value(const std::string& option_id) {
+    return static_cast<T>(std::get<uint32_t>(recompui::config::get_graphics_config().get_option_value(option_id)));
 }
 
-namespace recomp {
-    void to_json(json& j, const InputField& field) {
-        j = json{ {"input_type", field.input_type}, {"input_id", field.input_id} };
-    }
-
-    void from_json(const json& j, InputField& field) {
-        j.at("input_type").get_to(field.input_type);
-        j.at("input_id").get_to(field.input_id);
-    }
+template <typename T = uint32_t>
+T get_graphics_config_number_value(const std::string& option_id) {
+    return static_cast<T>(std::get<double>(recompui::config::get_graphics_config().get_option_value(option_id)));
 }
 
-std::filesystem::path zelda64::get_app_folder_path() {
-   // directly check for portable.txt (windows and native linux binary)
-   if (std::filesystem::exists("portable.txt")) {
-       return std::filesystem::current_path();
-   }
-
-#if defined(__APPLE__)
-   // Check for portable file in the directory containing the app bundle.
-   const auto app_bundle_path = zelda64::get_bundle_directory().parent_path();
-   if (std::filesystem::exists(app_bundle_path / "portable.txt")) {
-       return app_bundle_path;
-   }
-#endif
-
-   std::filesystem::path recomp_dir{};
-
-#if defined(_WIN32)
-   // Deduce local app data path.
-   PWSTR known_path = NULL;
-   HRESULT result = SHGetKnownFolderPath(FOLDERID_LocalAppData, 0, NULL, &known_path);
-   if (result == S_OK) {
-       recomp_dir = std::filesystem::path{known_path} / zelda64::program_id;
-   }
-
-   CoTaskMemFree(known_path);
-#elif defined(__linux__) || defined(__APPLE__)
-   // check for APP_FOLDER_PATH env var
-   if (getenv("APP_FOLDER_PATH") != nullptr) {
-       return std::filesystem::path{getenv("APP_FOLDER_PATH")};
-   }
-
-#if defined(__APPLE__)
-   const auto supportdir = zelda64::get_application_support_directory();
-   if (supportdir) {
-       return *supportdir / zelda64::program_id;
-   }
-#endif
-
-   const char *homedir;
-
-   if ((homedir = getenv("HOME")) == nullptr) {
-    #if defined(__linux__)
-       homedir = getpwuid(getuid())->pw_dir;
-    #elif defined(__APPLE__)
-        homedir = GetHomeDirectory();
-    #endif
-   }
-
-   if (homedir != nullptr) {
-       recomp_dir = std::filesystem::path{homedir} / (std::u8string{u8".config/"} + std::u8string{zelda64::program_id});
-   }
-#endif
-
-    return recomp_dir;
+template <typename T = uint32_t>
+T get_sound_config_enum_value(const std::string& option_id) {
+    return static_cast<T>(std::get<uint32_t>(recompui::config::get_sound_config().get_option_value(option_id)));
 }
 
-bool read_json(std::ifstream input_file, nlohmann::json& json_out) {
-    if (!input_file.good()) {
-        return false;
-    }
-
-    try {
-        input_file >> json_out;
-    }
-    catch (nlohmann::json::parse_error&) {
-        return false;
-    }
-    return true;
+template <typename T = uint32_t>
+T get_sound_config_number_value(const std::string& option_id) {
+    return static_cast<T>(std::get<double>(recompui::config::get_sound_config().get_option_value(option_id)));
 }
 
-bool read_json_with_backups(const std::filesystem::path& path, nlohmann::json& json_out) {
-    // Try reading and parsing the base file.
-    if (read_json(std::ifstream{path}, json_out)) {
-        return true;
-    }
+static void add_general_options(recomp::config::Config &config) {
+    using EnumOptionVector = const std::vector<recomp::config::ConfigOptionEnumOption>;
 
-    // Try reading and parsing the backup file.
-    if (read_json(recomp::open_input_backup_file(path), json_out)) {
-        return true;
-    }
+    // debug_mode
+    config.add_bool_option(
+        zelda64::configkeys::general::debug_mode,
+        "Debug Mode",
+        "Controls whether the debug menu is visible",
+        false,
+        true
+    );
 
-    // Both reads failed.
-    return false;
-}
+    // targeting_mode
+    static EnumOptionVector targeting_mode_options = {
+        {zelda64::TargetingMode::Switch, "Switch"},
+        {zelda64::TargetingMode::Hold, "Hold"},
+    };
+    config.add_enum_option(
+        zelda64::configkeys::general::targeting_mode,
+        "Targeting Mode",
+        "Controls how targeting enemies and objects works. <recomp-color primary>Switch</recomp-color> will start or stop targeting each time the target button is pressed. <recomp-color primary>Hold</recomp-color> will start when the target button is pressed and stop when the button is released.",
+        targeting_mode_options,
+        zelda64::TargetingMode::Switch
+    );
 
-bool save_json_with_backups(const std::filesystem::path& path, const nlohmann::json& json_data) {
-    {
-        std::ofstream output_file = recomp::open_output_file_with_backup(path);
-        if (!output_file.good()) {
-            return false;
-        }
+    // autosave_mode
+    static EnumOptionVector autosave_mode_options = {
+        {zelda64::AutosaveMode::Off, "Off"},
+        {zelda64::AutosaveMode::On, "On"},
+    };
+    config.add_enum_option(
+        zelda64::configkeys::general::autosave_mode,
+        "Autosaving",
+        "Turns on autosaving and prevents owl saves from being deleted on load. Autosaves act as owl saves and take up the same slot as they do.\n"
+        "\n"
+        "Loading an autosave will place you in Clock Town or at the entrance of the current dungeon if you were in one.\n"
+        "\n"
+        "\n"
+        "<recomp-color primary>If autosaving is disabled, existing autosaves will be deleted when loaded.</recomp-color>",
+        autosave_mode_options,
+        zelda64::AutosaveMode::On
+    );
 
-        output_file << std::setw(4) << json_data;
-    }
-    return recomp::finalize_output_file_with_backup(path);
-}
+    // camera_invert_mode
+    static EnumOptionVector camera_invert_mode_options = {
+        {zelda64::CameraInvertMode::InvertNone, "None"},
+        {zelda64::CameraInvertMode::InvertX, "Invert X"},
+        {zelda64::CameraInvertMode::InvertY, "Invert Y"},
+        {zelda64::CameraInvertMode::InvertBoth, "Invert Both"},
+    };
+    config.add_enum_option(
+        zelda64::configkeys::general::camera_invert_mode,
+        "Aiming Camera Mode",
+        "Inverts the camera controls for first-person aiming. <recomp-color primary>Invert Y</recomp-color> is the default and matches the original game.",
+        camera_invert_mode_options,
+        zelda64::CameraInvertMode::InvertY
+    );
 
-bool save_general_config(const std::filesystem::path& path) {
-    nlohmann::json config_json{};
+    // analog_cam_mode
+    static EnumOptionVector analog_cam_mode_options = {
+        {zelda64::AnalogCamMode::Off, "Off"},
+        {zelda64::AnalogCamMode::On, "On"},
+    };
+    config.add_enum_option(
+        zelda64::configkeys::general::analog_cam_mode,
+        "Analog Camera",
+        "Enables an analog \"free\" camera similar to later entries in the series that's mapped to the right analog stick on the controller.\n"
+        "\n"
+        "When you move the right stick, the camera will enter free mode and stop centering behind Link. Press the <recomp-color primary>Target</recomp-color> button at any time to go back into the normal camera mode. The camera will also return to normal mode after a cutscene plays or when you move between areas.\n"
+        "\n"
+        "This option also enables right stick control while looking and aiming.",
+        analog_cam_mode_options,
+        zelda64::AnalogCamMode::Off
+    );
 
-    zelda64::to_json(config_json["targeting_mode"], zelda64::get_targeting_mode());
-    recomp::to_json(config_json["background_input_mode"], recomp::get_background_input_mode());
-    config_json["rumble_strength"] = recomp::get_rumble_strength();
-    config_json["gyro_sensitivity"] = recomp::get_gyro_sensitivity();
-    config_json["mouse_sensitivity"] = recomp::get_mouse_sensitivity();
-    config_json["joystick_deadzone"] = recomp::get_joystick_deadzone();
-    config_json["autosave_mode"] = zelda64::get_autosave_mode();
-    config_json["camera_invert_mode"] = zelda64::get_camera_invert_mode();
-    config_json["analog_cam_mode"] = zelda64::get_analog_cam_mode();
-    config_json["analog_camera_invert_mode"] = zelda64::get_analog_camera_invert_mode();
-    config_json["debug_mode"] = zelda64::get_debug_mode_enabled();
-
-    return save_json_with_backups(path, config_json);
-}
-
-void set_general_settings_from_json(const nlohmann::json& config_json) {
-    zelda64::set_targeting_mode(from_or_default(config_json, "targeting_mode", zelda64::TargetingMode::Switch));
-    recomp::set_background_input_mode(from_or_default(config_json, "background_input_mode", recomp::BackgroundInputMode::On));
-    recomp::set_rumble_strength(from_or_default(config_json, "rumble_strength", 25));
-    recomp::set_gyro_sensitivity(from_or_default(config_json, "gyro_sensitivity", 50));
-    recomp::set_mouse_sensitivity(from_or_default(config_json, "mouse_sensitivity", is_steam_deck ? 50 : 0));
-    recomp::set_joystick_deadzone(from_or_default(config_json, "joystick_deadzone", 5));
-    zelda64::set_autosave_mode(from_or_default(config_json, "autosave_mode", zelda64::AutosaveMode::On));
-    zelda64::set_camera_invert_mode(from_or_default(config_json, "camera_invert_mode", zelda64::CameraInvertMode::InvertY));
-    zelda64::set_analog_cam_mode(from_or_default(config_json, "analog_cam_mode", zelda64::AnalogCamMode::Off));
-    zelda64::set_analog_camera_invert_mode(from_or_default(config_json, "analog_camera_invert_mode", zelda64::CameraInvertMode::InvertNone));
-    zelda64::set_debug_mode_enabled(from_or_default(config_json, "debug_mode", false));
-}
-
-bool load_general_config(const std::filesystem::path& path) {
-    nlohmann::json config_json{};
-    if (!read_json_with_backups(path, config_json)) {
-        return false;
-    }
-
-    set_general_settings_from_json(config_json);
-    return true;
-}
-
-void assign_mapping(recomp::InputDevice device, recomp::GameInput input, const std::vector<recomp::InputField>& value) {
-    for (size_t binding_index = 0; binding_index < std::min(value.size(), recomp::bindings_per_input); binding_index++) {
-        recomp::set_input_binding(input, binding_index, device, value[binding_index]);
-    }
-};
-
-// same as assign_mapping, except will clear unassigned bindings if not in value
-void assign_mapping_complete(recomp::InputDevice device, recomp::GameInput input, const std::vector<recomp::InputField>& value) {
-    for (size_t binding_index = 0; binding_index < recomp::bindings_per_input; binding_index++) {
-        if (binding_index >= value.size()) {
-            recomp::set_input_binding(input, binding_index, device, recomp::InputField{});
-        } else {
-            recomp::set_input_binding(input, binding_index, device, value[binding_index]);
-        }
-    }
-};
-
-void assign_all_mappings(recomp::InputDevice device, const recomp::DefaultN64Mappings& values) {
-    assign_mapping_complete(device, recomp::GameInput::A, values.a);
-    assign_mapping_complete(device, recomp::GameInput::B, values.b);
-    assign_mapping_complete(device, recomp::GameInput::Z, values.z);
-    assign_mapping_complete(device, recomp::GameInput::START, values.start);
-    assign_mapping_complete(device, recomp::GameInput::DPAD_UP, values.dpad_up);
-    assign_mapping_complete(device, recomp::GameInput::DPAD_DOWN, values.dpad_down);
-    assign_mapping_complete(device, recomp::GameInput::DPAD_LEFT, values.dpad_left);
-    assign_mapping_complete(device, recomp::GameInput::DPAD_RIGHT, values.dpad_right);
-    assign_mapping_complete(device, recomp::GameInput::L, values.l);
-    assign_mapping_complete(device, recomp::GameInput::R, values.r);
-    assign_mapping_complete(device, recomp::GameInput::C_UP, values.c_up);
-    assign_mapping_complete(device, recomp::GameInput::C_DOWN, values.c_down);
-    assign_mapping_complete(device, recomp::GameInput::C_LEFT, values.c_left);
-    assign_mapping_complete(device, recomp::GameInput::C_RIGHT, values.c_right);
-
-    assign_mapping_complete(device, recomp::GameInput::X_AXIS_NEG, values.analog_left);
-    assign_mapping_complete(device, recomp::GameInput::X_AXIS_POS, values.analog_right);
-    assign_mapping_complete(device, recomp::GameInput::Y_AXIS_NEG, values.analog_down);
-    assign_mapping_complete(device, recomp::GameInput::Y_AXIS_POS, values.analog_up);
-
-    assign_mapping_complete(device, recomp::GameInput::TOGGLE_MENU, values.toggle_menu);
-    assign_mapping_complete(device, recomp::GameInput::ACCEPT_MENU, values.accept_menu);
-    assign_mapping_complete(device, recomp::GameInput::APPLY_MENU, values.apply_menu);
-};
-
-void zelda64::reset_input_bindings() {
-    assign_all_mappings(recomp::InputDevice::Keyboard, recomp::default_n64_keyboard_mappings);
-    assign_all_mappings(recomp::InputDevice::Controller, recomp::default_n64_controller_mappings);
-}
-
-void zelda64::reset_cont_input_bindings() {
-    assign_all_mappings(recomp::InputDevice::Controller, recomp::default_n64_controller_mappings);
-}
-
-void zelda64::reset_kb_input_bindings() {
-    assign_all_mappings(recomp::InputDevice::Keyboard, recomp::default_n64_keyboard_mappings);
-}
-
-void zelda64::reset_single_input_binding(recomp::InputDevice device, recomp::GameInput input) {
-    assign_mapping_complete(
-        device,
-        input,
-        recomp::get_default_mapping_for_input(
-            device == recomp::InputDevice::Keyboard ?
-                recomp::default_n64_keyboard_mappings :
-                recomp::default_n64_controller_mappings,
-            input
-        )
+    // analog_camera_invert_mode
+    static EnumOptionVector analog_camera_invert_mode_options = {
+        {zelda64::CameraInvertMode::InvertNone, "None"},
+        {zelda64::CameraInvertMode::InvertX, "Invert X"},
+        {zelda64::CameraInvertMode::InvertY, "Invert Y"},
+        {zelda64::CameraInvertMode::InvertBoth, "Invert Both"},
+    };
+    config.add_enum_option(
+        zelda64::configkeys::general::analog_camera_invert_mode,
+        "Analog Camera Mode",
+        "Inverts the camera controls for the analog camera if it's enabled. <recomp-color primary>None</recomp-color> is the default.",
+        analog_camera_invert_mode_options,
+        zelda64::CameraInvertMode::InvertNone
     );
 }
 
-void reset_graphics_options() {
-    ultramodern::renderer::GraphicsConfig new_config{};
-    new_config.res_option = res_default;
-    new_config.wm_option = wm_default();
-    new_config.hr_option = hr_default;
-    new_config.ds_option = ds_default;
-    new_config.ar_option = ar_default;
-    new_config.msaa_option = msaa_default;
-    new_config.rr_option = rr_default;
-    new_config.hpfb_option = hpfb_default;
-    new_config.rr_manual_value = rr_manual_default;
-    new_config.developer_mode = developer_mode_default;
-    ultramodern::renderer::set_graphics_config(new_config);
+bool zelda64::get_debug_mode_enabled() {
+    return get_general_config_bool_value(zelda64::configkeys::general::debug_mode);
 }
 
-bool save_graphics_config(const std::filesystem::path& path) {
-    nlohmann::json config_json{};
-    ultramodern::to_json(config_json, ultramodern::renderer::get_graphics_config());
-    return save_json_with_backups(path, config_json);
+zelda64::AutosaveMode zelda64::get_autosave_mode() {
+    return get_general_config_enum_value<zelda64::AutosaveMode>(zelda64::configkeys::general::autosave_mode);
 }
 
-bool load_graphics_config(const std::filesystem::path& path) {
-    nlohmann::json config_json{};
-    if (!read_json_with_backups(path, config_json)) {
-        return false;
-    }
-
-    ultramodern::renderer::GraphicsConfig new_config{};
-    ultramodern::from_json(config_json, new_config);
-    ultramodern::renderer::set_graphics_config(new_config);
-    return true;
+zelda64::TargetingMode zelda64::get_targeting_mode() {
+    return get_general_config_enum_value<zelda64::TargetingMode>(zelda64::configkeys::general::targeting_mode);
 }
 
-void add_input_bindings(nlohmann::json& out, recomp::GameInput input, recomp::InputDevice device) {
-    const std::string& input_name = recomp::get_input_enum_name(input);
-    nlohmann::json& out_array = out[input_name];
-    out_array = nlohmann::json::array();
-    for (size_t binding_index = 0; binding_index < recomp::bindings_per_input; binding_index++) {
-        out_array[binding_index] = recomp::get_input_binding(input, binding_index, device);
-    }
-};
-
-bool save_controls_config(const std::filesystem::path& path) {
-    nlohmann::json config_json{};
-
-    config_json["keyboard"] = {};
-    config_json["controller"] = {};
-
-    for (size_t i = 0; i < recomp::get_num_inputs(); i++) {
-        recomp::GameInput cur_input = static_cast<recomp::GameInput>(i);
-
-        add_input_bindings(config_json["keyboard"], cur_input, recomp::InputDevice::Keyboard);
-        add_input_bindings(config_json["controller"], cur_input, recomp::InputDevice::Controller);
-    }
-
-    return save_json_with_backups(path, config_json);
+zelda64::CameraInvertMode zelda64::get_camera_invert_mode() {
+    return get_general_config_enum_value<zelda64::CameraInvertMode>(zelda64::configkeys::general::camera_invert_mode);
 }
 
-bool load_input_device_from_json(const nlohmann::json& config_json, recomp::InputDevice device, const std::string& key) {
-    // Check if the json object for the given key exists.
-    auto find_it = config_json.find(key);
-    if (find_it == config_json.end()) {
-        return false;
-    }
-
-    const nlohmann::json& mappings_json = *find_it;
-
-    for (size_t i = 0; i < recomp::get_num_inputs(); i++) {
-        recomp::GameInput cur_input = static_cast<recomp::GameInput>(i);
-        const std::string& input_name = recomp::get_input_enum_name(cur_input);
-
-        // Check if the json object for the given input exists and that it's an array.
-        auto find_input_it = mappings_json.find(input_name);
-        if (find_input_it == mappings_json.end() || !find_input_it->is_array()) {
-            assign_mapping(
-                device,
-                cur_input,
-                recomp::get_default_mapping_for_input(
-                    device == recomp::InputDevice::Keyboard ?
-                    recomp::default_n64_keyboard_mappings :
-                    recomp::default_n64_controller_mappings,
-                    cur_input
-                )
-            );
-            continue;
-        }
-        const nlohmann::json& input_json = *find_input_it;
-
-        // Deserialize all the bindings from the json array (up to the max number of bindings per input).
-        for (size_t binding_index = 0; binding_index < std::min(recomp::bindings_per_input, input_json.size()); binding_index++) {
-            recomp::InputField cur_field{};
-            recomp::from_json(input_json[binding_index], cur_field);
-            recomp::set_input_binding(cur_input, binding_index, device, cur_field);
-        }
-    }
-
-    return true;
+zelda64::AnalogCamMode zelda64::get_analog_cam_mode() {
+    return get_general_config_enum_value<zelda64::AnalogCamMode>(zelda64::configkeys::general::analog_cam_mode);
 }
 
-bool load_controls_config(const std::filesystem::path& path) {
-    nlohmann::json config_json{};
-    if (!read_json_with_backups(path, config_json)) {
-        return false;
-    }
-
-    if (!load_input_device_from_json(config_json, recomp::InputDevice::Keyboard, "keyboard")) {
-        assign_all_mappings(recomp::InputDevice::Keyboard, recomp::default_n64_keyboard_mappings);
-    }
-
-    if (!load_input_device_from_json(config_json, recomp::InputDevice::Controller, "controller")) {
-        assign_all_mappings(recomp::InputDevice::Controller, recomp::default_n64_controller_mappings);
-    }
-    return true;
+zelda64::CameraInvertMode zelda64::get_analog_camera_invert_mode() {
+    return get_general_config_enum_value<zelda64::CameraInvertMode>(zelda64::configkeys::general::analog_camera_invert_mode);
 }
 
-bool save_sound_config(const std::filesystem::path& path) {
-    nlohmann::json config_json{};
+static void add_graphics_options(recomp::config::Config &config) {
+    using EnumOptionVector = const std::vector<recomp::config::ConfigOptionEnumOption>;
 
-    config_json["main_volume"] = zelda64::get_main_volume();
-    config_json["bgm_volume"] = zelda64::get_bgm_volume();
-    config_json["low_health_beeps"] = zelda64::get_low_health_beeps_enabled();
-
-    return save_json_with_backups(path, config_json);
+    // Nothing to do here.
 }
 
-bool load_sound_config(const std::filesystem::path& path) {
-    nlohmann::json config_json{};
-    if (!read_json_with_backups(path, config_json)) {
-        return false;
-    }
+static void add_sound_options(recomp::config::Config &config) {
+    using EnumOptionVector = const std::vector<recomp::config::ConfigOptionEnumOption>;
 
-    zelda64::reset_sound_settings();
-    call_if_key_exists(zelda64::set_main_volume, config_json, "main_volume");
-    call_if_key_exists(zelda64::set_bgm_volume, config_json, "bgm_volume");
-    call_if_key_exists(zelda64::set_low_health_beeps_enabled, config_json, "low_health_beeps");
-    return true;
+    // bgm_volume
+    config.add_percent_number_option(
+        zelda64::configkeys::sound::bgm_volume,
+        "Background Music Volume",
+        "Controls the overall volume of background music.",
+        100.0f
+    );
+
+    // low_health_beeps
+    static EnumOptionVector low_health_beeps_mode_options = {
+        {zelda64::LowHealthBeepsMode::Off, "Off"},
+        {zelda64::LowHealthBeepsMode::On, "On"},
+    };
+    config.add_enum_option(
+        zelda64::configkeys::sound::low_health_beeps,
+        "Low Health Beeps",
+        "Toggles whether or not the low-health beeping sound plays.",
+        low_health_beeps_mode_options,
+        zelda64::LowHealthBeepsMode::On
+    );
 }
 
-void zelda64::load_config() {
-    detect_steam_deck();
+int zelda64::get_bgm_volume() {
+    return get_sound_config_number_value<int>(zelda64::configkeys::sound::bgm_volume);
+}
 
-    std::filesystem::path recomp_dir = zelda64::get_app_folder_path();
-    std::filesystem::path general_path = recomp_dir / general_filename;
-    std::filesystem::path graphics_path = recomp_dir / graphics_filename;
-    std::filesystem::path controls_path = recomp_dir / controls_filename;
-    std::filesystem::path sound_path = recomp_dir / sound_filename;
+bool zelda64::get_low_health_beeps_enabled() {
+    return get_sound_config_enum_value<zelda64::LowHealthBeepsMode>(zelda64::configkeys::sound::low_health_beeps) == zelda64::LowHealthBeepsMode::On;
+}
+
+static void set_control_defaults() {
+    // Nothing to do here.
+}
+
+static void set_control_descriptions() {
+    // TODO descriptions
+    recompinput::set_game_input_description(recompinput::GameInput::Y_AXIS_POS, "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::Y_AXIS_NEG, "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::X_AXIS_NEG, "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::X_AXIS_POS, "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::A,          "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::B,          "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::Z,          "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::L,          "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::R,          "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::START,      "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::C_UP,       "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::C_DOWN,     "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::C_LEFT,     "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::C_RIGHT,    "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::DPAD_UP,    "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::DPAD_DOWN,  "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::DPAD_LEFT,  "TODO description");
+    recompinput::set_game_input_description(recompinput::GameInput::DPAD_RIGHT, "TODO description");
+}
+
+void zelda64::init_config() {
+    std::filesystem::path recomp_dir = recompui::file::get_app_folder_path();
 
     if (!recomp_dir.empty()) {
         std::filesystem::create_directories(recomp_dir);
     }
 
-    // TODO error handling for failing to save config files after resetting them.
+    recompui::config::GeneralTabOptions general_options{};
+    general_options.has_rumble_strength = true;
+    general_options.has_gyro_sensitivity = true;
+    general_options.has_mouse_sensitivity = true;
 
-    if (!load_general_config(general_path)) {
-        // Set the general settings from an empty json to use defaults.
-        set_general_settings_from_json({});
-        save_general_config(general_path);
-    }
+    auto &general_config = recompui::config::create_general_tab(general_options);
+    add_general_options(general_config);
 
-    if (!load_graphics_config(graphics_path)) {
-        reset_graphics_options();
-        save_graphics_config(graphics_path);
-    }
+    set_control_defaults();
+    set_control_descriptions();
+    recompui::config::create_controls_tab();
 
-    if (!load_controls_config(controls_path)) {
-        zelda64::reset_input_bindings();
-        save_controls_config(controls_path);
-    }
+    auto &graphics_config = recompui::config::create_graphics_tab();
+    add_graphics_options(graphics_config);
 
-    if (!load_sound_config(sound_path)) {
-        zelda64::reset_sound_settings();
-        save_sound_config(sound_path);
-    }
-}
-
-void zelda64::save_config() {
-    std::filesystem::path recomp_dir = zelda64::get_app_folder_path();
-
-    if (recomp_dir.empty()) {
-        return;
-    }
-
-    std::filesystem::create_directories(recomp_dir);
-
-    // TODO error handling for failing to save config files.
-
-    save_general_config(recomp_dir / general_filename);
-    save_graphics_config(recomp_dir / graphics_filename);
-    save_controls_config(recomp_dir / controls_filename);
-    save_sound_config(recomp_dir / sound_filename);
+    auto &sound_config = recompui::config::create_sound_tab();
+    add_sound_options(sound_config);
+
+    recompui::config::create_mods_tab();
+
+    recompui::config::create_tab(
+        zelda64::debug::tab_name,
+        zelda64::debug::tab_id,
+        [](recompui::ContextId context, recompui::Element* parent) {
+            // TODO implement debug tab
+        }
+    );
+
+    recompui::config::finalize();
+
+    recompui::config::set_tab_visible(zelda64::debug::tab_id, get_debug_mode_enabled());
 }
diff --git a/src/game/controls.cpp b/src/game/controls.cpp
deleted file mode 100644
index 0bb3857..0000000
--- a/src/game/controls.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-#include <array>
-
-#include "librecomp/helpers.hpp"
-#include "recomp_input.h"
-#include "ultramodern/ultramodern.hpp"
-
-// Arrays that hold the mappings for every input for keyboard and controller respectively.
-using input_mapping = std::array<recomp::InputField, recomp::bindings_per_input>;
-using input_mapping_array = std::array<input_mapping, static_cast<size_t>(recomp::GameInput::COUNT)>;
-static input_mapping_array keyboard_input_mappings{};
-static input_mapping_array controller_input_mappings{};
-
-// Make the button value array, which maps a button index to its bit field.
-#define DEFINE_INPUT(name, value, readable) uint16_t(value##u),
-static const std::array n64_button_values = {
-    DEFINE_N64_BUTTON_INPUTS()
-};
-#undef DEFINE_INPUT
-
-// Make the input name array.
-#define DEFINE_INPUT(name, value, readable) readable,
-static const std::vector<std::string> input_names = {
-    DEFINE_ALL_INPUTS()
-};
-#undef DEFINE_INPUT
-
-// Make the input enum name array.
-#define DEFINE_INPUT(name, value, readable) #name,
-static const std::vector<std::string> input_enum_names = {
-    DEFINE_ALL_INPUTS()
-};
-#undef DEFINE_INPUT
-
-size_t recomp::get_num_inputs() {
-    return (size_t)GameInput::COUNT;
-}
-
-const std::string& recomp::get_input_name(GameInput input) {
-    return input_names.at(static_cast<size_t>(input));
-}
-
-const std::string& recomp::get_input_enum_name(GameInput input) {
-    return input_enum_names.at(static_cast<size_t>(input));
-}
-
-recomp::GameInput recomp::get_input_from_enum_name(const std::string_view enum_name) {
-    auto find_it = std::find(input_enum_names.begin(), input_enum_names.end(), enum_name);
-    if (find_it == input_enum_names.end()) {
-        return recomp::GameInput::COUNT;
-    }
-
-    return static_cast<recomp::GameInput>(find_it - input_enum_names.begin());
-}
-
-// Due to an RmlUi limitation this can't be const. Ideally it would return a const reference or even just a straight up copy.
-recomp::InputField& recomp::get_input_binding(GameInput input, size_t binding_index, recomp::InputDevice device) {
-    input_mapping_array& device_mappings = (device == recomp::InputDevice::Controller) ?  controller_input_mappings : keyboard_input_mappings;
-    input_mapping& cur_input_mapping = device_mappings.at(static_cast<size_t>(input));
-
-    if (binding_index < cur_input_mapping.size()) {
-        return cur_input_mapping[binding_index];
-    }
-    else {
-        static recomp::InputField dummy_field = {};
-        return dummy_field;
-    }
-}
-
-void recomp::set_input_binding(recomp::GameInput input, size_t binding_index, recomp::InputDevice device, recomp::InputField value) {
-    input_mapping_array& device_mappings = (device == recomp::InputDevice::Controller) ?  controller_input_mappings : keyboard_input_mappings;
-    input_mapping& cur_input_mapping = device_mappings.at(static_cast<size_t>(input));
-
-    if (binding_index < cur_input_mapping.size()) {
-        cur_input_mapping[binding_index] = value;
-    }
-}
-
-bool recomp::get_n64_input(int controller_num, uint16_t* buttons_out, float* x_out, float* y_out) {
-    uint16_t cur_buttons = 0;
-    float cur_x = 0.0f;
-    float cur_y = 0.0f;
-    
-    if (controller_num != 0) {
-        return false;
-    }
-
-    if (!recomp::game_input_disabled()) {
-        for (size_t i = 0; i < n64_button_values.size(); i++) {
-            size_t input_index = (size_t)GameInput::N64_BUTTON_START + i;
-            cur_buttons |= recomp::get_input_digital(keyboard_input_mappings[input_index]) ? n64_button_values[i] : 0;
-            cur_buttons |= recomp::get_input_digital(controller_input_mappings[input_index]) ? n64_button_values[i] : 0;
-        }
-
-        float joystick_deadzone = recomp::get_joystick_deadzone() / 100.0f;
-
-        float joystick_x = recomp::get_input_analog(controller_input_mappings[(size_t)GameInput::X_AXIS_POS])
-                        - recomp::get_input_analog(controller_input_mappings[(size_t)GameInput::X_AXIS_NEG]);
-
-        float joystick_y = recomp::get_input_analog(controller_input_mappings[(size_t)GameInput::Y_AXIS_POS])
-                        - recomp::get_input_analog(controller_input_mappings[(size_t)GameInput::Y_AXIS_NEG]);
-
-        recomp::apply_joystick_deadzone(joystick_x, joystick_y, &joystick_x, &joystick_y);
-
-        cur_x = recomp::get_input_analog(keyboard_input_mappings[(size_t)GameInput::X_AXIS_POS])
-                - recomp::get_input_analog(keyboard_input_mappings[(size_t)GameInput::X_AXIS_NEG]) + joystick_x;
-
-        cur_y = recomp::get_input_analog(keyboard_input_mappings[(size_t)GameInput::Y_AXIS_POS])
-                - recomp::get_input_analog(keyboard_input_mappings[(size_t)GameInput::Y_AXIS_NEG]) + joystick_y;
-    }
-
-    *buttons_out = cur_buttons;
-    *x_out = std::clamp(cur_x, -1.0f, 1.0f);
-    *y_out = std::clamp(cur_y, -1.0f, 1.0f);
-
-    return true;
-}
diff --git a/src/game/input.cpp b/src/game/input.cpp
deleted file mode 100644
index f06a5b1..0000000
--- a/src/game/input.cpp
+++ /dev/null
@@ -1,909 +0,0 @@
-#include <atomic>
-#include <mutex>
-
-#include "ultramodern/ultramodern.hpp"
-#include "recomp.h"
-#include "recomp_input.h"
-#include "zelda_config.h"
-#include "recomp_ui.h"
-#include "SDL.h"
-#include "promptfont.h"
-#include "GamepadMotion.hpp"
-
-constexpr float axis_threshold = 0.5f;
-
-struct ControllerState {
-    SDL_GameController* controller;
-    std::array<float, 3> latest_accelerometer;
-    GamepadMotion motion;
-    uint32_t prev_gyro_timestamp;
-    ControllerState() : controller{}, latest_accelerometer{}, motion{}, prev_gyro_timestamp{} {
-        motion.Reset();
-        motion.SetCalibrationMode(GamepadMotionHelpers::CalibrationMode::Stillness | GamepadMotionHelpers::CalibrationMode::SensorFusion);
-    };
-};
-
-static struct {
-    const Uint8* keys = nullptr;
-    SDL_Keymod keymod = SDL_Keymod::KMOD_NONE;
-    int numkeys = 0;
-    std::atomic_int32_t mouse_wheel_pos = 0;
-    std::mutex cur_controllers_mutex;
-    std::vector<SDL_GameController*> cur_controllers{};
-    std::unordered_map<SDL_JoystickID, ControllerState> controller_states;
-    
-    std::array<float, 2> rotation_delta{};
-    std::array<float, 2> mouse_delta{};
-    std::mutex pending_input_mutex;
-    std::array<float, 2> pending_rotation_delta{};
-    std::array<float, 2> pending_mouse_delta{};
-
-    float cur_rumble;
-    bool rumble_active;
-} InputState;
-
-static struct {
-    std::list<std::filesystem::path> files_dropped;
-} DropState;
-
-std::atomic<recomp::InputDevice> scanning_device = recomp::InputDevice::COUNT;
-std::atomic<recomp::InputField> scanned_input;
-
-enum class InputType {
-    None = 0, // Using zero for None ensures that default initialized InputFields are unbound.
-    Keyboard,
-    Mouse,
-    ControllerDigital,
-    ControllerAnalog // Axis input_id values are the SDL value + 1
-};
-
-void set_scanned_input(recomp::InputField value) {
-    scanning_device.store(recomp::InputDevice::COUNT);
-    scanned_input.store(value);
-}
-
-recomp::InputField recomp::get_scanned_input() {
-    recomp::InputField ret = scanned_input.load();
-    scanned_input.store({});
-    return ret;
-}
-
-void recomp::start_scanning_input(recomp::InputDevice device) {
-    scanned_input.store({});
-    scanning_device.store(device);
-}
-
-void recomp::stop_scanning_input() {
-    scanning_device.store(recomp::InputDevice::COUNT);
-}
-
-void queue_if_enabled(SDL_Event* event) {
-    if (!recomp::all_input_disabled()) {
-        recompui::queue_event(*event);
-    }
-}
-
-static std::atomic_bool cursor_enabled = true;
-
-void recompui::set_cursor_visible(bool visible) {
-    cursor_enabled.store(visible);
-}
-
-bool should_override_keystate(SDL_Scancode key, SDL_Keymod mod) {
-    // Override Enter when Alt is held.
-    if (key == SDL_Scancode::SDL_SCANCODE_RETURN) {
-        if (mod & SDL_Keymod::KMOD_ALT) {
-            return true;
-        }
-    }
-
-    return false;        
-}
-
-bool sdl_event_filter(void* userdata, SDL_Event* event) {
-    switch (event->type) {
-    case SDL_EventType::SDL_KEYDOWN:
-        {
-            SDL_KeyboardEvent* keyevent = &event->key;
-
-            // Skip repeated events when not in the menu
-            if (!recompui::is_context_capturing_input() &&
-                event->key.repeat) {
-                break;
-            }
-
-            if ((keyevent->keysym.scancode == SDL_Scancode::SDL_SCANCODE_RETURN && (keyevent->keysym.mod & SDL_Keymod::KMOD_ALT)) ||
-                keyevent->keysym.scancode == SDL_Scancode::SDL_SCANCODE_F11
-            ) {
-                recompui::toggle_fullscreen();
-            }
-            if (scanning_device != recomp::InputDevice::COUNT) {
-                if (keyevent->keysym.scancode == SDL_Scancode::SDL_SCANCODE_ESCAPE) {
-                    recomp::cancel_scanning_input();
-                } else if (scanning_device == recomp::InputDevice::Keyboard) {
-                    set_scanned_input({(uint32_t)InputType::Keyboard, keyevent->keysym.scancode});
-                }
-            } else {
-                if (!should_override_keystate(keyevent->keysym.scancode, static_cast<SDL_Keymod>(keyevent->keysym.mod))) {
-                    queue_if_enabled(event);
-                }
-            }
-        }
-        break;
-    case SDL_EventType::SDL_CONTROLLERDEVICEADDED:
-        {
-            SDL_ControllerDeviceEvent* controller_event = &event->cdevice;
-            SDL_GameController* controller = SDL_GameControllerOpen(controller_event->which);
-            printf("Controller added: %d\n", controller_event->which);
-            if (controller != nullptr) {
-                printf("  Instance ID: %d\n", SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller)));
-                ControllerState& state = InputState.controller_states[SDL_JoystickInstanceID(SDL_GameControllerGetJoystick(controller))];
-                state.controller = controller;
-
-                if (SDL_GameControllerHasSensor(controller, SDL_SensorType::SDL_SENSOR_GYRO) && SDL_GameControllerHasSensor(controller, SDL_SensorType::SDL_SENSOR_ACCEL)) {
-                    SDL_GameControllerSetSensorEnabled(controller, SDL_SensorType::SDL_SENSOR_GYRO, SDL_TRUE);
-                    SDL_GameControllerSetSensorEnabled(controller, SDL_SensorType::SDL_SENSOR_ACCEL, SDL_TRUE);
-                }
-            }
-        }
-        break;
-    case SDL_EventType::SDL_CONTROLLERDEVICEREMOVED:
-        {
-            SDL_ControllerDeviceEvent* controller_event = &event->cdevice;
-            printf("Controller removed: %d\n", controller_event->which);
-            InputState.controller_states.erase(controller_event->which);
-        }
-        break;
-    case SDL_EventType::SDL_QUIT: {
-        if (!ultramodern::is_game_started()) {
-            ultramodern::quit();
-            return true;
-        }
-
-        zelda64::open_quit_game_prompt();
-        recompui::activate_mouse();
-        break;
-    }
-    case SDL_EventType::SDL_MOUSEWHEEL:
-        {
-            SDL_MouseWheelEvent* wheel_event = &event->wheel;    
-            InputState.mouse_wheel_pos.fetch_add(wheel_event->y * (wheel_event->direction == SDL_MOUSEWHEEL_FLIPPED ? -1 : 1));
-        }
-        queue_if_enabled(event);
-        break;
-    case SDL_EventType::SDL_CONTROLLERBUTTONDOWN:
-        if (scanning_device != recomp::InputDevice::COUNT) {
-            auto menuToggleBinding0 = recomp::get_input_binding(recomp::GameInput::TOGGLE_MENU, 0, recomp::InputDevice::Controller);
-            auto menuToggleBinding1 = recomp::get_input_binding(recomp::GameInput::TOGGLE_MENU, 1, recomp::InputDevice::Controller);
-            // note - magic number: 0 is InputType::None
-            if ((menuToggleBinding0.input_type != 0 && event->cbutton.button == menuToggleBinding0.input_id) ||
-                (menuToggleBinding1.input_type != 0 && event->cbutton.button == menuToggleBinding1.input_id)) {
-                recomp::cancel_scanning_input();
-            } else if (scanning_device == recomp::InputDevice::Controller) {
-                SDL_ControllerButtonEvent* button_event = &event->cbutton;
-                auto scanned_input_index = recomp::get_scanned_input_index();
-                if ((scanned_input_index == static_cast<int>(recomp::GameInput::TOGGLE_MENU) ||
-                     scanned_input_index == static_cast<int>(recomp::GameInput::ACCEPT_MENU) ||
-                     scanned_input_index == static_cast<int>(recomp::GameInput::APPLY_MENU)) && (
-                     button_event->button == SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP ||
-                     button_event->button == SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN ||
-                     button_event->button == SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT ||
-                     button_event->button == SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT)) {
-                    break;
-                }
-
-                set_scanned_input({(uint32_t)InputType::ControllerDigital, button_event->button});
-            }
-        } else {
-            queue_if_enabled(event);
-        }
-        break;
-    case SDL_EventType::SDL_CONTROLLERAXISMOTION:
-        if (scanning_device == recomp::InputDevice::Controller) {
-            auto scanned_input_index = recomp::get_scanned_input_index();
-            if (scanned_input_index == static_cast<int>(recomp::GameInput::TOGGLE_MENU) ||
-                scanned_input_index == static_cast<int>(recomp::GameInput::ACCEPT_MENU) ||
-                scanned_input_index == static_cast<int>(recomp::GameInput::APPLY_MENU)) {
-                break;
-            }
-
-            SDL_ControllerAxisEvent* axis_event = &event->caxis;
-            float axis_value = axis_event->value * (1/32768.0f);
-            if (axis_value > axis_threshold) {
-                SDL_Event set_stick_return_event;
-                set_stick_return_event.type = SDL_USEREVENT;
-                set_stick_return_event.user.code = axis_event->axis;
-                set_stick_return_event.user.data1 = nullptr;
-                set_stick_return_event.user.data2 = nullptr;
-                recompui::queue_event(set_stick_return_event);
-                
-                set_scanned_input({(uint32_t)InputType::ControllerAnalog, axis_event->axis + 1});
-            }
-            else if (axis_value < -axis_threshold) {
-                SDL_Event set_stick_return_event;
-                set_stick_return_event.type = SDL_USEREVENT;
-                set_stick_return_event.user.code = axis_event->axis;
-                set_stick_return_event.user.data1 = nullptr;
-                set_stick_return_event.user.data2 = nullptr;
-                recompui::queue_event(set_stick_return_event);
-
-                set_scanned_input({(uint32_t)InputType::ControllerAnalog, -axis_event->axis - 1});
-            }
-        } else {
-            queue_if_enabled(event);
-        }
-        break;
-    case SDL_EventType::SDL_CONTROLLERSENSORUPDATE:
-        if (event->csensor.sensor == SDL_SensorType::SDL_SENSOR_ACCEL) {
-            // Convert acceleration to g's.
-            float x = event->csensor.data[0] / SDL_STANDARD_GRAVITY;
-            float y = event->csensor.data[1] / SDL_STANDARD_GRAVITY;
-            float z = event->csensor.data[2] / SDL_STANDARD_GRAVITY;
-            ControllerState& state = InputState.controller_states[event->csensor.which];
-            state.latest_accelerometer[0] = x;
-            state.latest_accelerometer[1] = y;
-            state.latest_accelerometer[2] = z;
-        }
-        else if (event->csensor.sensor == SDL_SensorType::SDL_SENSOR_GYRO) {
-            // constexpr float gyro_threshold = 0.05f;
-            // Convert rotational velocity to degrees per second.
-            constexpr float rad_to_deg = 180.0f / M_PI;
-            float x = event->csensor.data[0] * rad_to_deg;
-            float y = event->csensor.data[1] * rad_to_deg;
-            float z = event->csensor.data[2] * rad_to_deg;
-            ControllerState& state = InputState.controller_states[event->csensor.which];
-            uint64_t cur_timestamp = event->csensor.timestamp;
-            uint32_t delta_ms = cur_timestamp - state.prev_gyro_timestamp;
-            state.motion.ProcessMotion(x, y, z, state.latest_accelerometer[0], state.latest_accelerometer[1], state.latest_accelerometer[2], delta_ms * 0.001f);
-            state.prev_gyro_timestamp = cur_timestamp;
-
-            float rot_x = 0.0f;
-            float rot_y = 0.0f;
-            state.motion.GetPlayerSpaceGyro(rot_x, rot_y);
-
-            {
-                std::lock_guard lock{ InputState.pending_input_mutex };
-                InputState.pending_rotation_delta[0] += rot_x;
-                InputState.pending_rotation_delta[1] += rot_y;
-            }
-        }
-        break;
-    case SDL_EventType::SDL_MOUSEMOTION:
-        if (!recomp::game_input_disabled()) {
-            SDL_MouseMotionEvent* motion_event = &event->motion;
-            std::lock_guard lock{ InputState.pending_input_mutex };
-            InputState.pending_mouse_delta[0] += motion_event->xrel;
-            InputState.pending_mouse_delta[1] += motion_event->yrel;
-        }
-        queue_if_enabled(event);
-        break;
-    case SDL_EventType::SDL_DROPBEGIN:
-        DropState.files_dropped.clear();
-        break;
-    case SDL_EventType::SDL_DROPFILE:
-        DropState.files_dropped.emplace_back(std::filesystem::path(std::u8string_view((const char8_t *)(event->drop.file))));
-        SDL_free(event->drop.file);
-        break;
-    case SDL_EventType::SDL_DROPCOMPLETE:
-        recompui::drop_files(DropState.files_dropped);
-        break;
-    case SDL_EventType::SDL_CONTROLLERBUTTONUP:
-        // Always queue button up events to avoid missing them during binding.
-        recompui::queue_event(*event);
-        break;
-    default:
-        queue_if_enabled(event);
-        break;
-    }
-    return false;
-}
-
-void recomp::handle_events() {
-    SDL_Event cur_event;
-    static bool started = false;
-    static bool exited = false;
-    while (SDL_PollEvent(&cur_event) && !exited) {
-        exited = sdl_event_filter(nullptr, &cur_event);
-
-        // Lock the cursor if all three conditions are true: mouse aiming is enabled, game input is not disabled, and the game has been started. 
-        bool cursor_locked = (recomp::get_mouse_sensitivity() != 0) && !recomp::game_input_disabled() && ultramodern::is_game_started();
-
-        // Hide the cursor based on its enable state, but override visibility to false if the cursor is locked.
-        bool cursor_visible = cursor_enabled;
-        if (cursor_locked) {
-            cursor_visible = false;
-        }
-
-        SDL_ShowCursor(cursor_visible ? SDL_ENABLE : SDL_DISABLE);
-        SDL_SetRelativeMouseMode(cursor_locked ? SDL_TRUE : SDL_FALSE);
-    }
-
-    if (!started && ultramodern::is_game_started()) {
-        started = true;
-        recompui::process_game_started();
-    }
-}
-
-constexpr SDL_GameControllerButton SDL_CONTROLLER_BUTTON_SOUTH = SDL_CONTROLLER_BUTTON_A;
-constexpr SDL_GameControllerButton SDL_CONTROLLER_BUTTON_EAST = SDL_CONTROLLER_BUTTON_B;
-constexpr SDL_GameControllerButton SDL_CONTROLLER_BUTTON_WEST = SDL_CONTROLLER_BUTTON_X;
-constexpr SDL_GameControllerButton SDL_CONTROLLER_BUTTON_NORTH = SDL_CONTROLLER_BUTTON_Y;
-
-const recomp::DefaultN64Mappings recomp::default_n64_keyboard_mappings = {
-    .a = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_SPACE}
-    },
-    .b = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_LSHIFT}
-    },
-    .l = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_E}
-    },
-    .r = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_R}
-    },
-    .z = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_Q}
-    },
-    .start = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_RETURN}
-    },
-    .c_left = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_LEFT}
-    },
-    .c_right = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_RIGHT}
-    },
-    .c_up = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_UP}
-    },
-    .c_down = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_DOWN}
-    },
-    .dpad_left = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_J}
-    },
-    .dpad_right = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_L}
-    },
-    .dpad_up = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_I}
-    },
-    .dpad_down = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_K}
-    },
-    .analog_left = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_A}
-    },
-    .analog_right = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_D}
-    },
-    .analog_up = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_W}
-    },
-    .analog_down = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_S}
-    },
-    .toggle_menu = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_ESCAPE}
-    },
-    .accept_menu = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_RETURN}
-    },
-    .apply_menu = {
-        {.input_type = (uint32_t)InputType::Keyboard, .input_id = SDL_SCANCODE_F}
-    }
-};
-
-const recomp::DefaultN64Mappings recomp::default_n64_controller_mappings = {
-    .a = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_SOUTH},
-    },
-    .b = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_WEST},
-    },
-    .l = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_LEFTSHOULDER},
-    },
-    .r = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = SDL_CONTROLLER_AXIS_TRIGGERRIGHT + 1},
-    },
-    .z = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = SDL_CONTROLLER_AXIS_TRIGGERLEFT + 1},
-    },
-    .start = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_START},
-    },
-    .c_left = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = -(SDL_CONTROLLER_AXIS_RIGHTX + 1)},
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_NORTH},
-    },
-    .c_right = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = SDL_CONTROLLER_AXIS_RIGHTX + 1},
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_EAST},
-    },
-    .c_up = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = -(SDL_CONTROLLER_AXIS_RIGHTY + 1)},
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_RIGHTSTICK},
-    },
-    .c_down = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = SDL_CONTROLLER_AXIS_RIGHTY + 1},
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_RIGHTSHOULDER},
-    },
-    .dpad_left = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_DPAD_LEFT},
-    },
-    .dpad_right = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_DPAD_RIGHT},
-    },
-    .dpad_up = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_DPAD_UP},
-    },
-    .dpad_down = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_DPAD_DOWN},
-    },
-    .analog_left = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = -(SDL_CONTROLLER_AXIS_LEFTX + 1)},
-    },
-    .analog_right = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = SDL_CONTROLLER_AXIS_LEFTX + 1},
-    },
-    .analog_up = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = -(SDL_CONTROLLER_AXIS_LEFTY + 1)},
-    },
-    .analog_down = {
-        {.input_type = (uint32_t)InputType::ControllerAnalog, .input_id = SDL_CONTROLLER_AXIS_LEFTY + 1},
-    },
-    .toggle_menu = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_BACK},
-    },
-    .accept_menu = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_SOUTH},
-    },
-    .apply_menu = {
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_WEST},
-        {.input_type = (uint32_t)InputType::ControllerDigital, .input_id = SDL_CONTROLLER_BUTTON_START}
-    }
-};
-
-void recomp::poll_inputs() {
-    InputState.keys = SDL_GetKeyboardState(&InputState.numkeys);
-    InputState.keymod = SDL_GetModState();
-
-    {
-        std::lock_guard lock{ InputState.cur_controllers_mutex };
-        InputState.cur_controllers.clear();
-
-        for (const auto& [id, state] : InputState.controller_states) {
-            (void)id; // Avoid unused variable warning.
-            SDL_GameController* controller = state.controller;
-            if (controller != nullptr) {
-                InputState.cur_controllers.push_back(controller);
-            }
-        }
-    }
-
-    // Read the deltas while resetting them to zero.
-    {
-        std::lock_guard lock{ InputState.pending_input_mutex };
-        
-        InputState.rotation_delta = InputState.pending_rotation_delta;
-        InputState.pending_rotation_delta = { 0.0f, 0.0f };
-
-        InputState.mouse_delta = InputState.pending_mouse_delta;
-        InputState.pending_mouse_delta = { 0.0f, 0.0f };
-    }
-    
-    // Quicksaving is disabled for now and will likely have more limited functionality
-    // when restored, rather than allowing saving and loading at any point in time.
-    #if 0
-    if (InputState.keys) {
-        static bool save_was_held = false;
-        static bool load_was_held = false;
-        bool save_is_held = InputState.keys[SDL_SCANCODE_F5] != 0;
-        bool load_is_held = InputState.keys[SDL_SCANCODE_F7] != 0;
-        if (save_is_held && !save_was_held) {
-            zelda64::quicksave_save();
-        }
-        else if (load_is_held && !load_was_held) {
-            zelda64::quicksave_load();
-        }
-        save_was_held = save_is_held;
-    }
-    #endif
-}
-
-void recomp::set_rumble(int controller_num, bool on) {
-    if (controller_num == 0) {
-        InputState.rumble_active = on;
-    }
-}
-
-ultramodern::input::connected_device_info_t recomp::get_connected_device_info(int controller_num) {
-    switch (controller_num) {
-        case 0:
-            return ultramodern::input::connected_device_info_t {
-                .connected_device = ultramodern::input::Device::Controller,
-                .connected_pak = ultramodern::input::Pak::RumblePak,
-            };
-    }
-
-    return ultramodern::input::connected_device_info_t {
-        .connected_device = ultramodern::input::Device::None,
-        .connected_pak = ultramodern::input::Pak::None,
-    };
-}
-
-static float smoothstep(float from, float to, float amount) {
-    amount = (amount * amount) * (3.0f - 2.0f * amount);
-    return std::lerp(from, to, amount);
-}
-
-// Update rumble to attempt to mimic the way n64 rumble ramps up and falls off
-void recomp::update_rumble() {
-    // Note: values are not accurate! just approximations based on feel
-    if (InputState.rumble_active) {
-        InputState.cur_rumble += 0.17f;
-        if (InputState.cur_rumble > 1) InputState.cur_rumble = 1;
-    } else {
-        InputState.cur_rumble *= 0.92f;
-        InputState.cur_rumble -= 0.01f;
-        if (InputState.cur_rumble < 0) InputState.cur_rumble = 0;
-    }
-    float smooth_rumble = smoothstep(0, 1, InputState.cur_rumble);
-
-    uint16_t rumble_strength = smooth_rumble * (recomp::get_rumble_strength() * 0xFFFF / 100);
-    uint32_t duration = 1000000; // Dummy duration value that lasts long enough to matter as the game will reset rumble on its own.
-    {
-        std::lock_guard lock{ InputState.cur_controllers_mutex };
-        for (const auto& controller : InputState.cur_controllers) {
-            SDL_GameControllerRumble(controller, 0, rumble_strength, duration);
-        }
-    }
-}
-
-bool controller_button_state(int32_t input_id) {
-    if (input_id >= 0 && input_id < SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_MAX) {
-        SDL_GameControllerButton button = (SDL_GameControllerButton)input_id;
-        bool ret = false;
-        {
-            std::lock_guard lock{ InputState.cur_controllers_mutex };
-            for (const auto& controller : InputState.cur_controllers) {
-                ret |= SDL_GameControllerGetButton(controller, button);
-            }
-        }
-
-        return ret;
-    }
-    return false;
-}
-
-static std::atomic_bool right_analog_suppressed = false;
-
-float controller_axis_state(int32_t input_id, bool allow_suppression) {
-    if (abs(input_id) - 1 < SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_MAX) {
-        SDL_GameControllerAxis axis = (SDL_GameControllerAxis)(abs(input_id) - 1);
-        bool negative_range = input_id < 0;
-        float ret = 0.0f;
-
-        {
-            std::lock_guard lock{ InputState.cur_controllers_mutex };
-            for (const auto& controller : InputState.cur_controllers) {
-                float cur_val = SDL_GameControllerGetAxis(controller, axis) * (1/32768.0f);
-                if (negative_range) {
-                    cur_val = -cur_val;
-                }
-
-                // Check if this input is a right analog axis and suppress it accordingly.
-                if (allow_suppression && right_analog_suppressed.load() &&
-                    (axis == SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX || axis == SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY)) {
-                    cur_val = 0;
-                }
-                ret += std::clamp(cur_val, 0.0f, 1.0f);
-            }
-        }
-
-        return std::clamp(ret, 0.0f, 1.0f);
-    }
-    return false;
-}
-
-float recomp::get_input_analog(const recomp::InputField& field) {
-    switch ((InputType)field.input_type) {
-    case InputType::Keyboard:
-        if (InputState.keys && field.input_id >= 0 && field.input_id < InputState.numkeys) {
-            if (should_override_keystate(static_cast<SDL_Scancode>(field.input_id), InputState.keymod)) {
-                return 0.0f;
-            }
-            return InputState.keys[field.input_id] ? 1.0f : 0.0f;
-        }
-        return 0.0f;
-    case InputType::ControllerDigital:
-        return controller_button_state(field.input_id) ? 1.0f : 0.0f;
-    case InputType::ControllerAnalog:
-        return controller_axis_state(field.input_id, true);
-    case InputType::Mouse:
-        // TODO mouse support
-        return 0.0f;
-    case InputType::None:
-        return false;
-    }
-}
-
-float recomp::get_input_analog(const std::span<const recomp::InputField> fields) {
-    float ret = 0.0f;
-    for (const auto& field : fields) {
-        ret += get_input_analog(field);
-    }
-    return std::clamp(ret, 0.0f, 1.0f);
-}
-
-bool recomp::get_input_digital(const recomp::InputField& field) {
-    switch ((InputType)field.input_type) {
-    case InputType::Keyboard:
-        if (InputState.keys && field.input_id >= 0 && field.input_id < InputState.numkeys) {
-            if (should_override_keystate(static_cast<SDL_Scancode>(field.input_id), InputState.keymod)) {
-                return false;
-            }
-            return InputState.keys[field.input_id] != 0;
-        }
-        return false;
-    case InputType::ControllerDigital:
-        return controller_button_state(field.input_id);
-    case InputType::ControllerAnalog:
-        // TODO adjustable threshold
-        return controller_axis_state(field.input_id, true) >= axis_threshold;
-    case InputType::Mouse:
-        // TODO mouse support
-        return false;
-    case InputType::None:
-        return false;
-    }
-}
-
-bool recomp::get_input_digital(const std::span<const recomp::InputField> fields) {
-    bool ret = 0;
-    for (const auto& field : fields) {
-        ret |= get_input_digital(field);
-    }
-    return ret;
-}
-
-void recomp::get_gyro_deltas(float* x, float* y) {
-    std::array<float, 2> cur_rotation_delta = InputState.rotation_delta;
-    float sensitivity = (float)recomp::get_gyro_sensitivity() / 100.0f;
-    *x = cur_rotation_delta[0] * sensitivity;
-    *y = cur_rotation_delta[1] * sensitivity;
-}
-
-void recomp::get_mouse_deltas(float* x, float* y) {
-    std::array<float, 2> cur_mouse_delta = InputState.mouse_delta;
-    float sensitivity = (float)recomp::get_mouse_sensitivity() / 100.0f;
-    *x = cur_mouse_delta[0] * sensitivity;
-    *y = cur_mouse_delta[1] * sensitivity;
-}
-
-void recomp::apply_joystick_deadzone(float x_in, float y_in, float* x_out, float* y_out) {
-    float joystick_deadzone = (float)recomp::get_joystick_deadzone() / 100.0f;
-
-    if(fabsf(x_in) < joystick_deadzone) {
-        x_in = 0.0f;
-    }
-    else {
-        if(x_in > 0.0f) {
-            x_in -= joystick_deadzone;
-        } 
-        else {
-            x_in += joystick_deadzone;
-        }
-
-        x_in /= (1.0f - joystick_deadzone);
-    }
-
-    if(fabsf(y_in) < joystick_deadzone) {
-        y_in = 0.0f;
-    }
-    else {
-        if(y_in > 0.0f) {
-            y_in -= joystick_deadzone;
-        } 
-        else {
-            y_in += joystick_deadzone;
-        }
-
-        y_in /= (1.0f - joystick_deadzone);
-    }
-
-    *x_out = x_in;
-    *y_out = y_in;
-}
-
-void recomp::get_right_analog(float* x, float* y) {
-    float x_val =
-        controller_axis_state((SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX + 1), false) -
-        controller_axis_state(-(SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX + 1), false);
-    float y_val =
-        controller_axis_state((SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY + 1), false) -
-        controller_axis_state(-(SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY + 1), false);
-    recomp::apply_joystick_deadzone(x_val, y_val, x, y);
-}
-
-void recomp::set_right_analog_suppressed(bool suppressed) {
-    right_analog_suppressed.store(suppressed);
-}
-
-bool recomp::game_input_disabled() {
-    // Disable input if any menu that blocks input is open.
-    return recompui::is_context_capturing_input();
-}
-
-bool recomp::all_input_disabled() {
-    // Disable all input if an input is being polled.
-    return scanning_device != recomp::InputDevice::COUNT;
-}
-
-std::string controller_button_to_string(SDL_GameControllerButton button) {
-    switch (button) {
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_A:
-        return PF_GAMEPAD_A;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_B:
-        return PF_GAMEPAD_B;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_X:
-        return PF_GAMEPAD_X;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_Y:
-        return PF_GAMEPAD_Y;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_BACK:
-        return PF_XBOX_VIEW;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_GUIDE:
-        return PF_GAMEPAD_HOME;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_START:
-        return PF_XBOX_MENU;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSTICK:
-        return PF_ANALOG_L_CLICK;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSTICK:
-        return PF_ANALOG_R_CLICK;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_LEFTSHOULDER:
-        return PF_XBOX_LEFT_SHOULDER;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_RIGHTSHOULDER:
-        return PF_XBOX_RIGHT_SHOULDER;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP:
-        return PF_DPAD_UP;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN:
-        return PF_DPAD_DOWN;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT:
-        return PF_DPAD_LEFT;
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
-        return PF_DPAD_RIGHT;
-    // case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_MISC1:
-    //     return "";
-    // case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_PADDLE1:
-    //     return "";
-    // case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_PADDLE2:
-    //     return "";
-    // case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_PADDLE3:
-    //     return "";
-    // case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_PADDLE4:
-    //     return "";
-    case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_TOUCHPAD:
-        return PF_SONY_TOUCHPAD;
-    default:
-        return "Button " + std::to_string(button);
-    }
-}
-
-std::unordered_map<SDL_Scancode, std::string> scancode_codepoints {
-    {SDL_SCANCODE_LEFT, PF_KEYBOARD_LEFT},
-    // NOTE: UP and RIGHT are swapped with promptfont.
-    {SDL_SCANCODE_UP, PF_KEYBOARD_RIGHT},
-    {SDL_SCANCODE_RIGHT, PF_KEYBOARD_UP},
-    {SDL_SCANCODE_DOWN, PF_KEYBOARD_DOWN},
-    {SDL_SCANCODE_A, PF_KEYBOARD_A},
-    {SDL_SCANCODE_B, PF_KEYBOARD_B},
-    {SDL_SCANCODE_C, PF_KEYBOARD_C},
-    {SDL_SCANCODE_D, PF_KEYBOARD_D},
-    {SDL_SCANCODE_E, PF_KEYBOARD_E},
-    {SDL_SCANCODE_F, PF_KEYBOARD_F},
-    {SDL_SCANCODE_G, PF_KEYBOARD_G},
-    {SDL_SCANCODE_H, PF_KEYBOARD_H},
-    {SDL_SCANCODE_I, PF_KEYBOARD_I},
-    {SDL_SCANCODE_J, PF_KEYBOARD_J},
-    {SDL_SCANCODE_K, PF_KEYBOARD_K},
-    {SDL_SCANCODE_L, PF_KEYBOARD_L},
-    {SDL_SCANCODE_M, PF_KEYBOARD_M},
-    {SDL_SCANCODE_N, PF_KEYBOARD_N},
-    {SDL_SCANCODE_O, PF_KEYBOARD_O},
-    {SDL_SCANCODE_P, PF_KEYBOARD_P},
-    {SDL_SCANCODE_Q, PF_KEYBOARD_Q},
-    {SDL_SCANCODE_R, PF_KEYBOARD_R},
-    {SDL_SCANCODE_S, PF_KEYBOARD_S},
-    {SDL_SCANCODE_T, PF_KEYBOARD_T},
-    {SDL_SCANCODE_U, PF_KEYBOARD_U},
-    {SDL_SCANCODE_V, PF_KEYBOARD_V},
-    {SDL_SCANCODE_W, PF_KEYBOARD_W},
-    {SDL_SCANCODE_X, PF_KEYBOARD_X},
-    {SDL_SCANCODE_Y, PF_KEYBOARD_Y},
-    {SDL_SCANCODE_Z, PF_KEYBOARD_Z},
-    {SDL_SCANCODE_0, PF_KEYBOARD_0},
-    {SDL_SCANCODE_1, PF_KEYBOARD_1},
-    {SDL_SCANCODE_2, PF_KEYBOARD_2},
-    {SDL_SCANCODE_3, PF_KEYBOARD_3},
-    {SDL_SCANCODE_4, PF_KEYBOARD_4},
-    {SDL_SCANCODE_5, PF_KEYBOARD_5},
-    {SDL_SCANCODE_6, PF_KEYBOARD_6},
-    {SDL_SCANCODE_7, PF_KEYBOARD_7},
-    {SDL_SCANCODE_8, PF_KEYBOARD_8},
-    {SDL_SCANCODE_9, PF_KEYBOARD_9},
-    {SDL_SCANCODE_ESCAPE, PF_KEYBOARD_ESCAPE},
-    {SDL_SCANCODE_F1, PF_KEYBOARD_F1},
-    {SDL_SCANCODE_F2, PF_KEYBOARD_F2},
-    {SDL_SCANCODE_F3, PF_KEYBOARD_F3},
-    {SDL_SCANCODE_F4, PF_KEYBOARD_F4},
-    {SDL_SCANCODE_F5, PF_KEYBOARD_F5},
-    {SDL_SCANCODE_F6, PF_KEYBOARD_F6},
-    {SDL_SCANCODE_F7, PF_KEYBOARD_F7},
-    {SDL_SCANCODE_F8, PF_KEYBOARD_F8},
-    {SDL_SCANCODE_F9, PF_KEYBOARD_F9},
-    {SDL_SCANCODE_F10, PF_KEYBOARD_F10},
-    {SDL_SCANCODE_F11, PF_KEYBOARD_F11},
-    {SDL_SCANCODE_F12, PF_KEYBOARD_F12},
-    {SDL_SCANCODE_PRINTSCREEN, PF_KEYBOARD_PRINT_SCREEN},
-    {SDL_SCANCODE_SCROLLLOCK, PF_KEYBOARD_SCROLL_LOCK},
-    {SDL_SCANCODE_PAUSE, PF_KEYBOARD_PAUSE},
-    {SDL_SCANCODE_INSERT, PF_KEYBOARD_INSERT},
-    {SDL_SCANCODE_HOME, PF_KEYBOARD_HOME},
-    {SDL_SCANCODE_PAGEUP, PF_KEYBOARD_PAGE_UP},
-    {SDL_SCANCODE_DELETE, PF_KEYBOARD_DELETE},
-    {SDL_SCANCODE_END, PF_KEYBOARD_END},
-    {SDL_SCANCODE_PAGEDOWN, PF_KEYBOARD_PAGE_DOWN},
-    {SDL_SCANCODE_SPACE, PF_KEYBOARD_SPACE},
-    {SDL_SCANCODE_BACKSPACE, PF_KEYBOARD_BACKSPACE},
-    {SDL_SCANCODE_TAB, PF_KEYBOARD_TAB},
-    {SDL_SCANCODE_RETURN, PF_KEYBOARD_ENTER},
-    {SDL_SCANCODE_CAPSLOCK, PF_KEYBOARD_CAPS},
-    {SDL_SCANCODE_NUMLOCKCLEAR, PF_KEYBOARD_NUM_LOCK},
-    {SDL_SCANCODE_LSHIFT, "L" PF_KEYBOARD_SHIFT},
-    {SDL_SCANCODE_RSHIFT, "R" PF_KEYBOARD_SHIFT},
-};
-
-std::string keyboard_input_to_string(SDL_Scancode key) {
-    if (scancode_codepoints.find(key) != scancode_codepoints.end()) {
-        return scancode_codepoints[key];
-    }
-    return std::to_string(key);
-}
-
-std::string controller_axis_to_string(int axis) {
-    bool positive = axis > 0;
-    SDL_GameControllerAxis actual_axis = SDL_GameControllerAxis(abs(axis) - 1);
-    switch (actual_axis) {
-    case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX:
-        return positive ? "\u21C0" : "\u21BC";
-    case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY:
-        return positive ? "\u21C2" : "\u21BE";
-    case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTX:
-        return positive ? "\u21C1" : "\u21BD";
-    case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_RIGHTY:
-        return positive ? "\u21C3" : "\u21BF";
-    case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERLEFT:
-        return positive ? "\u2196" : "\u21DC";
-    case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_TRIGGERRIGHT:
-        return positive ? "\u2197" : "\u21DD";
-    default:
-        return "Axis " + std::to_string(actual_axis) + (positive ? '+' : '-');
-    }
-}
-
-std::string recomp::InputField::to_string() const {
-    switch ((InputType)input_type) {
-        case InputType::None:
-            return "";
-        case InputType::ControllerDigital:
-            return controller_button_to_string((SDL_GameControllerButton)input_id);
-        case InputType::ControllerAnalog:
-            return controller_axis_to_string(input_id);
-        case InputType::Keyboard:
-            return keyboard_input_to_string((SDL_Scancode)input_id);
-        default:
-            return std::to_string(input_type) + "," + std::to_string(input_id);
-    }
-}
diff --git a/src/game/recomp_actor_api.cpp b/src/game/recomp_actor_api.cpp
index 759b9a0..72c7928 100644
--- a/src/game/recomp_actor_api.cpp
+++ b/src/game/recomp_actor_api.cpp
@@ -6,7 +6,7 @@
 #include "librecomp/helpers.hpp"
 #include "librecomp/addresses.hpp"
 #include "ultramodern/error_handling.hpp"
-#include "recomp_ui.h"
+#include "recompui/recompui.h"
 #include "recomp_data.h"
 #include "../patches/actor_funcs.h"
 
diff --git a/src/game/recomp_api.cpp b/src/game/recomp_api.cpp
index 9ad08be..eeb7c4b 100644
--- a/src/game/recomp_api.cpp
+++ b/src/game/recomp_api.cpp
@@ -3,9 +3,9 @@
 #include "recomp.h"
 #include "librecomp/overlays.hpp"
 #include "zelda_config.h"
-#include "recomp_input.h"
-#include "recomp_ui.h"
-#include "zelda_render.h"
+#include "recompinput/recompinput.h"
+#include "recompui/recompui.h"
+#include "recompui/renderer.h"
 #include "zelda_sound.h"
 #include "librecomp/helpers.hpp"
 #include "../patches/input.h"
@@ -15,7 +15,7 @@
 #include "ultramodern/config.hpp"
 
 extern "C" void recomp_update_inputs(uint8_t* rdram, recomp_context* ctx) {
-    recomp::poll_inputs();
+    recompinput::poll_inputs();
 }
 
 extern "C" void recomp_puts(uint8_t* rdram, recomp_context* ctx) {
@@ -35,14 +35,14 @@ extern "C" void recomp_get_gyro_deltas(uint8_t* rdram, recomp_context* ctx) {
     float* x_out = _arg<0, float*>(rdram, ctx);
     float* y_out = _arg<1, float*>(rdram, ctx);
 
-    recomp::get_gyro_deltas(x_out, y_out);
+    recompinput::get_gyro_deltas(0, x_out, y_out);
 }
 
 extern "C" void recomp_get_mouse_deltas(uint8_t* rdram, recomp_context* ctx) {
     float* x_out = _arg<0, float*>(rdram, ctx);
     float* y_out = _arg<1, float*>(rdram, ctx);
 
-    recomp::get_mouse_deltas(x_out, y_out);
+    recompinput::get_mouse_deltas(x_out, y_out);
 }
 
 extern "C" void recomp_powf(uint8_t* rdram, recomp_context* ctx) {
@@ -115,7 +115,7 @@ extern "C" void recomp_load_overlays(uint8_t * rdram, recomp_context * ctx) {
 }
 
 extern "C" void recomp_high_precision_fb_enabled(uint8_t * rdram, recomp_context * ctx) {
-    _return(ctx, static_cast<s32>(zelda64::renderer::RT64HighPrecisionFBEnabled()));
+    _return(ctx, static_cast<s32>(recompui::renderer::RT64HighPrecisionFBEnabled()));
 }
 
 extern "C" void recomp_get_resolution_scale(uint8_t* rdram, recomp_context* ctx) {
@@ -155,7 +155,8 @@ extern "C" void recomp_get_camera_inputs(uint8_t* rdram, recomp_context* ctx) {
 
     float x, y;
 
-    recomp::get_right_analog(&x, &y);
+    // TODO: Use controller number.
+    recompinput::get_right_analog(0, &x, &y);
 
     float magnitude = sqrtf(x * x + y * y);
 
@@ -175,5 +176,5 @@ extern "C" void recomp_get_camera_inputs(uint8_t* rdram, recomp_context* ctx) {
 extern "C" void recomp_set_right_analog_suppressed(uint8_t* rdram, recomp_context* ctx) {
     s32 suppressed = _arg<0, s32>(rdram, ctx);
 
-    recomp::set_right_analog_suppressed(suppressed);
+    recompinput::set_right_analog_suppressed(suppressed);
 }
diff --git a/src/game/recomp_data_api.cpp b/src/game/recomp_data_api.cpp
index b07dbcf..1c1b815 100644
--- a/src/game/recomp_data_api.cpp
+++ b/src/game/recomp_data_api.cpp
@@ -5,7 +5,7 @@
 
 #include "slot_map.h"
 #include "recomp_data.h"
-#include "recomp_ui.h"
+#include "recompui/recompui.h"
 #include "librecomp/helpers.hpp"
 #include "librecomp/overlays.hpp"
 #include "librecomp/addresses.hpp"
diff --git a/src/main/launcher_animation.cpp b/src/main/launcher_animation.cpp
new file mode 100644
index 0000000..6fb7194
--- /dev/null
+++ b/src/main/launcher_animation.cpp
@@ -0,0 +1,13 @@
+#include "zelda_launcher.h"
+#include <atomic>
+
+void zelda64::launcher_animation_setup(recompui::LauncherMenu *menu) {
+    auto context = recompui::get_current_context();
+    recompui::Element *background_container = menu->get_background_container();
+    background_container->set_background_color({ 0x00, 0x00, 0x00, 0xFF });
+
+    (void)context;
+}
+
+void zelda64::launcher_animation_update(recompui::LauncherMenu *menu) {
+}
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 6c8262a..375c647 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -27,15 +27,22 @@
 #undef Always
 #endif
 
-#include "recomp_ui.h"
-#include "recomp_input.h"
+#include "recompui/recompui.h"
+#include "recompui/program_config.h"
+#include "recompui/renderer.h"
+#include "recompui/config.h"
+#include "util/file.h"
+#include "recompinput/input_events.h"
+#include "recompinput/recompinput.h"
+#include "recompinput/profiles.h"
 #include "zelda_config.h"
 #include "zelda_sound.h"
-#include "zelda_render.h"
 #include "zelda_support.h"
 #include "zelda_game.h"
+#include "zelda_launcher.h"
 #include "recomp_data.h"
 #include "ovl_patches.hpp"
+#include "theme.h"
 #include "librecomp/game.hpp"
 #include "librecomp/mods.hpp"
 #include "librecomp/helpers.hpp"
@@ -56,7 +63,7 @@
 
 #include "../../lib/rt64/src/contrib/stb/stb_image.h"
 
-const std::string version_string = "1.2.2";
+const std::string version_string = "1.2.3";
 
 template<typename... Ts>
 void exit_error(const char* str, Ts ...args) {
@@ -84,9 +91,23 @@ ultramodern::gfx_callbacks_t::gfx_data_t create_gfx() {
     return {};
 }
 
-#if defined(__gnu_linux__)
+ultramodern::input::connected_device_info_t get_connected_device_info(int controller_num) {
+    if (recompinput::players::is_single_player_mode() || recompinput::players::get_player_is_assigned(controller_num)) {
+        return ultramodern::input::connected_device_info_t{
+            .connected_device = ultramodern::input::Device::Controller,
+            .connected_pak = ultramodern::input::Pak::RumblePak,
+        };
+    }
+
+    return ultramodern::input::connected_device_info_t{
+        .connected_device = ultramodern::input::Device::None,
+        .connected_pak = ultramodern::input::Pak::None,
+    };
+}
+
 #include "icon_bytes.h"
 
+#if defined(__gnu_linux__)
 bool SetImageAsIcon(const char* filename, SDL_Window* window)
 {
     // Read data
@@ -145,14 +166,6 @@ ultramodern::renderer::WindowHandle create_window(ultramodern::gfx_callbacks_t::
 #endif
 
     window = SDL_CreateWindow("Zelda 64: Recompiled", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 1600, 960,  flags);
-#if defined(__linux__)
-    SetImageAsIcon("icons/512.png",window);
-    if (ultramodern::renderer::get_graphics_config().wm_option == ultramodern::renderer::WindowMode::Fullscreen) { // TODO: Remove once RT64 gets native fullscreen support on Linux
-        SDL_SetWindowFullscreen(window,SDL_WINDOW_FULLSCREEN_DESKTOP);
-    } else {
-        SDL_SetWindowFullscreen(window,0);
-    }
-#endif
 
     if (window == nullptr) {
         exit_error("Failed to create window: %s\n", SDL_GetError());
@@ -162,6 +175,10 @@ ultramodern::renderer::WindowHandle create_window(ultramodern::gfx_callbacks_t::
     SDL_VERSION(&wmInfo.version);
     SDL_GetWindowWMInfo(window, &wmInfo);
 
+#if defined(__linux__)
+    SetImageAsIcon("icons/512.png", window);
+#endif
+
 #if defined(_WIN32)
     return ultramodern::renderer::WindowHandle{ wmInfo.info.win.window, GetCurrentThreadId() };
 #elif defined(__linux__) || defined(__ANDROID__)
@@ -175,7 +192,7 @@ ultramodern::renderer::WindowHandle create_window(ultramodern::gfx_callbacks_t::
 }
 
 void update_gfx(void*) {
-    recomp::handle_events();
+    recompinput::handle_events();
 }
 
 static SDL_AudioCVT audio_convert;
@@ -217,7 +234,7 @@ void queue_samples(int16_t* audio_data, size_t sample_count) {
 
     // Convert the audio from 16-bit values to floats and swap the audio channels into the
     // swap buffer to correct for the address xor caused by endianness handling.
-    float cur_main_volume = zelda64::get_main_volume() / 100.0f; // Get the current main volume, normalized to 0.0-1.0.
+    float cur_main_volume = recompui::config::sound::get_main_volume() / 100.0f; // Get the current main volume, normalized to 0.0-1.0.
     for (size_t i = 0; i < sample_count; i += input_channels) {
         swap_buffer[i + 0 + duplicated_input_frames * input_channels] = audio_data[i + 1] * (0.5f / 32768.0f) * cur_main_volume;
         swap_buffer[i + 1 + duplicated_input_frames * input_channels] = audio_data[i + 0] * (0.5f / 32768.0f) * cur_main_volume;
@@ -352,9 +369,11 @@ std::vector<recomp::GameEntry> supported_games = {
     {
         .rom_hash = 0xEF18B4A9E2386169ULL,
         .internal_name = "ZELDA MAJORA'S MASK",
+        .display_name = "Majora's Mask",
         .game_id = u8"mm.n64.us.1.0",
         .mod_game_id = "mm",
         .save_type = recomp::SaveType::Flashram,
+        .thumbnail_bytes = std::span<const char>(icon_bytes),
         .is_enabled = false,
         .decompression_routine = zelda64::decompress_mm,
         .has_compressed_code = true,
@@ -538,7 +557,7 @@ void release_preload(PreloadContext& context) {
     context = {};
 }
 
-#else
+#elif defined(__linux__) || defined(APPLE)
 
 struct PreloadContext {
 
@@ -546,24 +565,51 @@ struct PreloadContext {
 
 // TODO implement on other platforms
 bool preload_executable(PreloadContext& context) {
+    // Preloading isn't implemented on Linux and MacOS, but it's also unnecessary there, as the OS already preloads the executable.
+    // Therefore, we can just consider the executable to be preloaded.
     return false;
 }
 
 void release_preload(PreloadContext& context) {
 }
 
+#else
+
+struct PreloadContext {};
+
+bool preload_executable(PreloadContext &context) {
+    return false;
+}
+
+void release_preload(PreloadContext &context) {
+}
+
 #endif
 
 void enable_texture_pack(recomp::mods::ModContext& context, const recomp::mods::ModHandle& mod) {
-    zelda64::renderer::enable_texture_pack(context, mod);
+    recompui::renderer::enable_texture_pack(context, mod);
 }
 
 void disable_texture_pack(recomp::mods::ModContext&, const recomp::mods::ModHandle& mod) {
-    zelda64::renderer::disable_texture_pack(mod);
+    recompui::renderer::disable_texture_pack(mod);
 }
 
 void reorder_texture_pack(recomp::mods::ModContext&) {
-    zelda64::renderer::trigger_texture_pack_update();
+    recompui::renderer::trigger_texture_pack_update();
+}
+
+void on_launcher_init(recompui::LauncherMenu *menu) {
+    auto game_options_menu = menu->init_game_options_menu(
+        supported_games[0].game_id,
+        supported_games[0].mod_game_id,
+        supported_games[0].display_name,
+        supported_games[0].thumbnail_bytes,
+        recompui::GameOptionsMenuLayout::Right
+    );
+    game_options_menu->add_default_options();
+
+    recompui::Element *menu_container = menu->get_menu_container();
+    zelda64::launcher_animation_setup(menu);
 }
 
 #define REGISTER_FUNC(name) recomp::overlays::register_base_export(#name, name)
@@ -610,9 +656,6 @@ int main(int argc, char** argv) {
     // Set up console output to accept UTF-8 on windows
     SetConsoleOutputCP(CP_UTF8);
 
-    // Initialize native file dialogs.
-    NFD_Init();
-
     // Change to a font that supports Japanese characters
     CONSOLE_FONT_INFOEX cfi;
     cfi.cbSize = sizeof cfi;
@@ -638,6 +681,13 @@ int main(int argc, char** argv) {
     std::filesystem::current_path("/var/data", ec);
 #endif
 
+    // Initialize native file dialogs.
+    NFD_Init();
+
+    // Initialize program settings.
+    recompui::programconfig::set_program_name(zelda64::program_name);
+    recompui::programconfig::set_program_id(zelda64::program_id);
+
     // Initialize SDL audio and set the output frequency.
     SDL_InitSubSystem(SDL_INIT_AUDIO);
     reset_audio(48000);
@@ -648,7 +698,11 @@ int main(int argc, char** argv) {
         fprintf(stderr, "Failed to load controller mappings: %s\n", SDL_GetError());
     }
 
-    recomp::register_config_path(zelda64::get_app_folder_path());
+    // Register fonts.
+    recompui::register_primary_font("ChiaroNormal.otf", "Chiaro");
+    recompui::register_extra_font("ChiaroBold.otf");
+
+    recomp::register_config_path(recompui::file::get_app_folder_path());
 
     // Register supported games and patches
     for (const auto& game : supported_games) {
@@ -672,18 +726,28 @@ int main(int argc, char** argv) {
     REGISTER_FUNC(recomp_get_analog_inverted_axes);
     recompui::register_ui_exports();
     recomputil::register_data_api_exports();
+    recomptheme::set_custom_theme();
 
     zelda64::register_overlays();
     zelda64::register_patches();
     recomputil::init_extended_actor_data();
-    zelda64::load_config();
+
+    recompinput::players::set_single_player_mode(true);
+
+    zelda64::init_config();
+
+    recompui::register_launcher_init_callback(on_launcher_init);
+    recompui::register_launcher_update_callback(zelda64::launcher_animation_update);
 
     recomp::rsp::callbacks_t rsp_callbacks{
         .get_rsp_microcode = get_rsp_microcode,
     };
 
     ultramodern::renderer::callbacks_t renderer_callbacks{
-        .create_render_context = zelda64::renderer::create_render_context,
+        .create_render_context = [](uint8_t *rdram, ultramodern::renderer::WindowHandle window_handle, bool developer_mode) {
+            auto presentation_mode = ultramodern::renderer::PresentationMode::PresentEarly;
+            return recompui::renderer::create_render_context(rdram, window_handle, presentation_mode, developer_mode);
+        },
     };
 
     ultramodern::gfx_callbacks_t gfx_callbacks{
@@ -699,15 +763,15 @@ int main(int argc, char** argv) {
     };
 
     ultramodern::input::callbacks_t input_callbacks{
-        .poll_input = recomp::poll_inputs,
-        .get_input = recomp::get_n64_input,
-        .set_rumble = recomp::set_rumble,
-        .get_connected_device_info = recomp::get_connected_device_info,
+        .poll_input = recompinput::poll_inputs,
+        .get_input = recompinput::profiles::get_n64_input,
+        .set_rumble = recompinput::set_rumble,
+        .get_connected_device_info = get_connected_device_info,
     };
 
     ultramodern::events::callbacks_t thread_callbacks{
-        .vi_callback = recomp::update_rumble,
-        .gfx_init_callback = recompui::update_supported_options,
+        .vi_callback = recompinput::update_rumble,
+        .gfx_init_callback = nullptr,
     };
 
     ultramodern::error_handling::callbacks_t error_handling_callbacks{
@@ -731,18 +795,24 @@ int main(int argc, char** argv) {
     // Register the .rtz texture pack file format with the previous content type as its only allowed content type.
     recomp::mods::register_mod_container_type("rtz", std::vector{ texture_pack_content_type_id }, false);
 
-    recomp::start(
-        project_version,
-        {},
-        rsp_callbacks,
-        renderer_callbacks,
-        audio_callbacks,
-        input_callbacks,
-        gfx_callbacks,
-        thread_callbacks,
-        error_handling_callbacks,
-        threads_callbacks
-    );
+   // Configure and start.
+    recomp::Configuration cfg;
+    cfg.project_version = project_version;
+    cfg.window_handle = {};
+    cfg.rsp_callbacks = rsp_callbacks;
+    cfg.renderer_callbacks = renderer_callbacks;
+    cfg.audio_callbacks = audio_callbacks;
+    cfg.input_callbacks = input_callbacks;
+    cfg.gfx_callbacks = gfx_callbacks;
+    cfg.events_callbacks = thread_callbacks;
+    cfg.error_handling_callbacks = error_handling_callbacks;
+    cfg.threads_callbacks = threads_callbacks;
+    cfg.message_queue_control.requeue_pi = true;
+    cfg.message_queue_control.requeue_ai = true;
+    cfg.message_queue_control.requeue_sp = true;
+    cfg.message_queue_control.requeue_dp = true;
+    cfg.message_queue_control.requeue_timer = true;
+    recomp::start(cfg);
 
     NFD_Quit();
 
diff --git a/src/main/rt64_render_context.cpp b/src/main/rt64_render_context.cpp
deleted file mode 100644
index 2eff6f8..0000000
--- a/src/main/rt64_render_context.cpp
+++ /dev/null
@@ -1,530 +0,0 @@
-#include <memory>
-#include <cstring>
-#include <variant>
-#include <algorithm>
-
-#define HLSL_CPU
-#include "hle/rt64_application.h"
-#include "rt64_render_hooks.h"
-#include "overloaded.h"
-
-#include "ultramodern/ultramodern.hpp"
-#include "ultramodern/config.hpp"
-
-#include "zelda_render.h"
-#include "recomp_ui.h"
-#include "concurrentqueue.h"
-
-static RT64::UserConfiguration::Antialiasing device_max_msaa = RT64::UserConfiguration::Antialiasing::None;
-static bool sample_positions_supported = false;
-static bool high_precision_fb_enabled = false;
-
-static uint8_t DMEM[0x1000];
-static uint8_t IMEM[0x1000];
-
-struct TexturePackEnableAction {
-    std::string mod_id;
-};
-
-struct TexturePackDisableAction {
-    std::string mod_id;
-};
-
-struct TexturePackSecondaryEnableAction {
-    std::string mod_id;
-};
-
-struct TexturePackSecondaryDisableAction {
-    std::string mod_id;
-};
-
-struct TexturePackUpdateAction {
-};
-
-using TexturePackAction = std::variant<TexturePackEnableAction, TexturePackDisableAction, TexturePackSecondaryEnableAction, TexturePackSecondaryDisableAction, TexturePackUpdateAction>;
-
-static moodycamel::ConcurrentQueue<TexturePackAction> texture_pack_action_queue;
-
-unsigned int MI_INTR_REG = 0;
-
-unsigned int DPC_START_REG = 0;
-unsigned int DPC_END_REG = 0;
-unsigned int DPC_CURRENT_REG = 0;
-unsigned int DPC_STATUS_REG = 0;
-unsigned int DPC_CLOCK_REG = 0;
-unsigned int DPC_BUFBUSY_REG = 0;
-unsigned int DPC_PIPEBUSY_REG = 0;
-unsigned int DPC_TMEM_REG = 0;
-
-void dummy_check_interrupts() {}
-
-RT64::UserConfiguration::Antialiasing compute_max_supported_aa(RT64::RenderSampleCounts bits) {
-    if (bits & RT64::RenderSampleCount::Bits::COUNT_2) {
-        if (bits & RT64::RenderSampleCount::Bits::COUNT_4) {
-            if (bits & RT64::RenderSampleCount::Bits::COUNT_8) {
-                return RT64::UserConfiguration::Antialiasing::MSAA8X;
-            }
-            return RT64::UserConfiguration::Antialiasing::MSAA4X;
-        }
-        return RT64::UserConfiguration::Antialiasing::MSAA2X;
-    };
-    return RT64::UserConfiguration::Antialiasing::None;
-}
-
-RT64::UserConfiguration::AspectRatio to_rt64(ultramodern::renderer::AspectRatio option) {
-    switch (option) {
-        case ultramodern::renderer::AspectRatio::Original:
-            return RT64::UserConfiguration::AspectRatio::Original;
-        case ultramodern::renderer::AspectRatio::Expand:
-            return RT64::UserConfiguration::AspectRatio::Expand;
-        case ultramodern::renderer::AspectRatio::Manual:
-            return RT64::UserConfiguration::AspectRatio::Manual;
-        case ultramodern::renderer::AspectRatio::OptionCount:
-            return RT64::UserConfiguration::AspectRatio::OptionCount;
-    }
-}
-
-RT64::UserConfiguration::Antialiasing to_rt64(ultramodern::renderer::Antialiasing option) {
-    switch (option) {
-        case ultramodern::renderer::Antialiasing::None:
-            return RT64::UserConfiguration::Antialiasing::None;
-        case ultramodern::renderer::Antialiasing::MSAA2X:
-            return RT64::UserConfiguration::Antialiasing::MSAA2X;
-        case ultramodern::renderer::Antialiasing::MSAA4X:
-            return RT64::UserConfiguration::Antialiasing::MSAA4X;
-        case ultramodern::renderer::Antialiasing::MSAA8X:
-            return RT64::UserConfiguration::Antialiasing::MSAA8X;
-        case ultramodern::renderer::Antialiasing::OptionCount:
-            return RT64::UserConfiguration::Antialiasing::OptionCount;
-    }
-}
-
-RT64::UserConfiguration::RefreshRate to_rt64(ultramodern::renderer::RefreshRate option) {
-    switch (option) {
-        case ultramodern::renderer::RefreshRate::Original:
-            return RT64::UserConfiguration::RefreshRate::Original;
-        case ultramodern::renderer::RefreshRate::Display:
-            return RT64::UserConfiguration::RefreshRate::Display;
-        case ultramodern::renderer::RefreshRate::Manual:
-            return RT64::UserConfiguration::RefreshRate::Manual;
-        case ultramodern::renderer::RefreshRate::OptionCount:
-            return RT64::UserConfiguration::RefreshRate::OptionCount;
-    }
-}
-
-RT64::UserConfiguration::InternalColorFormat to_rt64(ultramodern::renderer::HighPrecisionFramebuffer option) {
-    switch (option) {
-        case ultramodern::renderer::HighPrecisionFramebuffer::Off:
-            return RT64::UserConfiguration::InternalColorFormat::Standard;
-        case ultramodern::renderer::HighPrecisionFramebuffer::On:
-            return RT64::UserConfiguration::InternalColorFormat::High;
-        case ultramodern::renderer::HighPrecisionFramebuffer::Auto:
-            return RT64::UserConfiguration::InternalColorFormat::Automatic;
-        case ultramodern::renderer::HighPrecisionFramebuffer::OptionCount:
-            return RT64::UserConfiguration::InternalColorFormat::OptionCount;
-    }
-}
-
-void set_application_user_config(RT64::Application* application, const ultramodern::renderer::GraphicsConfig& config) {
-    switch (config.res_option) {
-        default:
-        case ultramodern::renderer::Resolution::Auto:
-            application->userConfig.resolution = RT64::UserConfiguration::Resolution::WindowIntegerScale;
-            application->userConfig.downsampleMultiplier = 1;
-            break;
-        case ultramodern::renderer::Resolution::Original:
-            application->userConfig.resolution = RT64::UserConfiguration::Resolution::Manual;
-            application->userConfig.resolutionMultiplier = std::max(config.ds_option, 1);
-            application->userConfig.downsampleMultiplier = std::max(config.ds_option, 1);
-            break;
-        case ultramodern::renderer::Resolution::Original2x:
-            application->userConfig.resolution = RT64::UserConfiguration::Resolution::Manual;
-            application->userConfig.resolutionMultiplier = 2.0 * std::max(config.ds_option, 1);
-            application->userConfig.downsampleMultiplier = std::max(config.ds_option, 1);
-            break;
-    }
-
-    switch (config.hr_option) {
-        default:
-        case ultramodern::renderer::HUDRatioMode::Original:
-            application->userConfig.extAspectRatio = RT64::UserConfiguration::AspectRatio::Original;
-            break;
-        case ultramodern::renderer::HUDRatioMode::Clamp16x9:
-            application->userConfig.extAspectRatio = RT64::UserConfiguration::AspectRatio::Manual;
-            application->userConfig.extAspectTarget = 16.0/9.0;
-            break;
-        case ultramodern::renderer::HUDRatioMode::Full:
-            application->userConfig.extAspectRatio = RT64::UserConfiguration::AspectRatio::Expand;
-            break;
-    }
-
-    application->userConfig.aspectRatio = to_rt64(config.ar_option);
-    application->userConfig.antialiasing = to_rt64(config.msaa_option);
-    application->userConfig.refreshRate = to_rt64(config.rr_option);
-    application->userConfig.refreshRateTarget = config.rr_manual_value;
-    application->userConfig.internalColorFormat = to_rt64(config.hpfb_option);
-    application->userConfig.displayBuffering = RT64::UserConfiguration::DisplayBuffering::Triple;
-}
-
-ultramodern::renderer::SetupResult map_setup_result(RT64::Application::SetupResult rt64_result) {
-    switch (rt64_result) {
-        case RT64::Application::SetupResult::Success:
-            return ultramodern::renderer::SetupResult::Success;
-        case RT64::Application::SetupResult::DynamicLibrariesNotFound:
-            return ultramodern::renderer::SetupResult::DynamicLibrariesNotFound;
-        case RT64::Application::SetupResult::InvalidGraphicsAPI:
-            return ultramodern::renderer::SetupResult::InvalidGraphicsAPI;
-        case RT64::Application::SetupResult::GraphicsAPINotFound:
-            return ultramodern::renderer::SetupResult::GraphicsAPINotFound;
-        case RT64::Application::SetupResult::GraphicsDeviceNotFound:
-            return ultramodern::renderer::SetupResult::GraphicsDeviceNotFound;
-    }
-
-    fprintf(stderr, "Unhandled `RT64::Application::SetupResult` ?\n");
-    assert(false);
-    std::exit(EXIT_FAILURE);
-}
-
-ultramodern::renderer::GraphicsApi map_graphics_api(RT64::UserConfiguration::GraphicsAPI api) {
-    switch (api) {
-        case RT64::UserConfiguration::GraphicsAPI::D3D12:
-            return ultramodern::renderer::GraphicsApi::D3D12;
-        case RT64::UserConfiguration::GraphicsAPI::Vulkan:
-            return ultramodern::renderer::GraphicsApi::Vulkan;
-        case RT64::UserConfiguration::GraphicsAPI::Metal:
-            return ultramodern::renderer::GraphicsApi::Metal;
-        case RT64::UserConfiguration::GraphicsAPI::Automatic:
-            return ultramodern::renderer::GraphicsApi::Auto;
-    }
-
-    fprintf(stderr, "Unhandled `RT64::UserConfiguration::GraphicsAPI` ?\n");
-    assert(false);
-    std::exit(EXIT_FAILURE);
-}
-
-zelda64::renderer::RT64Context::RT64Context(uint8_t* rdram, ultramodern::renderer::WindowHandle window_handle, bool debug) {
-    static unsigned char dummy_rom_header[0x40];
-    recompui::set_render_hooks();
-
-    // Set up the RT64 application core fields.
-    RT64::Application::Core appCore{};
-#if defined(_WIN32)
-    appCore.window = window_handle.window;
-#elif defined(__linux__) || defined(__ANDROID__)
-    appCore.window = window_handle;
-#elif defined(__APPLE__)
-    appCore.window.window = window_handle.window;
-    appCore.window.view = window_handle.view;
-#endif
-
-    appCore.checkInterrupts = dummy_check_interrupts;
-
-    appCore.HEADER = dummy_rom_header;
-    appCore.RDRAM = rdram;
-    appCore.DMEM = DMEM;
-    appCore.IMEM = IMEM;
-
-    appCore.MI_INTR_REG = &MI_INTR_REG;
-
-    appCore.DPC_START_REG = &DPC_START_REG;
-    appCore.DPC_END_REG = &DPC_END_REG;
-    appCore.DPC_CURRENT_REG = &DPC_CURRENT_REG;
-    appCore.DPC_STATUS_REG = &DPC_STATUS_REG;
-    appCore.DPC_CLOCK_REG = &DPC_CLOCK_REG;
-    appCore.DPC_BUFBUSY_REG = &DPC_BUFBUSY_REG;
-    appCore.DPC_PIPEBUSY_REG = &DPC_PIPEBUSY_REG;
-    appCore.DPC_TMEM_REG = &DPC_TMEM_REG;
-
-    ultramodern::renderer::ViRegs* vi_regs = ultramodern::renderer::get_vi_regs();
-
-    appCore.VI_STATUS_REG = &vi_regs->VI_STATUS_REG;
-    appCore.VI_ORIGIN_REG = &vi_regs->VI_ORIGIN_REG;
-    appCore.VI_WIDTH_REG = &vi_regs->VI_WIDTH_REG;
-    appCore.VI_INTR_REG = &vi_regs->VI_INTR_REG;
-    appCore.VI_V_CURRENT_LINE_REG = &vi_regs->VI_V_CURRENT_LINE_REG;
-    appCore.VI_TIMING_REG = &vi_regs->VI_TIMING_REG;
-    appCore.VI_V_SYNC_REG = &vi_regs->VI_V_SYNC_REG;
-    appCore.VI_H_SYNC_REG = &vi_regs->VI_H_SYNC_REG;
-    appCore.VI_LEAP_REG = &vi_regs->VI_LEAP_REG;
-    appCore.VI_H_START_REG = &vi_regs->VI_H_START_REG;
-    appCore.VI_V_START_REG = &vi_regs->VI_V_START_REG;
-    appCore.VI_V_BURST_REG = &vi_regs->VI_V_BURST_REG;
-    appCore.VI_X_SCALE_REG = &vi_regs->VI_X_SCALE_REG;
-    appCore.VI_Y_SCALE_REG = &vi_regs->VI_Y_SCALE_REG;
-
-    // Set up the RT64 application configuration fields.
-    RT64::ApplicationConfiguration appConfig;
-    appConfig.useConfigurationFile = false;
-
-    // Create the RT64 application.
-    app = std::make_unique<RT64::Application>(appCore, appConfig);
-
-    // Set initial user config settings based on the current settings.
-    auto& cur_config = ultramodern::renderer::get_graphics_config();
-    set_application_user_config(app.get(), cur_config);
-    app->userConfig.developerMode = debug;
-    // Force gbi depth branches to prevent LODs from kicking in.
-    app->enhancementConfig.f3dex.forceBranch = true;
-    // Scale LODs based on the output resolution.
-    app->enhancementConfig.textureLOD.scale = true;
-    // Pick an API if the user has set an override.
-    switch (cur_config.api_option) {
-        case ultramodern::renderer::GraphicsApi::D3D12:
-            app->userConfig.graphicsAPI = RT64::UserConfiguration::GraphicsAPI::D3D12;
-            break;
-        case ultramodern::renderer::GraphicsApi::Vulkan:
-            app->userConfig.graphicsAPI = RT64::UserConfiguration::GraphicsAPI::Vulkan;
-            break;
-        case ultramodern::renderer::GraphicsApi::Metal:
-            app->userConfig.graphicsAPI = RT64::UserConfiguration::GraphicsAPI::Metal;
-            break;
-        case ultramodern::renderer::GraphicsApi::Auto:
-            app->userConfig.graphicsAPI = RT64::UserConfiguration::GraphicsAPI::Automatic;
-            break;
-    }
-
-    // Set up the RT64 application.
-    uint32_t thread_id = 0;
-#ifdef _WIN32
-    thread_id = window_handle.thread_id;
-#endif
-    setup_result = map_setup_result(app->setup(thread_id));
-    // Get the API that RT64 chose.
-    chosen_api = map_graphics_api(app->chosenGraphicsAPI);
-    if (setup_result != ultramodern::renderer::SetupResult::Success) {
-        app = nullptr;
-        return;
-    }
-
-    // Set the application's fullscreen state.
-    app->setFullScreen(cur_config.wm_option == ultramodern::renderer::WindowMode::Fullscreen);
-
-    // Check if the selected device actually supports MSAA sample positions and MSAA for for the formats that will be used
-    // and downgrade the configuration accordingly.
-    if (app->device->getCapabilities().sampleLocations) {
-        RT64::RenderSampleCounts color_sample_counts = app->device->getSampleCountsSupported(RT64::RenderFormat::R8G8B8A8_UNORM);
-        RT64::RenderSampleCounts depth_sample_counts = app->device->getSampleCountsSupported(RT64::RenderFormat::D32_FLOAT);
-        RT64::RenderSampleCounts common_sample_counts = color_sample_counts & depth_sample_counts;
-        device_max_msaa = compute_max_supported_aa(common_sample_counts);
-        sample_positions_supported = true;
-    }
-    else {
-        device_max_msaa = RT64::UserConfiguration::Antialiasing::None;
-        sample_positions_supported = false;
-    }
-
-    high_precision_fb_enabled = app->shaderLibrary->usesHDR;
-}
-
-zelda64::renderer::RT64Context::~RT64Context() = default;
-
-void zelda64::renderer::RT64Context::send_dl(const OSTask* task) {
-    check_texture_pack_actions();
-    app->state->rsp->reset();
-    app->interpreter->loadUCodeGBI(task->t.ucode & 0x3FFFFFF, task->t.ucode_data & 0x3FFFFFF, true);
-    app->processDisplayLists(app->core.RDRAM, task->t.data_ptr & 0x3FFFFFF, 0, true);
-}
-
-void zelda64::renderer::RT64Context::update_screen() {
-    app->updateScreen();
-}
-
-void zelda64::renderer::RT64Context::shutdown() {
-    if (app != nullptr) {
-        app->end();
-    }
-}
-
-bool zelda64::renderer::RT64Context::update_config(const ultramodern::renderer::GraphicsConfig& old_config, const ultramodern::renderer::GraphicsConfig& new_config) {
-    if (old_config == new_config) {
-        return false;
-    }
-
-    if (new_config.wm_option != old_config.wm_option) {
-        app->setFullScreen(new_config.wm_option == ultramodern::renderer::WindowMode::Fullscreen);
-    }
-
-    set_application_user_config(app.get(), new_config);
-
-    app->updateUserConfig(true);
-
-    if (new_config.msaa_option != old_config.msaa_option) {
-        app->updateMultisampling();
-    }
-    return true;
-}
-
-void zelda64::renderer::RT64Context::enable_instant_present() {
-    // Enable the present early presentation mode for minimal latency.
-    app->enhancementConfig.presentation.mode = RT64::EnhancementConfiguration::Presentation::Mode::PresentEarly;
-
-    app->updateEnhancementConfig();
-}
-
-uint32_t zelda64::renderer::RT64Context::get_display_framerate() const {
-    return app->presentQueue->ext.sharedResources->swapChainRate;
-}
-
-float zelda64::renderer::RT64Context::get_resolution_scale() const {
-    constexpr int ReferenceHeight = 240;
-    switch (app->userConfig.resolution) {
-        case RT64::UserConfiguration::Resolution::WindowIntegerScale:
-            if (app->sharedQueueResources->swapChainHeight > 0) {
-                return std::max(float((app->sharedQueueResources->swapChainHeight + ReferenceHeight - 1) / ReferenceHeight), 1.0f);
-            }
-            else {
-                return 1.0f;
-            }
-        case RT64::UserConfiguration::Resolution::Manual:
-            return float(app->userConfig.resolutionMultiplier);
-        case RT64::UserConfiguration::Resolution::Original:
-        default:
-            return 1.0f;
-    }
-}
-
-void zelda64::renderer::RT64Context::check_texture_pack_actions() {
-    bool packs_changed = false;
-    TexturePackAction cur_action;
-    while (texture_pack_action_queue.try_dequeue(cur_action)) {
-        std::visit(overloaded{
-            [&](TexturePackDisableAction &to_disable) {
-                enabled_texture_packs.erase(to_disable.mod_id);
-                packs_changed = true;
-            },
-            [&](TexturePackEnableAction &to_enable) {
-                enabled_texture_packs.insert(to_enable.mod_id);
-                packs_changed = true;
-            },
-            [&](TexturePackSecondaryDisableAction &to_override_disable) {
-                secondary_disabled_texture_packs.insert(to_override_disable.mod_id);
-                packs_changed = true;
-            },
-            [&](TexturePackSecondaryEnableAction &to_override_enable) {
-                secondary_disabled_texture_packs.erase(to_override_enable.mod_id);
-                packs_changed = true;
-            },
-            [&](TexturePackUpdateAction &) {
-                packs_changed = true;
-            }
-        }, cur_action);
-    }
-
-    // If any packs were disabled, unload all packs and load all the active ones.
-    if (packs_changed) {
-        // Sort the enabled texture packs in reverse order so that earlier ones override later ones.
-        std::vector<std::string> sorted_texture_packs{};
-        sorted_texture_packs.reserve(enabled_texture_packs.size());
-        for (const std::string& mod : enabled_texture_packs) {
-            if (!secondary_disabled_texture_packs.contains(mod)) {
-                sorted_texture_packs.emplace_back(mod);
-            }
-        }
-
-        std::sort(sorted_texture_packs.begin(), sorted_texture_packs.end(),
-            [](const std::string& lhs, const std::string& rhs) {
-                return recomp::mods::get_mod_order_index(lhs) > recomp::mods::get_mod_order_index(rhs);
-            }
-        );
-
-        // Build the path list from the sorted mod list.
-        std::vector<RT64::ReplacementDirectory> replacement_directories;
-        replacement_directories.reserve(enabled_texture_packs.size());
-        for (const std::string &mod_id : sorted_texture_packs) {
-            replacement_directories.emplace_back(RT64::ReplacementDirectory(recomp::mods::get_mod_filename(mod_id)));
-        }
-
-        if (!replacement_directories.empty()) {
-            app->textureCache->loadReplacementDirectories(replacement_directories);
-        }
-        else {
-            app->textureCache->clearReplacementDirectories();
-        }
-    }
-}
-
-RT64::UserConfiguration::Antialiasing zelda64::renderer::RT64MaxMSAA() {
-    return device_max_msaa;
-}
-
-std::unique_ptr<ultramodern::renderer::RendererContext> zelda64::renderer::create_render_context(uint8_t* rdram, ultramodern::renderer::WindowHandle window_handle, bool developer_mode) {
-    return std::make_unique<zelda64::renderer::RT64Context>(rdram, window_handle, developer_mode);
-}
-
-bool zelda64::renderer::RT64SamplePositionsSupported() {
-    return sample_positions_supported;
-}
-
-bool zelda64::renderer::RT64HighPrecisionFBEnabled() {
-    return high_precision_fb_enabled;
-}
-
-void zelda64::renderer::trigger_texture_pack_update() {
-    texture_pack_action_queue.enqueue(TexturePackUpdateAction{});
-}
-
-void zelda64::renderer::enable_texture_pack(const recomp::mods::ModContext& context, const recomp::mods::ModHandle& mod) {
-    texture_pack_action_queue.enqueue(TexturePackEnableAction{mod.manifest.mod_id});
-
-    // Check for the texture pack enabled config option.
-    const recomp::mods::ConfigSchema& config_schema = context.get_mod_config_schema(mod.manifest.mod_id);
-    auto find_it = config_schema.options_by_id.find(zelda64::renderer::special_option_texture_pack_enabled);
-    if (find_it != config_schema.options_by_id.end()) {
-        const recomp::mods::ConfigOption& config_option = config_schema.options[find_it->second];
-
-        if (is_texture_pack_enable_config_option(config_option, false)) {
-            recomp::mods::ConfigValueVariant value_variant = context.get_mod_config_value(mod.manifest.mod_id, config_option.id);
-            uint32_t value;
-            if (uint32_t* value_ptr = std::get_if<uint32_t>(&value_variant)) {
-                value = *value_ptr;
-            }
-            else {
-                value = 0;
-            }
-
-            if (value) {
-                zelda64::renderer::secondary_enable_texture_pack(mod.manifest.mod_id);
-            }
-            else {
-                zelda64::renderer::secondary_disable_texture_pack(mod.manifest.mod_id);
-            }
-        }
-    }
-}
-
-void zelda64::renderer::disable_texture_pack(const recomp::mods::ModHandle& mod) {
-    texture_pack_action_queue.enqueue(TexturePackDisableAction{mod.manifest.mod_id});
-}
-
-void zelda64::renderer::secondary_enable_texture_pack(const std::string& mod_id) {
-    texture_pack_action_queue.enqueue(TexturePackSecondaryEnableAction{mod_id});
-}
-
-void zelda64::renderer::secondary_disable_texture_pack(const std::string& mod_id) {
-    texture_pack_action_queue.enqueue(TexturePackSecondaryDisableAction{mod_id});
-}
-
-
-// HD texture enable option. Must be an enum with two options.
-// The first option is treated as disabled and the second option is treated as enabled.
-bool zelda64::renderer::is_texture_pack_enable_config_option(const recomp::mods::ConfigOption& option, bool show_errors) {
-    if (option.id == zelda64::renderer::special_option_texture_pack_enabled) {
-        if (option.type != recomp::mods::ConfigOptionType::Enum) {
-            if (show_errors) {
-                recompui::message_box(("Mod has the special config option id for enabling an HD texture pack (\"" + zelda64::renderer::special_option_texture_pack_enabled + "\"), but the config option is not an enum.").c_str());
-            }
-            return false;
-        }
-
-        const recomp::mods::ConfigOptionEnum &option_enum = std::get<recomp::mods::ConfigOptionEnum>(option.variant);
-        if (option_enum.options.size() != 2) {
-            if (show_errors) {
-                recompui::message_box(("Mod has the special config option id for enabling an HD texture pack (\"" + zelda64::renderer::special_option_texture_pack_enabled + "\"), but the config option doesn't have exactly 2 values.").c_str());
-            }
-            return false;
-        }
-
-        return true;
-    }
-    return false;
-}
diff --git a/src/main/theme.cpp b/src/main/theme.cpp
new file mode 100644
index 0000000..1091b14
--- /dev/null
+++ b/src/main/theme.cpp
@@ -0,0 +1,106 @@
+#include "elements/ui_theme.h"
+#include "theme.h"
+
+void recomptheme::set_custom_theme() {
+    using namespace recompui;
+
+    theme::set_theme_color(theme::color::Background1, Color{8, 7, 13, 255});
+    theme::set_theme_color(theme::color::Background2, Color{18, 16, 24, 255});
+    theme::set_theme_color(theme::color::Background3, Color{25, 22, 34, 255});
+    theme::set_theme_color(theme::color::BGOverlay, Color{190, 184, 219, 25}); // actually the overlay for the modal
+    theme::set_theme_color(theme::color::ModalOverlay, Color{8, 7, 13, 229}); // actually the background color of the modal itself
+    theme::set_theme_color(theme::color::BGShadow, Color{0, 0, 0, 89});
+    theme::set_theme_color(theme::color::BGShadow2, Color{8, 7, 13, 184});
+    theme::set_theme_color(theme::color::Text, Color{242, 242, 242, 255});
+    theme::set_theme_color(theme::color::TextActive, Color{245, 245, 245, 255});
+    theme::set_theme_color(theme::color::TextDim, Color{204, 204, 204, 255});
+    theme::set_theme_color(theme::color::TextInactive, Color{255, 255, 255, 153});
+    theme::set_theme_color(theme::color::TextA5, Color{242, 242, 242, 13});
+    theme::set_theme_color(theme::color::TextA20, Color{242, 242, 242, 51});
+    theme::set_theme_color(theme::color::TextA30, Color{242, 242, 242, 77});
+    theme::set_theme_color(theme::color::TextA50, Color{242, 242, 242, 128});
+    theme::set_theme_color(theme::color::TextA80, Color{242, 242, 242, 204});
+    theme::set_theme_color(theme::color::Primary, Color{0xB9, 0x7D, 0xF2, 255});
+    theme::set_theme_color(theme::color::PrimaryL, Color{0xDA, 0xBA, 0xF7, 255});
+    theme::set_theme_color(theme::color::PrimaryD, Color{0x7A, 0x2A, 0xC6, 255});
+    theme::set_theme_color(theme::color::PrimaryA5, Color{185, 125, 242, 13});
+    theme::set_theme_color(theme::color::PrimaryA20, Color{185, 125, 242, 51});
+    theme::set_theme_color(theme::color::PrimaryA30, Color{185, 125, 242, 77});
+    theme::set_theme_color(theme::color::PrimaryA50, Color{185, 125, 242, 128});
+    theme::set_theme_color(theme::color::PrimaryA80, Color{185, 125, 242, 204});
+    theme::set_theme_color(theme::color::Secondary, Color{0x17, 0xD6, 0xE8, 255});
+    theme::set_theme_color(theme::color::SecondaryL, Color{0xA2, 0xEF, 0xF6, 255});
+    theme::set_theme_color(theme::color::SecondaryD, Color{0x25, 0xA1, 0xAD, 255});
+    theme::set_theme_color(theme::color::SecondaryA5, Color{23, 214, 232, 13});
+    theme::set_theme_color(theme::color::SecondaryA20, Color{23, 214, 232, 51});
+    theme::set_theme_color(theme::color::SecondaryA30, Color{23, 214, 232, 77});
+    theme::set_theme_color(theme::color::SecondaryA50, Color{23, 214, 232, 128});
+    theme::set_theme_color(theme::color::SecondaryA80, Color{23, 214, 232, 204});
+    theme::set_theme_color(theme::color::Warning, Color{0xE9, 0xCD, 0x35, 255});
+    theme::set_theme_color(theme::color::WarningL, Color{0xF9, 0xE5, 0x7C, 255});
+    theme::set_theme_color(theme::color::WarningD, Color{0xC5, 0xAA, 0x16, 255});
+    theme::set_theme_color(theme::color::WarningA5, Color{233, 205, 53, 13});
+    theme::set_theme_color(theme::color::WarningA20, Color{233, 205, 53, 51});
+    theme::set_theme_color(theme::color::WarningA30, Color{233, 205, 53, 77});
+    theme::set_theme_color(theme::color::WarningA50, Color{233, 205, 53, 128});
+    theme::set_theme_color(theme::color::WarningA80, Color{233, 205, 53, 204});
+    theme::set_theme_color(theme::color::Danger, Color{0xF8, 0x60, 0x39, 255});
+    theme::set_theme_color(theme::color::DangerL, Color{0xFE, 0x86, 0x67, 255});
+    theme::set_theme_color(theme::color::DangerD, Color{0xB2, 0x39, 0x19, 255});
+    theme::set_theme_color(theme::color::DangerA5, Color{248, 96, 57, 13});
+    theme::set_theme_color(theme::color::DangerA20, Color{248, 96, 57, 51});
+    theme::set_theme_color(theme::color::DangerA30, Color{248, 96, 57, 77});
+    theme::set_theme_color(theme::color::DangerA50, Color{248, 96, 57, 128});
+    theme::set_theme_color(theme::color::DangerA80, Color{248, 96, 57, 204});
+    theme::set_theme_color(theme::color::Success, Color{0x45, 0xD0, 0x43, 255});
+    theme::set_theme_color(theme::color::SuccessL, Color{0xAA, 0xEA, 0xA9, 255});
+    theme::set_theme_color(theme::color::SuccessD, Color{0x2C, 0xA7, 0x2A, 255});
+    theme::set_theme_color(theme::color::SuccessA5, Color{69, 208, 67, 13});
+    theme::set_theme_color(theme::color::SuccessA20, Color{69, 208, 67, 51});
+    theme::set_theme_color(theme::color::SuccessA30, Color{69, 208, 67, 77});
+    theme::set_theme_color(theme::color::SuccessA50, Color{69, 208, 67, 128});
+    theme::set_theme_color(theme::color::SuccessA80, Color{69, 208, 67, 204});
+    theme::set_theme_color(theme::color::Border, Color{255, 255, 255, 51});
+    theme::set_theme_color(theme::color::BorderSoft, Color{255, 255, 255, 26});
+    theme::set_theme_color(theme::color::BorderHard, Color{255, 255, 255, 77});
+    theme::set_theme_color(theme::color::BorderSolid, Color{255, 255, 255, 153});
+    theme::set_theme_color(theme::color::Transparent, Color{0, 0, 0, 0});
+    theme::set_theme_color(theme::color::A, Color{51, 51, 255, 255});
+    theme::set_theme_color(theme::color::AL, Color{178, 178, 255, 255});
+    theme::set_theme_color(theme::color::AD, Color{32, 32, 172, 255});
+    theme::set_theme_color(theme::color::AA5, Color{51, 51, 255, 13});
+    theme::set_theme_color(theme::color::AA20, Color{51, 51, 255, 51});
+    theme::set_theme_color(theme::color::AA30, Color{51, 51, 255, 77});
+    theme::set_theme_color(theme::color::AA50, Color{51, 51, 255, 128});
+    theme::set_theme_color(theme::color::AA80, Color{51, 51, 255, 204});
+    theme::set_theme_color(theme::color::White, Color{255, 255, 255, 255});
+    theme::set_theme_color(theme::color::WhiteA5, Color{255, 255, 255, 13});
+    theme::set_theme_color(theme::color::WhiteA20, Color{255, 255, 255, 51});
+    theme::set_theme_color(theme::color::WhiteA30, Color{255, 255, 255, 77});
+    theme::set_theme_color(theme::color::WhiteA50, Color{255, 255, 255, 128});
+    theme::set_theme_color(theme::color::WhiteA80, Color{255, 255, 255, 204});
+    theme::set_theme_color(theme::color::BW05, Color{13, 13, 13, 255});
+    theme::set_theme_color(theme::color::BW10, Color{26, 26, 26, 255});
+    theme::set_theme_color(theme::color::BW25, Color{64, 64, 64, 255});
+    theme::set_theme_color(theme::color::BW50, Color{128, 128, 128, 255});
+    theme::set_theme_color(theme::color::BW75, Color{191, 191, 191, 255});
+    theme::set_theme_color(theme::color::BW90, Color{229, 229, 229, 255});
+
+    theme::border::radius_sm = 8.0f;
+    theme::border::radius_md = 12.0f;
+    theme::border::radius_lg = 16.0f;
+
+    const uint32_t header_weight = 700;
+    const uint32_t label_weight = 700;
+    const uint32_t base_weight = 400;
+    theme::set_typography_preset(theme::Typography::Header1, 64.0f + 4.0f, 0.07f, header_weight);
+    theme::set_typography_preset(theme::Typography::Header2, 48.0f + 4.0f, 0.07f, header_weight);
+    theme::set_typography_preset(theme::Typography::Header3, 32.0f + 4.0f, 0.07f, header_weight);
+    theme::set_typography_preset(theme::Typography::LabelLG, 32.0f + 4.0f, 0.11f, label_weight);
+    theme::set_typography_preset(theme::Typography::LabelMD, 24.0f + 4.0f, 0.11f, label_weight);
+    theme::set_typography_preset(theme::Typography::LabelSM, 16.0f + 4.0f, 0.14f, label_weight);
+    theme::set_typography_preset(theme::Typography::LabelXS, 14.0f + 4.0f, 0.14f, base_weight);
+    theme::set_typography_preset(theme::Typography::Body,    16.0f + 4.0f, 0,     base_weight);
+};
+
+
diff --git a/src/main/theme.h b/src/main/theme.h
new file mode 100644
index 0000000..deaa66b
--- /dev/null
+++ b/src/main/theme.h
@@ -0,0 +1,6 @@
+#pragma once
+
+namespace recomptheme {
+    // Applies custom themes. recompui::apply_color_hack MUST be called after.
+    void set_custom_theme();
+} // namespace recomptheme
diff --git a/src/ui/core/ui_context.cpp b/src/ui/core/ui_context.cpp
deleted file mode 100644
index cff69fc..0000000
--- a/src/ui/core/ui_context.cpp
+++ /dev/null
@@ -1,725 +0,0 @@
-#include <mutex>
-#include <string>
-#include <unordered_map>
-#include <fstream>
-
-#include "slot_map.h"
-#include "RmlUi/Core/StreamMemory.h"
-
-#include "ultramodern/error_handling.hpp"
-#include "recomp_ui.h"
-#include "ui_context.h"
-#include "../elements/ui_element.h"
-
-// Hash implementations for ContextId and ResourceId.
-template <>
-struct std::hash<recompui::ContextId> {
-    std::size_t operator()(const recompui::ContextId& id) const {
-        return std::hash<uint32_t>()(id.slot_id);
-    }
-};
-
-template <>
-struct std::hash<recompui::ResourceId> {
-    std::size_t operator()(const recompui::ResourceId& id) const {
-        return std::hash<uint32_t>()(id.slot_id);
-    }
-};
-
-using resource_slotmap = dod::slot_map32<std::unique_ptr<recompui::Style>>;
-
-namespace recompui {
-    struct Context {
-        std::mutex context_lock;
-        resource_slotmap resources;
-        Rml::ElementDocument* document;
-        Element root_element;
-        Element* autofocus_element = nullptr;
-        std::vector<Element*> loose_elements;
-        std::unordered_set<ResourceId> to_update;
-        std::vector<std::tuple<Element*, ResourceId, std::string>> to_set_text;     
-        bool captures_input = true;
-        bool captures_mouse = true;
-        Context(Rml::ElementDocument* document) : document(document), root_element(document) {}
-    };
-} // namespace recompui
-
-using context_slotmap = dod::slot_map32<recompui::Context>;
-
-static struct {
-    std::recursive_mutex all_contexts_lock;
-    context_slotmap all_contexts;
-    std::unordered_set<recompui::ContextId> opened_contexts;
-    std::unordered_map<Rml::ElementDocument*, recompui::ContextId> documents_to_contexts;
-    Rml::SharedPtr<Rml::StyleSheetContainer> style_sheet;
-} context_state;
-
-thread_local recompui::Context* opened_context = nullptr;
-thread_local recompui::ContextId opened_context_id = recompui::ContextId::null();
-
-enum class ContextErrorType {
-    OpenWithoutClose,
-    OpenInvalidContext,
-    CloseWithoutOpen,
-    CloseWrongContext,
-    DestroyInvalidContext,
-    GetContextWithoutOpen,
-    AddResourceWithoutOpen,
-    AddResourceToWrongContext,
-    UpdateElementWithoutContext,
-    UpdateElementInWrongContext,
-    SetTextElementWithoutContext,
-    SetTextElementInWrongContext,
-    GetResourceWithoutOpen,
-    GetResourceFailed,
-    DestroyResourceWithoutOpen,
-    DestroyResourceInWrongContext,
-    DestroyResourceNotFound,
-    GetDocumentInvalidContext,
-    GetAutofocusInvalidContext,
-    SetAutofocusInvalidContext,
-    InternalError,
-};
-
-enum class SlotTag : uint8_t {
-    Style = 0,
-    Element = 1,
-};
-
-void context_error(recompui::ContextId id, ContextErrorType type) {
-    (void)id;
-
-    const char* error_message = "";
-
-    switch (type) {
-        case ContextErrorType::OpenWithoutClose:
-            error_message = "Attempted to open a UI context without closing another UI context";
-            break;
-        case ContextErrorType::OpenInvalidContext:
-            error_message = "Attempted to open an invalid UI context";
-            break;
-        case ContextErrorType::CloseWithoutOpen:
-            error_message = "Attempted to close a UI context without one being open";
-            break;
-        case ContextErrorType::CloseWrongContext:
-            error_message = "Attempted to close a different UI context than the one that's open";
-            break;
-        case ContextErrorType::DestroyInvalidContext:
-            error_message = "Attempted to destroy an invalid UI element";
-            break;
-        case ContextErrorType::GetContextWithoutOpen:
-            error_message = "Attempted to get the current UI context with no UI context open";
-            break;
-        case ContextErrorType::AddResourceWithoutOpen:
-            error_message = "Attempted to create a UI resource with no open UI context";
-            break;
-        case ContextErrorType::AddResourceToWrongContext:
-            error_message = "Attempted to create a UI resource in a different UI context than the one that's open";
-            break;
-        case ContextErrorType::UpdateElementWithoutContext:
-            error_message = "Attempted to update a UI element with no open UI context";
-            break;
-        case ContextErrorType::UpdateElementInWrongContext:
-            error_message = "Attempted to update a UI element in a different UI context than the one that's open";
-            break;
-        case ContextErrorType::SetTextElementWithoutContext:
-            error_message = "Attempted to set the text of a UI element with no open UI context";
-            break;
-        case ContextErrorType::SetTextElementInWrongContext:
-            error_message = "Attempted to set the text of a UI element in a different UI context than the one that's open";
-            break;
-        case ContextErrorType::GetResourceWithoutOpen:
-            error_message = "Attempted to get a UI resource with no open UI context";
-            break;
-        case ContextErrorType::GetResourceFailed:
-            error_message = "Failed to get a UI resource from the current open UI context";
-            break;
-        case ContextErrorType::DestroyResourceWithoutOpen:
-            error_message = "Attempted to destroy a UI resource with no open UI context";
-            break;
-        case ContextErrorType::DestroyResourceInWrongContext:
-            error_message = "Attempted to destroy a UI resource in a different UI context than the one that's open";
-            break;
-        case ContextErrorType::DestroyResourceNotFound:
-            error_message = "Attempted to destroy a UI resource that doesn't exist in the current context";
-            break;
-        case ContextErrorType::GetDocumentInvalidContext:
-            error_message = "Attempted to get the document of an invalid UI context";
-            break;
-        case ContextErrorType::GetAutofocusInvalidContext:
-            error_message = "Attempted to get the autofocus element of an invalid UI context";
-            break;
-        case ContextErrorType::SetAutofocusInvalidContext:
-            error_message = "Attempted to set the autofocus element of an invalid UI context";
-            break;
-        case ContextErrorType::InternalError:
-            error_message = "Internal error in UI context";
-            break;
-        default:
-            error_message = "Unknown UI context error";
-            break;
-    }
-
-    // This assumes the error is coming from a mod, as it's unlikely that an end user will see a UI context error
-    // in the base recomp.
-    recompui::message_box((std::string{"Fatal error in mod - "} + error_message + ".").c_str());
-    assert(false);
-    ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-}
-
-recompui::ContextId create_context_impl(Rml::ElementDocument* document) {
-    static Rml::ElementDocument dummy_document{""};
-    bool add_to_dict = true;
-
-    if (document == nullptr) {
-        document = &dummy_document;
-        add_to_dict = false;
-    }
-
-    recompui::ContextId ret;
-    {
-        std::lock_guard lock{ context_state.all_contexts_lock };
-        ret = { context_state.all_contexts.emplace(document).raw };
-
-        if (add_to_dict) {
-            context_state.documents_to_contexts.emplace(document, ret);
-        }
-    }
-
-    return ret;
-}
-
-void recompui::init_styling(const std::filesystem::path& rcss_file) {
-    std::string style{};
-    {
-        std::ifstream style_stream{rcss_file};
-        style_stream.seekg(0, std::ios::end);
-        style.resize(style_stream.tellg());
-        style_stream.seekg(0, std::ios::beg);
-
-        style_stream.read(style.data(), style.size());
-    }
-    std::unique_ptr<Rml::StreamMemory> rml_stream = std::make_unique<Rml::StreamMemory>(reinterpret_cast<Rml::byte*>(style.data()), style.size());
-    rml_stream->SetSourceURL(rcss_file.filename().string());
-    context_state.style_sheet = Rml::Factory::InstanceStyleSheetStream(rml_stream.get());
-}
-
-recompui::ContextId recompui::create_context(const std::filesystem::path& path) {
-    ContextId new_context = create_context_impl(nullptr);
-
-    auto workingdir = std::filesystem::current_path();
-
-    new_context.open();
-    Rml::ElementDocument* doc = recompui::load_document(path.string());
-    opened_context->document = doc;
-    opened_context->root_element.base = doc;
-    new_context.close();
-    
-    {
-        std::lock_guard lock{ context_state.all_contexts_lock };
-        context_state.documents_to_contexts.emplace(doc, new_context);
-    }
-
-    return new_context;
-}
-
-recompui::ContextId recompui::create_context(Rml::ElementDocument* document) {
-    assert(document != nullptr);
-
-    return create_context_impl(document);
-}
-
-recompui::ContextId recompui::create_context() {
-    Rml::ElementDocument* doc = create_empty_document();
-    doc->SetStyleSheetContainer(context_state.style_sheet);
-    ContextId ret = create_context_impl(doc);
-    Element* root = ret.get_root_element();
-    // Mark the root element as not being a shim, as that's only needed for elements that were parented to Rml ones manually.
-    root->shim = false;
-
-    ret.open();
-    root->set_width(100.0f, Unit::Percent);
-    root->set_height(100.0f, Unit::Percent);
-    root->set_display(Display::Flex);
-    ret.close();
-
-    doc->Hide();
-
-    return ret;
-}
-
-void recompui::destroy_context(ContextId id) {
-    bool existed = false;
-
-    // TODO prevent deletion of a context while its mutex is in use. Second lock on the context's mutex before popping
-    // from the slotmap?
-    
-    // Check if the provided id exists.
-    {
-        std::lock_guard lock{ context_state.all_contexts_lock };
-        // Check if the target context is currently open.
-        existed = context_state.all_contexts.has_key(context_slotmap::key{ id.slot_id });
-    }
-
-    
-    // Raise an error if the context didn't exist.
-    if (!existed) {
-        context_error(id, ContextErrorType::DestroyInvalidContext);
-    }
-
-    id.open();
-    id.clear_children();
-    id.close();
-
-    // Delete the provided id.
-    {
-        std::lock_guard lock{ context_state.all_contexts_lock };
-        context_state.all_contexts.erase(context_slotmap::key{ id.slot_id });
-    }
-}
-
-void recompui::destroy_all_contexts() {
-    recompui::hide_all_contexts();
-
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    // TODO prevent deletion of a context while its mutex is in use. Second lock on the context's mutex before popping
-    // from the slotmap
-
-    std::vector<context_slotmap::key> keys{};
-    for (const auto& [key, item] : context_state.all_contexts.items()) {
-        keys.push_back(key);
-    }
-
-    for (auto key : keys) {
-        Context* ctx = context_state.all_contexts.get(key);
-        
-        std::lock_guard context_lock{ ctx->context_lock };
-        opened_context = ctx;
-        opened_context_id = ContextId{ key };
-
-        opened_context_id.clear_children();
-
-        opened_context = nullptr;
-        opened_context_id = ContextId::null();
-    }
-
-    context_state.all_contexts.reset();
-    context_state.documents_to_contexts.clear();
-}
-
-void recompui::ContextId::open() {
-    // Ensure no other context is opened by this thread already.
-    if (opened_context_id != ContextId::null()) {
-        context_error(*this, ContextErrorType::OpenWithoutClose);
-    }
-
-    // Get the context with this id.
-    Context* ctx;
-    {
-        std::lock_guard lock{ context_state.all_contexts_lock };
-        ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-        // If the context was found, add it to the opened contexts.
-        if (ctx != nullptr) {
-            context_state.opened_contexts.emplace(*this);
-        }
-    }
-
-    // Check if the context exists.
-    if (ctx == nullptr) {
-        context_error(*this, ContextErrorType::OpenInvalidContext);
-    }
-
-    // Take ownership of the target context.
-    ctx->context_lock.lock();
-    opened_context = ctx;
-    opened_context_id = *this;
-}
-
-bool recompui::ContextId::open_if_not_already() {
-    if (opened_context_id == *this) {
-        return false;
-    }
-
-    open();
-    return true;
-}
-
-void recompui::ContextId::close() {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(*this, ContextErrorType::CloseWithoutOpen);
-    }
-
-    // Check that the context that was specified is the same one that's currently open.
-    if (*this != opened_context_id) {
-        context_error(*this, ContextErrorType::CloseWrongContext);
-    }
-
-    // Release ownership of the target context.
-    opened_context->context_lock.unlock();
-    opened_context = nullptr;
-    opened_context_id = ContextId::null();
-
-    // Remove this context from the opened contexts.
-    {
-        std::lock_guard lock{ context_state.all_contexts_lock };
-        context_state.opened_contexts.erase(*this);
-    }
-}
-
-recompui::ContextId recompui::try_close_current_context() {
-    if (opened_context_id != ContextId::null()) {
-        ContextId prev_context = opened_context_id;
-        opened_context_id.close();
-        return prev_context;
-    }
-    return ContextId::null();
-}
-
-void recompui::ContextId::process_updates() {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(*this, ContextErrorType::InternalError);
-    }
-
-    // Check that the context that was specified is the same one that's currently open.
-    if (*this != opened_context_id) {
-        context_error(*this, ContextErrorType::InternalError);
-    }
-
-    // Move the current update set into a local variable. This clears the update set
-    // and allows it to be used to queue updates from any element callbacks.
-    std::unordered_set<ResourceId> to_update = std::move(opened_context->to_update);
-
-    Event update_event = Event::update_event();
-
-    for (auto cur_resource_id : to_update) {
-        resource_slotmap::key cur_key{ cur_resource_id.slot_id };
-
-        // Ignore any resources that aren't elements.
-        if (cur_key.get_tag() != static_cast<uint8_t>(SlotTag::Element)) {
-            // Assert to catch errors of queueing other resource types for update.
-            // This isn't an actual error, so there's no issue with continuing in release builds.
-            assert(false);
-            continue;
-        }
-
-        // Get the resource being updaten from the context.
-        std::unique_ptr<Style>* cur_resource = opened_context->resources.get(cur_key);
-
-        // Make sure the resource exists before dispatching the event. It may have been deleted
-        // after being queued for a update, so just continue to the next element if it doesn't exist.
-        if (cur_resource == nullptr) {
-            continue;
-        }
-
-        static_cast<Element*>(cur_resource->get())->handle_event(update_event);
-    }
-
-    std::vector<std::tuple<Element*, ResourceId, std::string>> to_set_text = std::move(opened_context->to_set_text);
-
-    // Delete the Rml elements that are pending deletion.
-    for (auto cur_text_update : to_set_text) {
-        Element* element_ptr = std::get<0>(cur_text_update);
-        ResourceId resource = std::get<1>(cur_text_update);
-        std::string& text = std::get<2>(cur_text_update);
-
-        // If the resource ID is valid, prefer that as we can quickly validate if the resource still exists.
-        if (resource != ResourceId::null()) {
-            resource_slotmap::key cur_key{ resource.slot_id };
-            std::unique_ptr<Style>* cur_resource = opened_context->resources.get(cur_key);
-
-            // Make sure the resource exists before setting its text, as it may have been deleted.
-            if (cur_resource == nullptr) {
-                continue;
-            }
-
-            // Perform the text update.
-            static_cast<Element*>(cur_resource->get())->base->SetInnerRML(text);
-        }
-        // Otherwise we use the element pointer, but we need to validate that it still exists before doing so.
-        else {
-            // Scan the current resources to find the target element.
-            for (const std::unique_ptr<Style>& cur_e : opened_context->resources) {
-                if (cur_e.get() == element_ptr) {
-                    element_ptr->base->SetInnerRML(text);
-                    // We can stop after finding the element.
-                    break;
-                }
-            }
-        }
-    }
-}
-
-bool recompui::ContextId::captures_input() {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    Context* ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-    if (ctx == nullptr) {
-        return false;
-    }
-    return ctx->captures_input;
-
-}
-
-bool recompui::ContextId::captures_mouse() {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    Context* ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-    if (ctx == nullptr) {
-        return false;
-    }
-    return ctx->captures_mouse;
-}
-
-void recompui::ContextId::set_captures_input(bool captures_input) {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    Context* ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-    if (ctx == nullptr) {
-        return;
-    }
-    ctx->captures_input = captures_input;
-}
-
-void recompui::ContextId::set_captures_mouse(bool captures_mouse) {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    Context* ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-    if (ctx == nullptr) {
-        return;
-    }
-    ctx->captures_mouse = captures_mouse;
-}
-
-recompui::Style* recompui::ContextId::add_resource_impl(std::unique_ptr<Style>&& resource) {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(*this, ContextErrorType::AddResourceWithoutOpen);
-    }
-
-    // Check that the context that was specified is the same one that's currently open.
-    if (*this != opened_context_id) {
-        context_error(*this, ContextErrorType::AddResourceToWrongContext);
-    }
-
-    bool is_element = resource->is_element();
-    Style* resource_ptr = resource.get();
-    auto key = opened_context->resources.emplace(std::move(resource));
-
-    if (is_element) {
-        Element* element_ptr = static_cast<Element*>(resource_ptr);
-        element_ptr->set_id(std::string{element_ptr->get_type_name()} + "-" + std::to_string(key.raw));
-        key.set_tag(static_cast<uint8_t>(SlotTag::Element));
-        // Send one update to the element.
-        opened_context->to_update.emplace(ResourceId{ key.raw });
-    }
-    else {
-        key.set_tag(static_cast<uint8_t>(SlotTag::Style));
-    }
-
-    resource_ptr->resource_id = { key.raw };
-    return resource_ptr;
-}
-
-void recompui::ContextId::add_loose_element(Element* element) {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(*this, ContextErrorType::AddResourceWithoutOpen);
-    }
-
-    // Check that the context that was specified is the same one that's currently open.
-    if (*this != opened_context_id) {
-        context_error(*this, ContextErrorType::AddResourceToWrongContext);
-    }
-
-    opened_context->loose_elements.emplace_back(element);
-}
-
-void recompui::ContextId::queue_element_update(ResourceId element) {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(*this, ContextErrorType::UpdateElementWithoutContext);
-    }
-
-    // Check that the context that was specified is the same one that's currently open.
-    if (*this != opened_context_id) {
-        context_error(*this, ContextErrorType::UpdateElementInWrongContext);
-    }
-
-    // Check that the element that was specified is in the open context.
-    auto* elementPtr = opened_context->resources.get(resource_slotmap::key{ element.slot_id });
-    if (elementPtr == nullptr) {
-        context_error(*this, ContextErrorType::UpdateElementInWrongContext);
-    }
-
-    opened_context->to_update.emplace(element);
-}
-
-void recompui::ContextId::queue_set_text(Element* element, std::string&& text) {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(*this, ContextErrorType::SetTextElementWithoutContext);
-    }
-
-    // Check that the context that was specified is the same one that's currently open.
-    if (*this != opened_context_id) {
-        context_error(*this, ContextErrorType::SetTextElementInWrongContext);
-    }
-
-    opened_context->to_set_text.emplace_back(std::make_tuple(element, element->resource_id, std::move(text)));
-}
-
-recompui::Style* recompui::ContextId::create_style() {
-    return add_resource_impl(std::make_unique<Style>());
-}
-
-void recompui::ContextId::destroy_resource(Style* resource) {
-    destroy_resource(resource->resource_id);
-}
-
-void recompui::ContextId::destroy_resource(ResourceId resource) {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(*this, ContextErrorType::DestroyResourceWithoutOpen);
-    }
-
-    // Check that the context that was specified is the same one that's currently open.
-    if (*this != opened_context_id) {
-        context_error(*this, ContextErrorType::DestroyResourceInWrongContext);
-    }
-
-    // Try to remove the resource from the current context.
-    auto pop_result = opened_context->resources.pop(resource_slotmap::key{ resource.slot_id });
-    if (!pop_result.has_value()) {
-        context_error(*this, ContextErrorType::DestroyResourceNotFound);
-    }
-}
-
-void recompui::ContextId::clear_children() {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(*this, ContextErrorType::DestroyResourceWithoutOpen);
-    }
-
-    // Check that the context that was specified is the same one that's currently open.
-    if (*this != opened_context_id) {
-        context_error(*this, ContextErrorType::DestroyResourceInWrongContext);
-    }
-
-    // Remove the root element's children.
-    opened_context->root_element.clear_children();
-
-    // Remove any loose resources.
-    for (Element* e : opened_context->loose_elements) {
-        destroy_resource(e->resource_id);
-    }
-    opened_context->loose_elements.clear();
-}
-
-Rml::ElementDocument* recompui::ContextId::get_document() {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    Context* ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-    if (ctx == nullptr) {
-        context_error(*this, ContextErrorType::GetDocumentInvalidContext);
-    }
-
-    return ctx->document;
-}
-
-recompui::Element* recompui::ContextId::get_root_element() {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    Context* ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-    if (ctx == nullptr) {
-        context_error(*this, ContextErrorType::GetDocumentInvalidContext);
-    }
-
-    return &ctx->root_element;
-}
-
-recompui::Element* recompui::ContextId::get_autofocus_element() {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    Context* ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-    if (ctx == nullptr) {
-        context_error(*this, ContextErrorType::GetAutofocusInvalidContext);
-    }
-    
-    return ctx->autofocus_element;
-}
-
-void recompui::ContextId::set_autofocus_element(Element* element) {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-
-    Context* ctx = context_state.all_contexts.get(context_slotmap::key{ slot_id });
-    if (ctx == nullptr) {
-        context_error(*this, ContextErrorType::SetAutofocusInvalidContext);
-    }
-
-    ctx->autofocus_element = element;
-}
-
-recompui::ContextId recompui::get_current_context() {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == ContextId::null()) {
-        context_error(ContextId::null(), ContextErrorType::GetContextWithoutOpen);
-    }
-
-    return opened_context_id;
-}
-
-recompui::Style* get_resource_from_current_context(resource_slotmap::key key) {
-    // Ensure a context is currently opened by this thread.
-    if (opened_context_id == recompui::ContextId::null()) {
-        context_error(recompui::ContextId::null(), ContextErrorType::GetResourceWithoutOpen);
-    }
-
-    auto* value = opened_context->resources.get(key);
-    if (value == nullptr) {
-        context_error(opened_context_id, ContextErrorType::GetResourceFailed);
-    }
-
-    return value->get();
-}
-
-const recompui::Style* recompui::ResourceId::operator*() const {
-    resource_slotmap::key key{ slot_id };
-
-    return get_resource_from_current_context(key);
-}
-
-recompui::Style* recompui::ResourceId::operator*() {
-    resource_slotmap::key key{ slot_id };
-
-    return get_resource_from_current_context(key);
-}
-
-const recompui::Element* recompui::ResourceId::as_element() const {
-    resource_slotmap::key key{ slot_id };
-    uint8_t tag = key.get_tag();
-
-    assert(tag == static_cast<uint8_t>(SlotTag::Element));
-
-    return static_cast<Element*>(get_resource_from_current_context(key));
-}
-
-recompui::Element* recompui::ResourceId::as_element() {
-    resource_slotmap::key key{ slot_id };
-    uint8_t tag = key.get_tag();
-
-    assert(tag == static_cast<uint8_t>(SlotTag::Element));
-
-    return static_cast<Element*>(get_resource_from_current_context(key));
-}
-
-recompui::ContextId recompui::get_context_from_document(Rml::ElementDocument* document) {
-    std::lock_guard lock{ context_state.all_contexts_lock };
-    auto find_it = context_state.documents_to_contexts.find(document);
-    if (find_it == context_state.documents_to_contexts.end()) {
-        return ContextId::null();
-    }
-    return find_it->second;
-}
diff --git a/src/ui/core/ui_context.h b/src/ui/core/ui_context.h
deleted file mode 100644
index 6e65636..0000000
--- a/src/ui/core/ui_context.h
+++ /dev/null
@@ -1,70 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <memory>
-#include <utility>
-#include <filesystem>
-#include <functional>
-
-#include "RmlUi/Core.h"
-
-#include "ui_resource.h"
-
-namespace recompui {
-    class Style;
-    class Element;
-    class ContextId {
-        Style* add_resource_impl(std::unique_ptr<Style>&& resource);
-    public:
-        uint32_t slot_id;
-        auto operator<=>(const ContextId& rhs) const = default;
-
-        template <typename T, typename... Args>
-        T* create_element(Args... args) {
-            return static_cast<T*>(add_resource_impl(std::make_unique<T>(std::forward<Args>(args)...)));
-        }
-        
-        template <typename T>
-        T* create_element(T&& element) {
-            return static_cast<T*>(add_resource_impl(std::make_unique<T>(std::move(element))));
-        }
-
-        void add_loose_element(Element* element);
-        void queue_element_update(ResourceId element);
-        void queue_set_text(Element* element, std::string&& text);
-
-        Style* create_style();
-
-        void destroy_resource(Style* resource);
-        void destroy_resource(ResourceId resource);
-        void clear_children();
-
-        Rml::ElementDocument* get_document();
-        Element* get_root_element();
-        Element* get_autofocus_element();
-        void set_autofocus_element(Element* element);
-
-        void open();
-        bool open_if_not_already();
-        void close();
-        void process_updates();
-
-        static constexpr ContextId null() { return ContextId{ .slot_id = uint32_t(-1) }; }
-
-        bool captures_input();
-        bool captures_mouse();
-
-        void set_captures_input(bool captures_input);
-        void set_captures_mouse(bool captures_input);
-    };
-
-    ContextId create_context(const std::filesystem::path& path);
-    ContextId create_context(Rml::ElementDocument* document);
-    ContextId create_context();
-    void destroy_context(ContextId id);
-    ContextId get_current_context();
-    ContextId get_context_from_document(Rml::ElementDocument* document);
-    void destroy_all_contexts();
-
-    void register_ui_exports();
-} // namespace recompui
diff --git a/src/ui/core/ui_resource.h b/src/ui/core/ui_resource.h
deleted file mode 100644
index 1081326..0000000
--- a/src/ui/core/ui_resource.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#pragma once
-
-#include <cstdint>
-
-namespace recompui {
-    class Style;
-    class Element;
-    struct ResourceId {
-        uint32_t slot_id;
-
-        bool operator==(const ResourceId& rhs) const = default;
-
-        const Style* operator*() const;
-        Style* operator*();
-        
-        const Style* operator->() const { return *(*this); }
-        Style* operator->() { return *(*this); }
-
-        const Element* as_element() const;
-        Element* as_element();
-
-        static constexpr ResourceId null() { return ResourceId{ uint32_t(-1) }; }
-    };
-} // namespace recompui
diff --git a/src/ui/elements/ui_button.cpp b/src/ui/elements/ui_button.cpp
deleted file mode 100644
index 23bbf7b..0000000
--- a/src/ui/elements/ui_button.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "ui_button.h"
-
-#include <cassert>
-
-namespace recompui {
-
-    Button::Button(Element *parent, const std::string &text, ButtonStyle style) : Element(parent, Events(EventType::Click, EventType::Hover, EventType::Enable, EventType::Focus), "button", true) {
-        this->style = style;
-
-        enable_focus();
-
-        set_text(text);
-        set_display(Display::Block);
-        set_padding(23.0f);
-        set_border_width(1.1f);
-        set_border_radius(12.0f);
-        set_font_size(28.0f);
-        set_letter_spacing(3.08f);
-        set_line_height(28.0f);
-        set_font_style(FontStyle::Normal);
-        set_font_weight(700);
-        set_cursor(Cursor::Pointer);
-        set_color(Color{ 204, 204, 204, 255 });
-        set_tab_index(TabIndex::Auto);
-        hover_style.set_color(Color{ 242, 242, 242, 255 });
-        focus_style.set_color(Color{ 242, 242, 242, 255 });
-        disabled_style.set_color(Color{ 204, 204, 204, 128 });
-        hover_disabled_style.set_color(Color{ 242, 242, 242, 128 });
-
-        const uint8_t border_opacity = 204;
-        const uint8_t background_opacity = 13;
-        const uint8_t border_hover_opacity = 255;
-        const uint8_t background_hover_opacity = 76;
-        switch (style) {
-        case ButtonStyle::Primary: {
-            set_border_color({ 185, 125, 242, border_opacity });
-            set_background_color({ 185, 125, 242, background_opacity });
-            hover_style.set_border_color({ 185, 125, 242, border_hover_opacity });
-            hover_style.set_background_color({ 185, 125, 242, background_hover_opacity });
-            focus_style.set_border_color({ 185, 125, 242, border_hover_opacity });
-            focus_style.set_background_color({ 185, 125, 242, background_hover_opacity });
-            disabled_style.set_border_color({ 185, 125, 242, border_opacity / 4 });
-            disabled_style.set_background_color({ 185, 125, 242, background_opacity / 4 });
-            hover_disabled_style.set_border_color({ 185, 125, 242, border_hover_opacity / 4 });
-            hover_disabled_style.set_background_color({ 185, 125, 242, background_hover_opacity / 4 });
-            break;
-        }
-        case ButtonStyle::Secondary: {
-            set_border_color({ 23, 214, 232, border_opacity });
-            set_background_color({ 23, 214, 232, background_opacity });
-            hover_style.set_border_color({ 23, 214, 232, border_hover_opacity });
-            hover_style.set_background_color({ 23, 214, 232, background_hover_opacity });
-            focus_style.set_border_color({ 23, 214, 232, border_hover_opacity });
-            focus_style.set_background_color({ 23, 214, 232, background_hover_opacity });
-            disabled_style.set_border_color({ 23, 214, 232, border_opacity / 4 });
-            disabled_style.set_background_color({ 23, 214, 232, background_opacity / 4 });
-            hover_disabled_style.set_border_color({ 23, 214, 232, border_hover_opacity / 4 });
-            hover_disabled_style.set_background_color({ 23, 214, 232, background_hover_opacity / 4 });
-            break;
-        }
-        default:
-            assert(false && "Unknown button style.");
-            break;
-        }
-
-        add_style(&hover_style, hover_state);
-        add_style(&focus_style, focus_state);
-        add_style(&disabled_style, disabled_state);
-        add_style(&hover_disabled_style, { hover_state, disabled_state });
-
-        // transition: color 0.05s linear-in-out, background-color 0.05s linear-in-out;
-    }
-
-    void Button::process_event(const Event &e) {
-        switch (e.type) {
-        case EventType::Click:
-            if (is_enabled()) {
-                for (const auto &function : pressed_callbacks) {
-                    function();
-                }
-            }
-            break;
-        case EventType::Hover: 
-            set_style_enabled(hover_state, std::get<EventHover>(e.variant).active && is_enabled());
-            break;
-        case EventType::Enable:
-            {
-                bool enable_active = std::get<EventEnable>(e.variant).active;
-                set_style_enabled(disabled_state, !enable_active);
-                if (enable_active) {
-                    set_cursor(Cursor::Pointer);
-                    set_focusable(true);
-                }
-                else {
-                    set_cursor(Cursor::None);
-                    set_focusable(false);
-                }
-            }
-            break;
-        case EventType::Focus:
-            set_style_enabled(focus_state, std::get<EventFocus>(e.variant).active);
-            break;
-        case EventType::Update:
-            break;
-        default:
-            assert(false && "Unknown event type.");
-            break;
-        }
-    }
-
-    void Button::add_pressed_callback(std::function<void()> callback) {
-        pressed_callbacks.emplace_back(callback);
-    }
-};
\ No newline at end of file
diff --git a/src/ui/elements/ui_button.h b/src/ui/elements/ui_button.h
deleted file mode 100644
index 182cda3..0000000
--- a/src/ui/elements/ui_button.h
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-
-namespace recompui {
-
-    enum class ButtonStyle {
-        Primary,
-        Secondary
-    };
-
-    class Button : public Element {
-    protected:
-        ButtonStyle style = ButtonStyle::Primary;
-        Style hover_style;
-        Style focus_style;
-        Style disabled_style;
-        Style hover_disabled_style;
-        std::list<std::function<void()>> pressed_callbacks;
-
-        // Element overrides.
-        virtual void process_event(const Event &e) override;
-        std::string_view get_type_name() override { return "Button"; }
-    public:
-        Button(Element *parent, const std::string &text, ButtonStyle style);
-        void add_pressed_callback(std::function<void()> callback);
-        Style* get_hover_style() { return &hover_style; }
-        Style* get_focus_style() { return &focus_style; }
-        Style* get_disabled_style() { return &disabled_style; }
-        Style* get_hover_disabled_style() { return &hover_disabled_style; }
-    };
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_clickable.cpp b/src/ui/elements/ui_clickable.cpp
deleted file mode 100644
index 5ce865c..0000000
--- a/src/ui/elements/ui_clickable.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "ui_clickable.h"
-
-namespace recompui {
-
-    Clickable::Clickable(Element *parent, bool draggable) : Element(parent, Events(EventType::Click, EventType::MouseButton, EventType::Hover, EventType::Enable, draggable ? EventType::Drag : EventType::None)) {
-        set_cursor(Cursor::Pointer);
-        if (draggable) {
-            set_drag(Drag::Drag);
-        }
-    }
-
-    void Clickable::process_event(const Event &e) {
-        switch (e.type) {
-        case EventType::Click: {
-            if (is_enabled()) {
-                const EventClick &click = std::get<EventClick>(e.variant);
-                for (const auto &function : clicked_callbacks) {
-                    function(click.x, click.y);
-                }
-                break;
-            }
-        }
-        case EventType::MouseButton: {
-            if (is_enabled()) {
-                const EventMouseButton &mousebutton = std::get<EventMouseButton>(e.variant);
-                if (mousebutton.button == MouseButton::Left && mousebutton.pressed) {
-                    for (const auto &function : pressed_callbacks) {
-                        function(mousebutton.x, mousebutton.y);
-                    }
-                }
-                break;
-            }
-        }
-        case EventType::Hover:
-            set_style_enabled(hover_state, std::get<EventHover>(e.variant).active && is_enabled());
-            break;
-        case EventType::Enable:
-            {
-                bool enable_active = std::get<EventEnable>(e.variant).active;
-                set_style_enabled(disabled_state, !enable_active);
-                if (enable_active) {
-                    set_cursor(Cursor::Pointer);
-                    set_focusable(true);
-                }
-                else {
-                    set_cursor(Cursor::None);
-                    set_focusable(false);
-                }
-            }
-            break;
-        case EventType::Drag: {
-            if (is_enabled()) {
-                const EventDrag &drag = std::get<EventDrag>(e.variant);
-                for (const auto &function : dragged_callbacks) {
-                    function(drag.x, drag.y, drag.phase);
-                }
-                break;
-            }
-        }
-        default:
-            break;
-        }
-    }
-
-    void Clickable::add_clicked_callback(std::function<void(float, float)> callback) {
-        clicked_callbacks.emplace_back(callback);
-    }
-
-    void Clickable::add_pressed_callback(std::function<void(float, float)> callback) {
-        pressed_callbacks.emplace_back(callback);
-    }
-
-    void Clickable::add_dragged_callback(std::function<void(float, float, DragPhase)> callback) {
-        dragged_callbacks.emplace_back(callback);
-    }
-
-};
\ No newline at end of file
diff --git a/src/ui/elements/ui_clickable.h b/src/ui/elements/ui_clickable.h
deleted file mode 100644
index 97dceed..0000000
--- a/src/ui/elements/ui_clickable.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-
-namespace recompui {
-
-    class Clickable : public Element {
-    protected:
-        std::vector<std::function<void(float, float)>> clicked_callbacks;
-        std::vector<std::function<void(float, float)>> pressed_callbacks;
-        std::vector<std::function<void(float, float, DragPhase)>> dragged_callbacks;
-
-        // Element overrides.
-        virtual void process_event(const Event &e) override;
-        std::string_view get_type_name() override { return "Clickable"; }
-    public:
-        Clickable(Element *parent, bool draggable = false);
-        void add_clicked_callback(std::function<void(float, float)> callback);
-        void add_pressed_callback(std::function<void(float, float)> callback);
-        void add_dragged_callback(std::function<void(float, float, DragPhase)> callback);
-    };
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_container.cpp b/src/ui/elements/ui_container.cpp
deleted file mode 100644
index f3e67e9..0000000
--- a/src/ui/elements/ui_container.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "ui_container.h"
-
-#include <cassert>
-
-namespace recompui {
-
-    Container::Container(Element *parent, FlexDirection direction, JustifyContent justify_content, uint32_t events_enabled) : Element(parent, events_enabled) {
-        set_display(Display::Flex);
-        set_flex_direction(direction);
-        set_justify_content(justify_content);
-    }
-
-};
\ No newline at end of file
diff --git a/src/ui/elements/ui_container.h b/src/ui/elements/ui_container.h
deleted file mode 100644
index 89b0e84..0000000
--- a/src/ui/elements/ui_container.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-
-namespace recompui {
-
-    class Container : public Element {
-    protected:
-        std::string_view get_type_name() override { return "Container"; }
-    public:
-        Container(Element* parent, FlexDirection direction, JustifyContent justify_content, uint32_t events_enabled = 0);
-    };
-
-} // namespace recompui
diff --git a/src/ui/elements/ui_element.cpp b/src/ui/elements/ui_element.cpp
deleted file mode 100644
index 01a849a..0000000
--- a/src/ui/elements/ui_element.cpp
+++ /dev/null
@@ -1,516 +0,0 @@
-#include "RmlUi/Core/StringUtilities.h"
-
-#include "overloaded.h"
-#include "recomp_ui.h"
-#include "ui_element.h"
-#include "../core/ui_context.h"
-
-#include <cassert>
-
-namespace recompui {
-
-Element::Element(Rml::Element *base) {
-    assert(base != nullptr);
-
-    this->base = base;
-    this->base_owning = {};
-    this->shim = true;
-}
-
-Element::Element(Element* parent, uint32_t events_enabled, Rml::String base_class, bool can_set_text) : can_set_text(can_set_text) {
-    ContextId context = get_current_context();
-    base_owning = context.get_document()->CreateElement(base_class);
-
-    if (parent != nullptr) {
-        base = parent->base->AppendChild(std::move(base_owning));
-        parent->add_child(this);
-    }
-    else {
-        base = base_owning.get();
-    }
-
-    set_display(Display::Block);
-    set_property(Rml::PropertyId::BoxSizing, Rml::Style::BoxSizing::BorderBox);
-
-    register_event_listeners(events_enabled);
-}
-
-Element::~Element() {
-    if (!shim) {
-        clear_children();
-        if (!base_owning) {
-            base->GetParentNode()->RemoveChild(base);
-        }
-    }
-}
-
-void Element::add_child(Element *child) {
-    assert(child != nullptr);
-    if (can_set_text) {
-        assert(false && "Elements with settable text cannot have children");
-        return;
-    }
-
-    children.emplace_back(child);
-
-    if (shim) {
-        ContextId context = get_current_context();
-        context.add_loose_element(child);
-    }
-}
-
-void Element::set_property(Rml::PropertyId property_id, const Rml::Property &property) {
-    assert(base != nullptr);
-
-    base->SetProperty(property_id, property);
-    Style::set_property(property_id, property);
-}
-
-void Element::register_event_listeners(uint32_t events_enabled) {
-    assert(base != nullptr);
-
-    this->events_enabled = events_enabled;
-
-    if (events_enabled & Events(EventType::Click)) {
-        base->AddEventListener(Rml::EventId::Click, this);
-    }
-
-    if (events_enabled & Events(EventType::MouseButton)) {
-        base->AddEventListener(Rml::EventId::Mousedown, this);
-        base->AddEventListener(Rml::EventId::Mouseup, this);
-    }
-
-    if (events_enabled & Events(EventType::Focus)) {
-        base->AddEventListener(Rml::EventId::Focus, this);
-        base->AddEventListener(Rml::EventId::Blur, this);
-    }
-
-    if (events_enabled & Events(EventType::Hover)) {
-        base->AddEventListener(Rml::EventId::Mouseover, this);
-        base->AddEventListener(Rml::EventId::Mouseout, this);
-    }
-
-    if (events_enabled & Events(EventType::Drag)) {
-        base->AddEventListener(Rml::EventId::Drag, this);
-        base->AddEventListener(Rml::EventId::Dragstart, this);
-        base->AddEventListener(Rml::EventId::Dragend, this);
-    }
-
-    if (events_enabled & Events(EventType::Text)) {
-        base->AddEventListener(Rml::EventId::Change, this);
-    }
-
-    if (events_enabled & Events(EventType::Navigate)) {
-        base->AddEventListener(Rml::EventId::Keydown, this);
-    }
-}
-
-void Element::apply_style(Style *style) {
-    for (auto it : style->property_map) {
-        // Skip redundant SetProperty calls to prevent dirtying unnecessary state.
-        // This avoids expensive layout operations when a simple color-only style is applied.
-        const Rml::Property* cur_value = base->GetLocalProperty(it.first);
-        if (*cur_value != it.second) {
-            base->SetProperty(it.first, it.second);
-        }
-    }
-}
-
-void Element::apply_styles() {
-    apply_style(this);
-
-    for (size_t i = 0; i < styles_counter.size(); i++) {
-        if (styles_counter[i] == 0) {
-            apply_style(styles[i]);
-        }
-    }
-}
-
-void Element::propagate_disabled(bool disabled) {
-    disabled_from_parent = disabled;
-
-    bool attribute_state = disabled_from_parent || !enabled;
-    if (disabled_attribute != attribute_state) {
-        disabled_attribute = attribute_state;
-        base->SetAttribute("disabled", attribute_state);
-
-        if (events_enabled & Events(EventType::Enable)) {
-            handle_event(Event::enable_event(!attribute_state));
-        }
-
-        for (auto &child : children) {
-            child->propagate_disabled(attribute_state);
-        }
-    }
-}
-
-void Element::handle_event(const Event& event) {
-    for (const auto& callback : callbacks) {
-        recompui::queue_ui_callback(resource_id, event, callback);
-    }
-
-    process_event(event);
-}
-
-void Element::set_id(const std::string& new_id) {
-    id = new_id;
-    base->SetId(new_id);
-}
-
-recompui::MouseButton convert_rml_mouse_button(int button) {
-    switch (button) {
-        case 0:
-            return recompui::MouseButton::Left;
-        case 1:
-            return recompui::MouseButton::Right;
-        case 2:
-            return recompui::MouseButton::Middle;
-        default:
-            return recompui::MouseButton::Count;
-    }
-}
-
-void Element::ProcessEvent(Rml::Event &event) {
-    ContextId prev_context = recompui::try_close_current_context();
-    ContextId context = ContextId::null();
-    Rml::ElementDocument* doc = event.GetTargetElement()->GetOwnerDocument();
-    if (doc != nullptr) {
-        context = get_context_from_document(doc);
-    }
-
-    bool did_open = false;
-
-    // TODO disallow null contexts once the entire UI system has been migrated.
-    if (context != ContextId::null()) {
-        did_open = context.open_if_not_already();
-    }
-
-    // Events that are processed during any phase.
-    switch (event.GetId()) {
-    case Rml::EventId::Click:
-        handle_event(Event::click_event(event.GetParameter("mouse_x", 0.0f), event.GetParameter("mouse_y", 0.0f)));
-        break;
-    case Rml::EventId::Mousedown:
-        {
-            MouseButton mouse_button = convert_rml_mouse_button(event.GetParameter("button", 3));
-            if (mouse_button != MouseButton::Count) {
-                handle_event(Event::mousebutton_event(event.GetParameter("mouse_x", 0.0f), event.GetParameter("mouse_y", 0.0f), mouse_button, true));
-            }
-        }
-        break;
-    case Rml::EventId::Mouseup:
-        {
-            MouseButton mouse_button = convert_rml_mouse_button(event.GetParameter("button", 3));
-            if (mouse_button != MouseButton::Count) {
-                handle_event(Event::mousebutton_event(event.GetParameter("mouse_x", 0.0f), event.GetParameter("mouse_y", 0.0f), mouse_button, false));
-            }
-        }
-        break;
-    case Rml::EventId::Keydown:
-        switch ((Rml::Input::KeyIdentifier)event.GetParameter<int>("key_identifier", 0)) {
-            case Rml::Input::KeyIdentifier::KI_LEFT:
-                handle_event(Event::navigate_event(NavDirection::Left));
-                break;
-            case Rml::Input::KeyIdentifier::KI_UP:
-                handle_event(Event::navigate_event(NavDirection::Up));
-                break;
-            case Rml::Input::KeyIdentifier::KI_RIGHT:
-                handle_event(Event::navigate_event(NavDirection::Right));
-                break;
-            case Rml::Input::KeyIdentifier::KI_DOWN:
-                handle_event(Event::navigate_event(NavDirection::Down));
-                break;
-        }
-        break;
-    case Rml::EventId::Drag:
-        handle_event(Event::drag_event(event.GetParameter("mouse_x", 0.0f), event.GetParameter("mouse_y", 0.0f), DragPhase::Move));
-        break;
-    default:
-        break;
-    }
-
-    // Events that are only processed during the Target phase.
-    if (event.GetPhase() == Rml::EventPhase::Target) {
-        switch (event.GetId()) {
-        case Rml::EventId::Mouseover:
-            handle_event(Event::hover_event(true));
-            break;
-        case Rml::EventId::Mouseout:
-            handle_event(Event::hover_event(false));
-            break;
-        case Rml::EventId::Focus:
-            handle_event(Event::focus_event(true));
-            break;
-        case Rml::EventId::Blur:
-            handle_event(Event::focus_event(false));
-            break;
-        case Rml::EventId::Dragstart:
-            handle_event(Event::drag_event(event.GetParameter("mouse_x", 0.0f), event.GetParameter("mouse_y", 0.0f), DragPhase::Start));
-            break;
-        case Rml::EventId::Dragend:
-            handle_event(Event::drag_event(event.GetParameter("mouse_x", 0.0f), event.GetParameter("mouse_y", 0.0f), DragPhase::End));
-            break;
-        case Rml::EventId::Change: {
-            if (events_enabled & Events(EventType::Text)) {
-                Rml::Variant *value_variant = base->GetAttribute("value");
-                if (value_variant != nullptr) {
-                    handle_event(Event::text_event(value_variant->Get<std::string>()));
-                }
-            }
-
-            break;
-        }
-        default:
-            break;
-        }
-    }
-
-    if (context != ContextId::null() && did_open) {
-        context.close();
-    }
-
-    if (prev_context != ContextId::null()) {
-        prev_context.open();
-    }
-}
-
-void Element::set_attribute(const Rml::String &attribute_key, const Rml::String &attribute_value) {
-    base->SetAttribute(attribute_key, attribute_value);
-}
-
-void Element::process_event(const Event &) {
-    // Does nothing by default.
-}
-
-void Element::enable_focus() {
-    set_tab_index_auto();
-    set_focusable(true);
-    set_nav_auto(NavDirection::Up);
-    set_nav_auto(NavDirection::Down);
-    set_nav_auto(NavDirection::Left);
-    set_nav_auto(NavDirection::Right);
-}
-
-void Element::clear_children() {
-    if (children.empty()) {
-        return;
-    }
-    ContextId context = get_current_context();
-
-    // Remove the children from the context.
-    for (Element* child : children) {
-        context.destroy_resource(child);
-    }
-
-    // Clear the child list.
-    children.clear();
-}
-
-bool Element::remove_child(ResourceId child) {
-    bool found = false;
-
-    ContextId context = get_current_context();
-
-    for (auto it = children.begin(); it != children.end(); ++it) {
-        Element* cur_child = *it;
-        if (cur_child->get_resource_id() == child) {
-            children.erase(it);
-            context.destroy_resource(cur_child);
-            found = true;
-            break;
-        }
-    }
-
-    return found;
-}
-
-void Element::add_style(Style *style, const std::string_view style_name) {
-    add_style(style, { style_name });
-}
-
-void Element::add_style(Style *style, const std::initializer_list<std::string_view> &style_names) {
-    for (const std::string_view &style_name : style_names) {
-        style_name_index_map.emplace(style_name, styles.size());
-    }
-
-    styles.emplace_back(style);
-
-    uint32_t initial_style_counter = style_names.size();
-    for (const std::string_view &style_name : style_names) {
-        if (style_active_set.find(style_name) != style_active_set.end()) {
-            initial_style_counter--;
-        }
-    }
-
-    styles_counter.push_back(initial_style_counter);
-}
-
-void Element::set_enabled(bool enabled) {
-    this->enabled = enabled;
-
-    propagate_disabled(disabled_from_parent);
-}
-
-bool Element::is_enabled() const {
-    return enabled && !disabled_from_parent;
-}
-
-// Adapted from RmlUi's `EncodeRml`.
-std::string escape_rml(std::string_view string)
-{
-	std::string result;
-	result.reserve(string.size());
-	for (char c : string)
-	{
-		switch (c)
-		{
-		case '<': result += "&lt;"; break;
-		case '>': result += "&gt;"; break;
-		case '&': result += "&amp;"; break;
-		case '"': result += "&quot;"; break;
-        case '\n': result += "<br/>"; break;
-		default: result += c; break;
-		}
-	}
-	return result;
-}
-
-void Element::set_text(std::string_view text) {
-    if (can_set_text) {
-        // Queue the text update. If it's applied immediately, it might happen
-        // while the document is being updated or rendered. This can cause a crash
-        // due to the child elements being deleted while the document is being updated.
-        // Queueing them defers it to the update thread, which prevents that issue.
-        // Escape the string into Rml to prevent element injection.
-        get_current_context().queue_set_text(this, escape_rml(text));
-    }
-    else {
-        assert(false && "Attempted to set text of an element that cannot have its text set.");
-    }
-}
-
-std::string Element::get_input_text() {
-    return base->GetAttribute("value", std::string{});
-}
-
-void Element::set_input_text(std::string_view val) {
-    base->SetAttribute("value", std::string{ val });
-}
-
-void Element::set_src(std::string_view src) {
-    base->SetAttribute("src", std::string(src));
-}
-
-void Element::set_style_enabled(std::string_view style_name, bool enable) {
-    if (enable && style_active_set.find(style_name) == style_active_set.end()) {
-        // Style was disabled and will be enabled.
-        style_active_set.emplace(style_name);
-
-    }
-    else if (!enable && style_active_set.find(style_name) != style_active_set.end()) {
-        // Style was enabled and will be disabled.
-        style_active_set.erase(style_name);
-    }
-    else {
-        // Do nothing.
-        return;
-    }
-
-    auto range = style_name_index_map.equal_range(style_name);
-    for (auto it = range.first; it != range.second; it++) {
-        if (enable) {
-            styles_counter[it->second]--;
-        }
-        else {
-            styles_counter[it->second]++;
-        }
-    }
-
-    apply_styles();
-}
-
-bool Element::is_style_enabled(std::string_view style_name) {
-    return style_active_set.contains(style_name);
-}
-
-float Element::get_absolute_left() {
-    return base->GetAbsoluteLeft();
-}
-
-float Element::get_absolute_top() {
-    return base->GetAbsoluteTop();
-}
-
-float Element::get_client_left() {
-    return base->GetClientLeft();
-}
-
-float Element::get_client_top() {
-    return base->GetClientTop();
-}
-
-float Element::get_client_width() {
-    return base->GetClientWidth();
-}
-
-float Element::get_client_height() {
-    return base->GetClientHeight();
-}
-
-uint32_t Element::get_input_value_u32() {
-    ElementValue value = get_element_value();
-    
-    return std::visit(overloaded {
-        [](double d) { return (uint32_t)d; },
-        [](float f) { return (uint32_t)f; },
-        [](uint32_t u) { return u; },
-        [](std::monostate) { return 0U; }
-    }, value);
-}
-
-float Element::get_input_value_float() {
-    ElementValue value = get_element_value();
-    
-    return std::visit(overloaded {
-        [](double d) { return (float)d; },
-        [](float f) { return f; },
-        [](uint32_t u) { return (float)u; },
-        [](std::monostate) { return 0.0f; }
-    }, value);
-}
-
-double Element::get_input_value_double() {
-    ElementValue value = get_element_value();
-    
-    return std::visit(overloaded {
-        [](double d) { return d; },
-        [](float f) { return (double)f; },
-        [](uint32_t u) { return (double)u; },
-        [](std::monostate) { return 0.0; }
-    }, value);
-}
-
-void Element::focus() {
-    base->Focus();
-}
-
-void Element::blur() {
-    base->Blur();
-}
-
-void Element::queue_update() {
-    ContextId cur_context = get_current_context();
-
-    // TODO disallow null contexts once the entire UI system has been migrated.
-    if (cur_context == ContextId::null()) {
-        return;
-    }    
-
-    cur_context.queue_element_update(resource_id);
-}
-
-void Element::register_callback(ContextId context, PTR(void) callback, PTR(void) userdata) {
-    callbacks.emplace_back(UICallback{.context = context, .callback = callback, .userdata = userdata});
-}
-
-}
\ No newline at end of file
diff --git a/src/ui/elements/ui_element.h b/src/ui/elements/ui_element.h
deleted file mode 100644
index 6e2ce16..0000000
--- a/src/ui/elements/ui_element.h
+++ /dev/null
@@ -1,106 +0,0 @@
-#pragma once
-
-#include "ui_style.h"
-#include "../core/ui_context.h"
-
-#include "recomp.h"
-#include <ultramodern/ultra64.h>
-
-#include <unordered_set>
-#include <variant>
-
-namespace recompui {
-struct UICallback {
-    ContextId context;
-    PTR(void) callback;
-    PTR(void) userdata;
-};
-
-using ElementValue = std::variant<uint32_t, float, double, std::monostate>;
-
-class ContextId;
-class Element : public Style, public Rml::EventListener {
-    friend ContextId create_context(const std::filesystem::path& path);
-    friend ContextId create_context();
-    friend class ContextId; // To allow ContextId to call the handle_event method directly.
-private:
-    Rml::Element *base = nullptr;
-    Rml::ElementPtr base_owning = {};
-    uint32_t events_enabled = 0;
-    std::vector<Style *> styles;
-    std::vector<uint32_t> styles_counter;
-    std::unordered_set<std::string_view> style_active_set;
-    std::unordered_multimap<std::string_view, uint32_t> style_name_index_map;
-    std::vector<UICallback> callbacks;
-    std::vector<Element *> children;
-    std::string id;
-    bool shim = false;
-    bool enabled = true;
-    bool disabled_attribute = false;
-    bool disabled_from_parent = false;
-    bool can_set_text = false;
-
-    void add_child(Element *child);
-    void register_event_listeners(uint32_t events_enabled);
-    void apply_style(Style *style);
-    void propagate_disabled(bool disabled);
-    void handle_event(const Event &e);
-    void set_id(const std::string& new_id);
-
-    // Style overrides.
-    virtual void set_property(Rml::PropertyId property_id, const Rml::Property &property) override;
-
-    // Rml::EventListener overrides.
-    void ProcessEvent(Rml::Event &event) override final;
-protected:
-    // Use of this method in inherited classes is discouraged unless it's necessary.
-    void set_attribute(const Rml::String &attribute_key, const Rml::String &attribute_value);
-    virtual void process_event(const Event &e);
-    virtual ElementValue get_element_value() { return std::monostate{}; }
-    virtual void set_input_value(const ElementValue&) {}
-    virtual std::string_view get_type_name() { return "Element"; }
-public:
-    // Used for backwards compatibility with legacy UI elements.
-    Element(Rml::Element *base);
-
-    // Used to actually construct elements.
-    Element(Element* parent, uint32_t events_enabled = 0, Rml::String base_class = "div", bool can_set_text = false);
-    virtual ~Element();
-    void clear_children();
-    bool remove_child(ResourceId child);
-    bool remove_child(Element *child) { return remove_child(child->get_resource_id()); }
-    void add_style(Style *style, std::string_view style_name);
-    void add_style(Style *style, const std::initializer_list<std::string_view> &style_names);
-    void set_enabled(bool enabled);
-    bool is_enabled() const;
-    void set_text(std::string_view text);
-    std::string get_input_text();
-    void set_input_text(std::string_view text);
-    void set_src(std::string_view src);
-    void set_style_enabled(std::string_view style_name, bool enabled);
-    bool is_style_enabled(std::string_view style_name);
-    void apply_styles();
-    bool is_element() override { return true; }
-    float get_absolute_left();
-    float get_absolute_top();
-    float get_client_left();
-    float get_client_top();
-    float get_client_width();
-    float get_client_height();
-    void enable_focus();
-    void focus();
-    void blur();
-    void queue_update();
-    void register_callback(ContextId context, PTR(void) callback, PTR(void) userdata);
-    uint32_t get_input_value_u32();
-    float get_input_value_float();
-    double get_input_value_double();
-    void set_input_value_u32(uint32_t val) { set_input_value(val); }
-    void set_input_value_float(float val) { set_input_value(val); }
-    void set_input_value_double(double val) { set_input_value(val); }
-    const std::string& get_id() { return id; }
-};
-
-void queue_ui_callback(recompui::ResourceId resource, const Event& e, const UICallback& callback);
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_image.cpp b/src/ui/elements/ui_image.cpp
deleted file mode 100644
index e29742c..0000000
--- a/src/ui/elements/ui_image.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "ui_image.h"
-
-#include <cassert>
-
-namespace recompui {
-
-    Image::Image(Element *parent, std::string_view src) : Element(parent, 0, "img") {
-        set_src(src);
-    }
-
-};
\ No newline at end of file
diff --git a/src/ui/elements/ui_image.h b/src/ui/elements/ui_image.h
deleted file mode 100644
index 29df08f..0000000
--- a/src/ui/elements/ui_image.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-
-namespace recompui {
-
-    class Image : public Element {
-    protected:
-        std::string_view get_type_name() override { return "ImageView"; }
-    public:
-        Image(Element *parent, std::string_view src);
-    };
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_label.cpp b/src/ui/elements/ui_label.cpp
deleted file mode 100644
index 64a53b8..0000000
--- a/src/ui/elements/ui_label.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "ui_label.h"
-
-#include <cassert>
-
-namespace recompui {
-
-    Label::Label(Element *parent, LabelStyle label_style) : Element(parent, 0U, "div", true) {
-        switch (label_style) {
-        case LabelStyle::Annotation:
-            set_color(Color{ 185, 125, 242, 255 });
-            set_font_size(18.0f);
-            set_letter_spacing(2.52f);
-            set_line_height(18.0f);
-            set_font_weight(400);
-            break;
-        case LabelStyle::Small:
-            set_font_size(20.0f);
-            set_letter_spacing(0.0f);
-            set_line_height(20.0f);
-            set_font_weight(400);
-            break;
-        case LabelStyle::Normal:
-            set_font_size(28.0f);
-            set_letter_spacing(3.08f);
-            set_line_height(28.0f);
-            set_font_weight(700);
-            break;
-        case LabelStyle::Large:
-            set_font_size(36.0f);
-            set_letter_spacing(2.52f);
-            set_line_height(36.0f);
-            set_font_weight(700);
-            break;
-        }
-        
-        set_font_style(FontStyle::Normal);
-    }
-
-    Label::Label(Element *parent, const std::string &text, LabelStyle label_style) : Label(parent, label_style) {
-        set_text(text);
-    }
-
-};
\ No newline at end of file
diff --git a/src/ui/elements/ui_label.h b/src/ui/elements/ui_label.h
deleted file mode 100644
index 6695c55..0000000
--- a/src/ui/elements/ui_label.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-
-namespace recompui {
-
-    enum class LabelStyle {
-        Annotation,
-        Small,
-        Normal,
-        Large
-    };
-
-    class Label : public Element {
-    protected:
-        std::string_view get_type_name() override { return "Label"; }
-    public:
-        Label(Element *parent, LabelStyle label_style);
-        Label(Element *parent, const std::string &text, LabelStyle label_style);
-    };
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_radio.cpp b/src/ui/elements/ui_radio.cpp
deleted file mode 100644
index 6cd1423..0000000
--- a/src/ui/elements/ui_radio.cpp
+++ /dev/null
@@ -1,268 +0,0 @@
-#include "overloaded.h"
-#include "ui_radio.h"
-#include "../ui_utils.h"
-
-namespace recompui {
-
-    // RadioOption
-
-    RadioOption::RadioOption(Element *parent, std::string_view name, uint32_t index) : Element(parent, Events(EventType::MouseButton, EventType::Click, EventType::Focus, EventType::Hover, EventType::Enable, EventType::Update), "label", true) {
-        this->index = index;
-
-        enable_focus();
-        set_text(name);
-        set_cursor(Cursor::Pointer);
-        set_font_size(20.0f);
-        set_letter_spacing(2.8f);
-        set_line_height(20.0f);
-        set_font_weight(400);
-        set_font_style(FontStyle::Normal);
-        set_border_color(Color{ 242, 242, 242, 0 });
-        set_border_bottom_width(1.0f);
-        set_color(Color{ 255, 255, 255, 153 });
-        set_padding_bottom(8.0f);
-        set_text_transform(TextTransform::Uppercase);
-        set_height_auto();
-        hover_style.set_color(Color{ 255, 255, 255, 204 });
-        checked_style.set_color(Color{ 255, 255, 255, 255 });
-        checked_style.set_border_color(Color{ 242, 242, 242, 255 });
-        pulsing_style.set_border_color(Color{ 23, 214, 232, 244 });
-
-        add_style(&hover_style, { hover_state });
-        add_style(&checked_style, { checked_state });
-        add_style(&pulsing_style, { focus_state });
-    }
-
-    void RadioOption::set_pressed_callback(std::function<void(uint32_t)> callback) {
-        pressed_callback = callback;
-    }
-
-    void RadioOption::set_focus_callback(std::function<void(bool)> callback) {
-        focus_callback = callback;
-    }
-
-    void RadioOption::set_selected_state(bool enable) {
-        set_style_enabled(checked_state, enable);
-    }
-
-    void RadioOption::process_event(const Event &e) {
-        switch (e.type) {
-        case EventType::MouseButton:
-            {
-                const EventMouseButton &mousebutton = std::get<EventMouseButton>(e.variant);
-                if (mousebutton.button == MouseButton::Left && mousebutton.pressed) {
-                    pressed_callback(index);
-                }
-            }
-            break;
-        case EventType::Click:
-            pressed_callback(index);
-            break;
-        case EventType::Hover:
-            set_style_enabled(hover_state, std::get<EventHover>(e.variant).active);
-            break;
-        case EventType::Enable:
-            set_style_enabled(disabled_state, !std::get<EventEnable>(e.variant).active);
-            break;
-        case EventType::Focus:
-            {
-                bool active = std::get<EventFocus>(e.variant).active;
-                set_style_enabled(focus_state, active);
-                if (active) {
-                    queue_update();
-                }
-                if (focus_callback != nullptr) {
-                    focus_callback(active);
-                }
-            }
-            break;
-        case EventType::Update:
-            if (is_style_enabled(focus_state)) {
-                pulsing_style.set_color(recompui::get_pulse_color(750));
-                apply_styles();
-                queue_update();
-            }
-            break;
-        default:
-            break;
-        }
-    }
-
-    // Radio
-
-    void Radio::set_index_internal(uint32_t index, bool setup, bool trigger_callbacks) {
-        if (this->index != index || setup) {
-            options[this->index]->set_selected_state(false);
-            this->index = index;
-            options[index]->set_selected_state(true);
-
-            if (trigger_callbacks) {
-                for (const auto &function : index_changed_callbacks) {
-                    function(index);
-                }
-            }
-        }
-    }
-
-    void Radio::option_selected(uint32_t index) {
-        set_index_internal(index, false, true);
-    }
-    
-    void Radio::set_input_value(const ElementValue& val) {
-        std::visit(overloaded {
-            [this](uint32_t u) { set_index(u); }, 
-            [this](float f) { set_index(f); }, 
-            [this](double d) { set_index(d); },
-            [](std::monostate) {}
-        }, val);
-    }
-
-    Radio::Radio(Element *parent) : Container(parent, FlexDirection::Row, JustifyContent::FlexStart, Events(EventType::Focus, EventType::Update)) {
-        set_gap(24.0f);
-        set_align_items(AlignItems::FlexStart);
-        enable_focus();
-    }
-
-    void Radio::process_event(const Event &e) {
-        switch (e.type) {
-        case EventType::Focus:
-            if (!options.empty()) {
-                if (std::get<EventFocus>(e.variant).active) {
-                    blur();
-                    queue_child_focus();
-                }
-                if (focus_callback != nullptr) {
-                    focus_callback(std::get<EventFocus>(e.variant).active);
-                }
-            }
-            break;
-        case EventType::Update:
-            if (child_focus_queued) {
-                child_focus_queued = false;
-                options[index]->focus();
-            }
-        }
-    }
-
-    Radio::~Radio() {
-
-    }
-
-    void Radio::add_option(std::string_view name) {
-        RadioOption *option = get_current_context().create_element<RadioOption>(this, name, uint32_t(options.size()));
-        option->set_pressed_callback([this](uint32_t index){ options[index]->focus(); option_selected(index); });
-        option->set_focus_callback([this](bool active) {
-            if (focus_callback != nullptr) {
-                focus_callback(active);
-            }
-        });
-        options.emplace_back(option);
-
-        // The first option was added, select it.
-        if (options.size() == 1) {
-            set_index_internal(0, true, false);
-        }
-        // At least one other option already existed, so set up navigation.
-        else {
-            options[options.size() - 2]->set_nav(NavDirection::Right, options[options.size() - 1]);
-            options[options.size() - 1]->set_nav(NavDirection::Left, options[options.size() - 2]);
-        }
-    }
-
-    void Radio::set_index(uint32_t index) {
-        set_index_internal(index, false, false);
-    }
-
-    uint32_t Radio::get_index() const {
-        return index;
-    }
-
-    void Radio::add_index_changed_callback(std::function<void(uint32_t)> callback) {
-        index_changed_callbacks.emplace_back(callback);
-    }
-
-    void Radio::set_focus_callback(std::function<void(bool)> callback) {
-        focus_callback = callback;
-    }
-    
-    void Radio::set_nav_auto(NavDirection dir) {
-        Element::set_nav_auto(dir);
-        if (!options.empty()) {
-            switch (dir) {
-                case NavDirection::Up:
-                case NavDirection::Down:
-                    for (Element* e : options) {
-                        e->set_nav_auto(dir);
-                    }
-                    break;
-                case NavDirection::Left:
-                    options.front()->set_nav_auto(dir);
-                    break;
-                case NavDirection::Right:
-                    options.back()->set_nav_auto(dir);
-                    break;
-            }
-        }
-    }
-
-    void Radio::set_nav_none(NavDirection dir) {
-        Element::set_nav_none(dir);
-        if (!options.empty()) {
-            switch (dir) {
-                case NavDirection::Up:
-                case NavDirection::Down:
-                    for (Element* e : options) {
-                        e->set_nav_none(dir);
-                    }
-                    break;
-                case NavDirection::Left:
-                    options.front()->set_nav_none(dir);
-                    break;
-                case NavDirection::Right:
-                    options.back()->set_nav_none(dir);
-                    break;
-            }
-        }
-    }
-
-    void Radio::set_nav(NavDirection dir, Element* element) {
-        Element::set_nav(dir, element);
-        if (!options.empty()) {
-            switch (dir) {
-                case NavDirection::Up:
-                case NavDirection::Down:
-                    for (Element* e : options) {
-                        e->set_nav(dir, element);
-                    }
-                    break;
-                case NavDirection::Left:
-                    options.front()->set_nav(dir, element);
-                    break;
-                case NavDirection::Right:
-                    options.back()->set_nav(dir, element);
-                    break;
-            }
-        }
-    }
-
-    void Radio::set_nav_manual(NavDirection dir, const std::string& target) {
-        Element::set_nav_manual(dir, target);
-        if (!options.empty()) {
-            switch (dir) {
-                case NavDirection::Up:
-                case NavDirection::Down:
-                    for (Element* e : options) {
-                        e->set_nav_manual(dir, target);
-                    }
-                    break;
-                case NavDirection::Left:
-                    options.front()->set_nav_manual(dir, target);
-                    break;
-                case NavDirection::Right:
-                    options.back()->set_nav_manual(dir, target);
-                    break;
-            }
-        }
-    }
-
-};
diff --git a/src/ui/elements/ui_radio.h b/src/ui/elements/ui_radio.h
deleted file mode 100644
index 490bdab..0000000
--- a/src/ui/elements/ui_radio.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "ui_container.h"
-#include "ui_label.h"
-
-namespace recompui {
-    class RadioOption : public Element {
-    private:
-        Style hover_style;
-        Style checked_style;
-        Style pulsing_style;
-        std::function<void(uint32_t)> pressed_callback = nullptr;
-        std::function<void(bool)> focus_callback = nullptr;
-        uint32_t index = 0;
-    protected:
-        virtual void process_event(const Event &e) override;
-        std::string_view get_type_name() override { return "LabelRadioOption"; }
-    public:
-        RadioOption(Element *parent, std::string_view name, uint32_t index);
-        void set_pressed_callback(std::function<void(uint32_t)> callback);
-        void set_focus_callback(std::function<void(bool)> callback);
-        void set_selected_state(bool enable);
-    };
-
-    class Radio : public Container {
-    private:
-        std::vector<RadioOption *> options;
-        uint32_t index = 0;
-        std::vector<std::function<void(uint32_t)>> index_changed_callbacks;
-        std::function<void(bool)> focus_callback = nullptr;
-        bool child_focus_queued = false;
-
-        void set_index_internal(uint32_t index, bool setup, bool trigger_callbacks);
-        void option_selected(uint32_t index);
-        void set_input_value(const ElementValue& val) override;
-        ElementValue get_element_value() override { return get_index(); }
-    protected:
-        virtual void process_event(const Event &e) override;
-        std::string_view get_type_name() override { return "LabelRadio"; }
-        void queue_child_focus() { child_focus_queued = true; queue_update(); }
-    public:
-        Radio(Element *parent);
-        virtual ~Radio();
-        void add_option(std::string_view name);
-        void set_index(uint32_t index);
-        uint32_t get_index() const;
-        void add_index_changed_callback(std::function<void(uint32_t)> callback);
-        void set_focus_callback(std::function<void(bool)> callback);
-        size_t num_options() const { return options.size(); }
-        RadioOption* get_option_element(size_t option_index) { return options[option_index]; }
-        RadioOption* get_current_option_element() { return options.empty() ? nullptr : options[index]; }
-        void set_nav_auto(NavDirection dir) override;
-        void set_nav_none(NavDirection dir) override;
-        void set_nav(NavDirection dir, Element* element) override;
-        void set_nav_manual(NavDirection dir, const std::string& target) override;
-    };
-
-} // namespace recompui
diff --git a/src/ui/elements/ui_scroll_container.cpp b/src/ui/elements/ui_scroll_container.cpp
deleted file mode 100644
index cbc1f67..0000000
--- a/src/ui/elements/ui_scroll_container.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "ui_scroll_container.h"
-
-#include <cassert>
-
-namespace recompui {
-    
-    ScrollContainer::ScrollContainer(Element *parent, ScrollDirection direction) : Element(parent) {
-        set_flex(1.0f, 1.0f, 100.0f);
-        set_width(100.0f, Unit::Percent);
-        set_height(100.0f, Unit::Percent);
-
-        switch (direction) {
-        case ScrollDirection::Horizontal:
-            set_max_width(100.0f, Unit::Percent);
-            set_overflow_x(Overflow::Auto);
-            break;
-        case ScrollDirection::Vertical:
-            set_max_height(100.0f, Unit::Percent);
-            set_overflow_y(Overflow::Auto);
-            break;
-        default:
-            assert(false && "Unknown scroll direction.");
-            break;
-        }
-    }
-
-};
\ No newline at end of file
diff --git a/src/ui/elements/ui_scroll_container.h b/src/ui/elements/ui_scroll_container.h
deleted file mode 100644
index 9871370..0000000
--- a/src/ui/elements/ui_scroll_container.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-
-namespace recompui {
-
-    enum class ScrollDirection {
-        Horizontal,
-        Vertical
-    };
-
-    class ScrollContainer : public Element {
-    protected:
-        std::string_view get_type_name() override { return "ScrollContainer"; }
-    public:
-        ScrollContainer(Element *parent, ScrollDirection direction);
-    };
-
-} // namespace recompui
diff --git a/src/ui/elements/ui_slider.cpp b/src/ui/elements/ui_slider.cpp
deleted file mode 100644
index c77b45d..0000000
--- a/src/ui/elements/ui_slider.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-#include "overloaded.h"
-#include "ui_slider.h"
-#include "../ui_utils.h"
-
-#include <cmath>
-#include <charconv>
-
-namespace recompui {
-
-    void Slider::set_value_internal(double v, bool setup, bool trigger_callbacks) {
-        if (step_value != 0.0) {
-            v = std::lround(v / step_value) * step_value;
-        }
-
-        if (value != v || setup) {
-            value = v;
-            update_circle_position();
-            update_label_text();
-
-            if (trigger_callbacks) {
-                for (auto callback : value_changed_callbacks) {
-                    callback(v);
-                }
-            }
-        }
-    }
-
-    void Slider::bar_pressed(float x, float) {
-        update_value_from_mouse(x);
-    }
-
-    void Slider::bar_dragged(float x, float, DragPhase) {
-        update_value_from_mouse(x);
-    }
-
-    void Slider::circle_dragged(float x, float, DragPhase) {
-        update_value_from_mouse(x);
-    }
-
-    void Slider::update_value_from_mouse(float x) {
-        double left = slider_element->get_absolute_left();
-        double width = slider_element->get_client_width();
-        double ratio = std::clamp((x - left) / width, 0.0, 1.0);
-        set_value_internal(min_value + ratio * (max_value - min_value), false, true);
-    }
-
-    void Slider::update_circle_position() {
-        double ratio = std::clamp((value - min_value) / (max_value - min_value), 0.0, 1.0);
-        circle_element->set_left(ratio * 100.0, Unit::Percent);
-    }
-
-    void Slider::update_label_text() {
-        char text_buffer[32];
-
-        if (type == SliderType::Double) {
-            std::snprintf(text_buffer, sizeof(text_buffer), "%.1f", value);
-        } else if (type == SliderType::Percent) {
-            std::snprintf(text_buffer, sizeof(text_buffer), "%d%%", static_cast<int>(value));
-        } else {
-            std::snprintf(text_buffer, sizeof(text_buffer), "%d", static_cast<int>(value));
-        }
-
-        value_label->set_text(text_buffer);
-    }
-    
-    void Slider::set_input_value(const ElementValue& val) {
-        std::visit(overloaded {
-            [this](uint32_t u) { set_value(u); }, 
-            [this](float f) { set_value(f); }, 
-            [this](double d) { set_value(d); },
-            [](std::monostate) {}
-        }, val);
-    }
-
-    void Slider::process_event(const Event& e) {
-        switch (e.type) {
-        case EventType::Focus:
-            {
-                bool active = std::get<EventFocus>(e.variant).active;
-                circle_element->set_style_enabled(focus_state, active);
-                if (active) {
-                    queue_update();
-                }
-                if (focus_callback != nullptr) {
-                    focus_callback(active);
-                }
-            }
-            break;
-        case EventType::Update:
-            if (is_enabled()) {
-                if (circle_element->is_style_enabled(focus_state)) {
-                    circle_element->set_background_color(recompui::get_pulse_color(750));
-                    queue_update();
-                }
-                else {
-                    circle_element->set_background_color(Color{ 204, 204, 204, 255 });
-                }
-            }
-            else {
-                circle_element->set_background_color(Color{ 102, 102, 102, 255 });
-            }
-            break;
-        case EventType::Navigate:
-            {
-                NavDirection dir = std::get<EventNavigate>(e.variant).direction;
-                if (dir == NavDirection::Left) {
-                    do_step(false);
-                }
-                else if (dir == NavDirection::Right) {
-                    do_step(true);
-                }
-            }
-            break;
-        case EventType::Enable:
-            {
-                bool enable_active = std::get<EventEnable>(e.variant).active;
-                circle_element->set_enabled(enable_active);
-                if (enable_active) {
-                    set_cursor(Cursor::Pointer);
-                    set_focusable(true);
-                    circle_element->set_background_color(Color{ 204, 204, 204, 255 });
-                }
-                else {
-                    set_cursor(Cursor::None);
-                    set_focusable(false);
-                    circle_element->set_background_color(Color{ 102, 102, 102, 255 });
-                }
-            }
-            break;
-        default:
-            break;
-        }
-    }
-
-    Slider::Slider(Element *parent, SliderType type) : Element(parent, Events(EventType::Focus, EventType::Update, EventType::Navigate, EventType::Enable)) {
-        this->type = type;
-
-        set_cursor(Cursor::Pointer);
-        set_display(Display::Flex);
-        set_flex_direction(FlexDirection::Row);
-        set_text_align(TextAlign::Left);
-        set_min_width(120.0f);
-
-        enable_focus();
-        set_nav_none(NavDirection::Left);
-        set_nav_none(NavDirection::Right);
-
-        ContextId context = get_current_context();
-
-        value_label = context.create_element<Label>(this, "0", LabelStyle::Small);
-        value_label->set_margin_right(20.0f);
-        value_label->set_min_width(60.0f);
-        value_label->set_max_width(60.0f);
-
-        slider_element = context.create_element<Clickable>(this, true);
-        slider_element->set_flex(1.0f, 0.0f);
-        slider_element->add_pressed_callback([this](float x, float y){ bar_pressed(x, y); focus(); });
-        slider_element->add_dragged_callback([this](float x, float y, recompui::DragPhase phase){ bar_dragged(x, y, phase); focus(); });
-
-        {
-            bar_element = context.create_element<Clickable>(slider_element, true);
-            bar_element->set_width(100.0f, Unit::Percent);
-            bar_element->set_height(2.0f);
-            bar_element->set_margin_top(8.0f);
-            bar_element->set_background_color(Color{ 255, 255, 255, 50 });
-            bar_element->add_pressed_callback([this](float x, float y){ bar_pressed(x, y); focus(); });
-            bar_element->add_dragged_callback([this](float x, float y, recompui::DragPhase phase){ bar_dragged(x, y, phase); focus(); });
-            
-            circle_element = context.create_element<Clickable>(bar_element, true);
-            circle_element->set_position(Position::Relative);
-            circle_element->set_width(16.0f);
-            circle_element->set_height(16.0f);
-            circle_element->set_margin_top(-7.0f);
-            circle_element->set_margin_right(-8.0f);
-            circle_element->set_margin_left(-8.0f);
-            circle_element->set_background_color(Color{ 204, 204, 204, 255 });
-            circle_element->set_border_radius(8.0f);
-            circle_element->add_pressed_callback([this](float, float){ focus(); });
-            circle_element->add_dragged_callback([this](float x, float y, recompui::DragPhase phase){ circle_dragged(x, y, phase); focus(); });
-            circle_element->set_cursor(Cursor::Pointer);
-        }
-
-        set_value_internal(value, true, false);
-    }
-
-    Slider::~Slider() {
-
-    }
-
-    void Slider::set_value(double v) {
-        set_value_internal(v, false, false);
-    }
-
-    double Slider::get_value() const {
-        return value;
-    }
-    void Slider::set_min_value(double v) {
-        min_value = v;
-    }
-
-    double Slider::get_min_value() const {
-        return min_value;
-    }
-
-    void Slider::set_max_value(double v) {
-        max_value = v;
-    }
-
-    double Slider::get_max_value() const {
-        return max_value;
-    }
-
-    void Slider::set_step_value(double v) {
-        step_value = v;
-    }
-
-    double Slider::get_step_value() const {
-        return step_value;
-    }
-
-    void Slider::add_value_changed_callback(std::function<void(double)> callback) {
-        value_changed_callbacks.emplace_back(callback);
-    }
-
-    void Slider::set_focus_callback(std::function<void(bool)> callback) {
-        focus_callback = callback;
-    }
-
-    void Slider::do_step(bool increment) {
-        double new_value = value;
-        if (increment) {
-            new_value += step_value;
-        }
-        else {
-            new_value -= step_value;
-        }
-        new_value = std::clamp(new_value, min_value, max_value);
-        if (new_value != value) {
-            set_value_internal(new_value, false, true);
-        }
-    }
-
-} // namespace recompui
diff --git a/src/ui/elements/ui_slider.h b/src/ui/elements/ui_slider.h
deleted file mode 100644
index 7fbd62e..0000000
--- a/src/ui/elements/ui_slider.h
+++ /dev/null
@@ -1,58 +0,0 @@
-#pragma once
-
-#include "ui_clickable.h"
-#include "ui_label.h"
-
-namespace recompui {
-    
-    enum SliderType {
-        Double,
-        Percent,
-        Integer
-    };
-
-    class Slider : public Element {
-    private:
-        SliderType type = SliderType::Percent;
-        Label *value_label = nullptr;
-        Clickable *slider_element = nullptr;
-        Clickable *bar_element = nullptr;
-        Clickable *circle_element = nullptr;
-        double value = 50.0;
-        double min_value = 0.0;
-        double max_value = 100.0;
-        double step_value = 0.0;
-        std::vector<std::function<void(double)>> value_changed_callbacks;
-        std::function<void(bool)> focus_callback = nullptr;
-
-        void set_value_internal(double v, bool setup, bool trigger_callbacks);
-        void bar_pressed(float x, float y);
-        void bar_dragged(float x, float y, DragPhase phase);
-        void circle_dragged(float x, float y, DragPhase phase);
-        void update_value_from_mouse(float x);
-        void update_circle_position();
-        void update_label_text();
-        void set_input_value(const ElementValue& val) override;
-        ElementValue get_element_value() override { return get_value(); }
-
-    protected:
-        virtual void process_event(const Event &e) override;
-        std::string_view get_type_name() override { return "Slider"; }
-
-    public:
-        Slider(Element *parent, SliderType type);
-        virtual ~Slider();
-        void set_value(double v);
-        double get_value() const;
-        void set_min_value(double v);
-        double get_min_value() const;
-        void set_max_value(double v);
-        double get_max_value() const;
-        void set_step_value(double v);
-        double get_step_value() const;
-        void add_value_changed_callback(std::function<void(double)> callback);
-        void do_step(bool increment);
-        void set_focus_callback(std::function<void(bool)> callback);
-    };
-
-} // namespace recompui
diff --git a/src/ui/elements/ui_span.cpp b/src/ui/elements/ui_span.cpp
deleted file mode 100644
index e7bcdde..0000000
--- a/src/ui/elements/ui_span.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "ui_span.h"
-
-#include <cassert>
-
-namespace recompui {
-
-    Span::Span(Element *parent) : Element(parent, 0, "span", true) {
-        set_font_style(FontStyle::Normal);
-    }
-
-    Span::Span(Element *parent, const std::string &text) : Span(parent) {
-        set_text(text);
-    }
-
-};
diff --git a/src/ui/elements/ui_span.h b/src/ui/elements/ui_span.h
deleted file mode 100644
index 5d85bf3..0000000
--- a/src/ui/elements/ui_span.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-#include "ui_label.h"
-
-namespace recompui {
-
-    class Span : public Element {
-    protected:
-        std::string_view get_type_name() override { return "Span"; }
-    public:
-        Span(Element *parent);
-        Span(Element *parent, const std::string &text);
-    };
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_style.cpp b/src/ui/elements/ui_style.cpp
deleted file mode 100644
index 5708ec5..0000000
--- a/src/ui/elements/ui_style.cpp
+++ /dev/null
@@ -1,612 +0,0 @@
-#include "ui_style.h"
-#include "ui_element.h"
-
-#include <cassert>
-
-namespace recompui {
-
-    static Rml::Unit to_rml(Unit unit) {
-        switch (unit) {
-        case Unit::Px:
-            return Rml::Unit::PX;
-        case Unit::Dp:
-            return Rml::Unit::DP;
-        case Unit::Percent:
-            return Rml::Unit::PERCENT;
-        default:
-            return Rml::Unit::UNKNOWN;
-        }
-    }
-
-    static Rml::Style::AlignItems to_rml(AlignItems align_items) {
-        switch (align_items) {
-        case AlignItems::FlexStart:
-            return Rml::Style::AlignItems::FlexStart;
-        case AlignItems::FlexEnd:
-            return Rml::Style::AlignItems::FlexEnd;
-        case AlignItems::Center:
-            return Rml::Style::AlignItems::Center;
-        case AlignItems::Baseline:
-            return Rml::Style::AlignItems::Baseline;
-        case AlignItems::Stretch:
-            return Rml::Style::AlignItems::Stretch;
-        default:
-            assert(false && "Unknown align items.");
-            return Rml::Style::AlignItems::FlexStart;
-        }
-    }
-
-    static Rml::Style::Overflow to_rml(Overflow overflow) {
-        switch (overflow) {
-        case Overflow::Visible:
-            return Rml::Style::Overflow::Visible;
-        case Overflow::Hidden:
-            return Rml::Style::Overflow::Hidden;
-        case Overflow::Auto:
-            return Rml::Style::Overflow::Auto;
-        case Overflow::Scroll:
-            return Rml::Style::Overflow::Scroll;
-        default:
-            assert(false && "Unknown overflow.");
-            return Rml::Style::Overflow::Visible;
-        }
-    }
-
-    static Rml::Style::TextAlign to_rml(TextAlign text_align) {
-        switch (text_align) {
-        case TextAlign::Left:
-            return Rml::Style::TextAlign::Left;
-        case TextAlign::Right:
-            return Rml::Style::TextAlign::Right;
-        case TextAlign::Center:
-            return Rml::Style::TextAlign::Center;
-        case TextAlign::Justify:
-            return Rml::Style::TextAlign::Justify;
-        default:
-            assert(false && "Unknown text align.");
-            return Rml::Style::TextAlign::Left;
-        }
-    }
-
-    static Rml::Style::TextTransform to_rml(TextTransform text_transform) {
-        switch (text_transform) {
-        case TextTransform::None:
-            return Rml::Style::TextTransform::None;
-        case TextTransform::Capitalize:
-            return Rml::Style::TextTransform::Capitalize;
-        case TextTransform::Uppercase:
-            return Rml::Style::TextTransform::Uppercase;
-        case TextTransform::Lowercase:
-            return Rml::Style::TextTransform::Lowercase;
-        default:
-            assert(false && "Unknown text transform.");
-            return Rml::Style::TextTransform::None;
-        }
-    }
-
-    static Rml::Style::Drag to_rml(Drag drag) {
-        switch (drag) {
-        case Drag::None:
-            return Rml::Style::Drag::None;
-        case Drag::Drag:
-            return Rml::Style::Drag::Drag;
-        case Drag::DragDrop:
-            return Rml::Style::Drag::DragDrop;
-        case Drag::Block:
-            return Rml::Style::Drag::Block;
-        case Drag::Clone:
-            return Rml::Style::Drag::Clone;
-        default:
-            assert(false && "Unknown drag.");
-            return Rml::Style::Drag::None;
-        }
-    }
-
-    static Rml::Style::TabIndex to_rml(TabIndex tab_index) {
-        switch (tab_index) {
-        case TabIndex::None:
-            return Rml::Style::TabIndex::None;
-        case TabIndex::Auto:
-            return Rml::Style::TabIndex::Auto;
-        default:
-            assert(false && "Unknown tab index.");
-            return Rml::Style::TabIndex::None;
-        }
-    }
-
-    static Rml::Style::Display to_rml(Display display) {
-        switch (display) {
-        case Display::None:
-            return Rml::Style::Display::None;
-        case Display::Block:
-            return Rml::Style::Display::Block;
-        case Display::Inline:
-            return Rml::Style::Display::Inline;
-        case Display::InlineBlock:
-            return Rml::Style::Display::InlineBlock;
-        case Display::FlowRoot:
-            return Rml::Style::Display::FlowRoot;
-        case Display::Flex:
-            return Rml::Style::Display::Flex;
-        case Display::InlineFlex:
-            return Rml::Style::Display::InlineFlex;
-        case Display::Table:
-            return Rml::Style::Display::Table;
-        case Display::InlineTable:
-            return Rml::Style::Display::InlineTable;
-        case Display::TableRow:
-            return Rml::Style::Display::TableRow;
-        case Display::TableRowGroup:
-            return Rml::Style::Display::TableRowGroup;
-        case Display::TableColumn:
-            return Rml::Style::Display::TableColumn;
-        case Display::TableColumnGroup:
-            return Rml::Style::Display::TableColumnGroup;
-        case Display::TableCell:
-            return Rml::Style::Display::TableCell;
-        default:
-            assert(false && "Unknown display.");
-            return Rml::Style::Display::Block;
-        }
-    }
-
-    static Rml::Style::JustifyContent to_rml(JustifyContent justify_content) {
-        switch (justify_content) {
-        case JustifyContent::FlexStart:
-            return Rml::Style::JustifyContent::FlexStart;
-        case JustifyContent::FlexEnd:
-            return Rml::Style::JustifyContent::FlexEnd;
-        case JustifyContent::Center:
-            return Rml::Style::JustifyContent::Center;
-        case JustifyContent::SpaceBetween:
-            return Rml::Style::JustifyContent::SpaceBetween;
-        case JustifyContent::SpaceAround:
-            return Rml::Style::JustifyContent::SpaceAround;
-        case JustifyContent::SpaceEvenly:
-            return Rml::Style::JustifyContent::SpaceEvenly;
-        default:
-            assert(false && "Unknown justify content.");
-            return Rml::Style::JustifyContent::FlexStart;
-        }
-    }
-
-    static Rml::PropertyId nav_to_property(NavDirection dir) {
-        switch (dir) {
-            case NavDirection::Up:
-                return Rml::PropertyId::NavUp;
-            case NavDirection::Right:
-                return Rml::PropertyId::NavRight;
-            case NavDirection::Down:
-                return Rml::PropertyId::NavDown;
-            case NavDirection::Left:
-                return Rml::PropertyId::NavLeft;
-            default:
-                assert(false && "Unknown nav direction.");
-                return Rml::PropertyId::Invalid;
-        }
-    }
-
-    void Style::set_property(Rml::PropertyId property_id, const Rml::Property &property) {
-        property_map[property_id] = property;
-    }
-
-    Style::Style() {
-
-    }
-
-    Style::~Style() {
-
-    }
-
-    void Style::set_visibility(Visibility visibility) {
-        switch (visibility) {
-        case Visibility::Visible:
-            set_property(Rml::PropertyId::Visibility, Rml::Style::Visibility::Visible);
-            break;
-        case Visibility::Hidden:
-            set_property(Rml::PropertyId::Visibility, Rml::Style::Visibility::Hidden);
-            break;
-        }
-    }
-
-    void Style::set_position(Position position) {
-        switch (position) {
-        case Position::Absolute:
-            set_property(Rml::PropertyId::Position, Rml::Style::Position::Absolute);
-            break;
-        case Position::Relative:
-            set_property(Rml::PropertyId::Position, Rml::Style::Position::Relative);
-            break;
-        default:
-            assert(false && "Unknown position.");
-            break;
-        }
-    }
-
-    void Style::set_left(float left, Unit unit) {
-        set_property(Rml::PropertyId::Left, Rml::Property(left, to_rml(unit)));
-    }
-
-    void Style::set_top(float top, Unit unit) {
-        set_property(Rml::PropertyId::Top, Rml::Property(top, to_rml(unit)));
-    }
-
-    void Style::set_right(float right, Unit unit) {
-        set_property(Rml::PropertyId::Right, Rml::Property(right, to_rml(unit)));
-    }
-
-    void Style::set_bottom(float bottom, Unit unit) {
-        set_property(Rml::PropertyId::Bottom, Rml::Property(bottom, to_rml(unit)));
-    }
-
-    void Style::set_width(float width, Unit unit) {
-        set_property(Rml::PropertyId::Width, Rml::Property(width, to_rml(unit)));
-    }
-
-    void Style::set_width_auto() {
-        set_property(Rml::PropertyId::Width, Rml::Property(Rml::Style::FlexBasis::Type::Auto, Rml::Unit::KEYWORD));
-    }
-
-    void Style::set_height(float height, Unit unit) {
-        set_property(Rml::PropertyId::Height, Rml::Property(height, to_rml(unit)));
-    }
-
-    void Style::set_height_auto() {
-        set_property(Rml::PropertyId::Height, Rml::Property(Rml::Style::FlexBasis::Type::Auto, Rml::Unit::KEYWORD));
-    }
-
-    void Style::set_min_width(float width, Unit unit) {
-        set_property(Rml::PropertyId::MinWidth, Rml::Property(width, to_rml(unit)));
-    }
-
-    void Style::set_min_height(float height, Unit unit) {
-        set_property(Rml::PropertyId::MinHeight, Rml::Property(height, to_rml(unit)));
-    }
-
-    void Style::set_max_width(float width, Unit unit) {
-        set_property(Rml::PropertyId::MaxWidth, Rml::Property(width, to_rml(unit)));
-    }
-
-    void Style::set_max_height(float height, Unit unit) {
-        set_property(Rml::PropertyId::MaxHeight, Rml::Property(height, to_rml(unit)));
-    }
-
-    void Style::set_padding(float padding, Unit unit) {
-        set_property(Rml::PropertyId::PaddingLeft, Rml::Property(padding, to_rml(unit)));
-        set_property(Rml::PropertyId::PaddingTop, Rml::Property(padding, to_rml(unit)));
-        set_property(Rml::PropertyId::PaddingRight, Rml::Property(padding, to_rml(unit)));
-        set_property(Rml::PropertyId::PaddingBottom, Rml::Property(padding, to_rml(unit)));
-    }
-
-    void Style::set_padding_left(float padding, Unit unit) {
-        set_property(Rml::PropertyId::PaddingLeft, Rml::Property(padding, to_rml(unit)));
-    }
-
-    void Style::set_padding_top(float padding, Unit unit) {
-        set_property(Rml::PropertyId::PaddingTop, Rml::Property(padding, to_rml(unit)));
-    }
-
-    void Style::set_padding_right(float padding, Unit unit) {
-        set_property(Rml::PropertyId::PaddingRight, Rml::Property(padding, to_rml(unit)));
-    }
-
-    void Style::set_padding_bottom(float padding, Unit unit) {
-        set_property(Rml::PropertyId::PaddingBottom, Rml::Property(padding, to_rml(unit)));
-    }
-
-    void Style::set_margin(float margin, Unit unit) {
-        set_property(Rml::PropertyId::MarginLeft, Rml::Property(margin, to_rml(unit)));
-        set_property(Rml::PropertyId::MarginTop, Rml::Property(margin, to_rml(unit)));
-        set_property(Rml::PropertyId::MarginRight, Rml::Property(margin, to_rml(unit)));
-        set_property(Rml::PropertyId::MarginBottom, Rml::Property(margin, to_rml(unit)));
-    }
-
-    void Style::set_margin_left(float margin, Unit unit) {
-        set_property(Rml::PropertyId::MarginLeft, Rml::Property(margin, to_rml(unit)));
-    }
-
-    void Style::set_margin_top(float margin, Unit unit) {
-        set_property(Rml::PropertyId::MarginTop, Rml::Property(margin, to_rml(unit)));
-    }
-
-    void Style::set_margin_right(float margin, Unit unit) {
-        set_property(Rml::PropertyId::MarginRight, Rml::Property(margin, to_rml(unit)));
-    }
-
-    void Style::set_margin_bottom(float margin, Unit unit) {
-        set_property(Rml::PropertyId::MarginBottom, Rml::Property(margin, to_rml(unit)));
-    }
-
-    void Style::set_margin_auto() {
-        set_property(Rml::PropertyId::MarginLeft, Rml::Property(Rml::Style::Margin::Type::Auto, Rml::Unit::KEYWORD));
-        set_property(Rml::PropertyId::MarginTop, Rml::Property(Rml::Style::Margin::Type::Auto, Rml::Unit::KEYWORD));
-        set_property(Rml::PropertyId::MarginRight, Rml::Property(Rml::Style::Margin::Type::Auto, Rml::Unit::KEYWORD));
-        set_property(Rml::PropertyId::MarginBottom, Rml::Property(Rml::Style::Margin::Type::Auto, Rml::Unit::KEYWORD));
-    }
-
-    void Style::set_margin_left_auto() {
-        set_property(Rml::PropertyId::MarginLeft, Rml::Property(Rml::Style::Margin::Type::Auto, Rml::Unit::KEYWORD));
-    }
-
-    void Style::set_margin_top_auto() {
-        set_property(Rml::PropertyId::MarginTop, Rml::Property(Rml::Style::Margin::Type::Auto, Rml::Unit::KEYWORD));
-    }
-
-    void Style::set_margin_right_auto() {
-        set_property(Rml::PropertyId::MarginRight, Rml::Property(Rml::Style::Margin::Type::Auto, Rml::Unit::KEYWORD));
-    }
-
-    void Style::set_margin_bottom_auto() {
-        set_property(Rml::PropertyId::MarginBottom, Rml::Property(Rml::Style::Margin::Type::Auto, Rml::Unit::KEYWORD));
-    }
-
-    void Style::set_border_width(float width, Unit unit) {
-        Rml::Property property(width, to_rml(unit));
-        set_property(Rml::PropertyId::BorderTopWidth, property);
-        set_property(Rml::PropertyId::BorderBottomWidth, property);
-        set_property(Rml::PropertyId::BorderLeftWidth, property);
-        set_property(Rml::PropertyId::BorderRightWidth, property);
-    }
-
-    void Style::set_border_left_width(float width, Unit unit) {
-        set_property(Rml::PropertyId::BorderLeftWidth, Rml::Property(width, to_rml(unit)));
-    }
-
-    void Style::set_border_top_width(float width, Unit unit) {
-        set_property(Rml::PropertyId::BorderTopWidth, Rml::Property(width, to_rml(unit)));
-    }
-
-    void Style::set_border_right_width(float width, Unit unit) {
-        set_property(Rml::PropertyId::BorderRightWidth, Rml::Property(width, to_rml(unit)));
-    }
-
-    void Style::set_border_bottom_width(float width, Unit unit) {
-        set_property(Rml::PropertyId::BorderBottomWidth, Rml::Property(width, to_rml(unit)));
-    }
-
-    void Style::set_border_radius(float radius, Unit unit) {
-        Rml::Property property(radius, to_rml(unit));
-        set_property(Rml::PropertyId::BorderTopLeftRadius, property);
-        set_property(Rml::PropertyId::BorderTopRightRadius, property);
-        set_property(Rml::PropertyId::BorderBottomLeftRadius, property);
-        set_property(Rml::PropertyId::BorderBottomRightRadius, property);
-    }
-
-    void Style::set_border_top_left_radius(float radius, Unit unit) {
-        set_property(Rml::PropertyId::BorderTopLeftRadius, Rml::Property(radius, to_rml(unit)));
-    }
-
-    void Style::set_border_top_right_radius(float radius, Unit unit) {
-        set_property(Rml::PropertyId::BorderTopRightRadius, Rml::Property(radius, to_rml(unit)));
-    }
-
-    void Style::set_border_bottom_left_radius(float radius, Unit unit) {
-        set_property(Rml::PropertyId::BorderBottomLeftRadius, Rml::Property(radius, to_rml(unit)));
-    }
-
-    void Style::set_border_bottom_right_radius(float radius, Unit unit) {
-        set_property(Rml::PropertyId::BorderBottomRightRadius, Rml::Property(radius, to_rml(unit)));
-    }
-
-    void Style::set_background_color(const Color &color) {
-        Rml::Property property(Rml::Colourb(color.r, color.g, color.b, color.a), Rml::Unit::COLOUR);
-        set_property(Rml::PropertyId::BackgroundColor, property);
-    }
-
-    void Style::set_border_color(const Color &color) {
-        Rml::Property property(Rml::Colourb(color.r, color.g, color.b, color.a), Rml::Unit::COLOUR);
-        set_property(Rml::PropertyId::BorderTopColor, property);
-        set_property(Rml::PropertyId::BorderBottomColor, property);
-        set_property(Rml::PropertyId::BorderLeftColor, property);
-        set_property(Rml::PropertyId::BorderRightColor, property);
-    }
-
-    void Style::set_border_left_color(const Color &color) {
-        Rml::Property property(Rml::Colourb(color.r, color.g, color.b, color.a), Rml::Unit::COLOUR);
-        set_property(Rml::PropertyId::BorderLeftColor, property);
-    }
-
-    void Style::set_border_top_color(const Color &color) {
-        Rml::Property property(Rml::Colourb(color.r, color.g, color.b, color.a), Rml::Unit::COLOUR);
-        set_property(Rml::PropertyId::BorderTopColor, property);
-    }
-
-    void Style::set_border_right_color(const Color &color) {
-        Rml::Property property(Rml::Colourb(color.r, color.g, color.b, color.a), Rml::Unit::COLOUR);
-        set_property(Rml::PropertyId::BorderRightColor, property);
-    }
-
-    void Style::set_border_bottom_color(const Color &color) {
-        Rml::Property property(Rml::Colourb(color.r, color.g, color.b, color.a), Rml::Unit::COLOUR);
-        set_property(Rml::PropertyId::BorderBottomColor, property);
-    }
-
-    void Style::set_color(const Color &color) {
-        Rml::Property property(Rml::Colourb(color.r, color.g, color.b, color.a), Rml::Unit::COLOUR);
-        set_property(Rml::PropertyId::Color, property);
-    }
-
-    void Style::set_cursor(Cursor cursor) {
-        switch (cursor) {
-        case Cursor::None:
-            set_property(Rml::PropertyId::Cursor, Rml::Property("", Rml::Unit::STRING));
-            break;
-        case Cursor::Pointer:
-            set_property(Rml::PropertyId::Cursor, Rml::Property("pointer", Rml::Unit::STRING));
-            break;
-        default:
-            assert(false && "Unknown cursor.");
-            break;
-        }
-    }
-
-    void Style::set_opacity(float opacity) {
-        set_property(Rml::PropertyId::Opacity, Rml::Property(opacity, Rml::Unit::NUMBER));
-    }
-
-    void Style::set_display(Display display) {
-        set_property(Rml::PropertyId::Display, to_rml(display));
-    }
-
-    void Style::set_justify_content(JustifyContent justify_content) {
-        set_property(Rml::PropertyId::JustifyContent, to_rml(justify_content));
-    }
-
-    void Style::set_flex_grow(float grow) {
-        set_property(Rml::PropertyId::FlexGrow, Rml::Property(grow, Rml::Unit::NUMBER));
-    }
-
-    void Style::set_flex_shrink(float shrink) {
-        set_property(Rml::PropertyId::FlexShrink, Rml::Property(shrink, Rml::Unit::NUMBER));
-    }
-
-    void Style::set_flex_basis_auto() {
-        set_property(Rml::PropertyId::FlexBasis, Rml::Property(Rml::Style::FlexBasis::Type::Auto, Rml::Unit::KEYWORD));
-    }
-
-    void Style::set_flex_basis(float basis, Unit unit) {
-        set_property(Rml::PropertyId::FlexBasis, Rml::Property(basis, to_rml(unit)));
-    }
-
-    void Style::set_flex(float grow, float shrink) {
-        set_flex_grow(grow);
-        set_flex_shrink(shrink);
-        set_flex_basis_auto();
-    }
-
-    void Style::set_flex(float grow, float shrink, float basis, Unit basis_unit) {
-        set_flex_grow(grow);
-        set_flex_shrink(shrink);
-        set_flex_basis(basis, basis_unit);
-    }
-
-    void Style::set_flex_direction(FlexDirection flex_direction) {
-        switch (flex_direction) {
-        case FlexDirection::Row:
-            set_property(Rml::PropertyId::FlexDirection, Rml::Style::FlexDirection::Row);
-            break;
-        case FlexDirection::Column:
-            set_property(Rml::PropertyId::FlexDirection, Rml::Style::FlexDirection::Column);
-            break;
-        case FlexDirection::RowReverse:
-            set_property(Rml::PropertyId::FlexDirection, Rml::Style::FlexDirection::RowReverse);
-            break;
-        case FlexDirection::ColumnReverse:
-            set_property(Rml::PropertyId::FlexDirection, Rml::Style::FlexDirection::ColumnReverse);
-            break;
-        default:
-            assert(false && "Unknown flex direction.");
-            break;
-        }
-    }
-
-    void Style::set_align_items(AlignItems align_items) {
-        set_property(Rml::PropertyId::AlignItems, to_rml(align_items));
-    }
-
-    void Style::set_overflow(Overflow overflow) {
-        set_property(Rml::PropertyId::OverflowX, to_rml(overflow));
-        set_property(Rml::PropertyId::OverflowY, to_rml(overflow));
-    }
-
-    void Style::set_overflow_x(Overflow overflow) {
-        set_property(Rml::PropertyId::OverflowX, to_rml(overflow));
-    }
-
-    void Style::set_overflow_y(Overflow overflow) {
-        set_property(Rml::PropertyId::OverflowY, to_rml(overflow));
-    }
-
-    void Style::set_font_size(float size, Unit unit) {
-        set_property(Rml::PropertyId::FontSize, Rml::Property(size, to_rml(unit)));
-    }
-
-    void Style::set_letter_spacing(float spacing, Unit unit) {
-        set_property(Rml::PropertyId::LetterSpacing, Rml::Property(spacing, to_rml(unit)));
-    }
-
-    void Style::set_line_height(float height, Unit unit) {
-        set_property(Rml::PropertyId::LineHeight, Rml::Property(height, to_rml(unit)));
-    }
-
-    void Style::set_font_style(FontStyle style) {
-        switch (style) {
-        case FontStyle::Normal:
-            set_property(Rml::PropertyId::FontStyle, Rml::Style::FontStyle::Normal);
-            break;
-        case FontStyle::Italic:
-            set_property(Rml::PropertyId::FontStyle, Rml::Style::FontStyle::Italic);
-            break;
-        default:
-            assert(false && "Unknown font style.");
-            break;
-        }
-    }
-
-    void Style::set_font_weight(uint32_t weight) {
-        set_property(Rml::PropertyId::FontWeight, Rml::Style::FontWeight(weight));
-    }
-
-    void Style::set_text_align(TextAlign text_align) {
-        set_property(Rml::PropertyId::TextAlign, to_rml(text_align));
-    }
-
-    void Style::set_text_transform(TextTransform text_transform) {
-        set_property(Rml::PropertyId::TextTransform, to_rml(text_transform));
-    }
-
-    void Style::set_gap(float size, Unit unit) {
-        set_row_gap(size, unit);
-        set_column_gap(size, unit);
-    }
-
-    void Style::set_row_gap(float size, Unit unit) {
-        set_property(Rml::PropertyId::RowGap, Rml::Property(size, to_rml(unit)));
-    }
-
-    void Style::set_column_gap(float size, Unit unit) {
-        set_property(Rml::PropertyId::ColumnGap, Rml::Property(size, to_rml(unit)));
-    }
-
-    void Style::set_drag(Drag drag) {
-        set_property(Rml::PropertyId::Drag, to_rml(drag));
-    }
-
-    void Style::set_tab_index(TabIndex tab_index) {
-        set_property(Rml::PropertyId::TabIndex, to_rml(tab_index));
-    }
-
-    void Style::set_font_family(std::string_view family) {
-        set_property(Rml::PropertyId::FontFamily, Rml::Property(Rml::String{ family }, Rml::Unit::UNKNOWN));
-    }
-    
-    void Style::set_nav_auto(NavDirection dir) {
-        set_property(nav_to_property(dir), Rml::Style::Nav::Auto);
-    }
-
-    void Style::set_nav_none(NavDirection dir) {
-        set_property(nav_to_property(dir), Rml::Style::Nav::None);
-    }
-
-    void Style::set_nav(NavDirection dir, Element* element) {
-        set_property(nav_to_property(dir), Rml::Property(Rml::String{ "#" + element->get_id() }, Rml::Unit::STRING));
-    }
-
-    void Style::set_nav_manual(NavDirection dir, const std::string& target) {
-        set_property(nav_to_property(dir), Rml::Property(target, Rml::Unit::STRING));
-    }
-
-    void Style::set_tab_index_auto() {
-        set_property(Rml::PropertyId::TabIndex, Rml::Style::Nav::Auto);
-    }
-
-    void Style::set_tab_index_none() {
-        set_property(Rml::PropertyId::TabIndex, Rml::Style::Nav::None);
-    }
-    
-    void Style::set_focusable(bool focusable) {
-        set_property(Rml::PropertyId::Focus, focusable ? Rml::Style::Focus::Auto : Rml::Style::Focus::None);
-    }
-
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_style.h b/src/ui/elements/ui_style.h
deleted file mode 100644
index 372fa6d..0000000
--- a/src/ui/elements/ui_style.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#pragma once
-
-#include <string_view>
-
-#include "RmlUi/Core.h"
-
-#include "../core/ui_resource.h"
-#include "ui_types.h"
-
-namespace recompui {
-    class ContextId;
-    class Style {
-        friend class Element; // For access to property_map without making it visible to element subclasses.
-        friend class ContextId;
-    private:
-        std::map<Rml::PropertyId, Rml::Property> property_map;
-    protected:
-        virtual void set_property(Rml::PropertyId property_id, const Rml::Property &property);
-        ResourceId resource_id = ResourceId::null();
-    public:
-        Style();
-        virtual ~Style();
-        void set_visibility(Visibility visibility);
-        void set_position(Position position);
-        void set_left(float left, Unit unit = Unit::Dp);
-        void set_top(float top, Unit unit = Unit::Dp);
-        void set_right(float right, Unit unit = Unit::Dp);
-        void set_bottom(float bottom, Unit unit = Unit::Dp);
-        void set_width(float width, Unit unit = Unit::Dp);
-        void set_width_auto();
-        void set_height(float height, Unit unit = Unit::Dp);
-        void set_height_auto();
-        void set_min_width(float width, Unit unit = Unit::Dp);
-        void set_min_height(float height, Unit unit = Unit::Dp);
-        void set_max_width(float width, Unit unit = Unit::Dp);
-        void set_max_height(float height, Unit unit = Unit::Dp);
-        void set_padding(float padding, Unit unit = Unit::Dp);
-        void set_padding_left(float padding, Unit unit = Unit::Dp);
-        void set_padding_top(float padding, Unit unit = Unit::Dp);
-        void set_padding_right(float padding, Unit unit = Unit::Dp);
-        void set_padding_bottom(float padding, Unit unit = Unit::Dp);
-        void set_margin(float margin, Unit unit = Unit::Dp);
-        void set_margin_left(float margin, Unit unit = Unit::Dp);
-        void set_margin_top(float margin, Unit unit = Unit::Dp);
-        void set_margin_right(float margin, Unit unit = Unit::Dp);
-        void set_margin_bottom(float margin, Unit unit = Unit::Dp);
-        void set_margin_auto();
-        void set_margin_left_auto();
-        void set_margin_top_auto();
-        void set_margin_right_auto();
-        void set_margin_bottom_auto();
-        void set_border_width(float width, Unit unit = Unit::Dp);
-        void set_border_left_width(float width, Unit unit = Unit::Dp);
-        void set_border_top_width(float width, Unit unit = Unit::Dp);
-        void set_border_right_width(float width, Unit unit = Unit::Dp);
-        void set_border_bottom_width(float width, Unit unit = Unit::Dp);
-        void set_border_radius(float radius, Unit unit = Unit::Dp);
-        void set_border_top_left_radius(float radius, Unit unit = Unit::Dp);
-        void set_border_top_right_radius(float radius, Unit unit = Unit::Dp);
-        void set_border_bottom_left_radius(float radius, Unit unit = Unit::Dp);
-        void set_border_bottom_right_radius(float radius, Unit unit = Unit::Dp);
-        void set_background_color(const Color &color);
-        void set_border_color(const Color &color);
-        void set_border_left_color(const Color &color);
-        void set_border_top_color(const Color &color);
-        void set_border_right_color(const Color &color);
-        void set_border_bottom_color(const Color &color);
-        void set_color(const Color &color);
-        void set_cursor(Cursor cursor);
-        void set_opacity(float opacity);
-        void set_display(Display display);
-        void set_justify_content(JustifyContent justify_content);
-        void set_flex_grow(float grow);
-        void set_flex_shrink(float shrink);
-        void set_flex_basis_auto();
-        void set_flex_basis(float basis, Unit unit = Unit::Percent);
-        void set_flex(float grow, float shrink);
-        void set_flex(float grow, float shrink, float basis, Unit basis_unit = Unit::Percent);
-        void set_flex_direction(FlexDirection flex_direction);
-        void set_align_items(AlignItems align_items);
-        void set_overflow(Overflow overflow);
-        void set_overflow_x(Overflow overflow);
-        void set_overflow_y(Overflow overflow);
-        void set_font_size(float size, Unit unit = Unit::Dp);
-        void set_letter_spacing(float spacing, Unit unit = Unit::Dp);
-        void set_line_height(float height, Unit unit = Unit::Dp);
-        void set_font_style(FontStyle style);
-        void set_font_weight(uint32_t weight);
-        void set_text_align(TextAlign text_align);
-        void set_text_transform(TextTransform text_transform);
-        void set_gap(float size, Unit unit = Unit::Dp);
-        void set_row_gap(float size, Unit unit = Unit::Dp);
-        void set_column_gap(float size, Unit unit = Unit::Dp);
-        void set_drag(Drag drag);
-        void set_tab_index(TabIndex focus);
-        void set_font_family(std::string_view family);
-        virtual void set_nav_auto(NavDirection dir);
-        virtual void set_nav_none(NavDirection dir);
-        virtual void set_nav(NavDirection dir, Element* element);
-        virtual void set_nav_manual(NavDirection dir, const std::string& target);
-        void set_tab_index_auto();
-        void set_tab_index_none();
-        void set_focusable(bool focusable);
-        virtual bool is_element() { return false; }
-        ResourceId get_resource_id() { return resource_id; }
-    };
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_text_input.cpp b/src/ui/elements/ui_text_input.cpp
deleted file mode 100644
index b496728..0000000
--- a/src/ui/elements/ui_text_input.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include "ui_text_input.h"
-
-#include <cassert>
-
-namespace recompui {
-
-    void TextInput::process_event(const Event &e) {
-        switch (e.type) {
-        case EventType::Text: {
-            const EventText &event = std::get<EventText>(e.variant);
-            text = event.text;
-
-            for (const auto &function : text_changed_callbacks) {
-                function(text);
-            }
-
-            break;
-        }
-        case EventType::Focus: {
-            const EventFocus &event = std::get<EventFocus>(e.variant);
-            if (focus_callback != nullptr) {
-                focus_callback(event.active);
-            }
-            break;
-        }
-        default:
-            break;
-        }
-    }
-    
-    TextInput::TextInput(Element *parent, bool text_visible) : Element(parent, Events(EventType::Text, EventType::Focus), "input") {
-        if (!text_visible) {
-            set_attribute("type", "password");
-        }
-        set_min_width(60.0f);
-        set_border_color(Color{ 242, 242, 242, 255 });
-        set_border_bottom_width(1.0f);
-        set_padding_bottom(6.0f);
-        set_focusable(true);
-        set_nav_auto(NavDirection::Up);
-        set_nav_auto(NavDirection::Down);
-        set_tab_index_auto();
-    }
-
-    void TextInput::set_text(std::string_view text) {
-        this->text = std::string(text);
-        set_attribute("value", this->text);
-    }
-
-    const std::string &TextInput::get_text() {
-        return text;
-    }
-
-    void TextInput::add_text_changed_callback(std::function<void(const std::string &)> callback) {
-        text_changed_callbacks.emplace_back(callback);
-    }
-
-    void TextInput::set_focus_callback(std::function<void(bool)> callback) {
-        focus_callback = callback;
-    }
-};
diff --git a/src/ui/elements/ui_text_input.h b/src/ui/elements/ui_text_input.h
deleted file mode 100644
index 5d0024f..0000000
--- a/src/ui/elements/ui_text_input.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-
-namespace recompui {
-
-    class TextInput : public Element {
-    private:
-        std::string text;
-        std::vector<std::function<void(const std::string &)>> text_changed_callbacks;
-        std::function<void(bool)> focus_callback = nullptr;
-    protected:
-        virtual void process_event(const Event &e) override;
-        std::string_view get_type_name() override { return "TextInput"; }
-    public:
-        TextInput(Element *parent, bool text_visible = true);
-        void set_text(std::string_view text);
-        const std::string &get_text();
-        void add_text_changed_callback(std::function<void(const std::string &)> callback);
-        void set_focus_callback(std::function<void(bool)> callback);
-    };
-
-} // namespace recompui
diff --git a/src/ui/elements/ui_toggle.cpp b/src/ui/elements/ui_toggle.cpp
deleted file mode 100644
index 983d7ac..0000000
--- a/src/ui/elements/ui_toggle.cpp
+++ /dev/null
@@ -1,161 +0,0 @@
-#include "ui_toggle.h"
-
-#include <cassert>
-
-#include <ultramodern/ultramodern.hpp>
-
-namespace recompui {
-
-    Toggle::Toggle(Element *parent) : Element(parent, Events(EventType::Click, EventType::Focus, EventType::Hover, EventType::Enable), "button") {
-        enable_focus();
-
-        set_width(162.0f);
-        set_height(72.0f);
-        set_border_radius(36.0f);
-        set_opacity(0.9f);
-        set_cursor(Cursor::Pointer);
-        set_border_width(2.0f);
-        set_border_color(Color{ 177, 76, 34, 255 });
-        set_background_color(Color{ 0, 0, 0, 0 });
-        checked_style.set_border_color(Color{ 34, 177, 76, 255 });
-        hover_style.set_border_color(Color{ 177, 76, 34, 255 });
-        hover_style.set_background_color(Color{ 206, 120, 68, 76 });
-        focus_style.set_border_color(Color{ 177, 76, 34, 255 });
-        focus_style.set_background_color(Color{ 206, 120, 68, 76 });
-        checked_hover_style.set_border_color(Color{ 34, 177, 76, 255 });
-        checked_hover_style.set_background_color(Color{ 68, 206, 120, 76 });
-        checked_focus_style.set_border_color(Color{ 34, 177, 76, 255 });
-        checked_focus_style.set_background_color(Color{ 68, 206, 120, 76 });
-        disabled_style.set_border_color(Color{ 177, 76, 34, 128 });
-        checked_disabled_style.set_border_color(Color{ 34, 177, 76, 128 });
-        add_style(&checked_style, checked_state);
-        add_style(&hover_style, hover_state);
-        add_style(&focus_style, focus_state);
-        add_style(&checked_hover_style, { checked_state, hover_state });
-        add_style(&checked_focus_style, { checked_state, focus_state });
-        add_style(&disabled_style, disabled_state);
-        add_style(&checked_disabled_style, { checked_state, disabled_state });
-
-        ContextId context = get_current_context();
-
-        floater = context.create_element<Element>(this);
-        floater->set_position(Position::Relative);
-        floater->set_top(2.0f);
-        floater->set_width(80.0f);
-        floater->set_height(64.0f);
-        floater->set_border_radius(32.0f);
-        floater->set_background_color(Color{ 177, 76, 34, 255 });
-        floater_checked_style.set_background_color(Color{ 34, 177, 76, 255 });
-        floater_disabled_style.set_background_color(Color{ 177, 76, 34, 128 });
-        floater_disabled_checked_style.set_background_color(Color{ 34, 177, 76, 128 });
-        floater->add_style(&floater_checked_style, checked_state);
-        floater->add_style(&floater_disabled_style, disabled_state);
-        floater->add_style(&floater_disabled_checked_style, { checked_state, disabled_state });
-
-        set_checked_internal(false, false, true, false);
-    }
-
-    void Toggle::set_checked_internal(bool checked, bool animate, bool setup, bool trigger_callbacks) {
-        if (this->checked != checked || setup) {
-            this->checked = checked;
-
-            if (animate) {
-                last_time = ultramodern::time_since_start();
-                queue_update();
-            }
-            else {
-                floater_left = floater_left_target();
-            }
-
-            floater->set_left(floater_left, Unit::Dp);
-
-            if (trigger_callbacks) {
-                for (const auto &function : checked_callbacks) {
-                    function(checked);
-                }
-            }
-
-            set_style_enabled(checked_state, checked);
-            floater->set_style_enabled(checked_state, checked);
-        }
-    }
-
-    float Toggle::floater_left_target() const {
-        return checked ? 78.0f : 4.0f;
-    }
-
-    void Toggle::process_event(const Event &e) {
-        switch (e.type) {
-        case EventType::Click:
-            if (is_enabled()) {
-                set_checked_internal(!checked, true, false, true);
-            }
-
-            break;
-        case EventType::Hover: {
-            bool hover_active = std::get<EventHover>(e.variant).active && is_enabled();
-            set_style_enabled(hover_state, hover_active);
-            floater->set_style_enabled(hover_state, hover_active);
-            break;
-        }
-        case EventType::Focus: {
-            bool focus_active = std::get<EventFocus>(e.variant).active;
-            set_style_enabled(focus_state, focus_active);
-            break;
-        }
-        case EventType::Enable: {
-            bool enable_active = std::get<EventEnable>(e.variant).active;
-            set_style_enabled(disabled_state, !enable_active);
-            floater->set_style_enabled(disabled_state, !enable_active);
-            if (enable_active) {
-                set_cursor(Cursor::Pointer);
-                set_focusable(true);
-            }
-            else {
-                set_cursor(Cursor::None);
-                set_focusable(false);
-            }
-            break;
-        }
-        case EventType::Update: {
-            std::chrono::high_resolution_clock::duration now = ultramodern::time_since_start();
-            float delta_time = std::max(std::chrono::duration<float>(now - last_time).count(), 0.0f);
-            last_time = now;
-
-            constexpr float dp_speed = 740.0f;
-            const float target = floater_left_target();
-            if (target < floater_left) {
-                floater_left += std::max(-dp_speed * delta_time, target - floater_left);
-            }
-            else {
-                floater_left += std::min(dp_speed * delta_time, target - floater_left);
-            }
-
-            if (abs(target - floater_left) < 1e-4f) {
-                floater_left = target;
-            }
-            else {
-                queue_update();
-            }
-
-            floater->set_left(floater_left, Unit::Dp);
-
-            break;
-        }
-        default:
-            break;
-        }
-    }
-
-    void Toggle::set_checked(bool checked) {
-        set_checked_internal(checked, false, false, false);
-    }
-
-    bool Toggle::is_checked() const {
-        return checked;
-    }
-
-    void Toggle::add_checked_callback(std::function<void(bool)> callback) {
-        checked_callbacks.emplace_back(callback);
-    }
-};
\ No newline at end of file
diff --git a/src/ui/elements/ui_toggle.h b/src/ui/elements/ui_toggle.h
deleted file mode 100644
index 4ca1fa2..0000000
--- a/src/ui/elements/ui_toggle.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#pragma once
-
-#include "ui_element.h"
-
-namespace recompui {
-
-    class Toggle : public Element {
-    protected:
-        Element *floater;
-        float floater_left = 0.0f;
-        std::chrono::high_resolution_clock::duration last_time;
-        std::list<std::function<void(bool)>> checked_callbacks;
-        Style checked_style;
-        Style hover_style;
-        Style focus_style;
-        Style checked_hover_style;
-        Style checked_focus_style;
-        Style disabled_style;
-        Style checked_disabled_style;
-        Style floater_checked_style;
-        Style floater_disabled_style;
-        Style floater_disabled_checked_style;
-        bool checked = false;
-
-        void set_checked_internal(bool checked, bool animate, bool setup, bool trigger_callbacks);
-        float floater_left_target() const;
-
-        // Element overrides.
-        virtual void process_event(const Event &e) override;
-        std::string_view get_type_name() override { return "Toggle"; }
-    public:
-        Toggle(Element *parent);
-        void set_checked(bool checked);
-        bool is_checked() const;
-        void add_checked_callback(std::function<void(bool)> callback);
-    };
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/elements/ui_types.h b/src/ui/elements/ui_types.h
deleted file mode 100644
index 08645ea..0000000
--- a/src/ui/elements/ui_types.h
+++ /dev/null
@@ -1,282 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-#include <variant>
-
-namespace recompui {
-
-    constexpr std::string_view checked_state = "checked";
-    constexpr std::string_view hover_state = "hover";
-    constexpr std::string_view focus_state = "focus";
-    constexpr std::string_view disabled_state = "disabled";
-
-    struct Color {
-        uint8_t r = 255;
-        uint8_t g = 255;
-        uint8_t b = 255;
-        uint8_t a = 255;
-    };
-
-    enum class Cursor {
-        None,
-        Pointer
-    };
-
-    // These two enums must be kept in sync with patches/recompui_event_structs.h!
-    enum class EventType {
-        None,
-        Click,
-        Focus,
-        Hover,
-        Enable,
-        Drag,
-        Text,
-        Update,
-        Navigate,
-        MouseButton,
-        Count
-    };
-
-    enum class DragPhase {
-        None,
-        Start,
-        Move,
-        End
-    };
-
-    enum class NavDirection {
-        Up,
-        Right,
-        Down,
-        Left
-    };
-
-    enum class MouseButton {
-        Left,
-        Right,
-        Middle,
-        Count
-    };
-
-    template <typename Enum, typename = std::enable_if_t<std::is_enum_v<Enum>>>
-    constexpr uint32_t Events(Enum first) {
-        return 1u << static_cast<uint32_t>(first);
-    }
-
-    template <typename Enum, typename... Enums, typename = std::enable_if_t<std::is_enum_v<Enum>>>
-    constexpr uint32_t Events(Enum first, Enums... rest) {
-        return Events(first) | Events(rest...);
-    }
-
-    struct EventClick {
-        float x;
-        float y;
-    };
-
-    struct EventFocus {
-        bool active;
-    };
-
-    struct EventHover {
-        bool active;
-    };
-
-    struct EventEnable {
-        bool active;
-    };
-
-    struct EventDrag {
-        float x;
-        float y;
-        DragPhase phase;
-    };
-
-    struct EventText {
-        std::string text;
-    };
-
-    struct EventNavigate {
-        NavDirection direction;
-    };
-
-    struct EventMouseButton {
-        float x;
-        float y;
-        MouseButton button;
-        bool pressed;
-    };
-
-    using EventVariant = std::variant<EventClick, EventFocus, EventHover, EventEnable, EventDrag, EventText, EventNavigate, EventMouseButton, std::monostate>;
-
-    struct Event {
-        EventType type;
-        EventVariant variant;
-
-        // Factory methods for creating specific events
-        static Event click_event(float x, float y) {
-            Event e;
-            e.type = EventType::Click;
-            e.variant = EventClick{ x, y };
-            return e;
-        }
-
-        static Event focus_event(bool active) {
-            Event e;
-            e.type = EventType::Focus;
-            e.variant = EventFocus{ active };
-            return e;
-        }
-
-        static Event hover_event(bool active) {
-            Event e;
-            e.type = EventType::Hover;
-            e.variant = EventHover{ active };
-            return e;
-        }
-
-        static Event enable_event(bool enable) {
-            Event e;
-            e.type = EventType::Enable;
-            e.variant = EventEnable{ enable };
-            return e;
-        }
-
-        static Event drag_event(float x, float y, DragPhase phase) {
-            Event e;
-            e.type = EventType::Drag;
-            e.variant = EventDrag{ x, y, phase };
-            return e;
-        }
-
-        static Event text_event(const std::string &text) {
-            Event e;
-            e.type = EventType::Text;
-            e.variant = EventText{ text };
-            return e;
-        }
-
-        static Event update_event() {
-            Event e;
-            e.type = EventType::Update;
-            e.variant = std::monostate{};
-            return e;
-        }
-
-        static Event navigate_event(NavDirection direction) {
-            Event e;
-            e.type = EventType::Navigate;
-            e.variant = EventNavigate{ direction };
-            return e;
-        }
-
-        static Event mousebutton_event(float x, float y, MouseButton button, bool pressed) {
-            Event e;
-            e.type = EventType::MouseButton;
-            e.variant = EventMouseButton{ x, y, button, pressed };
-            return e;
-        }
-    };
-
-    enum class Display {
-        None,
-        Block,
-        Inline,
-        InlineBlock,
-        FlowRoot,
-        Flex,
-        InlineFlex,
-        Table,
-        InlineTable,
-        TableRow,
-        TableRowGroup,
-        TableColumn,
-        TableColumnGroup,
-        TableCell
-    };
-
-    enum class Visibility {
-        Visible,
-        Hidden
-    };
-
-    enum class Position {
-        Absolute,
-        Relative
-    };
-
-    enum class JustifyContent {
-        FlexStart,
-        FlexEnd,
-        Center,
-        SpaceBetween,
-        SpaceAround,
-        SpaceEvenly
-    };
-
-    enum class FlexDirection {
-        Row,
-        Column,
-        RowReverse,
-        ColumnReverse
-    };
-
-    enum class AlignItems {
-        FlexStart,
-        FlexEnd,
-        Center,
-        Baseline,
-        Stretch
-    };
-
-    enum class Overflow {
-        Visible,
-        Hidden,
-        Auto,
-        Scroll
-    };
-
-    enum class Unit {
-        Px,
-        Dp,
-        Percent
-    };
-
-    enum class AnimationType : uint32_t {
-        None,
-        Set,
-        Tween
-    };
-
-    enum class FontStyle {
-        Normal,
-        Italic
-    };
-
-    enum class TextAlign {
-        Left,
-        Right,
-        Center,
-        Justify
-    };
-
-    enum class TextTransform {
-        None,
-        Capitalize,
-        Uppercase,
-        Lowercase
-    };
-
-    enum class Drag {
-        None,
-        Drag,
-        DragDrop,
-        Block,
-        Clone
-    };
-
-    enum class TabIndex {
-        None,
-        Auto
-    };
-
-} // namespace recompui
\ No newline at end of file
diff --git a/src/ui/ui_api.cpp b/src/ui/ui_api.cpp
deleted file mode 100644
index 5819d09..0000000
--- a/src/ui/ui_api.cpp
+++ /dev/null
@@ -1,1031 +0,0 @@
-#include "recomp_ui.h"
-
-#include "ui_helpers.h"
-#include "ui_api_images.h"
-
-#include "core/ui_context.h"
-#include "core/ui_resource.h"
-
-#include "elements/ui_element.h"
-#include "elements/ui_button.h"
-#include "elements/ui_clickable.h"
-#include "elements/ui_container.h"
-#include "elements/ui_image.h"
-#include "elements/ui_label.h"
-#include "elements/ui_radio.h"
-#include "elements/ui_scroll_container.h"
-#include "elements/ui_slider.h"
-#include "elements/ui_span.h"
-#include "elements/ui_style.h"
-#include "elements/ui_text_input.h"
-#include "elements/ui_toggle.h"
-#include "elements/ui_types.h"
-
-#include "librecomp/overlays.hpp"
-#include "librecomp/helpers.hpp"
-#include "librecomp/addresses.hpp"
-#include "ultramodern/error_handling.hpp"
-
-using namespace recompui;
-
-// Contexts
-void recompui_create_context(uint8_t* rdram, recomp_context* ctx) {
-    (void)rdram;
-    ContextId ui_context = create_context();
-    
-    _return<uint32_t>(ctx, ui_context.slot_id);
-}
-
-void recompui_open_context(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-
-    ui_context.open();
-}
-
-void recompui_close_context(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-
-    ui_context.close();
-}
-
-void recompui_context_root(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    (void)ui_context;
-
-    return_resource(ctx, root_element_id);
-}
-
-void recompui_show_context(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-
-    recompui::show_context(ui_context, "");
-}
-
-void recompui_hide_context(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-
-    recompui::hide_context(ui_context);
-}
-
-void recompui_set_context_captures_input(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    bool captures_input = _arg<1, int>(rdram, ctx) != 0;
-
-    ui_context.set_captures_input(captures_input);
-}
-
-void recompui_set_context_captures_mouse(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    bool captures_mouse = _arg<1, int>(rdram, ctx) != 0;
-
-    ui_context.set_captures_mouse(captures_mouse);
-}
-
-// Resources
-void recompui_create_style(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-
-    Style* ret = ui_context.create_style();
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_create_element(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-
-    Element* ret = ui_context.create_element<Element>(parent);
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_destroy_element(uint8_t* rdram, recomp_context* ctx) {
-    Style* parent_resource = arg_style<0>(rdram, ctx);
-
-    if (!parent_resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to remove child from non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Element* parent = static_cast<Element*>(parent_resource);
-    ResourceId to_remove = arg_resource_id<1>(rdram, ctx);
-
-    if (!parent->remove_child(to_remove)) {
-        recompui::message_box("Fatal error in mod - attempted to remove child from wrong parent");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-}
-
-void recompui_create_button(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-    std::string text = _arg_string<2>(rdram, ctx);
-    uint32_t style = _arg<3, uint32_t>(rdram, ctx);
-
-    Button* ret = ui_context.create_element<Button>(parent, text, static_cast<ButtonStyle>(style));
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_create_label(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-    std::string text = _arg_string<2>(rdram, ctx);
-    uint32_t style = _arg<3, uint32_t>(rdram, ctx);
-
-    Element* ret = ui_context.create_element<Label>(parent, text, static_cast<LabelStyle>(style));
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_create_span(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-    std::string text = _arg_string<2>(rdram, ctx);
-
-    Element* ret = ui_context.create_element<Span>(parent, text);
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_create_textinput(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-
-    Element* ret = ui_context.create_element<TextInput>(parent);
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_create_passwordinput(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-
-    Element* ret = ui_context.create_element<TextInput>(parent, false);
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_create_labelradio(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-    PTR(PTR(char)) options = _arg<2, PTR(PTR(char))>(rdram, ctx);
-    uint32_t num_options = _arg<3, uint32_t>(rdram, ctx);
-
-    Radio* ret = ui_context.create_element<Radio>(parent);
-
-    for (size_t i = 0; i < num_options; i++) {
-        ret->add_option(decode_string(rdram, MEM_W(sizeof(uint32_t) * i, options)));
-    }
-
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_create_slider(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-    uint32_t type = _arg<2, uint32_t>(rdram, ctx);
-    float min_value = arg_float3(rdram, ctx);
-    float max_value = arg_float4(rdram, ctx);
-    float step = arg_float5(rdram, ctx);
-    float initial_value = arg_float6(rdram, ctx);
-
-    Slider* ret = ui_context.create_element<Slider>(parent, static_cast<SliderType>(type));
-    ret->set_min_value(min_value);
-    ret->set_max_value(max_value);
-    ret->set_step_value(step);
-    ret->set_value(initial_value);
-    return_resource(ctx, ret->get_resource_id());
-}
-
-// Position and Layout
-void recompui_set_visibility(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t visibility = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_visibility(static_cast<Visibility>(visibility));
-}
-
-void recompui_set_position(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t position = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_position(static_cast<Position>(position));
-}
-
-void recompui_set_left(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float left = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_left(left, static_cast<Unit>(unit));
-}
-
-void recompui_set_top(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float top = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_top(top, static_cast<Unit>(unit));
-}
-
-void recompui_set_right(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float right = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_right(right, static_cast<Unit>(unit));
-}
-
-void recompui_set_bottom(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float bottom = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_bottom(bottom, static_cast<Unit>(unit));
-}
-
-// Sizing
-void recompui_set_width(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float width = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_width(width, static_cast<Unit>(unit));
-}
-
-void recompui_set_width_auto(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    resource->set_width_auto();
-}
-
-void recompui_set_height(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float height = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_height(height, static_cast<Unit>(unit));
-}
-
-void recompui_set_height_auto(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    resource->set_height_auto();
-}
-
-void recompui_set_min_width(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float width = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_min_width(width, static_cast<Unit>(unit));
-}
-
-void recompui_set_min_height(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float height = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_min_height(height, static_cast<Unit>(unit));
-}
-
-void recompui_set_max_width(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float width = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_max_width(width, static_cast<Unit>(unit));
-}
-
-void recompui_set_max_height(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float height = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_max_height(height, static_cast<Unit>(unit));
-}
-
-// Padding
-void recompui_set_padding(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float padding = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_padding(padding, static_cast<Unit>(unit));
-}
-
-void recompui_set_padding_left(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float padding = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_padding_left(padding, static_cast<Unit>(unit));
-}
-
-void recompui_set_padding_top(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float padding = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_padding_top(padding, static_cast<Unit>(unit));
-}
-
-void recompui_set_padding_right(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float padding = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_padding_right(padding, static_cast<Unit>(unit));
-}
-
-void recompui_set_padding_bottom(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float padding = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_padding_bottom(padding, static_cast<Unit>(unit));
-}
-
-// Margins
-void recompui_set_margin(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float margin = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_margin(margin, static_cast<Unit>(unit));
-}
-
-void recompui_set_margin_left(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float margin = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_margin_left(margin, static_cast<Unit>(unit));
-}
-
-void recompui_set_margin_top(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float margin = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_margin_top(margin, static_cast<Unit>(unit));
-}
-
-void recompui_set_margin_right(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float margin = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_margin_right(margin, static_cast<Unit>(unit));
-}
-
-void recompui_set_margin_bottom(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float margin = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_margin_bottom(margin, static_cast<Unit>(unit));
-}
-
-void recompui_set_margin_auto(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    resource->set_margin_auto();
-}
-
-void recompui_set_margin_left_auto(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    resource->set_margin_left_auto();
-}
-
-void recompui_set_margin_top_auto(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    resource->set_margin_top_auto();
-}
-
-void recompui_set_margin_right_auto(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    resource->set_margin_right_auto();
-}
-
-void recompui_set_margin_bottom_auto(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    resource->set_margin_bottom_auto();
-}
-
-// Borders
-void recompui_set_border_width(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float width = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_width(width, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_left_width(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float width = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_left_width(width, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_top_width(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float width = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_top_width(width, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_right_width(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float width = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_right_width(width, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_bottom_width(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float width = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_bottom_width(width, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_radius(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float radius = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_radius(radius, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_top_left_radius(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float radius = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_top_left_radius(radius, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_top_right_radius(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float radius = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_top_right_radius(radius, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_bottom_left_radius(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float radius = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_bottom_left_radius(radius, static_cast<Unit>(unit));
-}
-
-void recompui_set_border_bottom_right_radius(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float radius = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_border_bottom_right_radius(radius, static_cast<Unit>(unit));
-}
-
-// Colors
-void recompui_set_background_color(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    Color color = arg_color<1>(rdram, ctx);
-
-    resource->set_background_color(color);
-}
-
-void recompui_set_border_color(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    Color color = arg_color<1>(rdram, ctx);
-
-    resource->set_border_color(color);
-
-}
-
-void recompui_set_border_left_color(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    Color color = arg_color<1>(rdram, ctx);
-
-    resource->set_border_left_color(color);
-}
-
-void recompui_set_border_top_color(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    Color color = arg_color<1>(rdram, ctx);
-
-    resource->set_border_top_color(color);
-}
-
-void recompui_set_border_right_color(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    Color color = arg_color<1>(rdram, ctx);
-
-    resource->set_border_right_color(color);
-}
-
-void recompui_set_border_bottom_color(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    Color color = arg_color<1>(rdram, ctx);
-
-    resource->set_border_bottom_color(color);
-}
-
-void recompui_set_color(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    Color color = arg_color<1>(rdram, ctx);
-
-    resource->set_color(color);
-}
-
-// Cursor and Display
-void recompui_set_cursor(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t cursor = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_cursor(static_cast<Cursor>(cursor));
-}
-
-void recompui_set_opacity(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float opacity = _arg_float_a1(rdram, ctx);
-
-    resource->set_opacity(opacity);
-}
-
-void recompui_set_display(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t display = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_display(static_cast<Display>(display));
-}
-
-// Flexbox
-void recompui_set_justify_content(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t justify_content = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_justify_content(static_cast<JustifyContent>(justify_content));
-}
-
-void recompui_set_flex_grow(uint8_t* rdram, recomp_context* ctx) { // float grow
-    Style* resource = arg_style<0>(rdram, ctx);
-    float grow = _arg_float_a1(rdram, ctx);
-
-    resource->set_flex_grow(grow);
-}
-
-void recompui_set_flex_shrink(uint8_t* rdram, recomp_context* ctx) { // float shrink
-    Style* resource = arg_style<0>(rdram, ctx);
-    float shrink = _arg_float_a1(rdram, ctx);
-
-    resource->set_flex_shrink(shrink);
-}
-
-void recompui_set_flex_basis_auto(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    resource->set_flex_basis_auto();
-}
-
-void recompui_set_flex_basis(uint8_t* rdram, recomp_context* ctx) { // float basis, Unit unit = Unit::Percent
-    Style* resource = arg_style<0>(rdram, ctx);
-    float basis = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_flex_basis(basis, static_cast<Unit>(unit));
-}
-
-void recompui_set_flex_direction(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t direction = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_flex_direction(static_cast<FlexDirection>(direction));
-}
-
-void recompui_set_align_items(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t align_items = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_align_items(static_cast<AlignItems>(align_items));
-}
-
-// Overflow
-void recompui_set_overflow(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t overflow = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_overflow(static_cast<Overflow>(overflow));
-}
-
-void recompui_set_overflow_x(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t overflow = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_overflow_x(static_cast<Overflow>(overflow));
-}
-
-void recompui_set_overflow_y(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t overflow = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_overflow_y(static_cast<Overflow>(overflow));
-}
-
-// Text and Fonts
-void recompui_set_text(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set text of non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Element* element = static_cast<Element*>(resource);
-    element->set_text(_arg_string<1>(rdram, ctx));
-}
-
-void recompui_set_font_size(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float size = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_font_size(size, static_cast<Unit>(unit));
-}
-
-void recompui_set_letter_spacing(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float spacing = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_letter_spacing(spacing, static_cast<Unit>(unit));
-}
-
-void recompui_set_line_height(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float height = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_line_height(height, static_cast<Unit>(unit));
-}
-
-void recompui_set_font_style(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t style = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_font_style(static_cast<FontStyle>(style));
-}
-
-void recompui_set_font_weight(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    int32_t weight = _arg<1, int32_t>(rdram, ctx);
-
-    resource->set_font_weight(weight);
-}
-
-void recompui_set_text_align(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t text_align = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_text_align(static_cast<TextAlign>(text_align));
-}
-
-// Gaps
-void recompui_set_gap(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float size = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_gap(size, static_cast<Unit>(unit));
-}
-
-void recompui_set_row_gap(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float size = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_row_gap(size, static_cast<Unit>(unit));
-
-}
-
-void recompui_set_column_gap(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float size = _arg_float_a1(rdram, ctx);
-    uint32_t unit = _arg<2, uint32_t>(rdram, ctx);
-
-    resource->set_column_gap(size, static_cast<Unit>(unit));
-}
-
-// Drag and Focus
-void recompui_set_drag(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t drag = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_drag(static_cast<Drag>(drag));
-}
-
-void recompui_set_tab_index(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t tab_index = _arg<1, uint32_t>(rdram, ctx);
-
-    resource->set_tab_index(static_cast<TabIndex>(tab_index));
-}
-
-// Values
-void recompui_get_input_value_u32(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to get value of non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-    
-    Element* element = static_cast<Element*>(resource);
-    _return<uint32_t>(ctx, element->get_input_value_u32());
-}
-
-void recompui_get_input_value_float(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to get value of non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-    
-    Element* element = static_cast<Element*>(resource);
-    _return<float>(ctx, element->get_input_value_float());
-}
-
-void recompui_get_input_text(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to get input text of non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-    
-    Element* element = static_cast<Element*>(resource);
-    std::string ret = element->get_input_text();
-    return_string(rdram, ctx, ret);
-}
-
-void recompui_set_input_value_u32(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t value = _arg<1, uint32_t>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set value of non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-    
-    Element* element = static_cast<Element*>(resource);
-    element->set_input_value_u32(value);
-}
-
-void recompui_set_input_value_float(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    float value = _arg_float_a1(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set value of non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-    
-    Element* element = static_cast<Element*>(resource);
-    element->set_input_value_float(value);
-}
-
-void recompui_set_input_text(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set input text of non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Element* element = static_cast<Element*>(resource);
-    element->set_input_text(_arg_string<1>(rdram, ctx));
-}
-
-// Callbacks
-void recompui_register_callback(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = recompui::get_current_context();
-
-    if (ui_context == ContextId::null()) {
-        recompui::message_box("Fatal error in mod - attempted to register callback with no active context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to register callback on non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Element* element = static_cast<Element*>(resource);
-    PTR(void) callback = _arg<1, PTR(void)>(rdram, ctx);
-    PTR(void) userdata = _arg<2, PTR(void)>(rdram, ctx);
-
-    element->register_callback(ui_context, callback, userdata);
-}
-
-// Navigation
-void recompui_set_nav_auto(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = recompui::get_current_context();
-
-    if (ui_context == ContextId::null()) {
-        recompui::message_box("Fatal error in mod - attempted to set element navigation with no active context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set navigation on non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Element* element = static_cast<Element*>(resource);
-    u32 nav_dir = _arg<1, u32>(rdram, ctx);
-
-    element->set_nav_auto(static_cast<recompui::NavDirection>(nav_dir));
-}
-
-void recompui_set_nav_none(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = recompui::get_current_context();
-
-    if (ui_context == ContextId::null()) {
-        recompui::message_box("Fatal error in mod - attempted to set element navigation with no active context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set navigation on non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Element* element = static_cast<Element*>(resource);
-    u32 nav_dir = _arg<1, u32>(rdram, ctx);
-
-    element->set_nav_none(static_cast<recompui::NavDirection>(nav_dir));
-}
-
-void recompui_set_nav(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = recompui::get_current_context();
-
-    if (ui_context == ContextId::null()) {
-        recompui::message_box("Fatal error in mod - attempted to set element navigation with no active context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Style* resource = arg_style<0>(rdram, ctx);
-
-    if (resource == nullptr || !resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set navigation on non-element or element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Style* target_resource = arg_style<2>(rdram, ctx);
-
-    if (target_resource == nullptr || !target_resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set element navigation to non-element or target element not found in context");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Element* element = static_cast<Element*>(resource);
-    Element* target_element = static_cast<Element*>(target_resource);
-    u32 nav_dir = _arg<1, u32>(rdram, ctx);
-
-    element->set_nav(static_cast<recompui::NavDirection>(nav_dir), target_element);
-}
-
-#define REGISTER_FUNC(name) recomp::overlays::register_base_export(#name, name)
-
-void recompui::register_ui_exports() {
-    REGISTER_FUNC(recompui_create_context);
-    REGISTER_FUNC(recompui_open_context);
-    REGISTER_FUNC(recompui_close_context);
-    REGISTER_FUNC(recompui_context_root);
-    REGISTER_FUNC(recompui_show_context);
-    REGISTER_FUNC(recompui_hide_context);
-    REGISTER_FUNC(recompui_set_context_captures_input);
-    REGISTER_FUNC(recompui_set_context_captures_mouse);
-    REGISTER_FUNC(recompui_create_style);
-    REGISTER_FUNC(recompui_create_element);
-    REGISTER_FUNC(recompui_destroy_element);
-    REGISTER_FUNC(recompui_create_button);
-    REGISTER_FUNC(recompui_create_label);
-    // REGISTER_FUNC(recompui_create_span);
-    REGISTER_FUNC(recompui_create_textinput);
-    REGISTER_FUNC(recompui_create_passwordinput);
-    REGISTER_FUNC(recompui_create_labelradio);
-    REGISTER_FUNC(recompui_create_slider);
-    REGISTER_FUNC(recompui_set_visibility);
-    REGISTER_FUNC(recompui_set_position);
-    REGISTER_FUNC(recompui_set_left);
-    REGISTER_FUNC(recompui_set_top);
-    REGISTER_FUNC(recompui_set_right);
-    REGISTER_FUNC(recompui_set_bottom);
-    REGISTER_FUNC(recompui_set_width);
-    REGISTER_FUNC(recompui_set_width_auto);
-    REGISTER_FUNC(recompui_set_height);
-    REGISTER_FUNC(recompui_set_height_auto);
-    REGISTER_FUNC(recompui_set_min_width);
-    REGISTER_FUNC(recompui_set_min_height);
-    REGISTER_FUNC(recompui_set_max_width);
-    REGISTER_FUNC(recompui_set_max_height);
-    REGISTER_FUNC(recompui_set_padding);
-    REGISTER_FUNC(recompui_set_padding_left);
-    REGISTER_FUNC(recompui_set_padding_top);
-    REGISTER_FUNC(recompui_set_padding_right);
-    REGISTER_FUNC(recompui_set_padding_bottom);
-    REGISTER_FUNC(recompui_set_margin);
-    REGISTER_FUNC(recompui_set_margin_left);
-    REGISTER_FUNC(recompui_set_margin_top);
-    REGISTER_FUNC(recompui_set_margin_right);
-    REGISTER_FUNC(recompui_set_margin_bottom);
-    REGISTER_FUNC(recompui_set_margin_auto);
-    REGISTER_FUNC(recompui_set_margin_left_auto);
-    REGISTER_FUNC(recompui_set_margin_top_auto);
-    REGISTER_FUNC(recompui_set_margin_right_auto);
-    REGISTER_FUNC(recompui_set_margin_bottom_auto);
-    REGISTER_FUNC(recompui_set_border_width);
-    REGISTER_FUNC(recompui_set_border_left_width);
-    REGISTER_FUNC(recompui_set_border_top_width);
-    REGISTER_FUNC(recompui_set_border_right_width);
-    REGISTER_FUNC(recompui_set_border_bottom_width);
-    REGISTER_FUNC(recompui_set_border_radius);
-    REGISTER_FUNC(recompui_set_border_top_left_radius);
-    REGISTER_FUNC(recompui_set_border_top_right_radius);
-    REGISTER_FUNC(recompui_set_border_bottom_left_radius);
-    REGISTER_FUNC(recompui_set_border_bottom_right_radius);
-    REGISTER_FUNC(recompui_set_background_color);
-    REGISTER_FUNC(recompui_set_border_color);
-    REGISTER_FUNC(recompui_set_border_left_color);
-    REGISTER_FUNC(recompui_set_border_top_color);
-    REGISTER_FUNC(recompui_set_border_right_color);
-    REGISTER_FUNC(recompui_set_border_bottom_color);
-    REGISTER_FUNC(recompui_set_color);
-    REGISTER_FUNC(recompui_set_cursor);
-    REGISTER_FUNC(recompui_set_opacity);
-    REGISTER_FUNC(recompui_set_display);
-    REGISTER_FUNC(recompui_set_justify_content);
-    REGISTER_FUNC(recompui_set_flex_grow);
-    REGISTER_FUNC(recompui_set_flex_shrink);
-    REGISTER_FUNC(recompui_set_flex_basis_auto);
-    REGISTER_FUNC(recompui_set_flex_basis);
-    REGISTER_FUNC(recompui_set_flex_direction);
-    REGISTER_FUNC(recompui_set_align_items);
-    REGISTER_FUNC(recompui_set_overflow);
-    REGISTER_FUNC(recompui_set_overflow_x);
-    REGISTER_FUNC(recompui_set_overflow_y);
-    REGISTER_FUNC(recompui_set_text);
-    REGISTER_FUNC(recompui_set_font_size);
-    REGISTER_FUNC(recompui_set_letter_spacing);
-    REGISTER_FUNC(recompui_set_line_height);
-    REGISTER_FUNC(recompui_set_font_style);
-    REGISTER_FUNC(recompui_set_font_weight);
-    REGISTER_FUNC(recompui_set_text_align);
-    REGISTER_FUNC(recompui_set_gap);
-    REGISTER_FUNC(recompui_set_row_gap);
-    REGISTER_FUNC(recompui_set_column_gap);
-    REGISTER_FUNC(recompui_set_drag);
-    REGISTER_FUNC(recompui_set_tab_index);
-    REGISTER_FUNC(recompui_get_input_value_u32);
-    REGISTER_FUNC(recompui_get_input_value_float);
-    REGISTER_FUNC(recompui_get_input_text);
-    REGISTER_FUNC(recompui_set_input_value_u32);
-    REGISTER_FUNC(recompui_set_input_value_float);
-    REGISTER_FUNC(recompui_set_input_text);
-    REGISTER_FUNC(recompui_set_nav_auto);
-    REGISTER_FUNC(recompui_set_nav_none);
-    REGISTER_FUNC(recompui_set_nav);
-    REGISTER_FUNC(recompui_register_callback);
-    register_ui_image_exports();
-}
diff --git a/src/ui/ui_api_events.cpp b/src/ui/ui_api_events.cpp
deleted file mode 100644
index 5cf0ea8..0000000
--- a/src/ui/ui_api_events.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-#include "concurrentqueue.h"
-
-#include "overloaded.h"
-#include "recomp_ui.h"
-
-#include "core/ui_context.h"
-#include "core/ui_resource.h"
-
-#include "elements/ui_element.h"
-#include "elements/ui_button.h"
-#include "elements/ui_clickable.h"
-#include "elements/ui_container.h"
-#include "elements/ui_image.h"
-#include "elements/ui_label.h"
-#include "elements/ui_radio.h"
-#include "elements/ui_scroll_container.h"
-#include "elements/ui_slider.h"
-#include "elements/ui_style.h"
-#include "elements/ui_text_input.h"
-#include "elements/ui_toggle.h"
-#include "elements/ui_types.h"
-
-#include "librecomp/overlays.hpp"
-#include "librecomp/helpers.hpp"
-
-#include "../patches/ui_funcs.h"
-
-struct QueuedCallback {
-    recompui::ResourceId resource;
-    recompui::Event event;
-    recompui::UICallback callback;
-};
-
-moodycamel::ConcurrentQueue<QueuedCallback> queued_callbacks{};
-
-void recompui::queue_ui_callback(recompui::ResourceId resource, const Event& e, const UICallback& callback) {
-    queued_callbacks.enqueue(QueuedCallback{ .resource = resource, .event = e, .callback = callback });
-}
-
-bool convert_event(const recompui::Event& in, RecompuiEventData& out) {
-    bool skip = false;
-    out = {};
-    out.type = static_cast<RecompuiEventType>(in.type);
-
-    switch (in.type) {
-        default:
-        case recompui::EventType::None:
-        case recompui::EventType::Count:
-            skip = true;
-            break;
-        case recompui::EventType::Click:
-            {
-                const recompui::EventClick &click = std::get<recompui::EventClick>(in.variant);
-                out.data.click.x = click.x;
-                out.data.click.y = click.y;
-            }
-            break;
-        case recompui::EventType::Focus:
-            {
-                const recompui::EventFocus &focus = std::get<recompui::EventFocus>(in.variant);
-                out.data.focus.active = focus.active;
-            }
-            break;
-        case recompui::EventType::Hover:
-            {
-                const recompui::EventHover &hover = std::get<recompui::EventHover>(in.variant);
-                out.data.hover.active = hover.active;
-            }
-            break;
-        case recompui::EventType::Enable:
-            {
-                const recompui::EventEnable &enable = std::get<recompui::EventEnable>(in.variant);
-                out.data.enable.active = enable.active;
-            }
-            break;
-        case recompui::EventType::Drag:
-            {
-                const recompui::EventDrag &drag = std::get<recompui::EventDrag>(in.variant);
-                out.data.drag.phase = static_cast<RecompuiDragPhase>(drag.phase);
-                out.data.drag.x = drag.x;
-                out.data.drag.y = drag.y;
-            }
-            break;
-        case recompui::EventType::Text:
-            skip = true; // Text events aren't supported in the UI mod API.
-            break;
-        case recompui::EventType::Update:
-            // No data for an update event.
-            break;
-    }
-
-    return !skip;
-}
-
-extern "C" void recomp_run_ui_callbacks(uint8_t* rdram, recomp_context* ctx) {
-    // Allocate the event on the stack.
-    gpr stack_frame = ctx->r29;
-    ctx->r29 -= sizeof(RecompuiEventData);
-    RecompuiEventData* event_data = TO_PTR(RecompuiEventData, stack_frame);
-
-    QueuedCallback cur_callback;
-
-    while (queued_callbacks.try_dequeue(cur_callback)) {
-        if (convert_event(cur_callback.event, *event_data)) {
-            recompui::ContextId cur_context = cur_callback.callback.context;
-            cur_context.open();
-
-            ctx->r4 = static_cast<int32_t>(cur_callback.resource.slot_id);
-            ctx->r5 = stack_frame;
-            ctx->r6 = cur_callback.callback.userdata;
-
-            LOOKUP_FUNC(cur_callback.callback.callback)(rdram, ctx);
-            cur_context.close();
-        }
-    }
-
-    ctx->r29 += sizeof(RecompuiEventData);
-}
diff --git a/src/ui/ui_api_images.cpp b/src/ui/ui_api_images.cpp
deleted file mode 100644
index 40b4ad9..0000000
--- a/src/ui/ui_api_images.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-#include <mutex>
-#include <unordered_set>
-
-#include "recomp_ui.h"
-#include "librecomp/overlays.hpp"
-#include "librecomp/helpers.hpp"
-#include "ultramodern/error_handling.hpp"
-
-#include "ui_helpers.h"
-#include "ui_api_images.h"
-#include "elements/ui_image.h"
-
-using namespace recompui;
-
-struct {
-    std::mutex mutex;
-    std::unordered_set<uint32_t> textures{};
-    uint32_t textures_created = 0;
-} TextureState;
-
-const std::string mod_texture_prefix = "?/mod_api/";
-
-static std::string get_texture_name(uint32_t texture_id) {
-    return mod_texture_prefix + std::to_string(texture_id);
-}
-
-static uint32_t get_new_texture_id() {
-    std::lock_guard lock{TextureState.mutex};
-    uint32_t cur_id = TextureState.textures_created++;
-    TextureState.textures.emplace(cur_id);
-
-    return cur_id;
-}
-
-static void release_texture(uint32_t texture_id) {
-    std::string texture_name = get_texture_name(texture_id);
-    std::lock_guard lock{TextureState.mutex};
-
-    if (TextureState.textures.erase(texture_id) == 0) {
-        recompui::message_box("Fatal error in mod - attempted to destroy texture that doesn't exist!");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    recompui::release_image(texture_name);
-}
-
-thread_local std::vector<char> swapped_image_bytes;
-
-void recompui_create_texture_rgba32(uint8_t* rdram, recomp_context* ctx) {
-    PTR(void) data_in = _arg<0, PTR(void)>(rdram, ctx);
-    uint32_t width = _arg<1, uint32_t>(rdram, ctx);
-    uint32_t height = _arg<2, uint32_t>(rdram, ctx);
-    uint32_t cur_id = get_new_texture_id();
-
-    // The size in bytes of the image's pixel data.
-    size_t size_bytes = width * height * 4 * sizeof(uint8_t);
-    swapped_image_bytes.resize(size_bytes);
-
-    // Byteswap copy the pixel data.
-    for (size_t i = 0; i < size_bytes; i++) {
-        swapped_image_bytes[i] = MEM_B(i, data_in);
-    }
-
-    // Create a texture name from the ID and queue its bytes.
-    std::string texture_name = get_texture_name(cur_id);
-    recompui::queue_image_from_bytes_rgba32(texture_name, swapped_image_bytes, width, height);
-
-    // Return the new texture ID.
-    _return(ctx, cur_id);
-}
-
-void recompui_create_texture_image_bytes(uint8_t* rdram, recomp_context* ctx) {
-    PTR(void) data_in = _arg<0, PTR(void)>(rdram, ctx);
-    uint32_t size_bytes = _arg<1, u32>(rdram, ctx);
-    uint32_t cur_id = get_new_texture_id();
-
-    // The size in bytes of the image's data.
-    swapped_image_bytes.resize(size_bytes);
-
-    // Byteswap copy the image's data.
-    for (size_t i = 0; i < size_bytes; i++) {
-        swapped_image_bytes[i] = MEM_B(i, data_in);
-    }
-
-    // Create a texture name from the ID and queue its bytes.
-    std::string texture_name = get_texture_name(cur_id);
-    recompui::queue_image_from_bytes_file(texture_name, swapped_image_bytes);
-
-    // Return the new texture ID.
-    _return(ctx, cur_id);
-}
-
-void recompui_destroy_texture(uint8_t* rdram, recomp_context* ctx) {
-    uint32_t texture_id = _arg<0, uint32_t>(rdram, ctx);
-
-    release_texture(texture_id);
-}
-
-void recompui_create_imageview(uint8_t* rdram, recomp_context* ctx) {
-    ContextId ui_context = get_context(rdram, ctx);
-    Element* parent = arg_element<1>(rdram, ctx, ui_context);
-    uint32_t texture_id = _arg<2, uint32_t>(rdram, ctx);
-
-    Element* ret = ui_context.create_element<Image>(parent, get_texture_name(texture_id));
-    return_resource(ctx, ret->get_resource_id());
-}
-
-void recompui_set_imageview_texture(uint8_t* rdram, recomp_context* ctx) {
-    Style* resource = arg_style<0>(rdram, ctx);
-    uint32_t texture_id = _arg<1, uint32_t>(rdram, ctx);
-
-    if (!resource->is_element()) {
-        recompui::message_box("Fatal error in mod - attempted to set texture of non-element");
-        assert(false);
-        ultramodern::error_handling::quick_exit(__FILE__, __LINE__, __FUNCTION__);
-    }
-
-    Element* element = static_cast<Element*>(resource);
-    element->set_src(get_texture_name(texture_id));
-}
-
-#define REGISTER_FUNC(name) recomp::overlays::register_base_export(#name, name)
-
-void recompui::register_ui_image_exports() {
-    REGISTER_FUNC(recompui_create_texture_rgba32);
-    REGISTER_FUNC(recompui_create_texture_image_bytes);
-    REGISTER_FUNC(recompui_destroy_texture);
-    REGISTER_FUNC(recompui_create_imageview);
-    REGISTER_FUNC(recompui_set_imageview_texture);
-}
diff --git a/src/ui/ui_api_images.h b/src/ui/ui_api_images.h
deleted file mode 100644
index 59a8a8b..0000000
--- a/src/ui/ui_api_images.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __UI_API_IMAGES_H__
-#define __UI_API_IMAGES_H__
-
-#include <cstdint>
-
-namespace recompui {
-    void register_ui_image_exports();
-}
-
-#endif
diff --git a/src/ui/ui_color_hack.cpp b/src/ui/ui_color_hack.cpp
deleted file mode 100644
index cc9b6fd..0000000
--- a/src/ui/ui_color_hack.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-
-#include "RmlUi/Core.h"
-#include "RmlUi/../../Source/Core/PropertyParserColour.h"
-#include "recomp_ui.h"
-#include <string.h>
-
-using ColourMap = Rml::UnorderedMap<Rml::String, Rml::Colourb>;
-
-namespace recompui {
-    class PropertyParserColorHack : public Rml::PropertyParser {
-    public:
-        PropertyParserColorHack();
-        virtual ~PropertyParserColorHack();
-        bool ParseValue(Rml::Property& property, const Rml::String& value, const Rml::ParameterMap& /*parameters*/) const override;
-    private:
-        static ColourMap html_colours;
-    };
-    static_assert(sizeof(PropertyParserColorHack) == sizeof(Rml::PropertyParserColour));
-    PropertyParserColorHack::PropertyParserColorHack() {
-        html_colours["black"] = Rml::Colourb(0, 0, 0);
-        html_colours["silver"] = Rml::Colourb(192, 192, 192);
-        html_colours["gray"] = Rml::Colourb(128, 128, 128);
-        html_colours["grey"] = Rml::Colourb(128, 128, 128);
-        html_colours["white"] = Rml::Colourb(255, 255, 255);
-        html_colours["maroon"] = Rml::Colourb(128, 0, 0);
-        html_colours["red"] = Rml::Colourb(255, 0, 0);
-        html_colours["orange"] = Rml::Colourb(255, 165, 0);
-        html_colours["purple"] = Rml::Colourb(128, 0, 128);
-        html_colours["fuchsia"] = Rml::Colourb(255, 0, 255);
-        html_colours["green"] = Rml::Colourb(0, 128, 0);
-        html_colours["lime"] = Rml::Colourb(0, 255, 0);
-        html_colours["olive"] = Rml::Colourb(128, 128, 0);
-        html_colours["yellow"] = Rml::Colourb(255, 255, 0);
-        html_colours["navy"] = Rml::Colourb(0, 0, 128);
-        html_colours["blue"] = Rml::Colourb(0, 0, 255);
-        html_colours["teal"] = Rml::Colourb(0, 128, 128);
-        html_colours["aqua"] = Rml::Colourb(0, 255, 255);
-        html_colours["transparent"] = Rml::Colourb(0, 0, 0, 0);
-        html_colours["whitesmoke"] = Rml::Colourb(245, 245, 245);
-    }
-
-    PropertyParserColorHack::~PropertyParserColorHack() {}
-
-    bool PropertyParserColorHack::ParseValue(Rml::Property& property, const Rml::String& value, const Rml::ParameterMap& /*parameters*/) const {
-        if (value.empty())
-            return false;
-
-        Rml::Colourb colour;
-
-        // Check for a hex colour.
-        if (value[0] == '#')
-        {
-            char hex_values[4][2] = { {'f', 'f'}, {'f', 'f'}, {'f', 'f'}, {'f', 'f'} };
-
-            switch (value.size())
-            {
-                // Single hex digit per channel, RGB and alpha.
-            case 5:
-                hex_values[3][0] = hex_values[3][1] = value[4];
-                //-fallthrough
-            // Single hex digit per channel, RGB only.
-            case 4:
-                hex_values[0][0] = hex_values[0][1] = value[1];
-                hex_values[1][0] = hex_values[1][1] = value[2];
-                hex_values[2][0] = hex_values[2][1] = value[3];
-                break;
-
-                // Two hex digits per channel, RGB and alpha.
-            case 9:
-                hex_values[3][0] = value[7];
-                hex_values[3][1] = value[8];
-                //-fallthrough
-            // Two hex digits per channel, RGB only.
-            case 7: memcpy(hex_values, &value.c_str()[1], sizeof(char) * 6); break;
-
-            default: return false;
-            }
-
-            // Parse each of the colour elements.
-            for (size_t i = 0; i < 4; i++)
-            {
-                int tens = Rml::Math::HexToDecimal(hex_values[i][0]);
-                int ones = Rml::Math::HexToDecimal(hex_values[i][1]);
-                if (tens == -1 || ones == -1)
-                    return false;
-
-                colour[i] = (Rml::byte)(tens * 16 + ones);
-            }
-        }
-        else if (value.substr(0, 3) == "rgb")
-        {
-            Rml::StringList values;
-            values.reserve(4);
-
-            size_t find = value.find('(');
-            if (find == Rml::String::npos)
-                return false;
-
-            size_t begin_values = find + 1;
-
-            Rml::StringUtilities::ExpandString(values, value.substr(begin_values, value.rfind(')') - begin_values), ',');
-
-            // Check if we're parsing an 'rgba' or 'rgb' colour declaration.
-            if (value.size() > 3 && value[3] == 'a')
-            {
-                if (values.size() != 4)
-                    return false;
-            }
-            else
-            {
-                if (values.size() != 3)
-                    return false;
-
-                values.push_back("255");
-            }
-
-            // Parse the three RGB values.
-            for (size_t i = 0; i < 3; ++i)
-            {
-                int component;
-
-                // We're parsing a percentage value.
-                if (values[i].size() > 0 && values[i][values[i].size() - 1] == '%')
-                    component = int((float)atof(values[i].substr(0, values[i].size() - 1).c_str()) * (255.0f / 100.0f));
-                // We're parsing a 0 -> 255 integer value.
-                else
-                    component = atoi(values[i].c_str());
-
-                colour[i] = (Rml::byte)(Rml::Math::Clamp(component, 0, 255));
-            }
-            // Parse the alpha value. Modified from the original RmlUi implementation to use 0-1 instead of 0-255.
-            {
-                int component;
-
-                // We're parsing a percentage value.
-                if (values[3].size() > 0 && values[3][values[3].size() - 1] == '%')
-                    component = ((float)atof(values[3].substr(0, values[3].size() - 1).c_str()) * (255.0f / 100.0f));
-                // We're parsing a 0 -> 1 float value.
-                else
-                    component = atof(values[3].c_str()) * 255.0f;
-
-                colour[3] = (Rml::byte)(Rml::Math::Clamp(component, 0, 255));
-            }
-        }
-        else
-        {
-            // Check for the specification of an HTML colour.
-            ColourMap::const_iterator iterator = html_colours.find(Rml::StringUtilities::ToLower(value));
-            if (iterator == html_colours.end())
-                return false;
-            else
-                colour = (*iterator).second;
-        }
-
-        property.value = Rml::Variant(colour);
-        property.unit = Rml::Unit::COLOUR;
-
-        return true;
-    }
-
-    // This hack overwrites the contents of a property parser pointer for "color" (which is known to point to a valid Rml::PropertyParserColour) with the contents of a PropertyParserColorHack.
-    // This overwrites the object's vtable, allowing us to override color parsing behavior to use 0-1 alpha instead of 0-255.
-    // Ideally we'd just replace the pointer itself, but RmlUi doesn't provide a way to do that currently.
-    void apply_color_hack() {
-        // Allocate and leak a parser to act as a vtable source.
-        PropertyParserColorHack* new_parser = new PropertyParserColorHack();
-        // Copy the allocated object into the color parser pointer to overwrite its vtable.
-        memcpy((void*)Rml::StyleSheetSpecification::GetParser("color"), (void*)new_parser, sizeof(*new_parser));
-    }
-
-    ColourMap PropertyParserColorHack::html_colours{};
-}
diff --git a/src/ui/ui_config.cpp b/src/ui/ui_config.cpp
deleted file mode 100644
index 6832b22..0000000
--- a/src/ui/ui_config.cpp
+++ /dev/null
@@ -1,1060 +0,0 @@
-#include "recomp_ui.h"
-#include "recomp_input.h"
-#include "zelda_sound.h"
-#include "zelda_config.h"
-#include "zelda_debug.h"
-#include "zelda_render.h"
-#include "zelda_support.h"
-#include "promptfont.h"
-#include "ultramodern/config.hpp"
-#include "ultramodern/ultramodern.hpp"
-#include "RmlUi/Core.h"
-
-#include "core/ui_context.h"
-
-ultramodern::renderer::GraphicsConfig new_options;
-Rml::DataModelHandle nav_help_model_handle;
-Rml::DataModelHandle general_model_handle;
-Rml::DataModelHandle controls_model_handle;
-Rml::DataModelHandle graphics_model_handle;
-Rml::DataModelHandle sound_options_model_handle;
-
-// True if controller config menu is open, false if keyboard config menu is open, undefined otherwise
-bool configuring_controller = false;
-
-int recompui::config_tab_to_index(recompui::ConfigTab tab) {
-    switch (tab) {
-    case recompui::ConfigTab::General:
-        return 0;
-    case recompui::ConfigTab::Controls:
-        return 1;
-    case recompui::ConfigTab::Graphics:
-        return 2;
-    case recompui::ConfigTab::Sound:
-        return 3;
-    case recompui::ConfigTab::Mods:
-        return 4;
-    case recompui::ConfigTab::Debug:
-        return 5;
-    default:
-        assert(false && "Unknown config tab.");
-        return 0;
-    }
-}
-
-template <typename T>
-void get_option(const T& input, Rml::Variant& output) {
-    std::string value = "";
-    to_json(value, input);
-
-    if (value.empty()) {
-        throw std::runtime_error("Invalid value :" + std::to_string(int(input)));
-    }
-
-    output = value;
-}
-
-template <typename T>
-void set_option(T& output, const Rml::Variant& input) {
-    T value = T::OptionCount;
-    from_json(input.Get<std::string>(), value);
-
-    if (value == T::OptionCount) {
-        throw std::runtime_error("Invalid value :" + input.Get<std::string>());
-    }
-
-    output = value;
-}
-
-template <typename T>
-void bind_option(Rml::DataModelConstructor& constructor, const std::string& name, T* option) {
-    constructor.BindFunc(name,
-        [option](Rml::Variant& out) { get_option(*option, out); },
-        [option](const Rml::Variant& in) {
-            set_option(*option, in);
-            graphics_model_handle.DirtyVariable("options_changed");
-            graphics_model_handle.DirtyVariable("ds_info");
-        }
-    );
-};
-
-template <typename T>
-void bind_atomic(Rml::DataModelConstructor& constructor, Rml::DataModelHandle handle, const char* name, std::atomic<T>* atomic_val) {
-    constructor.BindFunc(name,
-        [atomic_val](Rml::Variant& out) {
-            out = atomic_val->load();
-        },
-        [atomic_val, handle, name](const Rml::Variant& in) mutable {
-            atomic_val->store(in.Get<T>());
-            handle.DirtyVariable(name);
-        }
-    );
-}
-
-static int scanned_binding_index = -1;
-static int scanned_input_index = -1;
-static int focused_input_index = -1;
-static int focused_config_option_index = -1;
-
-static bool msaa2x_supported = false;
-static bool msaa4x_supported = false;
-static bool msaa8x_supported = false;
-static bool sample_positions_supported = false;
-
-static bool cont_active = true;
-
-static recomp::InputDevice cur_device = recomp::InputDevice::Controller;
-
-int recomp::get_scanned_input_index() {
-    return scanned_input_index;
-}
-
-void recomp::finish_scanning_input(recomp::InputField scanned_field) {
-    recomp::set_input_binding(static_cast<recomp::GameInput>(scanned_input_index), scanned_binding_index, cur_device, scanned_field);
-    scanned_input_index = -1;
-    scanned_binding_index = -1;
-    controls_model_handle.DirtyVariable("inputs");
-    controls_model_handle.DirtyVariable("active_binding_input");
-    controls_model_handle.DirtyVariable("active_binding_slot");
-    nav_help_model_handle.DirtyVariable("nav_help__accept");
-    nav_help_model_handle.DirtyVariable("nav_help__exit");
-    graphics_model_handle.DirtyVariable("gfx_help__apply");
-}
-
-void recomp::cancel_scanning_input() {
-    recomp::stop_scanning_input();
-    scanned_input_index = -1;
-    scanned_binding_index = -1;
-    controls_model_handle.DirtyVariable("inputs");
-    controls_model_handle.DirtyVariable("active_binding_input");
-    controls_model_handle.DirtyVariable("active_binding_slot");
-    nav_help_model_handle.DirtyVariable("nav_help__accept");
-    nav_help_model_handle.DirtyVariable("nav_help__exit");
-    graphics_model_handle.DirtyVariable("gfx_help__apply");
-}
-
-void recomp::config_menu_set_cont_or_kb(bool cont_interacted) {
-    if (cont_active != cont_interacted) {
-        cont_active = cont_interacted;
-
-        if (nav_help_model_handle) {
-            nav_help_model_handle.DirtyVariable("nav_help__navigate");
-            nav_help_model_handle.DirtyVariable("nav_help__accept");
-            nav_help_model_handle.DirtyVariable("nav_help__exit");
-        }
-
-        if (graphics_model_handle) {
-            graphics_model_handle.DirtyVariable("gfx_help__apply");
-        }
-    }
-}
-
-void close_config_menu_impl() {
-    zelda64::save_config();
-
-    recompui::ContextId config_context = recompui::get_config_context_id();
-    recompui::ContextId sub_menu_context = recompui::get_config_sub_menu_context_id();
-
-    if (recompui::is_context_shown(sub_menu_context)) {
-    	recompui::hide_context(sub_menu_context);
-    }
-    else {
-    	recompui::hide_context(config_context);
-    }
-
-    if (!ultramodern::is_game_started()) {
-        recompui::show_context(recompui::get_launcher_context_id(), "");
-    }
-}
-
-// TODO: Remove once RT64 gets native fullscreen support on Linux
-#if defined(__linux__)
-extern SDL_Window* window;
-#endif
-
-void apply_graphics_config(void) {
-    ultramodern::renderer::set_graphics_config(new_options);
-#if defined(__linux__) // TODO: Remove once RT64 gets native fullscreen support on Linux
-    if (new_options.wm_option == ultramodern::renderer::WindowMode::Fullscreen) {
-        SDL_SetWindowFullscreen(window,SDL_WINDOW_FULLSCREEN_DESKTOP);
-    } else {
-        SDL_SetWindowFullscreen(window,0);
-    }
-#endif
-}
-
-void close_config_menu() {
-    if (ultramodern::renderer::get_graphics_config() != new_options) {
-        recompui::open_choice_prompt(
-            "Graphics options have changed",
-            "Would you like to apply or discard the changes?",
-            "Apply",
-            "Discard",
-            []() {
-                apply_graphics_config();
-                graphics_model_handle.DirtyAllVariables();
-                close_config_menu_impl();
-            },
-            []() {
-                new_options = ultramodern::renderer::get_graphics_config();
-                graphics_model_handle.DirtyAllVariables();
-                close_config_menu_impl();
-            },
-            recompui::ButtonVariant::Success,
-            recompui::ButtonVariant::Error,
-            true,
-            "config__close-menu-button"
-        );
-        return;
-    }
-
-    close_config_menu_impl();
-}
-
-void zelda64::open_quit_game_prompt() {
-    recompui::open_choice_prompt(
-        "Are you sure you want to quit?",
-        "Any progress since your last save will be lost.",
-        "Quit",
-        "Cancel",
-        []() {
-            ultramodern::quit();
-        },
-        []() {},
-        recompui::ButtonVariant::Error,
-        recompui::ButtonVariant::Tertiary,
-        true,
-        "config__quit-game-button"
-    );
-}
-
-// These defaults values don't matter, as the config file handling overrides them.
-struct ControlOptionsContext {
-    int rumble_strength; // 0 to 100
-    int gyro_sensitivity; // 0 to 100
-    int mouse_sensitivity; // 0 to 100
-    int joystick_deadzone; // 0 to 100
-    zelda64::TargetingMode targeting_mode;
-    recomp::BackgroundInputMode background_input_mode;
-    zelda64::AutosaveMode autosave_mode;
-    zelda64::CameraInvertMode camera_invert_mode;
-    zelda64::AnalogCamMode analog_cam_mode;
-    zelda64::CameraInvertMode analog_camera_invert_mode;
-};
-
-ControlOptionsContext control_options_context;
-
-int recomp::get_rumble_strength() {
-    return control_options_context.rumble_strength;
-}
-
-void recomp::set_rumble_strength(int strength) {
-    control_options_context.rumble_strength = strength;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("rumble_strength");
-    }
-}
-
-int recomp::get_gyro_sensitivity() {
-    return control_options_context.gyro_sensitivity;
-}
-
-int recomp::get_mouse_sensitivity() {
-    return control_options_context.mouse_sensitivity;
-}
-
-int recomp::get_joystick_deadzone() {
-    return control_options_context.joystick_deadzone;
-}
-
-void recomp::set_gyro_sensitivity(int sensitivity) {
-    control_options_context.gyro_sensitivity = sensitivity;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("gyro_sensitivity");
-    }
-}
-
-void recomp::set_mouse_sensitivity(int sensitivity) {
-    control_options_context.mouse_sensitivity = sensitivity;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("mouse_sensitivity");
-    }
-}
-
-void recomp::set_joystick_deadzone(int deadzone) {
-    control_options_context.joystick_deadzone = deadzone;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("joystick_deadzone");
-    }
-}
-
-zelda64::TargetingMode zelda64::get_targeting_mode() {
-    return control_options_context.targeting_mode;
-}
-
-void zelda64::set_targeting_mode(zelda64::TargetingMode mode) {
-    control_options_context.targeting_mode = mode;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("targeting_mode");
-    }
-}
-
-recomp::BackgroundInputMode recomp::get_background_input_mode() {
-    return control_options_context.background_input_mode;
-}
-
-void recomp::set_background_input_mode(recomp::BackgroundInputMode mode) {
-    control_options_context.background_input_mode = mode;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("background_input_mode");
-    }
-    SDL_SetHint(
-        SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS,
-        mode == recomp::BackgroundInputMode::On
-            ? "1"
-            : "0"
-    );
-}
-
-zelda64::AutosaveMode zelda64::get_autosave_mode() {
-    return control_options_context.autosave_mode;
-}
-
-void zelda64::set_autosave_mode(zelda64::AutosaveMode mode) {
-    control_options_context.autosave_mode = mode;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("autosave_mode");
-    }
-}
-
-zelda64::CameraInvertMode zelda64::get_camera_invert_mode() {
-    return control_options_context.camera_invert_mode;
-}
-
-void zelda64::set_camera_invert_mode(zelda64::CameraInvertMode mode) {
-    control_options_context.camera_invert_mode = mode;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("camera_invert_mode");
-    }
-}
-
-zelda64::AnalogCamMode zelda64::get_analog_cam_mode() {
-    return control_options_context.analog_cam_mode;
-}
-
-void zelda64::set_analog_cam_mode(zelda64::AnalogCamMode mode) {
-    control_options_context.analog_cam_mode = mode;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("analog_cam_mode");
-    }
-}
-
-zelda64::CameraInvertMode zelda64::get_analog_camera_invert_mode() {
-    return control_options_context.analog_camera_invert_mode;
-}
-
-void zelda64::set_analog_camera_invert_mode(zelda64::CameraInvertMode mode) {
-    control_options_context.analog_camera_invert_mode = mode;
-    if (general_model_handle) {
-        general_model_handle.DirtyVariable("analog_camera_invert_mode");
-    }
-}
-
-struct SoundOptionsContext {
-    std::atomic<int> main_volume; // Option to control the volume of all sound
-    std::atomic<int> bgm_volume;
-    std::atomic<int> low_health_beeps_enabled; // RmlUi doesn't seem to like "true"/"false" strings for setting variants so an int is used here instead.
-    void reset() {
-        bgm_volume = 100;
-        main_volume = 100;
-        low_health_beeps_enabled = (int)true;
-    }
-    SoundOptionsContext() {
-        reset();
-    }
-};
-
-SoundOptionsContext sound_options_context;
-
-void zelda64::reset_sound_settings() {
-    sound_options_context.reset();
-    if (sound_options_model_handle) {
-        sound_options_model_handle.DirtyAllVariables();
-    }
-}
-
-void zelda64::set_main_volume(int volume) {
-    sound_options_context.main_volume.store(volume);
-    if (sound_options_model_handle) {
-        sound_options_model_handle.DirtyVariable("main_volume");
-    }
-}
-
-int zelda64::get_main_volume() {
-    return sound_options_context.main_volume.load();
-}
-
-void zelda64::set_bgm_volume(int volume) {
-    sound_options_context.bgm_volume.store(volume);
-    if (sound_options_model_handle) {
-        sound_options_model_handle.DirtyVariable("bgm_volume");
-    }
-}
-
-int zelda64::get_bgm_volume() {
-    return sound_options_context.bgm_volume.load();
-}
-
-void zelda64::set_low_health_beeps_enabled(bool enabled) {
-    sound_options_context.low_health_beeps_enabled.store((int)enabled);
-    if (sound_options_model_handle) {
-        sound_options_model_handle.DirtyVariable("low_health_beeps_enabled");
-    }
-}
-
-bool zelda64::get_low_health_beeps_enabled() {
-    return (bool)sound_options_context.low_health_beeps_enabled.load();
-}
-
-struct DebugContext {
-    Rml::DataModelHandle model_handle;
-    std::vector<std::string> area_names;
-    std::vector<std::string> scene_names;
-    std::vector<std::string> entrance_names; 
-    int area_index = 0;
-    int scene_index = 0;
-    int entrance_index = 0;
-    int set_time_day = 1;
-    int set_time_hour = 12;
-    int set_time_minute = 0;
-    bool debug_enabled = false;
-
-    DebugContext() {
-        for (const auto& area : zelda64::game_warps) {
-            area_names.emplace_back(area.name);
-        }
-        update_warp_names();
-    }
-
-    void update_warp_names() {
-        scene_names.clear();
-        for (const auto& scene : zelda64::game_warps[area_index].scenes) {
-            scene_names.emplace_back(scene.name);
-        }
-        
-        entrance_names = zelda64::game_warps[area_index].scenes[scene_index].entrances;
-    }
-};
-
-DebugContext debug_context;
-
-recompui::ContextId config_context;
-
-recompui::ContextId recompui::get_config_context_id() {
-	return config_context;
-}
-
-// Helper copied from RmlUi to get a named child.
-Rml::Element* recompui::get_child_by_tag(Rml::Element* parent, const std::string& tag)
-{
-	// Look for the existing child
-	for (int i = 0; i < parent->GetNumChildren(); i++)
-	{
-        Rml::Element* child = parent->GetChild(i);
-		if (child->GetTagName() == tag)
-			return child;
-	}
-
-    return nullptr;
-}
-
-class ConfigTabsetListener : public Rml::EventListener {
-    void ProcessEvent(Rml::Event& event) override {
-        if (event.GetId() == Rml::EventId::Tabchange) {
-            int tab_index = event.GetParameter<int>("tab_index", 0);
-            bool in_mod_tab = (tab_index == recompui::config_tab_to_index(recompui::ConfigTab::Mods));
-            if (in_mod_tab) {
-                recompui::set_config_tabset_mod_nav();
-            }
-            else {
-                Rml::ElementTabSet* tabset = recompui::get_config_tabset();
-                Rml::Element* tabs = recompui::get_child_by_tag(tabset, "tabs");
-                if (tabs != nullptr) {
-                    size_t num_children = tabs->GetNumChildren();
-                    for (size_t i = 0; i < num_children; i++) {
-                        tabs->GetChild(i)->SetProperty(Rml::PropertyId::NavDown, Rml::Style::Nav::Auto);
-                    }
-                }
-            }
-        }
-    }
-};
-
-class ConfigMenu : public recompui::MenuController {
-private:
-    ConfigTabsetListener config_tabset_listener;
-public:
-    ConfigMenu() {
-
-    }
-    ~ConfigMenu() override {
-
-    }
-    void load_document() override {
-		config_context = recompui::create_context(zelda64::get_asset_path("config_menu.rml"));
-        recompui::update_mod_list(false);
-        recompui::get_config_tabset()->AddEventListener(Rml::EventId::Tabchange, &config_tabset_listener);
-    }
-    void register_events(recompui::UiEventListenerInstancer& listener) override {
-        recompui::register_event(listener, "apply_options",
-            [](const std::string& param, Rml::Event& event) {
-                graphics_model_handle.DirtyVariable("options_changed");
-                apply_graphics_config();
-            });
-        recompui::register_event(listener, "config_keydown",
-            [](const std::string& param, Rml::Event& event) {
-                if (!recompui::is_prompt_open() && event.GetId() == Rml::EventId::Keydown) {
-                    auto key = event.GetParameter<Rml::Input::KeyIdentifier>("key_identifier", Rml::Input::KeyIdentifier::KI_UNKNOWN);
-                    switch (key) {
-                        case Rml::Input::KeyIdentifier::KI_ESCAPE:
-                            close_config_menu();
-                            break;
-                        case Rml::Input::KeyIdentifier::KI_F:
-                            graphics_model_handle.DirtyVariable("options_changed");
-                            apply_graphics_config();
-                            break;
-                    }
-                }
-            });
-        // This needs to be separate from `close_config_menu` so it ensures that the event is only on the target
-        recompui::register_event(listener, "close_config_menu_backdrop",
-            [](const std::string& param, Rml::Event& event) {
-                if (event.GetPhase() == Rml::EventPhase::Target) {
-                    close_config_menu();
-                }
-            });
-        recompui::register_event(listener, "close_config_menu",
-            [](const std::string& param, Rml::Event& event) {
-                close_config_menu();
-            });
-
-        recompui::register_event(listener, "open_quit_game_prompt",
-            [](const std::string& param, Rml::Event& event) {
-                zelda64::open_quit_game_prompt();
-            });
-
-        recompui::register_event(listener, "toggle_input_device",
-            [](const std::string& param, Rml::Event& event) {
-                cur_device = cur_device == recomp::InputDevice::Controller
-                    ? recomp::InputDevice::Keyboard
-                    : recomp::InputDevice::Controller;
-                controls_model_handle.DirtyVariable("input_device_is_keyboard");
-                controls_model_handle.DirtyVariable("inputs");
-            });
-            
-        recompui::register_event(listener, "area_index_changed",
-            [](const std::string& param, Rml::Event& event) {
-                debug_context.area_index = event.GetParameter<int>("value", 0);
-                debug_context.scene_index = 0;
-                debug_context.entrance_index = 0;
-                debug_context.update_warp_names();
-                debug_context.model_handle.DirtyVariable("scene_index");
-                debug_context.model_handle.DirtyVariable("entrance_index");
-                debug_context.model_handle.DirtyVariable("scene_names");
-                debug_context.model_handle.DirtyVariable("entrance_names");
-            });
-            
-        recompui::register_event(listener, "scene_index_changed",
-            [](const std::string& param, Rml::Event& event) {
-                debug_context.scene_index = event.GetParameter<int>("value", 0);
-                debug_context.entrance_index = 0;
-                debug_context.update_warp_names();
-                debug_context.model_handle.DirtyVariable("entrance_index");
-                debug_context.model_handle.DirtyVariable("entrance_names");
-            });
-
-        recompui::register_event(listener, "do_warp",
-            [](const std::string& param, Rml::Event& event) {
-                zelda64::do_warp(debug_context.area_index, debug_context.scene_index, debug_context.entrance_index);
-            });
-
-        recompui::register_event(listener, "set_time",
-            [](const std::string& param, Rml::Event& event) {
-                zelda64::set_time(debug_context.set_time_day, debug_context.set_time_hour, debug_context.set_time_minute);
-            });
-    }
-
-    void bind_config_list_events(Rml::DataModelConstructor &constructor) {
-        constructor.BindEventCallback("set_cur_config_index",
-            [](Rml::DataModelHandle model_handle, Rml::Event& event, const Rml::VariantList& inputs) {
-                int option_index = inputs.at(0).Get<size_t>();
-                // watch for mouseout being overzealous during event bubbling, only clear if the event's attached element matches the current
-                if (option_index == -1 && event.GetType() == "mouseout" && event.GetCurrentElement() != event.GetTargetElement()) {
-                    return;
-                }
-                focused_config_option_index = option_index;
-                model_handle.DirtyVariable("cur_config_index");
-            });
-
-        constructor.Bind("cur_config_index", &focused_config_option_index);
-    }
-
-    void make_graphics_bindings(Rml::Context* context) {
-        Rml::DataModelConstructor constructor = context->CreateDataModel("graphics_model");
-        if (!constructor) {
-            throw std::runtime_error("Failed to make RmlUi data model for the graphics config menu");
-        }
-
-        ultramodern::sleep_milliseconds(50);
-        new_options = ultramodern::renderer::get_graphics_config();
-        bind_config_list_events(constructor);
-
-        constructor.BindFunc("res_option",
-            [](Rml::Variant& out) { get_option(new_options.res_option, out); },
-            [](const Rml::Variant& in) {
-                set_option(new_options.res_option, in);
-                graphics_model_handle.DirtyVariable("options_changed");
-                graphics_model_handle.DirtyVariable("ds_info");
-                graphics_model_handle.DirtyVariable("ds_option");
-            }
-        );
-        bind_option(constructor, "wm_option", &new_options.wm_option);
-        bind_option(constructor, "ar_option", &new_options.ar_option);
-        bind_option(constructor, "hr_option", &new_options.hr_option);
-        bind_option(constructor, "msaa_option", &new_options.msaa_option);
-        bind_option(constructor, "rr_option", &new_options.rr_option);
-        constructor.BindFunc("rr_manual_value",
-            [](Rml::Variant& out) {
-                out = new_options.rr_manual_value;
-            },
-            [](const Rml::Variant& in) {
-                new_options.rr_manual_value = in.Get<int>();
-                graphics_model_handle.DirtyVariable("options_changed");
-            });
-        constructor.BindFunc("ds_option",
-            [](Rml::Variant& out) {
-                if (new_options.res_option == ultramodern::renderer::Resolution::Auto) {
-                    out = 1;
-                } else {
-                    out = new_options.ds_option;
-                }
-            },
-            [](const Rml::Variant& in) {
-                new_options.ds_option = in.Get<int>();
-                graphics_model_handle.DirtyVariable("options_changed");
-                graphics_model_handle.DirtyVariable("ds_info");
-            });
-
-        constructor.BindFunc("display_refresh_rate",
-            [](Rml::Variant& out) {
-                out = ultramodern::get_display_refresh_rate();
-            });
-
-        constructor.BindFunc("options_changed",
-            [](Rml::Variant& out) {
-                out = (ultramodern::renderer::get_graphics_config() != new_options);
-            });
-        constructor.BindFunc("ds_info",
-            [](Rml::Variant& out) {
-                switch (new_options.res_option) {
-                    default:
-                    case ultramodern::renderer::Resolution::Auto:
-                        out = "Downsampling is not available at auto resolution";
-                        return;
-                    case ultramodern::renderer::Resolution::Original:
-                        if (new_options.ds_option == 2) {
-                            out = "Rendered in 480p and scaled to 240p";
-                        } else if (new_options.ds_option == 4) {
-                            out = "Rendered in 960p and scaled to 240p";
-                        }
-                        return;
-                    case ultramodern::renderer::Resolution::Original2x:
-                        if (new_options.ds_option == 2) {
-                            out = "Rendered in 960p and scaled to 480p";
-                        } else if (new_options.ds_option == 4) {
-                            out = "Rendered in 4K and scaled to 480p";
-                        }
-                        return;
-                }
-                out = "";
-            });
-        
-        constructor.BindFunc("gfx_help__apply", [](Rml::Variant& out) {
-            if (cont_active) {
-                out = \
-                    (recomp::get_input_binding(recomp::GameInput::APPLY_MENU, 0, recomp::InputDevice::Controller).to_string() != "" ?
-                        " " + recomp::get_input_binding(recomp::GameInput::APPLY_MENU, 0, recomp::InputDevice::Controller).to_string() :
-                        ""
-                    ) + \
-                    (recomp::get_input_binding(recomp::GameInput::APPLY_MENU, 1, recomp::InputDevice::Controller).to_string() != "" ?
-                        " " + recomp::get_input_binding(recomp::GameInput::APPLY_MENU, 1, recomp::InputDevice::Controller).to_string() :
-                        ""
-                    );
-            } else {
-                out = " " PF_KEYBOARD_F;
-            }
-        });
-
-        constructor.Bind("msaa2x_supported", &msaa2x_supported);
-        constructor.Bind("msaa4x_supported", &msaa4x_supported);
-        constructor.Bind("msaa8x_supported", &msaa8x_supported);
-        constructor.Bind("sample_positions_supported", &sample_positions_supported);
-
-        graphics_model_handle = constructor.GetModelHandle();
-    }
-
-    void make_controls_bindings(Rml::Context* context) {
-        Rml::DataModelConstructor constructor = context->CreateDataModel("controls_model");
-        if (!constructor) {
-            throw std::runtime_error("Failed to make RmlUi data model for the controls config menu");
-        }
-
-        constructor.BindFunc("input_count", [](Rml::Variant& out) { out = static_cast<uint64_t>(recomp::get_num_inputs()); } );
-        constructor.BindFunc("input_device_is_keyboard", [](Rml::Variant& out) { out = cur_device == recomp::InputDevice::Keyboard; } );
-
-        constructor.RegisterTransformFunc("get_input_name", [](const Rml::VariantList& inputs) {
-            return Rml::Variant{recomp::get_input_name(static_cast<recomp::GameInput>(inputs.at(0).Get<size_t>()))};
-        });
-
-        constructor.RegisterTransformFunc("get_input_enum_name", [](const Rml::VariantList& inputs) {
-            return Rml::Variant{recomp::get_input_enum_name(static_cast<recomp::GameInput>(inputs.at(0).Get<size_t>()))};
-        });
-
-        constructor.BindEventCallback("set_input_binding",
-            [](Rml::DataModelHandle model_handle, Rml::Event& event, const Rml::VariantList& inputs) {
-                scanned_input_index = inputs.at(0).Get<size_t>();
-                scanned_binding_index = inputs.at(1).Get<size_t>();
-                recomp::start_scanning_input(cur_device);
-                model_handle.DirtyVariable("active_binding_input");
-                model_handle.DirtyVariable("active_binding_slot");
-            });
-
-        constructor.BindEventCallback("reset_input_bindings_to_defaults",
-            [](Rml::DataModelHandle model_handle, Rml::Event& event, const Rml::VariantList& inputs) {
-                if (cur_device == recomp::InputDevice::Controller) {
-                    zelda64::reset_cont_input_bindings();
-                } else {
-                    zelda64::reset_kb_input_bindings();
-                }
-                model_handle.DirtyAllVariables();
-                nav_help_model_handle.DirtyVariable("nav_help__accept");
-                nav_help_model_handle.DirtyVariable("nav_help__exit");
-                graphics_model_handle.DirtyVariable("gfx_help__apply");
-            });
-
-        constructor.BindEventCallback("clear_input_bindings",
-            [](Rml::DataModelHandle model_handle, Rml::Event& event, const Rml::VariantList& inputs) {
-                recomp::GameInput input = static_cast<recomp::GameInput>(inputs.at(0).Get<size_t>());
-                for (size_t binding_index = 0; binding_index < recomp::bindings_per_input; binding_index++) {
-                    recomp::set_input_binding(input, binding_index, cur_device, recomp::InputField{});
-                }
-                model_handle.DirtyVariable("inputs");
-                graphics_model_handle.DirtyVariable("gfx_help__apply");
-            });
-
-        constructor.BindEventCallback("reset_single_input_binding_to_default",
-            [](Rml::DataModelHandle model_handle, Rml::Event& event, const Rml::VariantList& inputs) {
-                recomp::GameInput input = static_cast<recomp::GameInput>(inputs.at(0).Get<size_t>());
-                zelda64::reset_single_input_binding(cur_device, input);
-                model_handle.DirtyVariable("inputs");
-                nav_help_model_handle.DirtyVariable("nav_help__accept");
-                nav_help_model_handle.DirtyVariable("nav_help__exit");
-            });
-
-        constructor.BindEventCallback("set_input_row_focus",
-            [](Rml::DataModelHandle model_handle, Rml::Event& event, const Rml::VariantList& inputs) {
-                int input_index = inputs.at(0).Get<size_t>();
-                // watch for mouseout being overzealous during event bubbling, only clear if the event's attached element matches the current
-                if (input_index == -1 && event.GetType() == "mouseout" && event.GetCurrentElement() != event.GetTargetElement()) {
-                    return;
-                }
-                focused_input_index = input_index;
-                model_handle.DirtyVariable("cur_input_row");
-            });
-
-        // Rml variable definition for an individual InputField.
-        struct InputFieldVariableDefinition : public Rml::VariableDefinition {
-            InputFieldVariableDefinition() : Rml::VariableDefinition(Rml::DataVariableType::Scalar) {}
-
-            virtual bool Get(void* ptr, Rml::Variant& variant) override { variant = reinterpret_cast<recomp::InputField*>(ptr)->to_string(); return true; }
-            virtual bool Set(void* ptr, const Rml::Variant& variant) override { return false; }
-        };
-        // Static instance of the InputField variable definition to have a pointer to return to RmlUi.
-        static InputFieldVariableDefinition input_field_definition_instance{};
-
-        // Rml variable definition for an array of InputField values (e.g. all the bindings for a single input).
-        struct BindingContainerVariableDefinition : public Rml::VariableDefinition {
-            BindingContainerVariableDefinition() : Rml::VariableDefinition(Rml::DataVariableType::Array) {}
-
-            virtual bool Get(void* ptr, Rml::Variant& variant) override { return false; }
-            virtual bool Set(void* ptr, const Rml::Variant& variant) override { return false; }
-
-            virtual int Size(void* ptr) override { return recomp::bindings_per_input; }
-            virtual Rml::DataVariable Child(void* ptr, const Rml::DataAddressEntry& address) override {
-                recomp::GameInput input = static_cast<recomp::GameInput>((uintptr_t)ptr);
-                return Rml::DataVariable{&input_field_definition_instance, &recomp::get_input_binding(input, address.index, cur_device)};
-            }
-        };
-        // Static instance of the InputField array variable definition to have a fixed pointer to return to RmlUi.
-        static BindingContainerVariableDefinition binding_container_var_instance{};
-
-        // Rml variable definition for an array of an array of InputField values (e.g. all the bindings for all inputs).
-        struct BindingArrayContainerVariableDefinition : public Rml::VariableDefinition {
-            BindingArrayContainerVariableDefinition() : Rml::VariableDefinition(Rml::DataVariableType::Array) {}
-
-            virtual bool Get(void* ptr, Rml::Variant& variant) override { return false; }
-            virtual bool Set(void* ptr, const Rml::Variant& variant) override { return false; }
-
-            virtual int Size(void* ptr) override { return recomp::get_num_inputs(); }
-            virtual Rml::DataVariable Child(void* ptr, const Rml::DataAddressEntry& address) override {
-                // Encode the input index as the pointer to avoid needing to do any allocations.
-                return Rml::DataVariable(&binding_container_var_instance, (void*)(uintptr_t)address.index);
-            }
-        };
-
-        // Static instance of the BindingArrayContainerVariableDefinition variable definition to have a fixed pointer to return to RmlUi.
-        static BindingArrayContainerVariableDefinition binding_array_var_instance{};
-
-        struct InputContainerVariableDefinition : public Rml::VariableDefinition {
-            InputContainerVariableDefinition() : Rml::VariableDefinition(Rml::DataVariableType::Struct) {}
-
-            virtual bool Get(void* ptr, Rml::Variant& variant) override { return true; }
-            virtual bool Set(void* ptr, const Rml::Variant& variant) override { return false; }
-
-            virtual int Size(void* ptr) override { return recomp::get_num_inputs(); }
-            virtual Rml::DataVariable Child(void* ptr, const Rml::DataAddressEntry& address) override {
-                if (address.name == "array") {
-                    return Rml::DataVariable(&binding_array_var_instance, nullptr);
-                }
-                else {
-                    recomp::GameInput input = recomp::get_input_from_enum_name(address.name);
-                    if (input != recomp::GameInput::COUNT) {
-                        return Rml::DataVariable(&binding_container_var_instance, (void*)(uintptr_t)input);
-                    }
-                }
-                return Rml::DataVariable{};
-            }
-        };
-
-        // Dummy type to associate with the variable definition.
-        struct InputContainer {};
-        constructor.RegisterCustomDataVariableDefinition<InputContainer>(Rml::MakeUnique<InputContainerVariableDefinition>());
-
-        // Dummy instance of the dummy type to bind to the variable.
-        static InputContainer dummy_container;
-        constructor.Bind("inputs", &dummy_container);
-
-        constructor.BindFunc("cur_input_row", [](Rml::Variant& out) {
-            if (focused_input_index == -1) {
-                out = "NONE";
-            }
-            else {
-                out = recomp::get_input_enum_name(static_cast<recomp::GameInput>(focused_input_index));
-            }
-        });
-
-        constructor.BindFunc("active_binding_input", [](Rml::Variant& out) {
-            if (scanned_input_index == -1) {
-                out = "NONE";
-            }
-            else {
-                out = recomp::get_input_enum_name(static_cast<recomp::GameInput>(scanned_input_index));
-            }
-        });
-
-        constructor.Bind<int>("active_binding_slot", &scanned_binding_index);
-
-        controls_model_handle = constructor.GetModelHandle();
-    }
-
-    void make_nav_help_bindings(Rml::Context* context) {
-        Rml::DataModelConstructor constructor = context->CreateDataModel("nav_help_model");
-        if (!constructor) {
-            throw std::runtime_error("Failed to make RmlUi data model for nav help");
-        }
-
-        constructor.BindFunc("nav_help__navigate", [](Rml::Variant& out) {
-            if (cont_active) {
-                out = PF_DPAD;
-            } else {
-                out = PF_KEYBOARD_ARROWS PF_KEYBOARD_TAB;
-            }
-        });
-
-        constructor.BindFunc("nav_help__accept", [](Rml::Variant& out) {
-            if (cont_active) {
-                out = \
-                    recomp::get_input_binding(recomp::GameInput::ACCEPT_MENU, 0, recomp::InputDevice::Controller).to_string() + \
-                    recomp::get_input_binding(recomp::GameInput::ACCEPT_MENU, 1, recomp::InputDevice::Controller).to_string();
-            } else {
-                out = PF_KEYBOARD_ENTER;
-            }
-        });
-
-        constructor.BindFunc("nav_help__exit", [](Rml::Variant& out) {
-            if (cont_active) {
-                out = \
-                    recomp::get_input_binding(recomp::GameInput::TOGGLE_MENU, 0, recomp::InputDevice::Controller).to_string() + \
-                    recomp::get_input_binding(recomp::GameInput::TOGGLE_MENU, 1, recomp::InputDevice::Controller).to_string();
-            } else {
-                out = PF_KEYBOARD_ESCAPE;
-            }
-        });
-
-        nav_help_model_handle = constructor.GetModelHandle();
-    }
-
-    void make_general_bindings(Rml::Context* context) {
-        Rml::DataModelConstructor constructor = context->CreateDataModel("general_model");
-        if (!constructor) {
-            throw std::runtime_error("Failed to make RmlUi data model for the control options menu");
-        }
-
-        bind_config_list_events(constructor);
-        
-        constructor.Bind("rumble_strength", &control_options_context.rumble_strength);
-        constructor.Bind("gyro_sensitivity", &control_options_context.gyro_sensitivity);
-        constructor.Bind("mouse_sensitivity", &control_options_context.mouse_sensitivity);
-        constructor.Bind("joystick_deadzone", &control_options_context.joystick_deadzone);
-        bind_option(constructor, "targeting_mode", &control_options_context.targeting_mode);
-        bind_option(constructor, "background_input_mode", &control_options_context.background_input_mode);
-        bind_option(constructor, "autosave_mode", &control_options_context.autosave_mode);
-        bind_option(constructor, "camera_invert_mode", &control_options_context.camera_invert_mode);
-        bind_option(constructor, "analog_cam_mode", &control_options_context.analog_cam_mode);
-        bind_option(constructor, "analog_camera_invert_mode", &control_options_context.analog_camera_invert_mode);
-
-        general_model_handle = constructor.GetModelHandle();
-    }
-    
-    void make_sound_options_bindings(Rml::Context* context) {
-        Rml::DataModelConstructor constructor = context->CreateDataModel("sound_options_model");
-        if (!constructor) {
-            throw std::runtime_error("Failed to make RmlUi data model for the sound options menu");
-        }
-
-        bind_config_list_events(constructor);
-        
-        sound_options_model_handle = constructor.GetModelHandle();
-
-        bind_atomic(constructor, sound_options_model_handle, "main_volume", &sound_options_context.main_volume);
-        bind_atomic(constructor, sound_options_model_handle, "bgm_volume", &sound_options_context.bgm_volume);
-        bind_atomic(constructor, sound_options_model_handle, "low_health_beeps_enabled", &sound_options_context.low_health_beeps_enabled);
-    }
-
-    void make_debug_bindings(Rml::Context* context) {
-        Rml::DataModelConstructor constructor = context->CreateDataModel("debug_model");
-        if (!constructor) {
-            throw std::runtime_error("Failed to make RmlUi data model for the debug menu");
-        }
-
-        bind_config_list_events(constructor);
-
-        // Bind the debug mode enabled flag.
-        constructor.Bind("debug_enabled", &debug_context.debug_enabled);
-        
-        // Register the array type for string vectors.
-        constructor.RegisterArray<std::vector<std::string>>();
-        
-        // Bind the warp parameter indices
-        constructor.Bind("area_index", &debug_context.area_index);
-        constructor.Bind("scene_index", &debug_context.scene_index);
-        constructor.Bind("entrance_index", &debug_context.entrance_index);
-
-        // Bind the vectors for warp names
-        constructor.Bind("area_names", &debug_context.area_names);
-        constructor.Bind("scene_names", &debug_context.scene_names);
-        constructor.Bind("entrance_names", &debug_context.entrance_names);
-
-        constructor.Bind("debug_time_day", &debug_context.set_time_day);
-        constructor.Bind("debug_time_hour", &debug_context.set_time_hour);
-        constructor.Bind("debug_time_minute", &debug_context.set_time_minute);
-
-        debug_context.model_handle = constructor.GetModelHandle();
-    }
-
-    void make_bindings(Rml::Context* context) override {
-        // initially set cont state for ui help
-        //recomp::config_menu_set_cont_or_kb(recompui::get_cont_active());
-        make_nav_help_bindings(context);
-        make_general_bindings(context);
-        make_controls_bindings(context);
-        make_graphics_bindings(context);
-        make_sound_options_bindings(context);
-        make_debug_bindings(context);
-    }
-};
-
-std::unique_ptr<recompui::MenuController> recompui::create_config_menu() {
-    return std::make_unique<ConfigMenu>();
-}
-
-bool zelda64::get_debug_mode_enabled() {
-    return debug_context.debug_enabled;
-}
-
-void zelda64::set_debug_mode_enabled(bool enabled) {
-    debug_context.debug_enabled = enabled;
-    if (debug_context.model_handle) {
-        debug_context.model_handle.DirtyVariable("debug_enabled");
-    }
-}
-
-void recompui::update_supported_options() {
-    msaa2x_supported = zelda64::renderer::RT64MaxMSAA() >= RT64::UserConfiguration::Antialiasing::MSAA2X;
-    msaa4x_supported = zelda64::renderer::RT64MaxMSAA() >= RT64::UserConfiguration::Antialiasing::MSAA4X;
-    msaa8x_supported = zelda64::renderer::RT64MaxMSAA() >= RT64::UserConfiguration::Antialiasing::MSAA8X;
-    sample_positions_supported = zelda64::renderer::RT64SamplePositionsSupported();
-    
-    new_options = ultramodern::renderer::get_graphics_config();
-
-    graphics_model_handle.DirtyAllVariables();
-}
-
-void recompui::toggle_fullscreen() {
-    new_options.wm_option = (new_options.wm_option == ultramodern::renderer::WindowMode::Windowed) ? ultramodern::renderer::WindowMode::Fullscreen : ultramodern::renderer::WindowMode::Windowed;
-    apply_graphics_config();
-    graphics_model_handle.DirtyVariable("wm_option");
-}
-
-void recompui::set_config_tab(ConfigTab tab) {
-    get_config_tabset()->SetActiveTab(config_tab_to_index(tab));
-}
-
-Rml::ElementTabSet* recompui::get_config_tabset() {
-    ContextId config_context = recompui::get_config_context_id();
-
-    ContextId old_context = recompui::try_close_current_context();
-
-    Rml::ElementDocument *doc = config_context.get_document();
-    assert(doc != nullptr);
-
-    Rml::Element *tabset_el = doc->GetElementById("config_tabset");
-    assert(tabset_el != nullptr);
-
-    Rml::ElementTabSet *tabset = rmlui_dynamic_cast<Rml::ElementTabSet *>(tabset_el);
-    assert(tabset != nullptr);
-
-    if (old_context != ContextId::null()) {
-        old_context.open();
-    }
-
-    return tabset;
-}
-
-Rml::Element* recompui::get_mod_tab() {
-    ContextId config_context = recompui::get_config_context_id();
-
-    ContextId old_context = recompui::try_close_current_context();
-
-    Rml::ElementDocument* doc = config_context.get_document();
-    assert(doc != nullptr);
-
-    Rml::Element* tab_el = doc->GetElementById("tab_mods");
-    assert(tab_el != nullptr);
-
-    if (old_context != ContextId::null()) {
-        old_context.open();
-    }
-
-    return tab_el;
-}
diff --git a/src/ui/ui_config_sub_menu.cpp b/src/ui/ui_config_sub_menu.cpp
deleted file mode 100644
index 75eb5b7..0000000
--- a/src/ui/ui_config_sub_menu.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-#include "ui_config_sub_menu.h"
-
-#include <cassert>
-#include <string_view>
-
-#include "recomp_ui.h"
-
-namespace recompui {
-
-// ConfigOptionElement
-
-
-void ConfigOptionElement::process_event(const Event &e) {
-    switch (e.type) {
-    case EventType::Hover:
-        if (hover_callback == nullptr) {
-            break;
-        }
-        hover_callback(this, std::get<EventHover>(e.variant).active);
-        break;
-    case EventType::Update:
-        break;
-    default:
-        assert(false && "Unknown event type.");
-        break;
-    }
-}
-
-ConfigOptionElement::ConfigOptionElement(Element *parent) : Element(parent, Events(EventType::Hover)) {
-    set_display(Display::Flex);
-    set_flex_direction(FlexDirection::Column);
-    set_gap(16.0f);
-    set_height(100.0f);
-
-    name_label = get_current_context().create_element<Label>(this, LabelStyle::Normal);
-}
-
-ConfigOptionElement::~ConfigOptionElement() {
-
-}
-
-void ConfigOptionElement::set_option_id(std::string_view id) {
-    this->option_id = id;
-}
-
-void ConfigOptionElement::set_name(std::string_view name) {
-    this->name = name;
-    name_label->set_text(name);
-}
-
-void ConfigOptionElement::set_description(std::string_view description) {
-    this->description = description;
-}
-
-void ConfigOptionElement::set_hover_callback(std::function<void(ConfigOptionElement *, bool)> callback) {
-    hover_callback = callback;
-}
-
-void ConfigOptionElement::set_focus_callback(std::function<void(const std::string &, bool)> callback) {
-    focus_callback = callback;
-}
-
-const std::string &ConfigOptionElement::get_description() const {
-    return description;
-}
-
-// ConfigOptionSlider
-
-void ConfigOptionSlider::slider_value_changed(double v) {
-    callback(option_id, v);
-}
-
-ConfigOptionSlider::ConfigOptionSlider(Element *parent, double value, double min_value, double max_value, double step_value, bool percent, std::function<void(const std::string &, double)> callback) : ConfigOptionElement(parent) {
-    this->callback = callback;
-
-    slider = get_current_context().create_element<Slider>(this, percent ? SliderType::Percent : SliderType::Double);
-    slider->set_max_width(380.0f);
-    slider->set_min_value(min_value);
-    slider->set_max_value(max_value);
-    slider->set_step_value(step_value);
-    slider->set_value(value);
-    slider->add_value_changed_callback([this](double v){ slider_value_changed(v); });
-    slider->set_focus_callback([this](bool active) {
-        focus_callback(option_id, active);
-    });
-}
-
-// ConfigOptionTextInput
-
-void ConfigOptionTextInput::text_changed(const std::string &text) {
-    callback(option_id, text);
-}
-
-ConfigOptionTextInput::ConfigOptionTextInput(Element *parent, std::string_view value, std::function<void(const std::string &, const std::string &)> callback) : ConfigOptionElement(parent) {
-    this->callback = callback;
-
-    text_input = get_current_context().create_element<TextInput>(this);
-    text_input->set_max_width(400.0f);
-    text_input->set_text(value);
-    text_input->add_text_changed_callback([this](const std::string &text){ text_changed(text); });
-    text_input->set_focus_callback([this](bool active) {
-        focus_callback(option_id, active);
-    });
-}
-
-// ConfigOptionRadio
-
-void ConfigOptionRadio::index_changed(uint32_t index) {
-    callback(option_id, index);
-}
-
-ConfigOptionRadio::ConfigOptionRadio(Element *parent, uint32_t value, const std::vector<std::string> &options, std::function<void(const std::string &, uint32_t)> callback) : ConfigOptionElement(parent) {
-    this->callback = callback;
-
-    radio = get_current_context().create_element<Radio>(this);
-    radio->set_focus_callback([this](bool active) {
-        focus_callback(option_id, active);
-    });
-    radio->add_index_changed_callback([this](uint32_t index){ index_changed(index); });
-    for (std::string_view option : options) {
-        radio->add_option(option);
-    }
-
-    if (value < options.size()) {
-        radio->set_index(value);
-    }
-}
-
-// ConfigSubMenu
-
-void ConfigSubMenu::back_button_pressed() {
-    // Hide the config sub menu and show the config menu.
-    ContextId config_context = recompui::get_config_context_id();
-    ContextId sub_menu_context = recompui::get_config_sub_menu_context_id();
-
-    recompui::hide_context(sub_menu_context);
-    recompui::show_context(config_context, "");
-    recompui::focus_mod_configure_button();
-}
-
-void ConfigSubMenu::set_description_option_element(ConfigOptionElement *option, bool active) {
-    if (active) {
-        description_option_element = option;
-    }
-    else if (description_option_element == option) {
-        description_option_element = nullptr;
-    }
-
-    if (description_option_element == nullptr) {
-        description_label->set_text("");
-    }
-    else {
-        description_label->set_text(description_option_element->get_description());
-    }
-}
-
-ConfigSubMenu::ConfigSubMenu(Element *parent) : Element(parent) {
-    using namespace std::string_view_literals;
-
-    set_display(Display::Flex);
-    set_flex(1, 1, 100.0f, Unit::Percent);
-    set_flex_direction(FlexDirection::Column);
-    set_height(100.0f, Unit::Percent);
-
-    recompui::ContextId context = get_current_context();
-    header_container = context.create_element<Container>(this, FlexDirection::Row, JustifyContent::FlexStart);
-    header_container->set_flex_grow(0.0f);
-    header_container->set_align_items(AlignItems::Center);
-    header_container->set_padding(12.0f);
-    header_container->set_gap(24.0f);
-
-    {
-        back_button = context.create_element<Button>(header_container, "Back", ButtonStyle::Secondary);
-        back_button->add_pressed_callback([this](){ back_button_pressed(); });
-        title_label = context.create_element<Label>(header_container, "Title", LabelStyle::Large);
-    }
-
-    body_container = context.create_element<Container>(this, FlexDirection::Row, JustifyContent::SpaceEvenly);
-    body_container->set_padding(32.0f);
-    {
-        config_container = context.create_element<Container>(body_container, FlexDirection::Column, JustifyContent::Center);
-        config_container->set_display(Display::Block);
-        config_container->set_flex_basis(100.0f);
-        config_container->set_align_items(AlignItems::Center);
-        {
-            config_scroll_container = context.create_element<ScrollContainer>(config_container, ScrollDirection::Vertical);
-        }
-
-        description_label = context.create_element<Label>(body_container, "", LabelStyle::Small);
-        description_label->set_min_width(800.0f);
-        description_label->set_padding_left(16.0f);
-        description_label->set_padding_right(16.0f);
-    }
-
-    recompui::get_current_context().set_autofocus_element(back_button);
-}
-
-ConfigSubMenu::~ConfigSubMenu() {
-
-}
-
-void ConfigSubMenu::enter(std::string_view title) {
-    title_label->set_text(title);
-}
-
-void ConfigSubMenu::clear_options() {
-    config_scroll_container->clear_children();
-    config_option_elements.clear();
-    description_option_element = nullptr;
-}
-
-void ConfigSubMenu::add_option(ConfigOptionElement *option, std::string_view id, std::string_view name, std::string_view description) {
-    option->set_option_id(id);
-    option->set_name(name);
-    option->set_description(description);
-    option->set_hover_callback([this](ConfigOptionElement *option, bool active){ set_description_option_element(option, active); });
-    option->set_focus_callback([this, option](const std::string &id, bool active) { set_description_option_element(option, active); });
-    if (config_option_elements.empty()) {
-        back_button->set_nav(NavDirection::Down, option->get_focus_element());
-        option->set_nav(NavDirection::Up, back_button);
-    }
-    else {
-        config_option_elements.back()->set_nav(NavDirection::Down, option->get_focus_element());
-        option->set_nav(NavDirection::Up, config_option_elements.back()->get_focus_element());
-    }
-
-    config_option_elements.emplace_back(option);
-}
-
-void ConfigSubMenu::add_slider_option(std::string_view id, std::string_view name, std::string_view description, double value, double min, double max, double step, bool percent, std::function<void(const std::string &, double)> callback) {
-    ConfigOptionSlider *option_slider = get_current_context().create_element<ConfigOptionSlider>(config_scroll_container, value, min, max, step, percent, callback);
-    add_option(option_slider, id, name, description);
-}
-
-void ConfigSubMenu::add_text_option(std::string_view id, std::string_view name, std::string_view description, std::string_view value, std::function<void(const std::string &, const std::string &)> callback) {
-    ConfigOptionTextInput *option_text_input = get_current_context().create_element<ConfigOptionTextInput>(config_scroll_container, value, callback);
-    add_option(option_text_input, id, name, description);
-}
-
-void ConfigSubMenu::add_radio_option(std::string_view id, std::string_view name, std::string_view description, uint32_t value, const std::vector<std::string> &options, std::function<void(const std::string &, uint32_t)> callback) {
-    ConfigOptionRadio *option_radio = get_current_context().create_element<ConfigOptionRadio>(config_scroll_container, value, options, callback);
-    add_option(option_radio, id, name, description);
-}
-
-// ElementConfigSubMenu
-
-ElementConfigSubMenu::ElementConfigSubMenu(const Rml::String &tag) : Rml::Element(tag) {
-    SetProperty(Rml::PropertyId::Display, Rml::Style::Display::Flex);
-    SetProperty("width", "100%");
-    SetProperty("height", "100%");
-
-    recompui::Element this_compat(this);
-    recompui::ContextId context = get_current_context();
-    config_sub_menu = context.create_element<ConfigSubMenu>(&this_compat);
-}
-
-ElementConfigSubMenu::~ElementConfigSubMenu() {
-
-}
-
-void ElementConfigSubMenu::set_display(bool display) {
-    SetProperty(Rml::PropertyId::Display, display ? Rml::Style::Display::Block : Rml::Style::Display::None);
-}
-
-ConfigSubMenu *ElementConfigSubMenu::get_config_sub_menu_element() const {
-    return config_sub_menu;
-}
-
-}
diff --git a/src/ui/ui_config_sub_menu.h b/src/ui/ui_config_sub_menu.h
deleted file mode 100644
index 79278c9..0000000
--- a/src/ui/ui_config_sub_menu.h
+++ /dev/null
@@ -1,117 +0,0 @@
-#ifndef RECOMPUI_CONFIG_SUB_MENU_H
-#define RECOMPUI_CONFIG_SUB_MENU_H
-
-#include <span>
-
-#include "elements/ui_button.h"
-#include "elements/ui_container.h"
-#include "elements/ui_label.h"
-#include "elements/ui_radio.h"
-#include "elements/ui_scroll_container.h"
-#include "elements/ui_slider.h"
-#include "elements/ui_text_input.h"
-
-namespace recompui {
-
-class ConfigOptionElement : public Element {
-protected:
-    Label *name_label = nullptr;
-    std::string option_id;
-    std::string name;
-    std::string description;
-    std::function<void(ConfigOptionElement *, bool)> hover_callback = nullptr;
-    std::function<void(const std::string &, bool)> focus_callback = nullptr;
-
-    virtual void process_event(const Event &e) override;
-    std::string_view get_type_name() override { return "ConfigOptionElement"; }
-public:
-    ConfigOptionElement(Element *parent);
-    virtual ~ConfigOptionElement();
-    void set_option_id(std::string_view id);
-    void set_name(std::string_view name);
-    void set_description(std::string_view description);
-    void set_hover_callback(std::function<void(ConfigOptionElement *, bool)> callback);
-    void set_focus_callback(std::function<void(const std::string &, bool)> callback);
-    const std::string &get_description() const;
-    void set_nav_auto(NavDirection dir) override { get_focus_element()->set_nav_auto(dir); }
-    void set_nav_none(NavDirection dir) override { get_focus_element()->set_nav_none(dir); }
-    void set_nav(NavDirection dir, Element* element) override { get_focus_element()->set_nav(dir, element); }
-    void set_nav_manual(NavDirection dir, const std::string& target) override { get_focus_element()->set_nav_manual(dir, target); }
-    virtual Element* get_focus_element() { return this; }
-};
-
-class ConfigOptionSlider : public ConfigOptionElement {
-protected:
-    Slider *slider = nullptr;
-    std::function<void(const std::string &, double)> callback;
-
-    void slider_value_changed(double v);
-    std::string_view get_type_name() override { return "ConfigOptionSlider"; }
-public:
-    ConfigOptionSlider(Element *parent, double value, double min_value, double max_value, double step_value, bool percent, std::function<void(const std::string &, double)> callback);
-    Element* get_focus_element() override { return slider; }
-};
-
-class ConfigOptionTextInput : public ConfigOptionElement {
-protected:
-    TextInput *text_input = nullptr;
-    std::function<void(const std::string &, const std::string &)> callback;
-
-    void text_changed(const std::string &text);
-    std::string_view get_type_name() override { return "ConfigOptionTextInput"; }
-public:
-    ConfigOptionTextInput(Element *parent, std::string_view value, std::function<void(const std::string &, const std::string &)> callback);
-    Element* get_focus_element() override { return text_input; }
-};
-
-class ConfigOptionRadio : public ConfigOptionElement {
-protected:
-    Radio *radio = nullptr;
-    std::function<void(const std::string &, uint32_t)> callback;
-
-    void index_changed(uint32_t index);
-    std::string_view get_type_name() override { return "ConfigOptionRadio"; }
-public:
-    ConfigOptionRadio(Element *parent, uint32_t value, const std::vector<std::string> &options, std::function<void(const std::string &, uint32_t)> callback);
-    Element* get_focus_element() override { return radio; }    
-};
-
-class ConfigSubMenu : public Element {
-private:
-    Container *header_container = nullptr;
-    Button *back_button = nullptr;
-    Label *title_label = nullptr;
-    Container *body_container = nullptr;
-    Label *description_label = nullptr;
-    Container *config_container = nullptr;
-    ScrollContainer *config_scroll_container = nullptr;
-    std::vector<ConfigOptionElement *> config_option_elements;
-    ConfigOptionElement * description_option_element = nullptr;
-
-    void back_button_pressed();
-    void set_description_option_element(ConfigOptionElement *option, bool active);
-    void add_option(ConfigOptionElement *option, std::string_view id, std::string_view name, std::string_view description);
-protected:
-    std::string_view get_type_name() override { return "ConfigSubMenu"; }
-public:
-    ConfigSubMenu(Element *parent);
-    virtual ~ConfigSubMenu();
-    void enter(std::string_view title);
-    void clear_options();
-    void add_slider_option(std::string_view id, std::string_view name, std::string_view description, double value, double min, double max, double step, bool percent, std::function<void(const std::string &, double)> callback);
-    void add_text_option(std::string_view id, std::string_view name, std::string_view description, std::string_view value, std::function<void(const std::string &, const std::string &)> callback);
-    void add_radio_option(std::string_view id, std::string_view name, std::string_view description, uint32_t value, const std::vector<std::string> &options, std::function<void(const std::string &, uint32_t)> callback);
-};
-
-class ElementConfigSubMenu : public Rml::Element {
-public:
-    ElementConfigSubMenu(const Rml::String &tag);
-    virtual ~ElementConfigSubMenu();
-    void set_display(bool display);
-    ConfigSubMenu *get_config_sub_menu_element() const;
-private:
-    ConfigSubMenu *config_sub_menu;
-};
-
-}
-#endif
diff --git a/src/ui/ui_elements.cpp b/src/ui/ui_elements.cpp
deleted file mode 100644
index 740e981..0000000
--- a/src/ui/ui_elements.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-#include "ui_elements.h"
-
-struct RecompCustomElement {
-    Rml::String tag;
-    std::unique_ptr<Rml::ElementInstancer> instancer;
-};
-
-#define CUSTOM_ELEMENT(s, e) { s, std::make_unique< Rml::ElementInstancerGeneric< e > >() }
-
-static RecompCustomElement custom_elements[] = {
-    CUSTOM_ELEMENT("recomp-mod-menu", recompui::ElementModMenu),
-    CUSTOM_ELEMENT("recomp-config-sub-menu", recompui::ElementConfigSubMenu),
-};
-
-void recompui::register_custom_elements() {
-    for (auto& element_config : custom_elements) {
-        Rml::Factory::RegisterElementInstancer(element_config.tag, element_config.instancer.get());
-    }
-}
-
-Rml::ElementInstancer* recompui::get_custom_element_instancer(std::string tag) {
-    for (auto& element_config : custom_elements) {
-        if (tag == element_config.tag) {
-            return element_config.instancer.get();
-        }
-    }
-    return nullptr;
-}
-
-Rml::ElementPtr recompui::create_custom_element(Rml::Element* parent, std::string tag) {
-    auto instancer = recompui::get_custom_element_instancer(tag);
-    const Rml::XMLAttributes attributes = {};
-    if (Rml::ElementPtr element = instancer->InstanceElement(parent, tag, attributes))
-    {
-        element->SetInstancer(instancer);
-        element->SetAttributes(attributes);
-
-        return element;
-    }
-
-    return nullptr;
-}
diff --git a/src/ui/ui_elements.h b/src/ui/ui_elements.h
deleted file mode 100644
index 8bede5d..0000000
--- a/src/ui/ui_elements.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef RECOMPUI_ELEMENTS_H
-#define RECOMPUI_ELEMENTS_H
-
-#include "recomp_ui.h"
-#include "RmlUi/Core/Element.h"
-
-#include "ui_mod_menu.h"
-#include "ui_config_sub_menu.h"
-
-namespace recompui {
-    void register_custom_elements();
-
-    Rml::ElementInstancer* get_custom_element_instancer(std::string tag);
-}
-
-#endif
diff --git a/src/ui/ui_helpers.h b/src/ui/ui_helpers.h
deleted file mode 100644
index 654a24d..0000000
--- a/src/ui/ui_helpers.h
+++ /dev/null
@@ -1,154 +0,0 @@
-#ifndef __UI_HELPERS_H__
-#define __UI_HELPERS_H__
-
-#include "librecomp/helpers.hpp"
-#include "librecomp/addresses.hpp"
-
-#include "elements/ui_element.h"
-#include "elements/ui_types.h"
-#include "core/ui_context.h"
-#include "core/ui_resource.h"
-
-namespace recompui {
-
-constexpr ResourceId root_element_id{ 0xFFFFFFFE };
-
-inline ContextId get_context(uint8_t* rdram, recomp_context* ctx) {
-    uint32_t context_id = _arg<0, uint32_t>(rdram, ctx);
-    return ContextId{ .slot_id = context_id };
-}
-
-inline float arg_float2(uint8_t* rdram, recomp_context* ctx) {
-    union {
-        float f32;
-        uint32_t u32;
-    } val;
-
-    val.u32 = _arg<2, uint32_t>(rdram, ctx);
-    return val.f32;
-}
-
-inline float arg_float3(uint8_t* rdram, recomp_context* ctx) {
-    union {
-        float f32;
-        uint32_t u32;
-    } val;
-
-    val.u32 = _arg<3, uint32_t>(rdram, ctx);
-    return val.f32;
-}
-
-inline float arg_float4(uint8_t* rdram, recomp_context* ctx) {
-    union {
-        float f32;
-        uint32_t u32;
-    } val;
-
-    val.u32 = MEM_W(0x10, ctx->r29);
-    return val.f32;
-}
-
-inline float arg_float5(uint8_t* rdram, recomp_context* ctx) {
-    union {
-        float f32;
-        uint32_t u32;
-    } val;
-
-    val.u32 = MEM_W(0x14, ctx->r29);
-    return val.f32;
-}
-
-inline float arg_float6(uint8_t* rdram, recomp_context* ctx) {
-    union {
-        float f32;
-        uint32_t u32;
-    } val;
-
-    val.u32 = MEM_W(0x18, ctx->r29);
-    return val.f32;
-}
-
-template <int arg_index>
-ResourceId arg_resource_id(uint8_t* rdram, recomp_context* ctx) {
-    uint32_t slot_id = _arg<arg_index, uint32_t>(rdram, ctx);
-    
-    return ResourceId{ .slot_id = slot_id };
-}
-
-template <int arg_index>
-Element* arg_element(uint8_t* rdram, recomp_context* ctx, ContextId ui_context) {
-    ResourceId resource = arg_resource_id<arg_index>(rdram, ctx);
-
-    if (resource == ResourceId::null()) {
-        return nullptr;
-    }
-    else if (resource == root_element_id) {
-        return ui_context.get_root_element();
-    }
-
-    return resource.as_element();
-}
-
-template <int arg_index>
-Style* arg_style(uint8_t* rdram, recomp_context* ctx) {
-    ResourceId resource = arg_resource_id<arg_index>(rdram, ctx);
-
-    if (resource == ResourceId::null()) {
-        return nullptr;
-    }
-    else if (resource == root_element_id) {
-        ContextId ui_context = recompui::get_current_context();
-        return ui_context.get_root_element();
-    }
-
-    return *resource;
-}
-
-template <int arg_index>
-Color arg_color(uint8_t* rdram, recomp_context* ctx) {
-    PTR(u8) color_arg = _arg<arg_index, PTR(u8)>(rdram, ctx);
-
-    Color ret{};
-
-    ret.r = MEM_B(0, color_arg);
-    ret.g = MEM_B(1, color_arg);
-    ret.b = MEM_B(2, color_arg);
-    ret.a = MEM_B(3, color_arg);
-
-    return ret;
-}
-
-inline void return_resource(recomp_context* ctx, ResourceId resource) {
-    _return<uint32_t>(ctx, resource.slot_id);
-}
-
-inline void return_string(uint8_t* rdram, recomp_context* ctx, const std::string& ret) {
-    gpr addr = (reinterpret_cast<uint8_t*>(recomp::alloc(rdram, ret.size() + 1)) - rdram) + 0xFFFFFFFF80000000ULL;
-
-    for (size_t i = 0; i < ret.size(); i++) {
-        MEM_B(i, addr) = ret[i];
-    }
-    MEM_B(ret.size(), addr) = '\x00';
-    
-    _return<PTR(char)>(ctx, addr);
-}
-
-inline std::string decode_string(uint8_t* rdram, PTR(char) str) {
-    // Get the length of the byteswapped string.
-    size_t len = 0;
-    while (MEM_B(str, len) != 0x00) {
-        len++;
-    }
-
-    std::string ret{};
-    ret.reserve(len + 1);
-
-    for (size_t i = 0; i < len; i++) {
-        ret += (char)MEM_B(str, i);
-    }
-
-    return ret;
-}
-}
-
-#endif
\ No newline at end of file
diff --git a/src/ui/ui_launcher.cpp b/src/ui/ui_launcher.cpp
deleted file mode 100644
index 67149c1..0000000
--- a/src/ui/ui_launcher.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-#include "recomp_ui.h"
-#include "zelda_config.h"
-#include "zelda_support.h"
-#include "librecomp/game.hpp"
-#include "ultramodern/ultramodern.hpp"
-#include "RmlUi/Core.h"
-#include "nfd.h"
-#include <filesystem>
-
-static std::string version_string;
-
-Rml::DataModelHandle model_handle;
-bool mm_rom_valid = false;
-
-extern std::vector<recomp::GameEntry> supported_games;
-
-void select_rom() {
-    nfdnchar_t* native_path = nullptr;
-    zelda64::open_file_dialog([](bool success, const std::filesystem::path& path) {
-        if (success) {
-            recomp::RomValidationError rom_error = recomp::select_rom(path, supported_games[0].game_id);
-            switch (rom_error) {
-                case recomp::RomValidationError::Good:
-                    mm_rom_valid = true;
-                    model_handle.DirtyVariable("mm_rom_valid");
-                    break;
-                case recomp::RomValidationError::FailedToOpen:
-                    recompui::message_box("Failed to open ROM file.");
-                    break;
-                case recomp::RomValidationError::NotARom:
-                    recompui::message_box("This is not a valid ROM file.");
-                    break;
-                case recomp::RomValidationError::IncorrectRom:
-                    recompui::message_box("This ROM is not the correct game.");
-                    break;
-                case recomp::RomValidationError::NotYet:
-                    recompui::message_box("This game isn't supported yet.");
-                    break;
-                case recomp::RomValidationError::IncorrectVersion:
-                    recompui::message_box(
-                            "This ROM is the correct game, but the wrong version.\nThis project requires the NTSC-U N64 version of the game.");
-                    break;
-                case recomp::RomValidationError::OtherError:
-                    recompui::message_box("An unknown error has occurred.");
-                    break;
-            }
-        }
-    });
-}
-
-recompui::ContextId launcher_context;
-
-recompui::ContextId recompui::get_launcher_context_id() {
-	return launcher_context;
-}
-
-class LauncherMenu : public recompui::MenuController {
-public:
-    LauncherMenu() {
-        mm_rom_valid = recomp::is_rom_valid(supported_games[0].game_id);
-    }
-    ~LauncherMenu() override {
-
-    }
-    void load_document() override {
-		launcher_context = recompui::create_context(zelda64::get_asset_path("launcher.rml"));
-    }
-    void register_events(recompui::UiEventListenerInstancer& listener) override {
-        recompui::register_event(listener, "select_rom",
-            [](const std::string& param, Rml::Event& event) {
-                select_rom();
-            }
-        );
-        recompui::register_event(listener, "rom_selected",
-            [](const std::string& param, Rml::Event& event) {
-                mm_rom_valid = true;
-                model_handle.DirtyVariable("mm_rom_valid");
-            }
-        );
-        recompui::register_event(listener, "start_game",
-            [](const std::string& param, Rml::Event& event) {
-                recomp::start_game(supported_games[0].game_id);
-                recompui::hide_all_contexts();
-            }
-        );
-        recompui::register_event(listener, "open_controls",
-            [](const std::string& param, Rml::Event& event) {
-                recompui::set_config_tab(recompui::ConfigTab::Controls);
-                recompui::hide_all_contexts();
-                recompui::show_context(recompui::get_config_context_id(), "");
-            }
-        );
-        recompui::register_event(listener, "open_settings",
-            [](const std::string& param, Rml::Event& event) {
-                recompui::set_config_tab(recompui::ConfigTab::General);
-                recompui::hide_all_contexts();
-                recompui::show_context(recompui::get_config_context_id(), "");
-            }
-        );
-        recompui::register_event(listener, "open_mods",
-            [](const std::string &param, Rml::Event &event) {
-                recompui::set_config_tab(recompui::ConfigTab::Mods);
-                recompui::hide_all_contexts();
-                recompui::show_context(recompui::get_config_context_id(), "");
-            }
-        );
-        recompui::register_event(listener, "exit_game",
-            [](const std::string& param, Rml::Event& event) {
-                ultramodern::quit();
-            }
-        );
-    }
-    void make_bindings(Rml::Context* context) override {
-        Rml::DataModelConstructor constructor = context->CreateDataModel("launcher_model");
-
-        constructor.Bind("mm_rom_valid", &mm_rom_valid);
-
-        version_string = recomp::get_project_version().to_string();
-        constructor.Bind("version_number", &version_string);
-
-        model_handle = constructor.GetModelHandle();
-    }
-};
-
-std::unique_ptr<recompui::MenuController> recompui::create_launcher_menu() {
-    return std::make_unique<LauncherMenu>();
-}
diff --git a/src/ui/ui_mod_details_panel.cpp b/src/ui/ui_mod_details_panel.cpp
deleted file mode 100644
index 9606ca3..0000000
--- a/src/ui/ui_mod_details_panel.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-#include "ui_mod_details_panel.h"
-
-#include "librecomp/mods.hpp"
-
-namespace recompui {
-
-extern const std::string mod_tab_id;
-
-ModDetailsPanel::ModDetailsPanel(Element *parent) : Element(parent) {
-    set_flex(1.0f, 1.0f, 200.0f);
-    set_height(100.0f, Unit::Percent);
-    set_display(Display::Flex);
-    set_flex_direction(FlexDirection::Column);
-    set_background_color(Color{ 190, 184, 219, 25 });
-
-    ContextId context = get_current_context();
-
-    header_container = context.create_element<Container>(this, FlexDirection::Row, JustifyContent::FlexStart);
-    header_container->set_flex(0.0f, 0.0f);
-    header_container->set_padding(16.0f);
-    header_container->set_gap(16.0f);
-    header_container->set_background_color(Color{ 0, 0, 0, 89 });
-    header_container->set_border_bottom_width(1.1f);
-    header_container->set_border_bottom_color(Color{ 255, 255, 255, 25 });
-    {
-        thumbnail_container = context.create_element<Container>(header_container, FlexDirection::Column, JustifyContent::SpaceEvenly);
-        thumbnail_container->set_flex(0.0f, 0.0f);
-        {
-            thumbnail_image = context.create_element<Image>(thumbnail_container, "");
-            thumbnail_image->set_width(100.0f);
-            thumbnail_image->set_height(100.0f);
-            thumbnail_image->set_background_color(Color{ 190, 184, 219, 25 });
-        }
-
-        header_details_container = context.create_element<Container>(header_container, FlexDirection::Column, JustifyContent::SpaceEvenly);
-        header_details_container->set_flex(1.0f, 1.0f);
-        header_details_container->set_flex_basis(100.0f, Unit::Percent);
-        header_details_container->set_text_align(TextAlign::Left);
-        {
-            title_label = context.create_element<Label>(header_details_container, LabelStyle::Large);
-            version_label = context.create_element<Label>(header_details_container, LabelStyle::Normal);
-        }
-    }
-
-    body_container = context.create_element<ScrollContainer>(this, ScrollDirection::Vertical);
-    body_container->set_text_align(TextAlign::Left);
-    body_container->set_padding(16.0f);
-    {
-        authors_label = context.create_element<Label>(body_container, LabelStyle::Normal);
-        authors_label->set_margin_bottom(16.0f);
-        description_label = context.create_element<Label>(body_container, LabelStyle::Normal);
-    }
-    
-    buttons_container = context.create_element<Container>(this, FlexDirection::Row, JustifyContent::SpaceAround);
-    buttons_container->set_flex(0.0f, 0.0f);
-    buttons_container->set_padding(16.0f);
-    buttons_container->set_justify_content(JustifyContent::SpaceBetween);
-    buttons_container->set_border_top_width(1.1f);
-    buttons_container->set_border_top_color(Color{ 255, 255, 255, 25 });
-    buttons_container->set_background_color(Color{ 0, 0, 0, 89 });
-    {
-        enable_container = context.create_element<Container>(buttons_container, FlexDirection::Row, JustifyContent::FlexStart);
-        enable_container->set_align_items(AlignItems::Center);
-        enable_container->set_gap(16.0f);
-        {
-            enable_toggle = context.create_element<Toggle>(enable_container);
-            enable_toggle->add_checked_callback([this](bool checked){ enable_toggle_checked(checked); });
-            enable_toggle->set_nav_manual(NavDirection::Up, mod_tab_id);
-
-            enable_label = context.create_element<Label>(enable_container, "A currently enabled mod requires this mod", LabelStyle::Annotation);
-        }
-
-        configure_button = context.create_element<Button>(buttons_container, "Configure", recompui::ButtonStyle::Secondary);
-        configure_button->add_pressed_callback([this](){ configure_button_pressed(); });
-        configure_button->set_nav_manual(NavDirection::Up, mod_tab_id);
-    }
-    clear_mod_navigation();
-}
-
-ModDetailsPanel::~ModDetailsPanel() {
-}
-
-void ModDetailsPanel::disable_toggle() {
-    enable_toggle->set_enabled(false);
-}
-
-void ModDetailsPanel::set_mod_details(const recomp::mods::ModDetails& details, const std::string &thumbnail, bool toggle_checked, bool toggle_enabled, bool toggle_label_visible, bool configure_enabled) {
-    cur_details = details;
-
-    thumbnail_image->set_src(thumbnail);
-
-    title_label->set_text(cur_details.display_name);
-    version_label->set_text(cur_details.version.to_string());
-
-    std::string authors_str = "Authors:";
-    bool first = true;
-    for (const std::string& author : details.authors) {
-        authors_str += (first ? " " : ", ") + author;
-        first = false;
-    }
-
-    authors_label->set_text(authors_str);
-    description_label->set_text(cur_details.description);
-    enable_toggle->set_checked(toggle_checked);
-    enable_toggle->set_enabled(toggle_enabled);
-    configure_button->set_enabled(configure_enabled);
-    enable_label->set_display(toggle_label_visible ? Display::Block : Display::None);
-
-    if (configure_enabled) {
-        enable_toggle->set_nav(NavDirection::Right, configure_button);
-    }
-    else {
-        enable_toggle->set_nav_none(NavDirection::Right);
-    }
-}
-
-void ModDetailsPanel::set_mod_toggled_callback(std::function<void(bool)> callback) {
-    mod_toggled_callback = callback;
-}
-
-void ModDetailsPanel::set_mod_configure_pressed_callback(std::function<void()> callback) {
-    mod_configure_pressed_callback = callback;
-}
-
-void ModDetailsPanel::setup_mod_navigation(Element* nav_target) {
-    enable_toggle->set_nav(NavDirection::Left, nav_target);
-
-    if (enable_toggle->is_enabled()) {
-        configure_button->set_nav(NavDirection::Left, enable_toggle);
-    }
-    else {
-        configure_button->set_nav(NavDirection::Left, nav_target);
-    }
-}
-
-void ModDetailsPanel::clear_mod_navigation() {
-    enable_toggle->set_nav_none(NavDirection::Left);
-    configure_button->set_nav_none(NavDirection::Left);
-}
-
-void ModDetailsPanel::enable_toggle_checked(bool checked) {
-    if (mod_toggled_callback != nullptr) {
-        mod_toggled_callback(checked);
-    }
-}
-
-void ModDetailsPanel::configure_button_pressed() {
-    if (mod_configure_pressed_callback != nullptr) {
-        mod_configure_pressed_callback();
-    }
-}
-
-} // namespace recompui
diff --git a/src/ui/ui_mod_details_panel.h b/src/ui/ui_mod_details_panel.h
deleted file mode 100644
index 39e5874..0000000
--- a/src/ui/ui_mod_details_panel.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef RECOMPUI_ELEMENT_MOD_DETAILS_PANEL_H
-#define RECOMPUI_ELEMENT_MOD_DETAILS_PANEL_H
-
-#include "librecomp/mods.hpp"
-#include "elements/ui_button.h"
-#include "elements/ui_container.h"
-#include "elements/ui_image.h"
-#include "elements/ui_label.h"
-#include "elements/ui_toggle.h"
-#include "elements/ui_scroll_container.h"
-
-namespace recompui {
-
-class ModDetailsPanel : public Element {
-public:
-    ModDetailsPanel(Element *parent);
-    virtual ~ModDetailsPanel();
-    void set_mod_details(const recomp::mods::ModDetails& details, const std::string &thumbnail, bool toggle_checked, bool toggle_enabled, bool toggle_label_visible, bool configure_enabled);
-    void set_mod_toggled_callback(std::function<void(bool)> callback);
-    void set_mod_configure_pressed_callback(std::function<void()> callback);
-    void setup_mod_navigation(Element* nav_target);
-    void clear_mod_navigation();
-    Toggle* get_enable_toggle() { return enable_toggle; }
-    Button* get_configure_button() { return configure_button; }
-    void disable_toggle();
-protected:
-    std::string_view get_type_name() override { return "ModDetailsPanel"; }
-private:
-    recomp::mods::ModDetails cur_details;
-    Container *thumbnail_container = nullptr;
-    Image *thumbnail_image = nullptr;
-    Container *header_container = nullptr;
-    Container *header_details_container = nullptr;
-    Label *title_label = nullptr;
-    Label *version_label = nullptr;
-    ScrollContainer *body_container = nullptr;
-    Label *description_label = nullptr;
-    Label *authors_label = nullptr;
-    Container *buttons_container = nullptr;
-    Container *enable_container = nullptr;
-    Toggle *enable_toggle = nullptr;
-    Label *enable_label = nullptr;
-    Button *configure_button = nullptr;
-    std::function<void(bool)> mod_toggled_callback = nullptr;
-    std::function<void()> mod_configure_pressed_callback = nullptr;
-
-    void enable_toggle_checked(bool checked);
-    void configure_button_pressed();
-};
-
-} // namespace recompui
-#endif
diff --git a/src/ui/ui_mod_installer.cpp b/src/ui/ui_mod_installer.cpp
deleted file mode 100644
index 013b7c8..0000000
--- a/src/ui/ui_mod_installer.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-#include "ui_mod_installer.h"
-
-#include "librecomp/mods.hpp"
-
-namespace recompui {
-    static const std::string ManifestFilename = "mod.json";
-    static const char *TextureDatabaseFilename = "rt64.json";
-    static const std::u8string OldExtension = u8".old";
-    static const std::u8string NewExtension = u8".new";
-
-    static bool is_dynamic_lib(const std::filesystem::path &file_path) {
-#if defined(_WIN32)
-        return file_path.extension() == ".dll";
-#elif defined(__linux__)
-        return file_path.extension() == ".so" || file_path.filename().string().find(".so.") != std::string::npos;
-#elif defined(__APPLE__)
-        return file_path.extension() == ".dylib";
-#else
-        static_assert(false, "Unimplemented for this platform.");
-#endif
-    }
-
-    size_t zip_write_func(void *opaque, mz_uint64 offset, const void *bytes, size_t count) {
-        std::ofstream &stream = *(std::ofstream *)(opaque);
-        stream.seekp(offset, std::ios::beg);
-        stream.write((const char *)(bytes), count);
-        return stream.bad() ? 0 : count;
-    }
-
-    void start_single_mod_installation(const std::filesystem::path &file_path, recomp::mods::ZipModFileHandle &file_handle, std::function<void(std::filesystem::path, size_t, size_t)> progress_callback, ModInstaller::Result &result) {
-        // Check for the existence of the manifest file.
-        std::filesystem::path mods_directory = recomp::mods::get_mods_directory();
-        std::filesystem::path target_path = mods_directory / file_path.filename();
-        std::filesystem::path target_write_path = target_path.u8string() + NewExtension;
-        ModInstaller::Installation installation;
-        bool exists = false;
-        std::vector<char> manifest_bytes = file_handle.read_file(ManifestFilename, exists);
-        if (exists) {
-            // Parse the manifest file to check for its validity.
-            std::string error;
-            recomp::mods::ModManifest manifest;
-            recomp::mods::ModOpenError open_error = parse_manifest(manifest, manifest_bytes, error);
-            exists = (open_error == recomp::mods::ModOpenError::Good);
-
-            if (exists) {
-                installation.mod_id = manifest.mod_id;
-                installation.display_name = manifest.display_name;
-                installation.mod_version = manifest.version;
-                installation.mod_file = target_path;
-            }
-        }
-        else if (file_path.extension() == ".rtz") {
-            // When it's an rtz file, check if the texture database file exists.
-            exists = mz_zip_reader_locate_file(file_handle.archive.get(), TextureDatabaseFilename, nullptr, 0) >= 0;
-
-            if (exists) {
-                installation.mod_id = std::string((const char *)(target_path.stem().u8string().c_str()));
-                installation.display_name = installation.mod_id;
-                installation.mod_version = recomp::Version{0, 0, 0, ""};
-                installation.mod_file = target_path;
-            }
-        }
-
-        std::error_code ec;
-        if (exists) {
-            std::filesystem::copy(file_path, target_write_path, ec);
-            if (ec) {
-                result.error_messages.emplace_back("Unable to install " + file_path.filename().string() + " to mod directory.");
-                return;
-            }
-        }
-        else {
-            result.error_messages.emplace_back(file_path.string() + " is not a mod.");
-            std::filesystem::remove(target_write_path, ec);
-            return;
-        }
-
-        if (std::filesystem::exists(installation.mod_file, ec)) {
-            installation.needs_overwrite_confirmation = true;
-        }
-        if (!installation.needs_overwrite_confirmation) {
-            // This check isn't really needed as additional_files will be empty for a single mod installation,
-            // but it's good to have in case this logic ever changes.
-            for (const std::filesystem::path &path : installation.additional_files) {
-                if (std::filesystem::exists(path, ec)) {
-                    installation.needs_overwrite_confirmation = true;
-                    break;
-                }
-            }
-        }
-
-        result.pending_installations.emplace_back(installation);
-    }
-
-    void start_package_mod_installation(const std::filesystem::path &path, recomp::mods::ZipModFileHandle &file_handle, std::function<void(std::filesystem::path, size_t, size_t)> progress_callback, ModInstaller::Result &result) {
-        std::error_code ec;
-        char filename[1024];
-        std::filesystem::path mods_directory = recomp::mods::get_mods_directory();
-        mz_zip_archive *zip_archive = file_handle.archive.get();
-        mz_uint num_files = mz_zip_reader_get_num_files(file_handle.archive.get());
-        std::list<std::filesystem::path> dynamic_lib_files;
-        std::list<ModInstaller::Installation>::iterator first_nrm_iterator = result.pending_installations.end();
-        bool found_mod = false;
-        for (mz_uint i = 0; i < num_files; i++) {
-            mz_uint filename_length = mz_zip_reader_get_filename(zip_archive, i, filename, sizeof(filename));
-            if (filename_length == 0) {
-                continue;
-            }
-
-            std::filesystem::path target_path = mods_directory / std::u8string_view((const char8_t *)(filename));
-            if ((target_path.extension() == ".rtz") || (target_path.extension() == ".nrm")) {
-                found_mod = true;
-                ModInstaller::Installation installation;
-                std::filesystem::path target_write_path = target_path.u8string() + NewExtension;
-                std::ofstream output_stream(target_write_path, std::ios::binary);
-                if (!output_stream.is_open()) {
-                    result.error_messages.emplace_back("Unable to write to mod directory.");
-                    continue;
-                }
-
-                if (!mz_zip_reader_extract_to_callback(zip_archive, i, &zip_write_func, &output_stream, 0)) {
-                    output_stream.close();
-                    std::filesystem::remove(target_write_path, ec);
-                    result.error_messages.emplace_back("Failed to install " + path.filename().string() + " to mod directory.");
-                    continue;
-                }
-
-                output_stream.close();
-                if (output_stream.bad()) {
-                    std::filesystem::remove(target_write_path, ec);
-                    result.error_messages.emplace_back("Failed to install " + path.filename().string() + " to mod directory.");
-                    continue;
-                }
-
-                // Try to load the extracted file as a mod file handle.
-                recomp::mods::ModOpenError open_error;
-                std::unique_ptr<recomp::mods::ZipModFileHandle> extracted_file_handle = std::make_unique<recomp::mods::ZipModFileHandle>(target_write_path, open_error);
-                if (open_error != recomp::mods::ModOpenError::Good) {
-                    result.error_messages.emplace_back("Invalid mod (" + target_path.filename().string() + ") in " + path.filename().string() + ".");
-                    extracted_file_handle.reset();
-                    std::filesystem::remove(target_write_path, ec);
-                    continue;
-                }
-
-                // Check for the existence of the manifest file.
-                bool exists = false;
-                std::vector<char> manifest_bytes = extracted_file_handle->read_file(ManifestFilename, exists);
-                if (exists) {
-                    // Parse the manifest file to check for its validity.
-                    std::string error;
-                    recomp::mods::ModManifest manifest;
-                    open_error = parse_manifest(manifest, manifest_bytes, error);
-                    exists = (open_error == recomp::mods::ModOpenError::Good);
-
-                    if (exists) {
-                        installation.mod_id = manifest.mod_id;
-                        installation.display_name = manifest.display_name;
-                        installation.mod_version = manifest.version;
-                        installation.mod_file = target_path;
-                    }
-                }
-                else if (target_path.extension() == ".rtz") {
-                    // When it's an rtz file, check if the texture database file exists.
-                    exists = mz_zip_reader_locate_file(extracted_file_handle->archive.get(), TextureDatabaseFilename, nullptr, 0) >= 0;
-
-                    if (exists) {
-                        installation.mod_id = std::string((const char *)(target_path.stem().u8string().c_str()));
-                        installation.display_name = installation.mod_id;
-                        installation.mod_version = recomp::Version();
-                        installation.mod_file = target_path;
-                    }
-                }
-
-                if (!exists) {
-                    result.error_messages.emplace_back("Invalid mod (" + target_path.filename().string() + ") in " + path.filename().string() + ".");
-                    extracted_file_handle.reset();
-                    std::filesystem::remove(target_write_path, ec);
-                    continue;
-                }
-
-                if (std::filesystem::exists(installation.mod_file, ec)) {
-                    installation.needs_overwrite_confirmation = true;
-                }
-                if (!installation.needs_overwrite_confirmation) {
-                    // This check isn't really needed as additional_files will be empty at this point,
-                    // but it's good to have in case this logic ever changes.
-                    for (const std::filesystem::path &path : installation.additional_files) {
-                        if (std::filesystem::exists(path, ec)) {
-                            installation.needs_overwrite_confirmation = true;
-                            break;
-                        }
-                    }
-                }
-
-                result.pending_installations.emplace_back(installation);
-
-                // Store the first nrm found for any dynamic libraries that might be found.
-                if ((first_nrm_iterator == result.pending_installations.end()) && (target_path.extension() == ".nrm")) {
-                    first_nrm_iterator = std::prev(result.pending_installations.end());
-                }
-            }
-            
-            if (is_dynamic_lib(target_path)) {
-                std::filesystem::path target_write_path = target_path.u8string() + NewExtension;
-                std::ofstream output_stream(target_write_path, std::ios::binary);
-                if (!output_stream.is_open()) {
-                    result.error_messages.emplace_back("Failed to install " + path.filename().string() + " to mod directory.");
-                    continue;
-                }
-
-                if (!mz_zip_reader_extract_to_callback(zip_archive, i, &zip_write_func, &output_stream, 0)) {
-                    output_stream.close();
-                    std::filesystem::remove(target_write_path, ec);
-                    result.error_messages.emplace_back("Failed to install " + path.filename().string() + " to mod directory.");
-                    continue;
-                }
-
-                output_stream.close();
-                if (output_stream.bad()) {
-                    std::filesystem::remove(target_write_path, ec);
-                    result.error_messages.emplace_back("Failed to install " + path.filename().string() + " to mod directory.");
-                    continue;
-                }
-
-                dynamic_lib_files.emplace_back(target_path);
-            }
-        }
-
-        if (!dynamic_lib_files.empty()) {
-            if (first_nrm_iterator != result.pending_installations.end()) {
-                // Associate all these files to the first mod that is found.
-                for (const std::filesystem::path &path : dynamic_lib_files) {
-                    first_nrm_iterator->additional_files.emplace_back(path);
-
-                    // Run verification against for overwrite confirmations.
-                    if (std::filesystem::exists(path, ec)) {
-                        first_nrm_iterator->needs_overwrite_confirmation = true;
-                    }
-                }
-            }
-            else {
-                // These library files were not required by any mod, just delete them.
-                for (const std::filesystem::path &path : dynamic_lib_files) {
-                    std::filesystem::path new_path(path.u8string() + NewExtension);
-                    std::filesystem::remove(new_path, ec);
-                }
-            }
-        }
-
-        if (!found_mod) {
-            result.error_messages.emplace_back("No mods found in " + path.filename().string() + ".");
-        }
-    }
-
-    void remove_and_rename(std::vector<std::string>& error_messages, const std::filesystem::path& path) {
-        std::error_code ec;
-        std::filesystem::path old_path(path.u8string() + OldExtension);
-        std::filesystem::path new_path(path.u8string() + NewExtension);
-
-        // Rename the current path to a temporary old path, but only if the current path already exists.
-        if (std::filesystem::exists(path, ec)) {
-            std::filesystem::remove(old_path, ec);
-            std::filesystem::rename(path, old_path, ec);
-            if (ec) {
-                // If it fails, remove the new path.
-                std::filesystem::remove(new_path, ec);
-                error_messages.emplace_back("Unable to rename " + path.filename().string() + ".");
-                return;
-            }
-        }
-
-        // Rename the new path to the current path.
-        std::filesystem::rename(new_path, path, ec);
-        if (ec) {
-            // If it fails, remove the new path and also restore the temporary old path to the current path.
-            std::filesystem::remove(new_path, ec);
-            std::filesystem::rename(old_path, path, ec);
-            error_messages.emplace_back("Unable to rename " + path.filename().string() + ".");
-            return;
-        }
-
-        // If nothing failed, just remove the temporary old path.
-        std::filesystem::remove(old_path, ec);
-    };
-
-    void ModInstaller::start_mod_installation(const std::list<std::filesystem::path> &file_paths, std::function<void(std::filesystem::path, size_t, size_t)> progress_callback, Result &result) {
-        result = Result();
-
-        for (const std::filesystem::path &path : file_paths) {
-            if (is_dynamic_lib(path)) {
-                result.error_messages.emplace_back("The provided mod(s) must be installed without extracting the ZIP file(s). Please install the mod ZIP file(s) directly.");
-                return;
-            }
-        }
-
-        for (const std::filesystem::path &path : file_paths) {
-            recomp::mods::ModOpenError open_error;
-            recomp::mods::ZipModFileHandle file_handle(path, open_error);
-            if (open_error != recomp::mods::ModOpenError::Good) {
-                result.error_messages.emplace_back(path.filename().string() + " is not a valid zip or mod.");
-                continue;
-            }
-
-            // First we verify if the container itself isn't a mod already.
-            // TODO hook into the runtime's container registration to check the extension instead of using hardcoded values.
-            if ((path.extension() == ".rtz") || (path.extension() == ".nrm")) {
-                start_single_mod_installation(path, file_handle, progress_callback, result);
-            }
-            else {
-                // Scan the container for compatible mods instead. This is the case for packages made by users or how they're tipically uploaded to Thunderstore.
-                start_package_mod_installation(path, file_handle, progress_callback, result);
-            }
-        }
-    }
-
-    void ModInstaller::cancel_mod_installation(const Result &result, std::vector<std::string>& error_messages) {
-        error_messages.clear();
-
-        std::error_code ec;
-        // Delete all the files that were extracted for all mods.
-        for (const Installation &installation : result.pending_installations) {
-            std::filesystem::path new_path(installation.mod_file.u8string() + NewExtension);
-            std::filesystem::remove(new_path, ec);
-            for (const std::filesystem::path &path : installation.additional_files) {
-                std::filesystem::path new_path(path.u8string() + NewExtension);
-                std::filesystem::remove(new_path, ec);
-            }
-        }
-    }
-
-    void ModInstaller::finish_mod_installation(const Result &result, std::vector<std::string>& error_messages) {
-        error_messages.clear();
-
-        std::error_code ec;
-        for (const Installation &installation : result.pending_installations) {
-            // Overwrite the mod files.
-            remove_and_rename(error_messages, installation.mod_file);
-            for (const std::filesystem::path &path : installation.additional_files) {
-                remove_and_rename(error_messages, path);
-            }
-        }
-    }
-};
\ No newline at end of file
diff --git a/src/ui/ui_mod_installer.h b/src/ui/ui_mod_installer.h
deleted file mode 100644
index ea463b9..0000000
--- a/src/ui/ui_mod_installer.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef RECOMPUI_MOD_INSTALLER_H
-#define RECOMPUI_MOD_INSTALLER_H
-
-#include <librecomp/game.hpp>
-
-#include <unordered_set>
-#include <vector>
-#include <string>
-#include <list>
-
-namespace recompui {
-    struct ModInstaller {
-        struct Installation {
-            std::string mod_id;
-            std::string display_name;
-            recomp::Version mod_version;
-            std::filesystem::path mod_file;
-            std::list<std::filesystem::path> additional_files;
-            bool needs_overwrite_confirmation = false;
-        };
-
-        struct Confirmation {
-            std::string old_display_name;
-            std::string new_display_name;
-            std::string old_mod_id;
-            std::string new_mod_id;
-            recomp::Version old_version;
-            recomp::Version new_version;
-        };
-
-        struct Result {
-            std::list<std::string> error_messages;
-            std::list<Installation> pending_installations;
-        };
-
-        static void start_mod_installation(const std::list<std::filesystem::path> &file_paths, std::function<void(std::filesystem::path, size_t, size_t)> progress_callback, Result &result);
-        static void cancel_mod_installation(const Result& result, std::vector<std::string>& errors);
-        static void finish_mod_installation(const Result &result, std::vector<std::string>& errors);
-    };
-};
-
-#endif
\ No newline at end of file
diff --git a/src/ui/ui_mod_menu.cpp b/src/ui/ui_mod_menu.cpp
deleted file mode 100644
index 86068b4..0000000
--- a/src/ui/ui_mod_menu.cpp
+++ /dev/null
@@ -1,799 +0,0 @@
-#include "ui_mod_menu.h"
-#include "ui_utils.h"
-#include "recomp_ui.h"
-#include "zelda_support.h"
-#include "zelda_render.h"
-
-#include "librecomp/mods.hpp"
-
-#include <string>
-
-#ifdef WIN32
-#include <shellapi.h>
-#endif
-
-// TODO:
-// - Set up navigation.
-// - Add hover and active state for mod entries.
-
-namespace recompui {
-
-static std::string generate_thumbnail_src_for_mod(const std::string &mod_id) {
-    return "?/mods/" + mod_id + "/thumb";
-}
-
-static bool is_mod_enabled_or_auto(const std::string &mod_id) {
-    return recomp::mods::is_mod_enabled(mod_id) || recomp::mods::is_mod_auto_enabled(mod_id);
-}
-
-// ModEntryView
-#define COL_TEXT_DEFAULT 242, 242, 242
-#define COL_TEXT_DIM 204, 204, 204
-#define COL_SECONDARY 23, 214, 232
-constexpr float modEntryHeight = 120.0f;
-constexpr float modEntryPadding = 4.0f;
-
-extern const std::string mod_tab_id;
-const std::string mod_tab_id = "#tab_mods";
-
-ModEntryView::ModEntryView(Element *parent) : Element(parent, Events(EventType::Update)) {
-    ContextId context = get_current_context();
-
-    set_display(Display::Flex);
-    set_flex_direction(FlexDirection::Row);
-    set_width(100.0f, Unit::Percent);
-    set_height_auto();
-    set_padding(modEntryPadding);
-    set_border_left_width(2.0f);
-    set_border_color(Color{ COL_TEXT_DEFAULT, 12 });
-    set_background_color(Color{ COL_TEXT_DEFAULT, 12 });
-    set_cursor(Cursor::Pointer);
-    set_color(Color{ COL_TEXT_DEFAULT, 255 });
-
-    checked_style.set_border_color(Color{ COL_TEXT_DEFAULT, 160 });
-    checked_style.set_color(Color{ 255, 255, 255, 255 });
-    checked_style.set_background_color(Color{ 26, 24, 32, 255 });
-    hover_style.set_border_color(Color{ COL_TEXT_DEFAULT, 64 });
-    checked_hover_style.set_border_color(Color{ COL_TEXT_DEFAULT, 255 });
-    pulsing_style.set_border_color(Color{ 23, 214, 232, 244 });
-
-    {
-        thumbnail_image = context.create_element<Image>(this, "");
-        thumbnail_image->set_width(modEntryHeight);
-        thumbnail_image->set_height(modEntryHeight);
-        thumbnail_image->set_min_width(modEntryHeight);
-        thumbnail_image->set_min_height(modEntryHeight);
-        thumbnail_image->set_background_color(Color{ 190, 184, 219, 25 });
-
-
-        body_container = context.create_element<Element>(this);
-        body_container->set_width_auto();
-        body_container->set_margin_left(16.0f);
-        body_container->set_padding_top(8.0f);
-        body_container->set_padding_bottom(8.0f);
-        body_container->set_max_height(modEntryHeight);
-        body_container->set_overflow_y(Overflow::Hidden);
-
-        {
-            name_label = context.create_element<Label>(body_container, LabelStyle::Normal);
-            description_label = context.create_element<Label>(body_container, LabelStyle::Small);
-            description_label->set_margin_top(4.0f);
-            description_label->set_color(Color{ COL_TEXT_DIM, 255 });
-        } // body_container
-    } // this
-
-    add_style(&checked_style, checked_state);
-    add_style(&hover_style, hover_state);
-    add_style(&checked_hover_style, { checked_state, hover_state });
-    add_style(&pulsing_style, { focus_state });
-}
-
-ModEntryView::~ModEntryView() {
-
-}
-
-void ModEntryView::set_mod_details(const recomp::mods::ModDetails &details) {
-    name_label->set_text(details.display_name);
-    description_label->set_text(details.short_description);
-}
-
-void ModEntryView::set_mod_thumbnail(const std::string &thumbnail) {
-    thumbnail_image->set_src(thumbnail);
-}
-
-void ModEntryView::set_mod_enabled(bool enabled) {
-    set_opacity(enabled ? 1.0f : 0.5f);
-}
-
-void ModEntryView::set_selected(bool selected) {
-    set_style_enabled(checked_state, selected);
-}
-
-void ModEntryView::set_focused(bool focused) {
-    set_style_enabled(focus_state, focused);
-}
-
-void ModEntryView::process_event(const Event &e) {
-    switch (e.type) {
-    case EventType::Update:
-        if (is_style_enabled(focus_state)) {
-            pulsing_style.set_color(recompui::get_pulse_color(750));
-            apply_styles();
-            queue_update();
-        }
-
-        break;
-    default:
-        break;
-    }
-}
-
-// ModEntryButton
-
-ModEntryButton::ModEntryButton(Element *parent, uint32_t mod_index) : Element(parent, Events(EventType::Click, EventType::Hover, EventType::Focus, EventType::Drag)) {
-    this->mod_index = mod_index;
-
-    set_drag(Drag::Drag);
-    enable_focus();
-
-    ContextId context = get_current_context();
-    view = context.create_element<ModEntryView>(this);
-}
-
-ModEntryButton::~ModEntryButton() {
-
-}
-
-void ModEntryButton::set_mod_selected_callback(std::function<void(uint32_t)> callback) {
-    selected_callback = callback;
-}
-
-void ModEntryButton::set_mod_drag_callback(std::function<void(uint32_t, EventDrag)> callback) {
-    drag_callback = callback;
-}
-
-void ModEntryButton::set_mod_details(const recomp::mods::ModDetails &details) {
-    view->set_mod_details(details);
-}
-
-void ModEntryButton::set_mod_thumbnail(const std::string &thumbnail) {
-    view->set_mod_thumbnail(thumbnail);
-}
-
-void ModEntryButton::set_mod_enabled(bool enabled) {
-    view->set_mod_enabled(enabled);
-}
-
-void ModEntryButton::set_selected(bool selected) {
-    view->set_selected(selected);
-}
-
-void ModEntryButton::set_focused(bool focused) {
-    view->set_focused(focused);
-    view->queue_update();
-}
-
-void ModEntryButton::process_event(const Event& e) {
-    switch (e.type) {
-    case EventType::Focus:
-        selected_callback(mod_index);
-        set_focused(std::get<EventFocus>(e.variant).active);
-        break;
-    case EventType::Hover:
-        view->set_style_enabled(hover_state, std::get<EventHover>(e.variant).active);
-        break;
-    case EventType::Drag:
-        drag_callback(mod_index, std::get<EventDrag>(e.variant));
-        break;
-    default:
-        break;
-    }
-}
-
-// ModEntrySpacer
-
-void ModEntrySpacer::check_height_distance() {
-    constexpr float tolerance = 0.01f;
-    if (abs(target_height - height) < tolerance) {
-        height = target_height;
-        set_height(height, Unit::Dp);
-    }
-    else {
-        queue_update();
-    }
-}
-
-void ModEntrySpacer::process_event(const Event &e) {
-    switch (e.type) {
-    case EventType::Update: {
-        std::chrono::high_resolution_clock::duration now = ultramodern::time_since_start();
-        float delta_time = std::max(std::chrono::duration<float>(now - last_time).count(), 0.0f);
-        constexpr float dp_speed = 1000.0f;
-        last_time = now;
-
-        if (target_height < height) {
-            height += std::max(-dp_speed * delta_time, target_height - height);
-        }
-        else {
-            height += std::min(dp_speed * delta_time, target_height - height);
-        }
-
-        set_height(height, Unit::Dp);
-        check_height_distance();
-        break;
-    }
-    default:
-        break;
-    }
-}
-
-ModEntrySpacer::ModEntrySpacer(Element *parent) : Element(parent) {
-    // Do nothing.
-}
-
-void ModEntrySpacer::set_target_height(float target_height, bool animate_to_target) {
-    this->target_height = target_height;
-
-    if (animate_to_target) {
-        last_time = ultramodern::time_since_start();
-        check_height_distance();
-    }
-    else {
-        height = target_height;
-        set_height(target_height, Unit::Dp);
-    }
-}
-
-// ModMenu
-
-void ModMenu::refresh_mods(bool scan_mods) {
-    for (const std::string &thumbnail : loaded_thumbnails) {
-        recompui::release_image(thumbnail);
-    }
-
-    if (scan_mods) {
-        recomp::mods::scan_mods();
-    }
-    mod_details = recomp::mods::get_all_mod_details(game_mod_id);
-    create_mod_list();
-}
-
-void ModMenu::open_mods_folder() {
-    std::filesystem::path mods_directory = recomp::mods::get_mods_directory();
-#if defined(WIN32)
-    std::wstring path_wstr = mods_directory.wstring();
-    ShellExecuteW(NULL, L"open", path_wstr.c_str(), NULL, NULL, SW_SHOWDEFAULT);
-#elif defined(__linux__)
-    std::string command = "xdg-open \"" + mods_directory.string() + "\" &";
-    std::system(command.c_str());
-#elif defined(__APPLE__)
-    std::string command = "open \"" + mods_directory.string() + "\"";
-    std::system(command.c_str());
-#else
-    static_assert(false, "Not implemented for this platform.");
-#endif
-}
-
-void ModMenu::open_install_dialog() {
-    zelda64::open_file_dialog_multiple([](bool success, const std::list<std::filesystem::path>& paths) {
-        if (success) {
-            ContextId old_context = recompui::try_close_current_context();
-
-            recompui::drop_files(paths);
-
-            if (old_context != ContextId::null()) {
-                old_context.open();
-            }
-        }
-    });
-}
-
-void ModMenu::mod_toggled(bool enabled) {
-    if (active_mod_index >= 0) {
-        recomp::mods::enable_mod(mod_details[active_mod_index].mod_id, enabled);
-        
-        // Refresh enabled status for all mods in case one of them got auto-enabled due to being a dependency.
-        for (size_t i = 0; i < mod_entry_buttons.size(); i++) {
-            mod_entry_buttons[i]->set_mod_enabled(is_mod_enabled_or_auto(mod_details[i].mod_id));
-        }
-    }
-}
-
-void ModMenu::mod_selected(uint32_t mod_index) {
-    if (active_mod_index >= 0) {
-        mod_entry_buttons[active_mod_index]->set_selected(false);
-    }
-
-    active_mod_index = mod_index;
-
-    if (active_mod_index >= 0) {
-        std::string thumbnail_src = generate_thumbnail_src_for_mod(mod_details[mod_index].mod_id);
-        const recomp::mods::ConfigSchema &config_schema = recomp::mods::get_mod_config_schema(mod_details[active_mod_index].mod_id);
-        bool toggle_checked = is_mod_enabled_or_auto(mod_details[mod_index].mod_id);
-        bool auto_enabled = recomp::mods::is_mod_auto_enabled(mod_details[mod_index].mod_id);
-        bool toggle_enabled = !auto_enabled && (mod_details[mod_index].runtime_toggleable || !ultramodern::is_game_started());
-        bool configure_enabled = !config_schema.options.empty();
-        mod_details_panel->set_mod_details(mod_details[mod_index], thumbnail_src, toggle_checked, toggle_enabled, auto_enabled, configure_enabled);
-        mod_entry_buttons[active_mod_index]->set_selected(true);
-
-        mod_details_panel->setup_mod_navigation(mod_entry_buttons[mod_index]);
-
-        // Navigation from the bottom bar.
-        Button *configure_button = mod_details_panel->get_configure_button();
-        Toggle *enable_toggle = mod_details_panel->get_enable_toggle();
-        if (configure_enabled) {
-            refresh_button->set_nav(NavDirection::Up, configure_button);
-            mods_folder_button->set_nav(NavDirection::Up, configure_button);
-        }
-        else if (toggle_enabled) {
-            refresh_button->set_nav(NavDirection::Up, enable_toggle);
-            mods_folder_button->set_nav(NavDirection::Up, enable_toggle);
-        }
-        else {
-            refresh_button->set_nav_manual(NavDirection::Up, mod_tab_id);
-            mods_folder_button->set_nav_manual(NavDirection::Up, mod_tab_id);
-        }
-
-        // Navigation from the mod list.
-        if (toggle_enabled) {
-            mod_entry_buttons[active_mod_index]->set_nav(NavDirection::Right, enable_toggle);
-        }
-        else if (configure_enabled) {
-            mod_entry_buttons[active_mod_index]->set_nav(NavDirection::Right, configure_button);
-        }
-        else {
-            mod_entry_buttons[active_mod_index]->set_nav_none(NavDirection::Right);
-        }
-    }
-}
-
-void ModMenu::mod_dragged(uint32_t mod_index, EventDrag drag) {
-    constexpr float spacer_height = modEntryHeight + modEntryPadding * 2.0f;
-
-    switch (drag.phase) {
-    case DragPhase::Start: {
-        for (size_t i = 0; i < mod_entry_buttons.size(); i++) {
-            mod_entry_middles[i] = mod_entry_buttons[i]->get_absolute_top() + mod_entry_buttons[i]->get_client_height() / 2.0f;
-        }
-
-        // When the drag phase starts, we make the floating mod details visible and store the relative coordinate of the
-        // mouse cursor. Instantly hide the real element and use a spacer in its place that will stay on the same size as
-        // long as the cursor is hovering over this slot.
-        float width = mod_entry_buttons[mod_index]->get_client_width();
-        float height = mod_entry_buttons[mod_index]->get_client_height();
-        float left = mod_entry_buttons[mod_index]->get_absolute_left() - get_absolute_left();
-        float top = mod_entry_buttons[mod_index]->get_absolute_top() - (height / 2.0f); // TODO: Figure out why this adjustment is even necessary.
-        mod_entry_buttons[mod_index]->set_display(Display::None);
-        mod_entry_buttons[mod_index]->set_focused(false);
-        mod_entry_floating_view->set_display(Display::Flex);
-        mod_entry_floating_view->set_mod_details(mod_details[mod_index]);
-        mod_entry_floating_view->set_mod_thumbnail(generate_thumbnail_src_for_mod(mod_details[mod_index].mod_id));
-        mod_entry_floating_view->set_mod_enabled(is_mod_enabled_or_auto(mod_details[mod_index].mod_id));
-        mod_entry_floating_view->set_left(left, Unit::Px);
-        mod_entry_floating_view->set_top(top, Unit::Px);
-        mod_entry_floating_view->set_width(width, Unit::Px);
-        mod_entry_floating_view->set_height(height, Unit::Px);
-        mod_drag_start_coordinates[0] = drag.x;
-        mod_drag_start_coordinates[1] = drag.y;
-        mod_drag_view_coordinates[0] = left;
-        mod_drag_view_coordinates[1] = top;
-        
-        mod_drag_target_index = mod_index;
-        mod_entry_spacers[mod_drag_target_index]->set_target_height(spacer_height, false);
-        break;
-    }
-    case DragPhase::Move: {
-        // Binary search for the drag area.
-        uint32_t low = 0;
-        uint32_t high = mod_entry_buttons.size();
-        while (low < high) {
-            uint32_t mid = low + (high - low) / 2;
-            if (drag.y < mod_entry_middles[mid]) {
-                high = mid;
-            }
-            else {
-                low = mid + 1;
-            }
-        }
-        
-        uint32_t new_index = low;
-        float delta_x = drag.x - mod_drag_start_coordinates[0];
-        float delta_y = drag.y - mod_drag_start_coordinates[1];
-        mod_entry_floating_view->set_left(mod_drag_view_coordinates[0] + delta_x, Unit::Px);
-        mod_entry_floating_view->set_top(mod_drag_view_coordinates[1] + delta_y, Unit::Px);
-        if (mod_drag_target_index != new_index) {
-            mod_entry_spacers[mod_drag_target_index]->set_target_height(0.0f, true);
-            mod_entry_spacers[new_index]->set_target_height(spacer_height, true);
-            mod_drag_target_index = new_index;
-        }
-
-        break;
-    }
-    case DragPhase::End: {
-        // Dragging has ended, hide the floating view.
-        mod_entry_buttons[mod_index]->set_display(Display::Block);
-        mod_entry_buttons[mod_index]->set_selected(false);
-        mod_entry_spacers[mod_drag_target_index]->set_target_height(0.0f, false);
-        mod_entry_floating_view->set_display(Display::None);
-
-        // Result needs a small substraction when dragging downwards.
-        if (mod_drag_target_index > mod_index) {
-            mod_drag_target_index--;
-        }
-
-        // Re-order the mods and update all the details on the menu.
-        recomp::mods::set_mod_index(game_mod_id, mod_details[mod_index].mod_id, mod_drag_target_index);
-        mod_details = recomp::mods::get_all_mod_details(game_mod_id);
-        for (size_t i = 0; i < mod_entry_buttons.size(); i++) {
-            mod_entry_buttons[i]->set_mod_details(mod_details[i]);
-            mod_entry_buttons[i]->set_mod_thumbnail(generate_thumbnail_src_for_mod(mod_details[i].mod_id));
-            mod_entry_buttons[i]->set_mod_enabled(is_mod_enabled_or_auto(mod_details[i].mod_id));
-        }
-
-        mod_entry_buttons[mod_drag_target_index]->set_selected(true);
-        active_mod_index = mod_drag_target_index;
-
-        break;
-    }
-    default:
-        break;
-    }
-}
-
-// TODO remove this once this is migrated to the new system.
-ContextId sub_menu_context;
-
-ContextId get_config_sub_menu_context_id() {
-    return sub_menu_context;
-}
-
-bool ModMenu::handle_special_config_options(const recomp::mods::ConfigOption& option, const recomp::mods::ConfigValueVariant& config_value) {
-    if (zelda64::renderer::is_texture_pack_enable_config_option(option, true)) {
-        const recomp::mods::ConfigOptionEnum &option_enum = std::get<recomp::mods::ConfigOptionEnum>(option.variant);
-
-        config_sub_menu->add_radio_option(option.id, option.name, option.description, std::get<uint32_t>(config_value), option_enum.options,
-            [this](const std::string &id, uint32_t value) {
-                mod_enum_option_changed(id, value);
-                mod_hd_textures_enabled_changed(value);
-            });
-
-        return true;
-    }
-
-    return false;
-}
-
-void ModMenu::mod_configure_requested() {
-    if (active_mod_index >= 0) {
-        // Record the context that was open when this function was called and close it.
-        ContextId prev_context = recompui::get_current_context();
-        prev_context.close();
-
-        // Open the sub menu context and set up the element.
-        sub_menu_context.open();
-        config_sub_menu->clear_options();
-
-        const recomp::mods::ConfigSchema &config_schema = recomp::mods::get_mod_config_schema(mod_details[active_mod_index].mod_id);
-        for (const recomp::mods::ConfigOption &option : config_schema.options) {
-            recomp::mods::ConfigValueVariant config_value = recomp::mods::get_mod_config_value(mod_details[active_mod_index].mod_id, option.id);
-            if (std::holds_alternative<std::monostate>(config_value)) {
-                continue;
-            }
-
-            if (handle_special_config_options(option, config_value)) {
-                continue;
-            }
-
-            switch (option.type) {
-            case recomp::mods::ConfigOptionType::Enum: {
-                const recomp::mods::ConfigOptionEnum &option_enum = std::get<recomp::mods::ConfigOptionEnum>(option.variant);
-                config_sub_menu->add_radio_option(option.id, option.name, option.description, std::get<uint32_t>(config_value), option_enum.options,
-                    [this](const std::string &id, uint32_t value){ mod_enum_option_changed(id, value); });
-                break;
-            }
-            case recomp::mods::ConfigOptionType::Number: {
-                const recomp::mods::ConfigOptionNumber &option_number = std::get<recomp::mods::ConfigOptionNumber>(option.variant);
-                config_sub_menu->add_slider_option(option.id, option.name, option.description, std::get<double>(config_value), option_number.min, option_number.max, option_number.step, option_number.percent,
-                    [this](const std::string &id, double value){ mod_number_option_changed(id, value); });
-                break;
-            }
-            case recomp::mods::ConfigOptionType::String: {
-                config_sub_menu->add_text_option(option.id, option.name, option.description, std::get<std::string>(config_value),
-                    [this](const std::string &id, const std::string &value){ mod_string_option_changed(id, value); });
-                break;
-            }
-            default:
-                assert(false && "Unknown config option type.");
-                break;
-            }
-        }
-
-        config_sub_menu->enter(mod_details[active_mod_index].display_name);
-        sub_menu_context.close();
-
-        // Reopen the context that was open when this function was called.
-        prev_context.open();
-        
-        // Hide the config menu and show the sub menu.
-        recompui::hide_context(recompui::get_config_context_id());
-        recompui::show_context(sub_menu_context, "");
-    }
-}
-
-void ModMenu::mod_enum_option_changed(const std::string &id, uint32_t value) {
-    if (active_mod_index >= 0) {
-        recomp::mods::set_mod_config_value(mod_details[active_mod_index].mod_id, id, value);
-    }
-}
-
-void ModMenu::mod_string_option_changed(const std::string &id, const std::string &value) {
-    if (active_mod_index >= 0) {
-        recomp::mods::set_mod_config_value(mod_details[active_mod_index].mod_id, id, value);
-    }
-}
-
-void ModMenu::mod_number_option_changed(const std::string &id, double value) {
-    if (active_mod_index >= 0) {
-        recomp::mods::set_mod_config_value(mod_details[active_mod_index].mod_id, id, value);
-    }
-}
-
-void ModMenu::mod_hd_textures_enabled_changed(uint32_t value) {
-    if (active_mod_index >= 0) {
-        if (value) {
-            zelda64::renderer::secondary_enable_texture_pack(mod_details[active_mod_index].mod_id);
-        }
-        else {
-            zelda64::renderer::secondary_disable_texture_pack(mod_details[active_mod_index].mod_id);
-        }
-    }
-}
-
-void ModMenu::create_mod_list() {
-    ContextId context = get_current_context();
-    
-    // Clear the contents of the list scroll.
-    list_scroll_container->clear_children();
-    mod_entry_buttons.clear();
-    mod_entry_spacers.clear();
-
-    Toggle* enable_toggle = mod_details_panel->get_enable_toggle();
-
-    // Create the child elements for the list scroll.
-    for (size_t mod_index = 0; mod_index < mod_details.size(); mod_index++) {
-        const std::vector<char> &thumbnail = recomp::mods::get_mod_thumbnail(mod_details[mod_index].mod_id);
-        std::string thumbnail_name = generate_thumbnail_src_for_mod(mod_details[mod_index].mod_id);
-        if (!thumbnail.empty()) {
-            recompui::queue_image_from_bytes_file(thumbnail_name, thumbnail);
-            loaded_thumbnails.emplace(thumbnail_name);
-        }
-
-        ModEntrySpacer *spacer = context.create_element<ModEntrySpacer>(list_scroll_container);
-        mod_entry_spacers.emplace_back(spacer);
-
-        ModEntryButton *mod_entry = context.create_element<ModEntryButton>(list_scroll_container, mod_index);
-        mod_entry->set_mod_selected_callback([this](uint32_t mod_index){ mod_selected(mod_index); });
-        mod_entry->set_mod_drag_callback([this](uint32_t mod_index, recompui::EventDrag drag){ mod_dragged(mod_index, drag); });
-        mod_entry->set_mod_details(mod_details[mod_index]);
-        mod_entry->set_mod_thumbnail(thumbnail_name);
-        mod_entry->set_mod_enabled(is_mod_enabled_or_auto(mod_details[mod_index].mod_id));
-        mod_entry_buttons.emplace_back(mod_entry);
-    }
-
-    if (!mod_entry_buttons.empty()) {
-        mod_entry_buttons.front()->set_nav_manual(NavDirection::Up, mod_tab_id);
-        mod_entry_buttons.back()->set_nav(NavDirection::Down, install_mods_button);
-        install_mods_button->set_nav(NavDirection::Up, mod_entry_buttons.back());
-    }
-    else {
-        install_mods_button->set_nav_manual(NavDirection::Up, mod_tab_id);
-    }
-
-    Rml::ElementTabSet* tabset = recompui::get_config_tabset();
-    if (tabset && tabset->GetActiveTab() == recompui::config_tab_to_index(ConfigTab::Mods)) {
-        recompui::set_config_tabset_mod_nav();
-    }       
-
-    // Add one extra spacer at the bottom.
-    ModEntrySpacer *spacer = context.create_element<ModEntrySpacer>(list_scroll_container);
-    mod_entry_spacers.emplace_back(spacer);
-
-    mod_entry_middles.resize(mod_entry_buttons.size());
-
-    bool mods_available = !mod_details.empty();
-    body_container->set_display(mods_available ? Display::Flex : Display::None);
-    body_empty_container->set_display(mods_available ? Display::None : Display::Flex);
-    if (mods_available) {
-        mod_selected(0);
-    }
-}
-
-void ModMenu::process_event(const Event &e) {
-    if (e.type == EventType::Update) {
-        if (mods_dirty) {
-            refresh_mods(mod_scan_queued);
-            mods_dirty = false;
-            mod_scan_queued = false;
-        }
-        if (ultramodern::is_game_started()) {
-            install_mods_button->set_enabled(false);
-            refresh_button->set_enabled(false);
-        }
-        if (active_mod_index != -1) {        
-            bool auto_enabled = recomp::mods::is_mod_auto_enabled(mod_details[active_mod_index].mod_id);
-            bool toggle_enabled = !auto_enabled && (mod_details[active_mod_index].runtime_toggleable || !ultramodern::is_game_started());
-            if (!toggle_enabled) {
-                mod_details_panel->disable_toggle();
-            }
-        }
-    }
-}
-
-ModMenu::ModMenu(Element *parent) : Element(parent) {
-    game_mod_id = "mm";
-
-    ContextId context = get_current_context();
-
-    set_display(Display::Flex);
-    set_flex(1.0f, 1.0f, 100.0f);
-    set_flex_direction(FlexDirection::Column);
-    set_align_items(AlignItems::Center);
-    set_justify_content(JustifyContent::FlexStart);
-    set_width(100.0f, Unit::Percent);
-    set_height(100.0f, Unit::Percent);
-    
-    {
-        body_container = context.create_element<Container>(this, FlexDirection::Row, JustifyContent::FlexStart);
-        body_container->set_flex(1.0f, 1.0f, 100.0f);
-        body_container->set_width(100.0f, Unit::Percent);
-        body_container->set_height(100.0f, Unit::Percent);
-        {
-            list_container = context.create_element<Container>(body_container, FlexDirection::Column, JustifyContent::Center);
-            list_container->set_display(Display::Block);
-            list_container->set_flex_basis(100.0f);
-            list_container->set_align_items(AlignItems::Center);
-            list_container->set_height(100.0f, Unit::Percent);
-            list_container->set_background_color(Color{ 0, 0, 0, 89 });
-            list_container->set_border_bottom_left_radius(16.0f);
-            {
-                list_scroll_container = context.create_element<ScrollContainer>(list_container, ScrollDirection::Vertical);
-            } // list_container
-
-            mod_details_panel = context.create_element<ModDetailsPanel>(body_container);
-            mod_details_panel->set_mod_toggled_callback([this](bool enabled){ mod_toggled(enabled); });
-            mod_details_panel->set_mod_configure_pressed_callback([this](){ mod_configure_requested(); });
-        } // body_container
-        
-        body_empty_container = context.create_element<Container>(this, FlexDirection::Column, JustifyContent::SpaceBetween);
-        body_empty_container->set_flex(1.0f, 1.0f, 100.0f);
-        body_empty_container->set_display(Display::None);
-        {
-            context.create_element<Element>(body_empty_container);
-            context.create_element<Label>(body_empty_container, "You have no mods. Go get some!", LabelStyle::Large);
-            context.create_element<Element>(body_empty_container);
-        } // body_empty_container
-
-        footer_container = context.create_element<Container>(this, FlexDirection::Row, JustifyContent::FlexStart);
-        footer_container->set_width(100.0f, recompui::Unit::Percent);
-        footer_container->set_align_items(recompui::AlignItems::Center);
-        footer_container->set_background_color(Color{ 0, 0, 0, 89 });
-        footer_container->set_border_top_width(1.1f);
-        footer_container->set_border_top_color(Color{ 255, 255, 255, 25 });
-        footer_container->set_padding(20.0f);
-        footer_container->set_gap(20.0f);
-        footer_container->set_border_bottom_left_radius(16.0f);
-        footer_container->set_border_bottom_right_radius(16.0f);
-        {
-            Button* configure_button = mod_details_panel->get_configure_button();
-            install_mods_button = context.create_element<Button>(footer_container, "Install Mods", recompui::ButtonStyle::Primary);
-            install_mods_button->add_pressed_callback([this](){ open_install_dialog(); });
-
-            Element* footer_spacer = context.create_element<Element>(footer_container);
-            footer_spacer->set_flex(1.0f, 0.0f);
-
-            refresh_button = context.create_element<Button>(footer_container, "Refresh", recompui::ButtonStyle::Primary);
-            refresh_button->add_pressed_callback([this](){ refresh_mods(true); });
-            refresh_button->set_nav_manual(NavDirection::Up, mod_tab_id);
-
-            mods_folder_button = context.create_element<Button>(footer_container, "Open Mods Folder", recompui::ButtonStyle::Primary);
-            mods_folder_button->add_pressed_callback([this](){ open_mods_folder(); });
-            mods_folder_button->set_nav(NavDirection::Up, configure_button);
-            mods_folder_button->set_nav_manual(NavDirection::Up, mod_tab_id);
-        } // footer_container
-    } // this
-    
-    mod_entry_floating_view = context.create_element<ModEntryView>(this);
-    mod_entry_floating_view->set_display(Display::None);
-    mod_entry_floating_view->set_position(Position::Absolute);
-    mod_entry_floating_view->set_selected(true);
-
-    context.close();
-
-    sub_menu_context = recompui::create_context(zelda64::get_asset_path("config_sub_menu.rml"));
-    sub_menu_context.open();
-    Rml::ElementDocument* sub_menu_doc = sub_menu_context.get_document();
-    Rml::Element* config_sub_menu_generic = sub_menu_doc->GetElementById("config_sub_menu");
-    ElementConfigSubMenu* config_sub_menu_element = rmlui_dynamic_cast<ElementConfigSubMenu*>(config_sub_menu_generic);
-    config_sub_menu = config_sub_menu_element->get_config_sub_menu_element();
-    sub_menu_context.close();
-
-    context.open();
-}
-
-ModMenu::~ModMenu() {
-}
-
-// Placeholder class until the rest of the UI refactor is finished.
-
-recompui::ModMenu* mod_menu;
-
-void update_mod_list(bool scan_mods) {
-    if (mod_menu) {
-        recompui::ContextId ui_context = recompui::get_config_context_id();
-        bool opened = ui_context.open_if_not_already();
-
-        mod_menu->set_mods_dirty(scan_mods);
-        mod_menu->queue_update();
-
-        if (opened) {
-            ui_context.close();
-        }
-    }
-}
-
-void process_game_started() {
-    if (mod_menu) {
-        recompui::ContextId ui_context = recompui::get_config_context_id();
-        bool opened = ui_context.open_if_not_already();
-
-        mod_menu->queue_update();
-
-        if (opened) {
-            ui_context.close();
-        }
-    }
-}
-
-void set_config_tabset_mod_nav() {
-    if (mod_menu) {
-        Rml::ElementTabSet* tabset = recompui::get_config_tabset();
-        Rml::Element* tabs = recompui::get_child_by_tag(tabset, "tabs");
-        if (tabs != nullptr) {
-            size_t num_children = tabs->GetNumChildren();
-            Element* first_mod_entry = mod_menu->get_first_mod_entry();
-            if (first_mod_entry != nullptr) {
-                std::string id = "#" + first_mod_entry->get_id();
-                for (size_t i = 0; i < num_children; i++) {
-                    tabs->GetChild(i)->SetProperty(Rml::PropertyId::NavDown, Rml::Property{ id, Rml::Unit::STRING });
-                }
-            }
-            else {
-                for (size_t i = 0; i < num_children; i++) {
-                    tabs->GetChild(i)->SetProperty(Rml::PropertyId::NavDown, Rml::Style::Nav::Auto);
-                }
-            }
-        }
-    }
-}
-
-void focus_mod_configure_button() {
-    Element* configure_button = mod_menu->get_mod_configure_button();
-    if (configure_button) {
-        configure_button->focus();
-    }
-}
-
-ElementModMenu::ElementModMenu(const Rml::String &tag) : Rml::Element(tag) {
-    SetProperty("width", "100%");
-    SetProperty("height", "100%");
-
-    recompui::Element this_compat(this);
-    recompui::ContextId context = get_current_context();
-    mod_menu = context.create_element<ModMenu>(&this_compat);
-}
-
-ElementModMenu::~ElementModMenu() {
-
-}
-
-} // namespace recompui
diff --git a/src/ui/ui_mod_menu.h b/src/ui/ui_mod_menu.h
deleted file mode 100644
index 90d104c..0000000
--- a/src/ui/ui_mod_menu.h
+++ /dev/null
@@ -1,130 +0,0 @@
-#ifndef RECOMPUI_ELEMENT_MOD_MENU_H
-#define RECOMPUI_ELEMENT_MOD_MENU_H
-
-#include "librecomp/mods.hpp"
-#include "elements/ui_scroll_container.h"
-#include "ui_config_sub_menu.h"
-#include "ui_mod_details_panel.h"
-
-namespace recompui {
-
-class ModMenu;
-
-class ModEntryView : public Element {
-public:
-    ModEntryView(Element *parent);
-    virtual ~ModEntryView();
-    void set_mod_details(const recomp::mods::ModDetails &details);
-    void set_mod_thumbnail(const std::string &thumbnail);
-    void set_mod_enabled(bool enabled);
-    void set_selected(bool selected);
-    void set_focused(bool focused);
-protected:
-    virtual void process_event(const Event &e) override;
-    std::string_view get_type_name() override { return "ModEntryView"; }
-private:
-    Image *thumbnail_image = nullptr;
-    Element *body_container = nullptr;
-    Label *name_label = nullptr;
-    Label *description_label = nullptr;
-    Style checked_style;
-    Style hover_style;
-    Style checked_hover_style;
-    Style pulsing_style;
-};
-
-class ModEntryButton : public Element {
-public:
-    ModEntryButton(Element *parent, uint32_t mod_index);
-    virtual ~ModEntryButton();
-    void set_mod_selected_callback(std::function<void(uint32_t)> callback);
-    void set_mod_drag_callback(std::function<void(uint32_t, EventDrag)> callback);
-    void set_mod_details(const recomp::mods::ModDetails &details);
-    void set_mod_thumbnail(const std::string &thumbnail);
-    void set_mod_enabled(bool enabled);
-    void set_selected(bool selected);
-    void set_focused(bool focused);
-protected:
-    virtual void process_event(const Event &e) override;
-    std::string_view get_type_name() override { return "ModEntryButton"; }
-private:
-    uint32_t mod_index = 0;
-    ModEntryView *view = nullptr;
-    std::function<void(uint32_t)> selected_callback = nullptr;
-    std::function<void(uint32_t, EventDrag)> drag_callback = nullptr;
-};
-
-class ModEntrySpacer : public Element {
-private:
-    float height = 0.0f;
-    float target_height = 0.0f;
-    std::chrono::high_resolution_clock::duration last_time;
-
-    void check_height_distance();
-protected:
-    virtual void process_event(const Event &e) override;
-    std::string_view get_type_name() override { return "ModEntrySpacer"; }
-public:
-    ModEntrySpacer(Element *parent);
-    void set_target_height(float target_height, bool animate_to_target);
-};
-
-class ModMenu : public Element {
-public:
-    ModMenu(Element *parent);
-    virtual ~ModMenu();
-    void set_mods_dirty(bool scan_mods) { mods_dirty = true; mod_scan_queued = scan_mods; }
-    Element* get_first_mod_entry() { return !mod_entry_buttons.empty() ? mod_entry_buttons[0] : nullptr; }
-    Element* get_mod_configure_button() { return mod_details_panel != nullptr ? mod_details_panel->get_configure_button() : nullptr; }
-protected:
-    std::string_view get_type_name() override { return "ModMenu"; }
-private:
-    void refresh_mods(bool scan_mods);
-    void open_mods_folder();
-    void open_install_dialog();
-    void mod_toggled(bool enabled);
-    void mod_selected(uint32_t mod_index);
-    void mod_dragged(uint32_t mod_index, EventDrag drag);
-    void mod_configure_requested();
-    bool handle_special_config_options(const recomp::mods::ConfigOption& option, const recomp::mods::ConfigValueVariant& config_value);
-    void mod_enum_option_changed(const std::string &id, uint32_t value);
-    void mod_string_option_changed(const std::string &id, const std::string &value);
-    void mod_number_option_changed(const std::string &id, double value);
-    void mod_hd_textures_enabled_changed(uint32_t value);
-    void create_mod_list();
-    void process_event(const Event &e) override;
-
-    Container *body_container = nullptr;
-    Container *list_container = nullptr;
-    ScrollContainer *list_scroll_container = nullptr;
-    ModDetailsPanel *mod_details_panel = nullptr;
-    Container *body_empty_container = nullptr;
-    Container *footer_container = nullptr;
-    Button *install_mods_button = nullptr;
-    Button *refresh_button = nullptr;
-    Button *mods_folder_button = nullptr;
-    int32_t active_mod_index = -1;
-    std::vector<ModEntryButton *> mod_entry_buttons;
-    std::vector<ModEntrySpacer *> mod_entry_spacers;
-    std::vector<float> mod_entry_middles;
-    ModEntryView *mod_entry_floating_view = nullptr;
-    float mod_drag_start_coordinates[2] = {};
-    float mod_drag_view_coordinates[2] = {};
-    uint32_t mod_drag_target_index = 0;
-    std::vector<recomp::mods::ModDetails> mod_details{};
-    std::unordered_set<std::string> loaded_thumbnails;
-    std::string game_mod_id;
-    bool mods_dirty = false;
-    bool mod_scan_queued = false;
-
-    ConfigSubMenu *config_sub_menu;
-};
-
-class ElementModMenu : public Rml::Element {
-public:
-    ElementModMenu(const Rml::String& tag);
-    virtual ~ElementModMenu();
-};
-
-} // namespace recompui
-#endif
diff --git a/src/ui/ui_prompt.cpp b/src/ui/ui_prompt.cpp
deleted file mode 100644
index ca2e95b..0000000
--- a/src/ui/ui_prompt.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-#include <mutex>
-
-#include "recomp_ui.h"
-
-#include "elements/ui_element.h"
-#include "elements/ui_label.h"
-#include "elements/ui_button.h"
-
-struct {
-    recompui::ContextId ui_context;
-    recompui::Label* prompt_header;
-    recompui::Label* prompt_label;
-    recompui::Element* prompt_controls;
-    recompui::Button* confirm_button;
-    recompui::Button* cancel_button;
-    std::function<void()> confirm_action;
-    std::function<void()> cancel_action;
-    std::string return_element_id;
-    std::mutex mutex;
-} prompt_state;
-
-void run_confirm_callback() {
-    std::function<void()> confirm_action;
-    {
-        std::lock_guard lock{ prompt_state.mutex };
-        confirm_action = std::move(prompt_state.confirm_action);
-    }
-    if (confirm_action) {
-        confirm_action();
-    }
-    recompui::hide_context(prompt_state.ui_context);
-
-    // TODO nav: focus on return_element_id
-    // or just remove it as the usage of the prompt can change now
-}
-
-void run_cancel_callback() {
-    std::function<void()> cancel_action;
-    {
-        std::lock_guard lock{ prompt_state.mutex };
-        cancel_action = std::move(prompt_state.cancel_action);
-    }
-    if (cancel_action) {
-        cancel_action();
-    }
-    recompui::hide_context(prompt_state.ui_context);
-
-    // TODO nav: focus on return_element_id
-    // or just remove it as the usage of the prompt can change now
-}
-
-void recompui::init_prompt_context() {
-    ContextId context = create_context();
-
-    std::lock_guard lock{ prompt_state.mutex };
-
-    context.open();
-
-    prompt_state.ui_context = context;
-
-    Element* window = context.create_element<Element>(context.get_root_element());
-    window->set_display(Display::Flex);
-    window->set_flex_direction(FlexDirection::Column);
-    window->set_background_color({0, 0, 0, 0});
-
-    Element* prompt_overlay = context.create_element<Element>(window);
-    prompt_overlay->set_background_color(Color{ 190, 184, 219, 25 });
-    prompt_overlay->set_position(Position::Absolute);
-    prompt_overlay->set_top(0);
-    prompt_overlay->set_right(0);
-    prompt_overlay->set_bottom(0);
-    prompt_overlay->set_left(0);
-
-    Element* prompt_content_wrapper = context.create_element<Element>(window);
-    prompt_content_wrapper->set_display(Display::Flex);
-    prompt_content_wrapper->set_position(Position::Absolute);
-    prompt_content_wrapper->set_top(0);
-    prompt_content_wrapper->set_right(0);
-    prompt_content_wrapper->set_bottom(0);
-    prompt_content_wrapper->set_left(0);
-    prompt_content_wrapper->set_align_items(AlignItems::Center);
-    prompt_content_wrapper->set_justify_content(JustifyContent::Center);
-
-    Element* prompt_content = context.create_element<Element>(prompt_content_wrapper);
-    prompt_content->set_display(Display::Flex);
-    prompt_content->set_position(Position::Relative);
-    prompt_content->set_flex(1.0f, 1.0f);
-    prompt_content->set_flex_basis(100, Unit::Percent);
-    prompt_content->set_flex_direction(FlexDirection::Column);
-    prompt_content->set_width(100, Unit::Percent);
-    prompt_content->set_max_width(700, Unit::Dp);
-    prompt_content->set_height_auto();
-    prompt_content->set_margin_auto();
-    prompt_content->set_border_width(1.1, Unit::Dp);
-    prompt_content->set_border_radius(16, Unit::Dp);
-    prompt_content->set_border_color(Color{ 255, 255, 255, 51 });
-    prompt_content->set_background_color(Color{ 8, 7, 13, 229 });
-    
-    prompt_state.prompt_header = context.create_element<Label>(prompt_content, "", LabelStyle::Large);
-    prompt_state.prompt_header->set_margin(24, Unit::Dp);
-
-    prompt_state.prompt_label = context.create_element<Label>(prompt_content, "", LabelStyle::Small);
-    prompt_state.prompt_label->set_margin(24, Unit::Dp);
-    prompt_state.prompt_label->set_margin_top(0);
-    
-    prompt_state.prompt_controls = context.create_element<Element>(prompt_content);
-    
-    prompt_state.prompt_controls->set_display(Display::Flex);
-    prompt_state.prompt_controls->set_flex_direction(FlexDirection::Row);
-    prompt_state.prompt_controls->set_justify_content(JustifyContent::Center);
-    prompt_state.prompt_controls->set_padding_top(24, Unit::Dp);
-    prompt_state.prompt_controls->set_padding_bottom(24, Unit::Dp);
-    prompt_state.prompt_controls->set_padding_left(12, Unit::Dp);
-    prompt_state.prompt_controls->set_padding_right(12, Unit::Dp);
-    prompt_state.prompt_controls->set_border_top_width(1.1, Unit::Dp);
-    prompt_state.prompt_controls->set_border_top_color({ 255, 255, 255, 25 });
-
-    prompt_state.confirm_button = context.create_element<Button>(prompt_state.prompt_controls, "", ButtonStyle::Primary);
-    prompt_state.confirm_button->set_min_width(185.0f, Unit::Dp);
-    prompt_state.confirm_button->set_margin_top(0);
-    prompt_state.confirm_button->set_margin_bottom(0);
-    prompt_state.confirm_button->set_margin_left(12, Unit::Dp);
-    prompt_state.confirm_button->set_margin_right(12, Unit::Dp);
-    prompt_state.confirm_button->set_text_align(TextAlign::Center);
-    prompt_state.confirm_button->set_color(Color{ 204, 204, 204, 255 });
-    prompt_state.confirm_button->add_pressed_callback(run_confirm_callback);
-    
-    Style* confirm_hover_style = prompt_state.confirm_button->get_hover_style();
-    confirm_hover_style->set_border_color(Color{ 69, 208, 67, 255 });
-    confirm_hover_style->set_background_color(Color{ 69, 208, 67, 76 });
-    confirm_hover_style->set_color(Color{ 242, 242, 242, 255 });
-    
-    Style* confirm_focus_style = prompt_state.confirm_button->get_focus_style();
-    confirm_focus_style->set_border_color(Color{ 69, 208, 67, 255 });
-    confirm_focus_style->set_background_color(Color{ 69, 208, 67, 76 });
-    confirm_focus_style->set_color(Color{ 242, 242, 242, 255 });
-
-    prompt_state.cancel_button = context.create_element<Button>(prompt_state.prompt_controls, "", ButtonStyle::Primary);
-    prompt_state.cancel_button->set_min_width(185.0f, Unit::Dp);
-    prompt_state.cancel_button->set_margin_top(0);
-    prompt_state.cancel_button->set_margin_bottom(0);
-    prompt_state.cancel_button->set_margin_left(12, Unit::Dp);
-    prompt_state.cancel_button->set_margin_right(12, Unit::Dp);
-    prompt_state.cancel_button->set_text_align(TextAlign::Center);
-    prompt_state.cancel_button->set_color(Color{ 204, 204, 204, 255 });
-    prompt_state.cancel_button->add_pressed_callback(run_cancel_callback);
-    
-    Style* cancel_hover_style = prompt_state.cancel_button->get_hover_style();
-    cancel_hover_style->set_border_color(Color{ 248, 96, 57, 255 });
-    cancel_hover_style->set_background_color(Color{ 248, 96, 57, 76 });
-    cancel_hover_style->set_color(Color{ 242, 242, 242, 255 });
-
-    Style* cancel_focus_style = prompt_state.cancel_button->get_focus_style();
-    cancel_focus_style->set_border_color(Color{ 248, 96, 57, 255 });
-    cancel_focus_style->set_background_color(Color{ 248, 96, 57, 76 });
-    cancel_focus_style->set_color(Color{ 242, 242, 242, 255 });
-
-
-    context.close();
-}
-
-void style_button(recompui::Button* button, recompui::ButtonVariant variant) {
-    recompui::Color button_color{};
-
-    switch (variant) {
-        case recompui::ButtonVariant::Primary:
-            button_color = { 185, 125, 242, 255 };
-            break;
-        case recompui::ButtonVariant::Secondary:
-            button_color = { 23, 214, 232, 255 };
-            break;
-        case recompui::ButtonVariant::Tertiary:
-            button_color = { 242, 242, 242, 255 };
-            break;
-        case recompui::ButtonVariant::Success:
-            button_color = { 69, 208, 67, 255 };
-            break;
-        case recompui::ButtonVariant::Error:
-            button_color = { 248, 96, 57, 255 };
-            break;
-        case recompui::ButtonVariant::Warning:
-            button_color = { 233, 205, 53, 255 };
-            break;
-        default:
-            assert(false);
-            break;
-    }
-
-    recompui::Color border_color = button_color;
-    recompui::Color background_color = button_color;
-    border_color.a = 0.8f * 255;
-    background_color.a = 0.05f * 255;
-    button->set_border_color(border_color);
-    button->set_background_color(background_color);
-    
-    recompui::Color hover_border_color = button_color;
-    recompui::Color hover_background_color = button_color;
-    hover_border_color.a = 255;
-    hover_background_color.a = 0.3f * 255;
-    recompui::Style* hover_style = button->get_hover_style();
-    hover_style->set_border_color(hover_border_color);
-    hover_style->set_background_color(hover_background_color);
-    
-    recompui::Style* focus_style = button->get_focus_style();
-    focus_style->set_border_color(hover_border_color);
-    focus_style->set_background_color(hover_background_color);
-
-    recompui::Color disabled_color { 255, 255, 255, 0.6f * 255 };
-    recompui::Style* disabled_style = button->get_disabled_style();
-    disabled_style->set_color(disabled_color);
-}
-
-// Must be called while prompt_state.mutex is locked.
-void show_prompt(std::function<void()>& prev_cancel_action, bool focus_on_cancel) {
-    if (focus_on_cancel) {
-        prompt_state.ui_context.set_autofocus_element(prompt_state.cancel_button);
-    }
-    else {
-        prompt_state.ui_context.set_autofocus_element(prompt_state.confirm_button);
-    }
-
-    if (!recompui::is_context_shown(prompt_state.ui_context)) {
-        recompui::show_context(prompt_state.ui_context, "");
-    }
-    else {
-        // Call the previous cancel action to effectively close the previous prompt.
-        if (prev_cancel_action) {
-            prev_cancel_action();
-        }
-    }
-}
-
-void recompui::open_choice_prompt(
-    const std::string& header_text,
-    const std::string& content_text,
-    const std::string& confirm_label_text,
-    const std::string& cancel_label_text,
-    std::function<void()> confirm_action,
-    std::function<void()> cancel_action,
-    ButtonVariant confirm_variant,
-    ButtonVariant cancel_variant,
-    bool focus_on_cancel,
-    const std::string& return_element_id
-) {
-    std::lock_guard lock{ prompt_state.mutex };
-
-    std::function<void()> prev_cancel_action = std::move(prompt_state.cancel_action);
-
-    ContextId prev_context = try_close_current_context();
-
-    prompt_state.ui_context.open();
-
-    prompt_state.prompt_header->set_text(header_text);
-    prompt_state.prompt_label->set_text(content_text);
-    prompt_state.prompt_controls->set_display(Display::Flex);
-    prompt_state.confirm_button->set_display(Display::Block);
-    prompt_state.cancel_button->set_display(Display::Block);
-    prompt_state.confirm_button->set_text(confirm_label_text);
-    prompt_state.cancel_button->set_text(cancel_label_text);
-    prompt_state.confirm_action = confirm_action;
-    prompt_state.cancel_action = cancel_action;
-    prompt_state.return_element_id = return_element_id;
-
-    style_button(prompt_state.confirm_button, confirm_variant);
-    style_button(prompt_state.cancel_button, cancel_variant);
-
-    prompt_state.ui_context.close();
-
-    if (prev_context != ContextId::null()) {
-        prev_context.open();
-    }
-
-    show_prompt(prev_cancel_action, focus_on_cancel);
-}
-
-void recompui::open_info_prompt(
-    const std::string& header_text,
-    const std::string& content_text,
-    const std::string& okay_label_text,
-    std::function<void()> okay_action,
-    ButtonVariant okay_variant,
-    const std::string& return_element_id
-) {
-    std::lock_guard lock{ prompt_state.mutex };
-
-    std::function<void()> prev_cancel_action = std::move(prompt_state.cancel_action);
-
-    ContextId prev_context = try_close_current_context();
-
-    prompt_state.ui_context.open();
-
-    prompt_state.prompt_header->set_text(header_text);
-    prompt_state.prompt_label->set_text(content_text);
-    prompt_state.prompt_controls->set_display(Display::Flex);
-    prompt_state.confirm_button->set_display(Display::None);
-    prompt_state.cancel_button->set_display(Display::Block);
-    prompt_state.cancel_button->set_text(okay_label_text);
-    prompt_state.confirm_action = {};
-    prompt_state.cancel_action = okay_action;
-    prompt_state.return_element_id = return_element_id;
-
-    style_button(prompt_state.cancel_button, okay_variant);
-
-    prompt_state.ui_context.close();
-
-    if (prev_context != ContextId::null()) {
-        prev_context.open();
-    }
-
-    show_prompt(prev_cancel_action, true);
-}
-
-void recompui::open_notification(
-    const std::string& header_text,
-    const std::string& content_text,
-    const std::string& return_element_id
-) {
-    std::lock_guard lock{ prompt_state.mutex };
-
-    std::function<void()> prev_cancel_action = std::move(prompt_state.cancel_action);
-
-    ContextId prev_context = try_close_current_context();
-
-    prompt_state.ui_context.open();
-
-    prompt_state.prompt_header->set_text(header_text);
-    prompt_state.prompt_label->set_text(content_text);
-    prompt_state.prompt_controls->set_display(Display::None);
-    prompt_state.confirm_button->set_display(Display::None);
-    prompt_state.cancel_button->set_display(Display::None);
-    prompt_state.confirm_action = {};
-    prompt_state.cancel_action = {};
-    prompt_state.return_element_id = return_element_id;
-
-    prompt_state.ui_context.close();
-
-    if (prev_context != ContextId::null()) {
-        prev_context.open();
-    }
-
-    show_prompt(prev_cancel_action, false);
-}
-
-void recompui::close_prompt() {
-    std::lock_guard lock{ prompt_state.mutex };
-
-    if (recompui::is_context_shown(prompt_state.ui_context)) {
-        if (prompt_state.cancel_action) {
-            prompt_state.cancel_action();
-        }
-
-        recompui::hide_context(prompt_state.ui_context);
-    }
-}
-
-bool recompui::is_prompt_open() {
-    std::lock_guard lock{ prompt_state.mutex };
-
-	return recompui::is_context_shown(prompt_state.ui_context);
-}
diff --git a/src/ui/ui_renderer.cpp b/src/ui/ui_renderer.cpp
deleted file mode 100644
index fc5fc89..0000000
--- a/src/ui/ui_renderer.cpp
+++ /dev/null
@@ -1,721 +0,0 @@
-#ifdef _WIN32
-#define _CRT_SECURE_NO_WARNINGS
-#define WIN32_LEAN_AND_MEAN
-#endif
-
-#include <fstream>
-#include <filesystem>
-
-#include <concurrentqueue.h>
-
-#include "rt64_render_hooks.h"
-#include "rt64_render_interface_builders.h"
-#include "rt64_texture_cache.h"
-
-#include "RmlUi/Core/RenderInterfaceCompatibility.h"
-
-#include "ui_renderer.h"
-
-#include "InterfaceVS.hlsl.spirv.h"
-#include "InterfacePS.hlsl.spirv.h"
-
-#ifdef _WIN32
-#   include "InterfaceVS.hlsl.dxil.h"
-#   include "InterfacePS.hlsl.dxil.h"
-#elif defined(__APPLE__)
-#   include "InterfaceVS.hlsl.metal.h"
-#   include "InterfacePS.hlsl.metal.h"
-#endif
-
-#ifdef _WIN32
-#    define GET_SHADER_BLOB(name, format) \
-        ((format) == RT64::RenderShaderFormat::SPIRV ? name##BlobSPIRV : \
-        (format) == RT64::RenderShaderFormat::DXIL ? name##BlobDXIL : nullptr)
-#    define GET_SHADER_SIZE(name, format) \
-        ((format) == RT64::RenderShaderFormat::SPIRV ? std::size(name##BlobSPIRV) : \
-        (format) == RT64::RenderShaderFormat::DXIL ? std::size(name##BlobDXIL) : 0)
-#elif defined(__APPLE__)
-#    define GET_SHADER_BLOB(name, format) \
-((format) == RT64::RenderShaderFormat::SPIRV ? name##BlobSPIRV : \
-(format) == RT64::RenderShaderFormat::METAL ? name##BlobMSL : nullptr)
-#    define GET_SHADER_SIZE(name, format) \
-((format) == RT64::RenderShaderFormat::SPIRV ? std::size(name##BlobSPIRV) : \
-(format) == RT64::RenderShaderFormat::METAL ? std::size(name##BlobMSL) : 0)
-#else
-#    define GET_SHADER_BLOB(name, format) \
-        ((format) == RT64::RenderShaderFormat::SPIRV ? name##BlobSPIRV : nullptr)
-#    define GET_SHADER_SIZE(name, format) \
-        ((format) == RT64::RenderShaderFormat::SPIRV ? std::size(name##BlobSPIRV) : 0)
-#endif
-
-// TODO deduplicate from rt64_common.h
-void CalculateTextureRowWidthPadding(uint32_t rowPitch, uint32_t &rowWidth, uint32_t &rowPadding) {
-    const int RowMultiple = 256;
-    rowWidth = rowPitch;
-    rowPadding = (rowWidth % RowMultiple) ? RowMultiple - (rowWidth % RowMultiple) : 0;
-    rowWidth += rowPadding;
-}
-
-struct RmlPushConstants {
-    Rml::Matrix4f transform;
-    Rml::Vector2f translation;
-};
-
-struct TextureHandle {
-    std::unique_ptr<RT64::RenderTexture> texture;
-    std::unique_ptr<RT64::RenderDescriptorSet> set;
-    bool transitioned = false;
-};
-
-template <typename T>
-T from_bytes_le(const char* input) {
-    return *reinterpret_cast<const T*>(input);
-}
-
-enum class ImageType {
-    File,
-    RGBA32
-};
-
-struct ImageFromBytes {
-    ImageType type;
-    // Dimensions only used for RGBA32 data. Files pull the size from the file data. 
-    uint32_t width;
-    uint32_t height;
-    std::string name;
-    std::vector<char> bytes;
-};
-
-namespace recompui {
-class RmlRenderInterface_RT64_impl : public Rml::RenderInterfaceCompatibility {
-    struct DynamicBuffer {
-        std::unique_ptr<RT64::RenderBuffer> buffer_{};
-        uint32_t size_ = 0;
-        uint32_t bytes_used_ = 0;
-        uint8_t* mapped_data_ = nullptr;
-        RT64::RenderBufferFlags flags_ = RT64::RenderBufferFlag::NONE;
-    };
-
-    static constexpr uint32_t per_frame_descriptor_set = 0;
-    static constexpr uint32_t per_draw_descriptor_set = 1;
-
-    static constexpr uint32_t initial_upload_buffer_size = 1024 * 1024;
-    static constexpr uint32_t initial_vertex_buffer_size = 512 * sizeof(Rml::Vertex);
-    static constexpr uint32_t initial_index_buffer_size = 1024 * sizeof(int);
-    static constexpr RT64::RenderFormat RmlTextureFormat = RT64::RenderFormat::R8G8B8A8_UNORM;
-    static constexpr RT64::RenderFormat RmlTextureFormatBgra = RT64::RenderFormat::B8G8R8A8_UNORM;
-    static constexpr RT64::RenderFormat SwapChainFormat = RT64::RenderFormat::B8G8R8A8_UNORM;
-    static constexpr uint32_t RmlTextureFormatBytesPerPixel = RenderFormatSize(RmlTextureFormat);
-    static_assert(RenderFormatSize(RmlTextureFormatBgra) == RmlTextureFormatBytesPerPixel);
-    RT64::RenderInterface* interface_;
-    RT64::RenderDevice* device_;
-    int scissor_x_ = 0;
-    int scissor_y_ = 0;
-    int scissor_width_ = 0;
-    int scissor_height_ = 0;
-    int window_width_ = 0;
-    int window_height_ = 0;
-    RT64::RenderMultisampling multisampling_ = RT64::RenderMultisampling();
-    Rml::Matrix4f projection_mtx_ = Rml::Matrix4f::Identity();
-    Rml::Matrix4f transform_ = Rml::Matrix4f::Identity();
-    Rml::Matrix4f mvp_ = Rml::Matrix4f::Identity();
-    std::unordered_map<Rml::TextureHandle, TextureHandle> textures_{};
-    Rml::TextureHandle texture_count_ = 2; // Start at 1 to reserve texture 0 as the 1x1 pixel white texture
-    DynamicBuffer upload_buffer_;
-    DynamicBuffer vertex_buffer_;
-    DynamicBuffer index_buffer_;
-    std::unique_ptr<RT64::RenderSampler> nearestSampler_{};
-    std::unique_ptr<RT64::RenderSampler> linearSampler_{};
-    std::unique_ptr<RT64::RenderShader> vertex_shader_{};
-    std::unique_ptr<RT64::RenderShader> pixel_shader_{};
-    std::unique_ptr<RT64::RenderDescriptorSet> sampler_set_{};
-    std::unique_ptr<RT64::RenderDescriptorSetBuilder> texture_set_builder_{};
-    std::unique_ptr<RT64::RenderPipelineLayout> layout_{};
-    std::unique_ptr<RT64::RenderPipeline> pipeline_{};
-    std::unique_ptr<RT64::RenderPipeline> pipeline_ms_{};
-    std::unique_ptr<RT64::RenderTexture> screen_texture_ms_{};
-    std::unique_ptr<RT64::RenderTexture> screen_texture_{};
-    std::unique_ptr<RT64::RenderFramebuffer> screen_framebuffer_{};
-    std::unique_ptr<RT64::RenderDescriptorSet> screen_descriptor_set_{};
-    std::unique_ptr<RT64::RenderBuffer> screen_vertex_buffer_{};
-    std::unique_ptr<RT64::RenderCommandQueue> copy_command_queue_{};
-    std::unique_ptr<RT64::RenderCommandList> copy_command_list_{};
-    std::unique_ptr<RT64::RenderBuffer> copy_buffer_{};
-    std::unique_ptr<RT64::RenderCommandFence> copy_command_fence_;
-    uint64_t copy_buffer_size_ = 0;
-    uint64_t screen_vertex_buffer_size_ = 0;
-    uint32_t gTexture_descriptor_index;
-    RT64::RenderInputSlot vertex_slot_{ 0, sizeof(Rml::Vertex) };
-    RT64::RenderCommandList* list_ = nullptr;
-    bool scissor_enabled_ = false;
-    std::vector<std::unique_ptr<RT64::RenderBuffer>> stale_buffers_{};
-    moodycamel::ConcurrentQueue<ImageFromBytes> image_from_bytes_queue;
-    std::unordered_map<std::string, ImageFromBytes> image_from_bytes_map;
-public:
-    RmlRenderInterface_RT64_impl(RT64::RenderInterface* interface, RT64::RenderDevice* device) {
-        interface_ = interface;
-        device_ = device;
-
-        // Enable 4X MSAA if supported by the device.
-        const RT64::RenderSampleCounts desired_sample_count = RT64::RenderSampleCount::COUNT_8;
-        if (device_->getSampleCountsSupported(SwapChainFormat) & desired_sample_count) {
-            multisampling_.sampleCount = desired_sample_count;
-        }
-
-        vertex_buffer_.flags_ = RT64::RenderBufferFlag::VERTEX;
-        index_buffer_.flags_ = RT64::RenderBufferFlag::INDEX;
-
-        // Create the texture upload buffer, vertex buffer and index buffer
-        resize_dynamic_buffer(upload_buffer_, initial_upload_buffer_size, false);
-        resize_dynamic_buffer(vertex_buffer_, initial_vertex_buffer_size, false);
-        resize_dynamic_buffer(index_buffer_, initial_index_buffer_size, false);
-
-        // Describe the vertex format
-        std::vector<RT64::RenderInputElement> vertex_elements{};
-        vertex_elements.emplace_back(RT64::RenderInputElement{ "POSITION", 0, 0, RT64::RenderFormat::R32G32_FLOAT, 0, offsetof(Rml::Vertex, position) });
-        vertex_elements.emplace_back(RT64::RenderInputElement{ "COLOR", 0, 1, RT64::RenderFormat::R8G8B8A8_UNORM, 0, offsetof(Rml::Vertex, colour) });
-        vertex_elements.emplace_back(RT64::RenderInputElement{ "TEXCOORD", 0, 2, RT64::RenderFormat::R32G32_FLOAT, 0, offsetof(Rml::Vertex, tex_coord) });
-
-        // Create a nearest sampler and a linear sampler
-        RT64::RenderSamplerDesc samplerDesc;
-        samplerDesc.minFilter = RT64::RenderFilter::NEAREST;
-        samplerDesc.magFilter = RT64::RenderFilter::NEAREST;
-        samplerDesc.addressU = RT64::RenderTextureAddressMode::CLAMP;
-        samplerDesc.addressV = RT64::RenderTextureAddressMode::CLAMP;
-        samplerDesc.addressW = RT64::RenderTextureAddressMode::CLAMP;
-        nearestSampler_ = device_->createSampler(samplerDesc);
-
-        samplerDesc.minFilter = RT64::RenderFilter::LINEAR;
-        samplerDesc.magFilter = RT64::RenderFilter::LINEAR;
-        linearSampler_ = device_->createSampler(samplerDesc);
-
-        // Create the shaders
-        RT64::RenderShaderFormat shaderFormat = interface_->getCapabilities().shaderFormat;
-
-        vertex_shader_ = device_->createShader(GET_SHADER_BLOB(InterfaceVS, shaderFormat), GET_SHADER_SIZE(InterfaceVS, shaderFormat), "VSMain", shaderFormat);
-        pixel_shader_ = device_->createShader(GET_SHADER_BLOB(InterfacePS, shaderFormat), GET_SHADER_SIZE(InterfacePS, shaderFormat), "PSMain", shaderFormat);
-
-
-        // Create the descriptor set that contains the sampler
-        RT64::RenderDescriptorSetBuilder sampler_set_builder{};
-        sampler_set_builder.begin();
-        sampler_set_builder.addImmutableSampler(1, linearSampler_.get());
-        sampler_set_builder.addConstantBuffer(3, 1); // Workaround D3D12 crash due to an empty RT64 descriptor set
-        sampler_set_builder.end();
-        sampler_set_ = sampler_set_builder.create(device_);
-
-        // Create a builder for the descriptor sets that will contain textures
-        texture_set_builder_ = std::make_unique<RT64::RenderDescriptorSetBuilder>();
-        texture_set_builder_->begin();
-        gTexture_descriptor_index = texture_set_builder_->addTexture(2);
-        texture_set_builder_->end();
-
-        // Create the pipeline layout
-        RT64::RenderPipelineLayoutBuilder layout_builder{};
-        layout_builder.begin(false, true);
-        layout_builder.addPushConstant(0, 0, sizeof(RmlPushConstants), RT64::RenderShaderStageFlag::VERTEX);
-        // Add the descriptor set for descriptors changed once per frame.
-        layout_builder.addDescriptorSet(sampler_set_builder);
-        // Add the descriptor set for descriptors changed once per draw.
-        layout_builder.addDescriptorSet(*texture_set_builder_);
-        layout_builder.end();
-        layout_ = layout_builder.create(device_);
-
-        // Create the pipeline description
-        RT64::RenderGraphicsPipelineDesc pipeline_desc{};
-        // Set up alpha blending for non-premultiplied alpha. RmlUi recommends using premultiplied alpha normally,
-        // but that would require preprocessing all input files, which would be difficult for user-provided content (such as mods).
-        // This blending setup produces similar results as premultipled alpha but for normal assets as it multiplies during blending and
-        // computes the output alpha value the same way that a premultipled alpha blender would.
-        pipeline_desc.renderTargetBlend[0] = RT64::RenderBlendDesc {
-            .blendEnabled = true,
-            .srcBlend = RT64::RenderBlend::SRC_ALPHA,
-            .dstBlend = RT64::RenderBlend::INV_SRC_ALPHA,
-            .blendOp = RT64::RenderBlendOperation::ADD,
-            .srcBlendAlpha = RT64::RenderBlend::ONE,
-            .dstBlendAlpha = RT64::RenderBlend::INV_SRC_ALPHA,
-            .blendOpAlpha = RT64::RenderBlendOperation::ADD,
-        };
-        pipeline_desc.renderTargetFormat[0] = SwapChainFormat; // TODO: Use whatever format the swap chain was created with.
-        pipeline_desc.renderTargetCount = 1;
-        pipeline_desc.cullMode = RT64::RenderCullMode::NONE;
-        pipeline_desc.inputSlots = &vertex_slot_;
-        pipeline_desc.inputSlotsCount = 1;
-        pipeline_desc.inputElements = vertex_elements.data();
-        pipeline_desc.inputElementsCount = uint32_t(vertex_elements.size());
-        pipeline_desc.pipelineLayout = layout_.get();
-        pipeline_desc.primitiveTopology = RT64::RenderPrimitiveTopology::TRIANGLE_LIST;
-        pipeline_desc.vertexShader = vertex_shader_.get();
-        pipeline_desc.pixelShader = pixel_shader_.get();
-
-        pipeline_ = device_->createGraphicsPipeline(pipeline_desc);
-
-        if (multisampling_.sampleCount > 1) {
-            pipeline_desc.multisampling = multisampling_;
-            pipeline_ms_ = device_->createGraphicsPipeline(pipeline_desc);
-
-            // Create the descriptor set for the screen drawer.
-            RT64::RenderDescriptorRange screen_descriptor_range(RT64::RenderDescriptorRangeType::TEXTURE, 2, 1);
-            screen_descriptor_set_ = device_->createDescriptorSet(RT64::RenderDescriptorSetDesc(&screen_descriptor_range, 1));
-
-            // Create vertex buffer for the screen drawer (full-screen triangle).
-            screen_vertex_buffer_size_ = sizeof(Rml::Vertex) * 3;
-            screen_vertex_buffer_ = device_->createBuffer(RT64::RenderBufferDesc::VertexBuffer(screen_vertex_buffer_size_, RT64::RenderHeapType::UPLOAD));
-            Rml::Vertex *vertices = (Rml::Vertex *)(screen_vertex_buffer_->map());
-            const Rml::ColourbPremultiplied white(255, 255, 255, 255);
-            vertices[0] = Rml::Vertex{ Rml::Vector2f(-1.0f, 1.0f), white, Rml::Vector2f(0.0f, 0.0f) };
-            vertices[1] = Rml::Vertex{ Rml::Vector2f(-1.0f, -3.0f), white, Rml::Vector2f(0.0f, 2.0f) };
-            vertices[2] = Rml::Vertex{ Rml::Vector2f(3.0f, 1.0f), white, Rml::Vector2f(2.0f, 0.0f) };
-            screen_vertex_buffer_->unmap();
-        }
-
-        copy_command_queue_ = device->createCommandQueue(RT64::RenderCommandListType::COPY);
-        copy_command_list_ = copy_command_queue_->createCommandList(RT64::RenderCommandListType::COPY);
-        copy_command_fence_ = device->createCommandFence();
-    }
-
-    void reset_dynamic_buffer(DynamicBuffer &dynamic_buffer) {
-        assert(dynamic_buffer.mapped_data_ == nullptr);
-        dynamic_buffer.bytes_used_ = 0;
-        dynamic_buffer.mapped_data_ = reinterpret_cast<uint8_t*>(dynamic_buffer.buffer_->map());
-    }
-
-    void end_dynamic_buffer(DynamicBuffer &dynamic_buffer) {
-        assert(dynamic_buffer.mapped_data_ != nullptr);
-        dynamic_buffer.buffer_->unmap();
-        dynamic_buffer.mapped_data_ = nullptr;
-    }
-
-    void resize_dynamic_buffer(DynamicBuffer &dynamic_buffer, uint32_t new_size, bool map = true) {
-        // Unmap the buffer if it's mapped
-        if (dynamic_buffer.mapped_data_ != nullptr) {
-            dynamic_buffer.buffer_->unmap();
-        }
-        
-        // If there's already a buffer, move it into the stale buffers so it persists until the start of next frame.
-        if (dynamic_buffer.buffer_ != nullptr) {
-            stale_buffers_.emplace_back(std::move(dynamic_buffer.buffer_));
-        }
-
-        // Create the new buffer, update the size and map it.
-        dynamic_buffer.buffer_ = device_->createBuffer(RT64::RenderBufferDesc::UploadBuffer(new_size, dynamic_buffer.flags_));
-        dynamic_buffer.size_ = new_size;
-        dynamic_buffer.bytes_used_ = 0;
-
-        if (map) {
-            dynamic_buffer.mapped_data_ = reinterpret_cast<uint8_t*>(dynamic_buffer.buffer_->map());
-        }
-    }
-
-    uint32_t allocate_dynamic_data(DynamicBuffer &dynamic_buffer, uint32_t num_bytes) {
-        // Check if there's enough remaining room in the buffer to allocate the requested bytes.
-        uint32_t total_bytes = num_bytes + dynamic_buffer.bytes_used_;
-
-        if (total_bytes > dynamic_buffer.size_) {
-            // There isn't, so mark the current buffer as stale and allocate a new one with 50% more space than the required amount.
-            resize_dynamic_buffer(dynamic_buffer, total_bytes + total_bytes / 2);
-        }
-
-        // Record the current end of the buffer to return.
-        uint32_t offset = dynamic_buffer.bytes_used_;
-
-        // Bump the buffer's end forward by the number of bytes allocated.
-        dynamic_buffer.bytes_used_ += num_bytes;
-
-        return offset;
-    }
-
-    uint32_t allocate_dynamic_data_aligned(DynamicBuffer &dynamic_buffer, uint32_t num_bytes, uint32_t alignment) {
-        // Check if there's enough remaining room in the buffer to allocate the requested bytes.
-        uint32_t total_bytes = num_bytes + dynamic_buffer.bytes_used_;
-
-        // Determine the amount of padding needed to meet the target alignment.
-        uint32_t padding_bytes = ((dynamic_buffer.bytes_used_ + alignment - 1) / alignment) * alignment - dynamic_buffer.bytes_used_;
-
-        // If there isn't enough room to allocate the required bytes plus the padding then resize the buffer and allocate from the start of the new one.
-        if (total_bytes + padding_bytes > dynamic_buffer.size_) {
-            resize_dynamic_buffer(dynamic_buffer, total_bytes + total_bytes / 2);
-
-            dynamic_buffer.bytes_used_ += num_bytes;
-
-            return 0;
-        }
-
-        // Otherwise allocate the padding and required bytes and offset the allocated position by the padding size.
-        return allocate_dynamic_data(dynamic_buffer, padding_bytes + num_bytes) + padding_bytes;
-    }
-    
-    void RenderGeometry(Rml::Vertex* vertices, int num_vertices, int* indices, int num_indices, Rml::TextureHandle texture, const Rml::Vector2f& translation) override {
-        if (!textures_.contains(texture)) {
-            if (texture == 0) {
-                Rml::byte white_pixel[] = { 255, 255, 255, 255 };
-                create_texture(0, white_pixel, Rml::Vector2i{ 1, 1 });
-            }
-            else if (texture == 1) {
-                Rml::byte transparent_pixel[] = { 0, 0, 0, 0 };
-                create_texture(1, transparent_pixel, Rml::Vector2i{ 1, 1 });
-            }
-            else {
-                assert(false && "Rendered without texture!");
-            }
-        }
-
-        // Copy the vertex and index data into the mapped buffers.
-        uint32_t vert_size_bytes = num_vertices * sizeof(*vertices);
-        uint32_t index_size_bytes = num_indices * sizeof(*indices);
-        uint32_t vertex_buffer_offset = allocate_dynamic_data(vertex_buffer_, vert_size_bytes);
-        uint32_t index_buffer_offset = allocate_dynamic_data(index_buffer_, index_size_bytes);
-        memcpy(vertex_buffer_.mapped_data_ + vertex_buffer_offset, vertices, vert_size_bytes);
-        memcpy(index_buffer_.mapped_data_ + index_buffer_offset, indices, index_size_bytes);
-
-        list_->setViewports(RT64::RenderViewport{ 0, 0, float(window_width_), float(window_height_) });
-        if (scissor_enabled_) {
-            list_->setScissors(RT64::RenderRect{
-                scissor_x_,
-                scissor_y_,
-                (scissor_width_ + scissor_x_),
-                (scissor_height_ + scissor_y_) });
-        }
-        else {
-            list_->setScissors(RT64::RenderRect{ 0, 0, window_width_, window_height_ });
-        }
-
-        RT64::RenderIndexBufferView index_view{index_buffer_.buffer_->at(index_buffer_offset), index_size_bytes, RT64::RenderFormat::R32_UINT};
-        list_->setIndexBuffer(&index_view);
-        RT64::RenderVertexBufferView vertex_view{vertex_buffer_.buffer_->at(vertex_buffer_offset), vert_size_bytes};
-        list_->setVertexBuffers(0, &vertex_view, 1, &vertex_slot_);
-
-        TextureHandle &texture_handle = textures_.at(texture);
-        if (!texture_handle.transitioned) {
-            // Prepare the texture for being read from a pixel shader.
-            list_->barriers(RT64::RenderBarrierStage::GRAPHICS, RT64::RenderTextureBarrier(texture_handle.texture.get(), RT64::RenderTextureLayout::SHADER_READ));
-            texture_handle.transitioned = true;
-        }
-
-        list_->setGraphicsDescriptorSet(texture_handle.set.get(), 1);
-
-        RmlPushConstants constants{
-            .transform = mvp_,
-            .translation = translation
-        };
-
-        list_->setGraphicsPushConstants(0, &constants);
-
-        list_->drawIndexedInstanced(num_indices, 1, 0, 0, 0);
-    }
-
-    void EnableScissorRegion(bool enable) override {
-        scissor_enabled_ = enable;
-    }
-
-    void SetScissorRegion(int x, int y, int width, int height) override {
-        scissor_x_ = x;
-        scissor_y_ = y;
-        scissor_width_ = width;
-        scissor_height_ = height;
-    }
-
-    bool LoadTexture(Rml::TextureHandle& texture_handle, Rml::Vector2i& texture_dimensions, const Rml::String& source) override {
-        flush_image_from_bytes_queue();
-
-        auto it = image_from_bytes_map.find(source);
-        if (it == image_from_bytes_map.end()) {
-            // Return a transparent texture if the image can't be found.
-            texture_handle = 1;
-            texture_dimensions.x = 1;
-            texture_dimensions.y = 1;
-            return true;
-        }
-        
-        RT64::Texture* texture = nullptr;
-        std::unique_ptr<RT64::RenderBuffer> texture_buffer;
-        ImageFromBytes& img = it->second;
-        copy_command_list_->begin();
-
-        switch (img.type) {
-            case ImageType::RGBA32:
-                {
-                    // Read the image header (two 32-bit values for width and height respectively).
-                    uint32_t rowPitch = img.width * 4;
-                    size_t byteCount = img.height * rowPitch;
-                    texture = new RT64::Texture();
-                    RT64::TextureCache::setRGBA32(texture, device_, copy_command_list_.get(), reinterpret_cast<const uint8_t*>(img.bytes.data()), byteCount, img.width, img.height, rowPitch, texture_buffer, nullptr);
-                }
-                break;
-            case ImageType::File:
-                {
-                    // TODO: This data copy can be avoided when RT64::TextureCache::loadTextureFromBytes's function is updated to only take a pointer and size as the input.
-                    std::vector<uint8_t> data_copy(img.bytes.data(), img.bytes.data() + img.bytes.size());
-                    texture = RT64::TextureCache::loadTextureFromBytes(device_, copy_command_list_.get(), data_copy, texture_buffer);
-                }
-                break;
-        }
-        
-        copy_command_list_->end();
-        copy_command_queue_->executeCommandLists(copy_command_list_.get(), copy_command_fence_.get());
-        copy_command_queue_->waitForCommandFence(copy_command_fence_.get());
-
-        if (texture == nullptr) {
-            return false;
-        }
-
-        texture_handle = texture_count_++;
-        texture_dimensions.x = texture->width;
-        texture_dimensions.y = texture->height;
-
-        std::unique_ptr<RT64::RenderDescriptorSet> set = texture_set_builder_->create(device_);
-        set->setTexture(gTexture_descriptor_index, texture->texture.get(), RT64::RenderTextureLayout::SHADER_READ);
-        textures_.emplace(texture_handle, TextureHandle{ std::move(texture->texture), std::move(set), false });
-        delete texture;
-
-        return true;
-    }
-
-    bool GenerateTexture(Rml::TextureHandle& texture_handle, const Rml::byte* source, const Rml::Vector2i& source_dimensions) override {
-        if (source_dimensions.x == 0 || source_dimensions.y == 0) {
-            texture_handle = 0;
-            return true;
-        }
-
-        texture_handle = texture_count_++;
-        return create_texture(texture_handle, source, source_dimensions);
-    }
-
-    bool create_texture(Rml::TextureHandle texture_handle, const Rml::byte* source, const Rml::Vector2i& source_dimensions, bool flip_y = false, bool bgra = false) {
-        std::unique_ptr<RT64::RenderTexture> texture =
-            device_->createTexture(RT64::RenderTextureDesc::Texture2D(source_dimensions.x, source_dimensions.y, 1, bgra ? RmlTextureFormatBgra : RmlTextureFormat));
-
-        if (texture != nullptr) {
-            uint32_t image_size_bytes = source_dimensions.x * source_dimensions.y * RmlTextureFormatBytesPerPixel;
-
-            // Calculate the texture padding for alignment purposes.
-            uint32_t row_pitch = source_dimensions.x * RmlTextureFormatBytesPerPixel;
-            uint32_t row_byte_width, row_byte_padding;
-            CalculateTextureRowWidthPadding(row_pitch, row_byte_width, row_byte_padding);
-            uint32_t row_width = row_byte_width / RmlTextureFormatBytesPerPixel;
-
-            // Calculate the real number of bytes to upload including padding.
-            uint32_t uploaded_size_bytes = row_byte_width * source_dimensions.y;
-
-            // Allocate room in the upload buffer for the uploaded data.
-            if (uploaded_size_bytes > copy_buffer_size_) {
-                copy_buffer_size_ = (uploaded_size_bytes * 3) / 2;
-                copy_buffer_ = device_->createBuffer(RT64::RenderBufferDesc::UploadBuffer(copy_buffer_size_));
-            }
-
-            // Copy the source data into the upload buffer.
-            uint8_t* dst_data = (uint8_t *)(copy_buffer_->map());
-            if (row_byte_padding == 0) {
-                // Copy row-by-row if the image is flipped.
-                if (flip_y) {
-                    for (int row = 0; row < source_dimensions.y; row++) {
-                        memcpy(dst_data + row_byte_width * (source_dimensions.y - row - 1), source + row_byte_width * row, row_byte_width);
-                    }
-                }
-                // Directly copy if no padding is needed and the image isn't flipped.
-                else {
-                    memcpy(dst_data, source, image_size_bytes);
-                }
-            }
-            // Otherwise pad each row as necessary.
-            else {
-                const Rml::byte *src_data = flip_y ? source + row_pitch * (source_dimensions.y - 1) : source;
-                uint32_t src_stride = flip_y ? -row_pitch : row_pitch;
-
-                for (int row = 0; row < source_dimensions.y; row++) {
-                    memcpy(dst_data, src_data, row_pitch);
-                    src_data += src_stride;
-                    dst_data += row_byte_width;
-                }
-            }
-
-            copy_buffer_->unmap();
-
-            // Reset the command list.
-            copy_command_list_->begin();
-
-            // Prepare the texture to be a destination for copying.
-            copy_command_list_->barriers(RT64::RenderBarrierStage::COPY, RT64::RenderTextureBarrier(texture.get(), RT64::RenderTextureLayout::COPY_DEST));
-            
-            // Copy the upload buffer into the texture.
-            copy_command_list_->copyTextureRegion(
-                RT64::RenderTextureCopyLocation::Subresource(texture.get()),
-                RT64::RenderTextureCopyLocation::PlacedFootprint(copy_buffer_.get(), RmlTextureFormat, source_dimensions.x, source_dimensions.y, 1, row_width));
-            
-            // End the command list, execute it and wait.
-            copy_command_list_->end();
-            copy_command_queue_->executeCommandLists(copy_command_list_.get(), copy_command_fence_.get());
-            copy_command_queue_->waitForCommandFence(copy_command_fence_.get());
-
-            // Create a descriptor set with this texture in it.
-            std::unique_ptr<RT64::RenderDescriptorSet> set = texture_set_builder_->create(device_);
-
-            set->setTexture(gTexture_descriptor_index, texture.get(), RT64::RenderTextureLayout::SHADER_READ);
-
-            textures_.emplace(texture_handle, TextureHandle{ std::move(texture), std::move(set), false });
-
-            return true;
-        }
-
-        return false;
-    }
-
-	void ReleaseTexture(Rml::TextureHandle texture) override {
-        if (texture > 1) {
-            // Textures #0 and #1 are reserved and should never be released.
-            textures_.erase(texture);
-        }
-    }
-
-    void SetTransform(const Rml::Matrix4f* transform) override {
-        transform_ = transform ? *transform : Rml::Matrix4f::Identity();
-        recalculate_mvp();
-    }
-
-    void recalculate_mvp() {
-        mvp_ = projection_mtx_ * transform_;
-    }
-
-    void start(RT64::RenderCommandList* list, int image_width, int image_height) {
-        list_ = list;
-
-        if (multisampling_.sampleCount > 1) {
-            if (window_width_ != image_width || window_height_ != image_height) {
-                screen_framebuffer_.reset();
-                screen_texture_ = device_->createTexture(RT64::RenderTextureDesc::ColorTarget(image_width, image_height, SwapChainFormat));
-                screen_texture_ms_ = device_->createTexture(RT64::RenderTextureDesc::ColorTarget(image_width, image_height, SwapChainFormat, multisampling_));
-                const RT64::RenderTexture *color_attachment = screen_texture_ms_.get();
-                screen_framebuffer_ = device_->createFramebuffer(RT64::RenderFramebufferDesc(&color_attachment, 1));
-                screen_descriptor_set_->setTexture(0, screen_texture_.get(), RT64::RenderTextureLayout::SHADER_READ);
-            }
-
-            list_->setPipeline(pipeline_ms_.get());
-        }
-        else {
-            list_->setPipeline(pipeline_.get());
-        }
-
-        list_->setGraphicsPipelineLayout(layout_.get());
-        // Bind the set for descriptors that don't change across draws
-        list_->setGraphicsDescriptorSet(sampler_set_.get(), 0);
-
-        window_width_ = image_width;
-        window_height_ = image_height;
-
-        projection_mtx_ = Rml::Matrix4f::ProjectOrtho(0.0f, float(image_width), float(image_height), 0.0f, -10000, 10000);
-        recalculate_mvp();
-
-        // The following code assumes command lists aren't double buffered.
-        // Clear out any stale buffers from the last command list.
-        stale_buffers_.clear();
-
-        // Reset buffers.
-        reset_dynamic_buffer(upload_buffer_);
-        reset_dynamic_buffer(vertex_buffer_);
-        reset_dynamic_buffer(index_buffer_);
-
-        // Set an internal texture as the render target if MSAA is enabled.
-        if (multisampling_.sampleCount > 1) {
-            list->barriers(RT64::RenderBarrierStage::GRAPHICS, RT64::RenderTextureBarrier(screen_texture_ms_.get(), RT64::RenderTextureLayout::COLOR_WRITE));
-            list->setFramebuffer(screen_framebuffer_.get());
-            list->clearColor(0, RT64::RenderColor(0.0f, 0.0f, 0.0f, 0.0f));
-        }
-    }
-
-    void end(RT64::RenderCommandList* list, RT64::RenderFramebuffer* framebuffer) {
-        // Draw the texture were rendered the UI in to the swap chain framebuffer if MSAA is enabled.
-        if (multisampling_.sampleCount > 1) {
-            RT64::RenderTextureBarrier before_resolve_barriers[] = {
-                RT64::RenderTextureBarrier(screen_texture_ms_.get(), RT64::RenderTextureLayout::RESOLVE_SOURCE),
-                RT64::RenderTextureBarrier(screen_texture_.get(), RT64::RenderTextureLayout::RESOLVE_DEST)
-            };
-
-            list->barriers(RT64::RenderBarrierStage::COPY, before_resolve_barriers, uint32_t(std::size(before_resolve_barriers)));
-            list->resolveTexture(screen_texture_.get(), screen_texture_ms_.get());
-            list->barriers(RT64::RenderBarrierStage::GRAPHICS, RT64::RenderTextureBarrier(screen_texture_.get(), RT64::RenderTextureLayout::SHADER_READ));
-            list->setFramebuffer(framebuffer);
-            list->setPipeline(pipeline_.get());
-            list->setGraphicsPipelineLayout(layout_.get());
-            list->setGraphicsDescriptorSet(sampler_set_.get(), 0);
-            list->setGraphicsDescriptorSet(screen_descriptor_set_.get(), 1);
-            list->setScissors(RT64::RenderRect{ 0, 0, window_width_, window_height_ });
-            RT64::RenderVertexBufferView vertex_view(screen_vertex_buffer_.get(), screen_vertex_buffer_size_);
-            list->setVertexBuffers(0, &vertex_view, 1, &vertex_slot_);
-
-            RmlPushConstants constants{
-                .transform = Rml::Matrix4f::Identity(),
-                .translation = Rml::Vector2f(0.0f, 0.0f)
-            };
-
-            list_->setGraphicsPushConstants(0, &constants);
-            list->drawInstanced(3, 1, 0, 0);
-        }
-
-        end_dynamic_buffer(upload_buffer_);
-        end_dynamic_buffer(vertex_buffer_);
-        end_dynamic_buffer(index_buffer_);
-
-        list_ = nullptr;
-    }
-
-    void queue_image_from_bytes_file(const std::string &src, const std::vector<char> &bytes) {
-        // Width and height aren't used for file images, so set them to 0.
-        image_from_bytes_queue.enqueue(ImageFromBytes{ .type = ImageType::File, .width = 0, .height = 0, .name = src, .bytes = bytes });
-    }
-
-    void queue_image_from_bytes_rgba32(const std::string &src, const std::vector<char> &bytes, uint32_t width, uint32_t height) {
-        image_from_bytes_queue.enqueue(ImageFromBytes{ .type = ImageType::RGBA32, .width = width, .height = height, .name = src, .bytes = bytes });
-    }
-
-    void flush_image_from_bytes_queue() {
-        ImageFromBytes image_from_bytes;
-        while (image_from_bytes_queue.try_dequeue(image_from_bytes)) {
-            // We can move the name into the map since the name in the actual entry is no longer needed.
-            // After that, move the entry itself into the map.
-            image_from_bytes_map.emplace(std::move(image_from_bytes.name), std::move(image_from_bytes));
-        }
-    }
-};
-} // namespace recompui
-
-recompui::RmlRenderInterface_RT64::RmlRenderInterface_RT64() = default;
-recompui::RmlRenderInterface_RT64::~RmlRenderInterface_RT64() = default;
-
-void recompui::RmlRenderInterface_RT64::reset() {
-    impl.reset();
-}
-
-void recompui::RmlRenderInterface_RT64::init(RT64::RenderInterface* interface, RT64::RenderDevice* device) {
-    impl = std::make_unique<RmlRenderInterface_RT64_impl>(interface, device);
-}
-
-Rml::RenderInterface* recompui::RmlRenderInterface_RT64::get_rml_interface() {
-    if (impl) {
-        return impl->GetAdaptedInterface();
-    }
-    return nullptr;
-}
-
-void recompui::RmlRenderInterface_RT64::start(RT64::RenderCommandList* list, int image_width, int image_height) {
-    assert(static_cast<bool>(impl));
-
-    impl->start(list, image_width, image_height);
-}
-
-void recompui::RmlRenderInterface_RT64::end(RT64::RenderCommandList* list, RT64::RenderFramebuffer* framebuffer) {
-    assert(static_cast<bool>(impl));
-
-    impl->end(list, framebuffer);
-}
-
-void recompui::RmlRenderInterface_RT64::queue_image_from_bytes_file(const std::string &src, const std::vector<char> &bytes) {
-    assert(static_cast<bool>(impl));
-
-    impl->queue_image_from_bytes_file(src, bytes);
-}
-
-void recompui::RmlRenderInterface_RT64::queue_image_from_bytes_rgba32(const std::string &src, const std::vector<char> &bytes, uint32_t width, uint32_t height) {
-    assert(static_cast<bool>(impl));
-
-    impl->queue_image_from_bytes_rgba32(src, bytes, width, height);
-}
diff --git a/src/ui/ui_renderer.h b/src/ui/ui_renderer.h
deleted file mode 100644
index 83a6912..0000000
--- a/src/ui/ui_renderer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-#ifndef __UI_RENDERER_H__
-#define __UI_RENDERER_H__
-
-#include <memory>
-#include "recomp_ui.h"
-
-namespace RT64 {
-    struct RenderInterface;
-    struct RenderDevice;
-    struct RenderCommandList;
-    struct RenderFramebuffer;
-};
-
-namespace Rml {
-    class RenderInterface;
-}
-
-namespace recompui {
-    class RmlRenderInterface_RT64_impl;
-
-    class RmlRenderInterface_RT64 {
-    private:
-        std::unique_ptr<RmlRenderInterface_RT64_impl> impl;
-    public:
-        RmlRenderInterface_RT64();
-        ~RmlRenderInterface_RT64();
-        void reset();
-        void init(RT64::RenderInterface* interface, RT64::RenderDevice* device);
-        Rml::RenderInterface* get_rml_interface();
-        
-        void start(RT64::RenderCommandList* list, int image_width, int image_height);
-        void end(RT64::RenderCommandList* list, RT64::RenderFramebuffer* framebuffer);
-        void queue_image_from_bytes_file(const std::string &src, const std::vector<char> &bytes);
-        void queue_image_from_bytes_rgba32(const std::string &src, const std::vector<char> &bytes, uint32_t width, uint32_t height);
-    };
-} // namespace recompui
-
-#endif
diff --git a/src/ui/ui_rml_hacks.cpp b/src/ui/ui_rml_hacks.cpp
deleted file mode 100644
index 3bd705f..0000000
--- a/src/ui/ui_rml_hacks.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "recomp_ui.h"
-#include "RmlUi/Core.h"
-#include "ui_rml_hacks.hpp"
-
-//! these are hidden methods not exposed by RmlUi
-//! they may need to be updated eventually with RmlUi
-
-RecompRml::CanFocus RecompRml::CanFocusElement(Rml::Element* element)
-{
-	if (!element->IsVisible())
-		return RecompRml::CanFocus::NoAndNoChildren;
-
-	const Rml::ComputedValues& computed = element->GetComputedValues();
-
-	if (computed.focus() == Rml::Style::Focus::None)
-		return RecompRml::CanFocus::NoAndNoChildren;
-
-	if (computed.tab_index() == Rml::Style::TabIndex::Auto)
-		return RecompRml::CanFocus::Yes;
-
-	return RecompRml::CanFocus::No;
-}
-
-Rml::Element* SearchFocusSubtree(Rml::Element* element, bool forward)
-{
-	auto can_focus = RecompRml::CanFocusElement(element);
-	if (can_focus == RecompRml::CanFocus::Yes)
-		return element;
-	else if (can_focus == RecompRml::CanFocus::NoAndNoChildren)
-		return nullptr;
-
-	for (int i = 0; i < element->GetNumChildren(); i++)
-	{
-		int child_index = i;
-		if (!forward)
-			child_index = element->GetNumChildren() - i - 1;
-		if (Rml::Element* result = SearchFocusSubtree(element->GetChild(child_index), forward))
-			return result;
-	}
-
-	return nullptr;
-}
-
-Rml::Element* RecompRml::FindNextTabElement(Rml::Element* current_element, bool forward)
-{
-	// This algorithm is quite sneaky, I originally thought a depth first search would work, but it appears not. What is
-	// required is to cut the tree in half along the nodes from current_element up the root and then either traverse the
-	// tree in a clockwise or anticlock wise direction depending if you're searching forward or backward respectively.
-
-	// If we're searching forward, check the immediate children of this node first off.
-	if (forward)
-	{
-		for (int i = 0; i < current_element->GetNumChildren(); i++)
-			if (Rml::Element* result = SearchFocusSubtree(current_element->GetChild(i), forward))
-				return result;
-	}
-
-	// Now walk up the tree, testing either the bottom or top
-	// of the tree, depending on whether we're going forward
-	// or backward respectively.
-	bool search_enabled = false;
-	Rml::Element* document = current_element->GetOwnerDocument();
-	Rml::Element* child = current_element;
-	Rml::Element* parent = current_element->GetParentNode();
-	while (child != document)
-	{
-		const int num_children = parent->GetNumChildren();
-		for (int i = 0; i < num_children; i++)
-		{
-			// Calculate index into children
-			const int child_index = forward ? i : (num_children - i - 1);
-			Rml::Element* search_child = parent->GetChild(child_index);
-
-			// Do a search if its enabled
-			if (search_enabled)
-				if (Rml::Element* result = SearchFocusSubtree(search_child, forward))
-					return result;
-
-			// Enable searching when we reach the child.
-			if (search_child == child)
-				search_enabled = true;
-		}
-
-		// Advance up the tree
-		child = parent;
-		parent = parent->GetParentNode();
-		search_enabled = false;
-	}
-
-	// We could not find anything to focus along this direction.
-
-	// If we can focus the document, then focus that now.
-	if (current_element != document && RecompRml::CanFocusElement(document) == RecompRml::CanFocus::Yes)
-		return document;
-
-	// Otherwise, search the entire document tree. This way we will wrap around.
-	const int num_children = document->GetNumChildren();
-	for (int i = 0; i < num_children; i++)
-	{
-		const int child_index = forward ? i : (num_children - i - 1);
-		if (Rml::Element* result = SearchFocusSubtree(document->GetChild(child_index), forward))
-			return result;
-	}
-
-	return nullptr;
-}
diff --git a/src/ui/ui_rml_hacks.hpp b/src/ui/ui_rml_hacks.hpp
deleted file mode 100644
index 692ae72..0000000
--- a/src/ui/ui_rml_hacks.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef UI_RML_HACKS_H
-#define UI_RML_HACKS_H
-
-#include "RmlUi/Core.h"
-namespace RecompRml {
-    Rml::Element* FindNextTabElement(Rml::Element* current_element, bool forward);
-
-    enum class CanFocus { Yes, No, NoAndNoChildren };
-
-    CanFocus CanFocusElement(Rml::Element* element);
-}
-
-#endif
diff --git a/src/ui/ui_state.cpp b/src/ui/ui_state.cpp
deleted file mode 100644
index 1941c5c..0000000
--- a/src/ui/ui_state.cpp
+++ /dev/null
@@ -1,1019 +0,0 @@
-#ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <SDL_video.h>
-#else
-#include <SDL2/SDL_video.h>
-#endif
-#include <chrono>
-
-#include "rt64_render_hooks.h"
-
-#include "concurrentqueue.h"
-
-#include "RmlUi/Core.h"
-#include "RmlUi/Debugger.h"
-#include "RmlUi/Core/RenderInterfaceCompatibility.h"
-#include "RmlUi/../../Source/Core/Elements/ElementLabel.h"
-#include "RmlUi_Platform_SDL.h"
-
-#include "recomp_ui.h"
-#include "recomp_input.h"
-#include "librecomp/game.hpp"
-#include "zelda_config.h"
-#include "zelda_support.h"
-#include "ui_rml_hacks.hpp"
-#include "ui_elements.h"
-#include "ui_mod_menu.h"
-#include "ui_mod_installer.h"
-#include "ui_renderer.h"
-
-bool can_focus(Rml::Element* element) {
-    return element->GetOwnerDocument() != nullptr && element->GetProperty(Rml::PropertyId::TabIndex)->Get<Rml::Style::TabIndex>() != Rml::Style::TabIndex::None;
-}
-
-//! Copied from lib\RmlUi\Source\Core\Elements\ElementLabel.cpp
-// Get the first descending element whose tag name matches one of tags.
-static Rml::Element* TagMatchRecursive(const Rml::StringList& tags, Rml::Element* element)
-{
-	const int num_children = element->GetNumChildren();
-
-	for (int i = 0; i < num_children; i++)
-	{
-		Rml::Element* child = element->GetChild(i);
-
-		for (const Rml::String& tag : tags)
-		{
-			if (child->GetTagName() == tag)
-				return child;
-		}
-
-		Rml::Element* matching_element = TagMatchRecursive(tags, child);
-		if (matching_element)
-			return matching_element;
-	}
-
-	return nullptr;
-}
-
-Rml::Element* get_target(Rml::ElementDocument* document, Rml::Element* element) {
-    // Labels can have targets, so check if this element is a label.
-    if (element->GetTagName() == "label") {
-        Rml::ElementLabel* labelElement = (Rml::ElementLabel*)element;
-        const Rml::String target_id = labelElement->GetAttribute<Rml::String>("for", "");
-
-        if (target_id.empty())
-        {
-            const Rml::StringList matching_tags = {"button", "input", "textarea", "progress", "progressbar", "select"};
-
-            return TagMatchRecursive(matching_tags, element);
-        }
-        else
-        {
-            Rml::Element* target = labelElement->GetElementById(target_id);
-            if (target != element)
-                return target;
-        }
-
-        return nullptr;
-    }
-    // Return the element directly if no target exists.
-    return element;
-}
-
-namespace recompui {
-    class UiEventListener : public Rml::EventListener {
-        event_handler_t* handler_;
-        Rml::String param_;
-    public:
-        UiEventListener(event_handler_t* handler, Rml::String&& param) : handler_(handler), param_(std::move(param)) {}
-        void ProcessEvent(Rml::Event& event) override {
-            handler_(param_, event);
-        }
-    };
-
-    class UiEventListenerInstancer : public Rml::EventListenerInstancer {
-        std::unordered_map<Rml::String, event_handler_t*> handler_map_;
-        std::unordered_map<Rml::String, UiEventListener> listener_map_;
-    public:
-        Rml::EventListener* InstanceEventListener(const Rml::String& value, Rml::Element* element) override {
-            // Check if a listener has already been made for the full event string and return it if so.
-            auto find_listener_it = listener_map_.find(value);
-            if (find_listener_it != listener_map_.end()) {
-                return &find_listener_it->second;
-            }
-
-            // No existing listener, so check if a handler has been registered for this event type and create a listener for it if so.
-            size_t delimiter_pos = value.find(':');
-            Rml::String event_type = value.substr(0, delimiter_pos);
-            auto find_handler_it = handler_map_.find(event_type);
-            if (find_handler_it != handler_map_.end()) {
-                // A handler was found, create a listener and return it.
-                Rml::String event_param = value.substr(std::min(delimiter_pos, value.size()));
-                return &listener_map_.emplace(value, UiEventListener{ find_handler_it->second, std::move(event_param) }).first->second;
-            }
-
-            return nullptr;
-        }
-
-        void register_event(const Rml::String& value, event_handler_t* handler) {
-            handler_map_.emplace(value, handler);
-        }
-    };
-}
-
-void recompui::register_event(UiEventListenerInstancer& listener, const std::string& name, event_handler_t* handler) {
-    listener.register_event(name, handler);
-}
-
-Rml::Element* find_autofocus_element(Rml::Element* start) {
-    Rml::Element* cur_element = start;
-    Rml::Element* first_found = nullptr;
-
-    while (cur_element) {
-        if (cur_element->HasAttribute("autofocus")) {
-            break;
-        }
-        cur_element = RecompRml::FindNextTabElement(cur_element, true);
-        // Track the first element that was found to know when we've wrapped around.
-        if (!first_found) {
-            first_found = cur_element;
-        }
-        // Stop searching if we found the first element again.
-        else {
-            if (cur_element == first_found) {
-                // Return the first tab element as there was nothing marked with autofocus.
-                return first_found;
-            }
-        }
-    }
-
-    return cur_element;
-}
-
-struct ContextDetails {
-    recompui::ContextId context;
-    Rml::ElementDocument* document;
-};
-
-class UIState {
-    Rml::Element* prev_focused = nullptr;
-    bool mouse_is_active_changed = false;
-    std::unique_ptr<recompui::MenuController> launcher_menu_controller{};
-    std::unique_ptr<recompui::MenuController> config_menu_controller{};
-    std::vector<ContextDetails> shown_contexts{};
-public:
-    bool mouse_is_active_initialized = false;
-    bool mouse_is_active = false;
-    bool cont_is_active = false;
-    bool await_stick_return_x = false;
-    bool await_stick_return_y = false;
-    int last_active_mouse_position[2] = {0, 0};
-    std::unique_ptr<recompui::MenuController> config_controller;
-    std::unique_ptr<recompui::MenuController> launcher_controller;
-    std::unique_ptr<SystemInterface_SDL> system_interface;
-    recompui::RmlRenderInterface_RT64 render_interface;
-    Rml::Context* context;
-    recompui::UiEventListenerInstancer event_listener_instancer;
-
-    UIState(const UIState& rhs) = delete;
-    UIState& operator=(const UIState& rhs) = delete;
-    UIState(UIState&& rhs) = delete;
-    UIState& operator=(UIState&& rhs) = delete;
-
-    UIState(SDL_Window* window, RT64::RenderInterface* interface, RT64::RenderDevice* device) {
-        launcher_menu_controller = recompui::create_launcher_menu();
-        config_menu_controller = recompui::create_config_menu();
-
-        system_interface = std::make_unique<SystemInterface_SDL>();
-        system_interface->SetWindow(window);
-        render_interface.init(interface, device);
-
-        launcher_menu_controller->register_events(event_listener_instancer);
-        config_menu_controller->register_events(event_listener_instancer);
-
-        Rml::SetSystemInterface(system_interface.get());
-        Rml::SetRenderInterface(render_interface.get_rml_interface());
-        Rml::Factory::RegisterEventListenerInstancer(&event_listener_instancer);
-
-        recompui::register_custom_elements();
-
-        Rml::Initialise();
-        
-        // Apply the hack to replace RmlUi's default color parser with one that conforms to HTML5 alpha parsing for SASS compatibility
-        recompui::apply_color_hack();
-
-        int width, height;
-        SDL_GetWindowSizeInPixels(window, &width, &height);
-        
-        context = Rml::CreateContext("main", Rml::Vector2i(width, height));
-        launcher_menu_controller->make_bindings(context);
-        config_menu_controller->make_bindings(context);
-
-        Rml::Debugger::Initialise(context);
-        {
-            struct FontFace {
-                const char* filename;
-                bool fallback_face;
-            };
-            FontFace font_faces[] = {
-                {"LatoLatin-Regular.ttf", false},
-                {"ChiaroNormal.otf", false},
-                {"ChiaroBold.otf", false},
-                {"LatoLatin-Italic.ttf", false},
-                {"LatoLatin-Bold.ttf", false},
-                {"LatoLatin-BoldItalic.ttf", false},
-                {"NotoEmoji-Regular.ttf", true},
-                {"promptfont/promptfont.ttf", false},
-            };
-
-            for (const FontFace& face : font_faces) {
-                auto font = zelda64::get_asset_path(face.filename);
-                Rml::LoadFontFace(font.string(), face.fallback_face);
-            }
-        }
-    }
-
-    void create_menus() {
-        recompui::init_styling(zelda64::get_asset_path("recomp.rcss"));
-        launcher_menu_controller->load_document();
-        config_menu_controller->load_document();
-        recompui::init_prompt_context();
-    }
-
-    void unload() {
-        render_interface.reset();
-    }
-
-    void update_primary_input(bool mouse_moved, bool non_mouse_interacted) {
-        mouse_is_active_changed = false;
-        if (non_mouse_interacted) {
-            // controller newly interacted with
-            if (mouse_is_active) {
-                mouse_is_active = false;
-                mouse_is_active_changed = true;
-            }
-        }
-        else if (mouse_moved) {
-            // mouse newly interacted with
-            if (!mouse_is_active) {
-                mouse_is_active = true;
-                mouse_is_active_changed = true;
-            }
-        }
-
-        if (mouse_moved || non_mouse_interacted) {
-            mouse_is_active_initialized = true;
-        }
-
-        if (mouse_is_active_initialized) {
-            recompui::set_cursor_visible(mouse_is_active);
-        }
-
-        Rml::ElementDocument* current_document = top_mouse_document();
-        if (current_document == nullptr) {
-            return;
-        }
-
-        // TODO is this needed?
-        Rml::Element* window_el = current_document->GetElementById("window");
-        if (window_el != nullptr) {
-            if (mouse_is_active) {
-                if (!window_el->HasAttribute("mouse-active")) {
-                    window_el->SetAttribute("mouse-active", true);
-                }
-            }
-            else if (window_el->HasAttribute("mouse-active")) {
-                window_el->RemoveAttribute("mouse-active");
-            }
-        }
-    }
-
-    void update_focus(bool mouse_moved, bool non_mouse_interacted) {
-        Rml::ElementDocument* current_document = top_mouse_document();
-
-        if (current_document == nullptr) {
-            return;
-        }
-
-        if (cont_is_active || non_mouse_interacted) {
-            if (non_mouse_interacted) {
-                auto focusedEl = current_document->GetFocusLeafNode();
-                if (focusedEl == nullptr || RecompRml::CanFocusElement(focusedEl) != RecompRml::CanFocus::Yes) {
-                    Rml::Element* element = find_autofocus_element(current_document);
-                    if (element != nullptr) {
-                        element->Focus();
-                    }
-                }
-            }
-            return;
-        }
-
-        // If there was mouse motion, get the current hovered element (or its target if it points to one) and focus that if applicable.
-        if (mouse_is_active) {
-            if (mouse_is_active_changed) {
-                Rml::Element* focused = current_document->GetFocusLeafNode();
-                if (focused) focused->Blur();
-            } else if (mouse_moved) {
-                Rml::Element* hovered = context->GetHoverElement();
-                if (hovered) {
-                    Rml::Element* hover_target = get_target(current_document, hovered);
-                    if (hover_target && can_focus(hover_target)) {
-                        prev_focused = hover_target;
-                    }
-                }
-            }
-        }
-
-        if (!mouse_is_active) {
-            if (!prev_focused || !can_focus(prev_focused)) {
-                // Find the autofocus element in the tab chain
-                Rml::Element* element = find_autofocus_element(current_document);
-                if (element && can_focus(element)) {
-                    prev_focused = element;
-                }
-            }
-
-            if (mouse_is_active_changed && prev_focused && can_focus(prev_focused)) {
-                prev_focused->Focus();
-            }
-        }
-    }
-
-    void show_context(recompui::ContextId context) {
-        if (std::find_if(shown_contexts.begin(), shown_contexts.end(), [context](auto& c){ return c.context == context; }) != shown_contexts.end()) {
-            recompui::message_box("Attemped to show the same context twice");
-            assert(false);
-        }
-        Rml::ElementDocument* document = context.get_document();
-        shown_contexts.push_back(ContextDetails{
-            .context = context,
-            .document = document
-        });
-
-        // auto& on_show = context.on_show;
-        // if (on_show) {
-        //     context.open();
-        //     on_show();
-        //     context.close();
-        // }
-
-        document->PullToFront();
-        document->Show();
-        recompui::Element* default_element = context.get_autofocus_element();
-        if (default_element) {
-            default_element->focus();
-        }
-    }
-
-    void hide_context(recompui::ContextId context) {
-        auto remove_it = std::remove_if(shown_contexts.begin(), shown_contexts.end(), [context](auto& c) { return c.context == context; });
-        if (remove_it == shown_contexts.end()) {
-            recompui::message_box("Attemped to hide a context that isn't shown");
-            assert(false);
-        }
-        shown_contexts.erase(remove_it, shown_contexts.end());
-
-        context.get_document()->Hide();
-    }
-    
-    void hide_all_contexts() {
-        for (auto& context : shown_contexts) {
-            context.document->Hide();
-        }
-
-        shown_contexts.clear();
-    }
-
-    bool is_context_shown(recompui::ContextId context) {
-        return std::find_if(shown_contexts.begin(), shown_contexts.end(), [context](auto& c){ return c.context == context; }) != shown_contexts.end();
-    }
-
-    bool is_context_capturing_input() {
-        return std::find_if(shown_contexts.begin(), shown_contexts.end(), [](auto& c){ return c.context.captures_input(); }) != shown_contexts.end();
-    }
-
-    bool is_context_capturing_mouse() {
-        return std::find_if(shown_contexts.begin(), shown_contexts.end(), [](auto& c){ return c.context.captures_mouse(); }) != shown_contexts.end();
-    }
-
-    bool is_any_context_shown() {
-        return !shown_contexts.empty();
-    }
-
-    Rml::ElementDocument* top_input_document() {
-        // Iterate backwards and stop at the first context that takes input.
-        for (auto it = shown_contexts.rbegin(); it != shown_contexts.rend(); it++) {
-            if (it->context.captures_input()) {
-                return it->document;
-            }
-        }
-        return nullptr;
-    }
-
-    Rml::ElementDocument* top_mouse_document() {
-        // Iterate backwards and stop at the first context that takes input.
-        for (auto it = shown_contexts.rbegin(); it != shown_contexts.rend(); it++) {
-            if (it->context.captures_mouse()) {
-                return it->document;
-            }
-        }
-        return nullptr;
-    }
-
-    void update_contexts() {
-        for (auto& context_details : shown_contexts) {
-            context_details.context.open();
-            context_details.context.process_updates();
-            context_details.context.close();
-        }
-    }
-};
-
-std::unique_ptr<UIState> ui_state;
-std::recursive_mutex ui_state_mutex{};
-
-// TODO make this not be global
-extern SDL_Window* window;
-
-void recompui::get_window_size(int& width, int& height) {
-    SDL_GetWindowSizeInPixels(window, &width, &height);
-}
-
-inline const std::string read_file_to_string(std::filesystem::path path) {
-    std::ifstream stream = std::ifstream{path};
-    std::ostringstream ss;
-    ss << stream.rdbuf();
-    return ss.str(); 
-}
-
-void init_hook(RT64::RenderInterface* interface, RT64::RenderDevice* device) {
-#if defined(__linux__)
-    std::locale::global(std::locale::classic());
-#endif
-    ui_state = std::make_unique<UIState>(window, interface, device);
-    ui_state->create_menus();
-}
-
-moodycamel::ConcurrentQueue<SDL_Event> ui_event_queue{};
-
-void recompui::queue_event(const SDL_Event& event) {
-    ui_event_queue.enqueue(event);
-}
-
-bool recompui::try_deque_event(SDL_Event& out) {
-    return ui_event_queue.try_dequeue(out);
-}
-
-int cont_button_to_key(SDL_ControllerButtonEvent& button) {
-    // Configurable accept button in menu
-    auto menuAcceptBinding0 = recomp::get_input_binding(recomp::GameInput::ACCEPT_MENU, 0, recomp::InputDevice::Controller);
-    auto menuAcceptBinding1 = recomp::get_input_binding(recomp::GameInput::ACCEPT_MENU, 1, recomp::InputDevice::Controller);
-    // note - magic number: 0 is InputType::None
-    if ((menuAcceptBinding0.input_type != 0 && button.button == menuAcceptBinding0.input_id) ||
-        (menuAcceptBinding1.input_type != 0 && button.button == menuAcceptBinding1.input_id)) {
-        return SDLK_RETURN;
-    }
-
-    // Configurable apply button in menu
-    auto menuApplyBinding0 = recomp::get_input_binding(recomp::GameInput::APPLY_MENU, 0, recomp::InputDevice::Controller);
-    auto menuApplyBinding1 = recomp::get_input_binding(recomp::GameInput::APPLY_MENU, 1, recomp::InputDevice::Controller);
-    // note - magic number: 0 is InputType::None
-    if ((menuApplyBinding0.input_type != 0 && button.button == menuApplyBinding0.input_id) ||
-        (menuApplyBinding1.input_type != 0 && button.button == menuApplyBinding1.input_id)) {
-        return SDLK_f;
-    } 
-
-    // Allows closing the menu
-    auto menuToggleBinding0 = recomp::get_input_binding(recomp::GameInput::TOGGLE_MENU, 0, recomp::InputDevice::Controller);
-    auto menuToggleBinding1 = recomp::get_input_binding(recomp::GameInput::TOGGLE_MENU, 1, recomp::InputDevice::Controller);
-    // note - magic number: 0 is InputType::None
-    if ((menuToggleBinding0.input_type != 0 && button.button == menuToggleBinding0.input_id) ||
-        (menuToggleBinding1.input_type != 0 && button.button == menuToggleBinding1.input_id)) {
-        return SDLK_ESCAPE;
-    }
-
-    switch (button.button) {
-        case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_UP:
-            return SDLK_UP;
-        case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_DOWN:
-            return SDLK_DOWN;
-        case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_LEFT:
-            return SDLK_LEFT;
-        case SDL_GameControllerButton::SDL_CONTROLLER_BUTTON_DPAD_RIGHT:
-            return SDLK_RIGHT;
-    }
-
-    return 0;
-}
-
-
-int cont_axis_to_key(SDL_ControllerAxisEvent& axis, float value) {
-    switch (axis.axis) {
-    case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY:
-        if (value < 0) return SDLK_UP;
-        return SDLK_DOWN;
-    case SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX:
-        if (value >= 0) return SDLK_RIGHT;
-        return SDLK_LEFT;
-    }
-    return 0;
-}
-
-void apply_background_input_mode() {
-    static recomp::BackgroundInputMode last_input_mode = recomp::BackgroundInputMode::OptionCount;
-
-    recomp::BackgroundInputMode cur_input_mode = recomp::get_background_input_mode();
-
-    if (last_input_mode != cur_input_mode) {
-        SDL_SetHint(
-            SDL_HINT_JOYSTICK_ALLOW_BACKGROUND_EVENTS,
-            cur_input_mode == recomp::BackgroundInputMode::On
-                ? "1"
-                : "0"
-        );
-    }
-    last_input_mode = cur_input_mode;
-}
-
-bool recompui::get_cont_active() {
-    return ui_state->cont_is_active;
-}
-
-void recompui::set_cont_active(bool active) {
-    ui_state->cont_is_active = active;
-}
-
-void recompui::activate_mouse() {
-    ui_state->update_primary_input(true, false);
-    ui_state->update_focus(true, false);
-}
-
-void draw_hook(RT64::RenderCommandList* command_list, RT64::RenderFramebuffer* swap_chain_framebuffer) {
-
-    apply_background_input_mode();
-
-    // Return early if the ui context has been destroyed already.
-    if (!ui_state) {
-        return;
-    }
-
-    // Return to the launcher if no menu is open and the game isn't started.
-    if (!recompui::is_any_context_shown() && !ultramodern::is_game_started()) {
-        recompui::show_context(recompui::get_launcher_context_id(), "");
-    }
-
-    std::lock_guard lock{ ui_state_mutex };
-
-    SDL_Event cur_event{};
-
-    bool mouse_moved = false;
-    bool mouse_clicked = false;
-    bool non_mouse_interacted = false;
-    bool cont_interacted = false;
-    bool kb_interacted = false;
-
-    bool config_was_open = recompui::is_context_shown(recompui::get_config_context_id()) || recompui::is_context_shown(recompui::get_config_sub_menu_context_id());
-
-    using clock = std::chrono::system_clock;
-
-    // TODO move these into a more appropriate place.
-    constexpr clock::duration start_repeat_delay = std::chrono::milliseconds{500};
-    constexpr clock::duration repeat_rate = std::chrono::milliseconds{50};
-    static clock::time_point next_repeat_time = {};
-    static int latest_controller_key_pressed = SDLK_UNKNOWN;
-
-    while (recompui::try_deque_event(cur_event)) {
-        bool context_capturing_input = recompui::is_context_capturing_input();
-        bool context_capturing_mouse = recompui::is_context_capturing_mouse();
-
-        // Handle up button events even when input is disabled to avoid missing them during binding.
-        if (cur_event.type == SDL_EventType::SDL_CONTROLLERBUTTONUP) {
-            int sdl_key = cont_button_to_key(cur_event.cbutton);
-            if (sdl_key == latest_controller_key_pressed) {
-                latest_controller_key_pressed = SDLK_UNKNOWN;
-            }
-        }
-
-        if (!recomp::all_input_disabled()) {
-            bool is_mouse_input = false;
-            // Implement some additional behavior for specific events on top of what RmlUi normally does with them.
-            switch (cur_event.type) {
-            case SDL_EventType::SDL_MOUSEMOTION: {
-                int *last_mouse_pos = ui_state->last_active_mouse_position;
-
-                if (!ui_state->mouse_is_active) {
-                    float xD = cur_event.motion.x - last_mouse_pos[0];
-                    float yD = cur_event.motion.y - last_mouse_pos[1];
-                    if (sqrt(xD * xD + yD * yD) < 100) {
-                        break;
-                    }
-                }
-                last_mouse_pos[0] = cur_event.motion.x;
-                last_mouse_pos[1] = cur_event.motion.y;
-
-                // if controller is the primary input, don't use mouse movement to allow cursor to reactivate
-                if (recompui::get_cont_active()) {
-                    break;
-                }
-            }
-            // fallthrough
-            case SDL_EventType::SDL_MOUSEBUTTONDOWN:
-                mouse_moved = true;
-                mouse_clicked = true;
-                is_mouse_input = true;
-                break;
-                
-            case SDL_EventType::SDL_MOUSEBUTTONUP:
-            case SDL_EventType::SDL_MOUSEWHEEL:
-                is_mouse_input = true;
-                break;
-                
-            case SDL_EventType::SDL_CONTROLLERBUTTONDOWN: {
-                int sdl_key = cont_button_to_key(cur_event.cbutton);
-                if (context_capturing_input && sdl_key) {
-                    ui_state->context->ProcessKeyDown(RmlSDL::ConvertKey(sdl_key), 0);
-                    latest_controller_key_pressed = sdl_key;
-                    next_repeat_time = clock::now() + start_repeat_delay;
-                }
-                non_mouse_interacted = true;
-                cont_interacted = true;
-                break;
-            }
-            case SDL_EventType::SDL_KEYDOWN:
-                non_mouse_interacted = true;
-                kb_interacted = true;
-                if (cur_event.key.keysym.scancode == SDL_Scancode::SDL_SCANCODE_F8) {
-                    if (zelda64::get_debug_mode_enabled()) {
-                        Rml::Debugger::SetVisible(!Rml::Debugger::IsVisible());
-                    }
-                }
-                break;
-            case SDL_EventType::SDL_USEREVENT:
-                if (cur_event.user.code == SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY) {
-                    ui_state->await_stick_return_y = true;
-                } else if (cur_event.user.code == SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX) {
-                    ui_state->await_stick_return_x = true;
-                }
-                break;
-            case SDL_EventType::SDL_CONTROLLERAXISMOTION:
-                SDL_ControllerAxisEvent* axis_event = &cur_event.caxis;
-                if (axis_event->axis != SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY && axis_event->axis != SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTX) {
-                    break;
-                }
-
-                float axis_value = axis_event->value * (1 / 32768.0f);
-                bool* await_stick_return = axis_event->axis == SDL_GameControllerAxis::SDL_CONTROLLER_AXIS_LEFTY
-                        ? &ui_state->await_stick_return_y
-                        : &ui_state->await_stick_return_x;
-                if (fabsf(axis_value) > 0.5f) {
-                    if (!*await_stick_return) {
-                        *await_stick_return = true;
-                        non_mouse_interacted = true;
-                        int sdl_key = cont_axis_to_key(cur_event.caxis, axis_value);
-                        if (context_capturing_input && sdl_key) {
-                            ui_state->context->ProcessKeyDown(RmlSDL::ConvertKey(sdl_key), 0);
-                            latest_controller_key_pressed = sdl_key;
-                            next_repeat_time = clock::now() + start_repeat_delay;
-                        }
-                    }
-                    non_mouse_interacted = true;
-                    cont_interacted = true;
-                }
-                else if (*await_stick_return && fabsf(axis_value) < 0.15f) {
-                    *await_stick_return = false;
-                    // Stop pressing the current key if the axis that was released was the one triggering key presses.
-                    int sdl_key = cont_axis_to_key(cur_event.caxis, axis_value);
-                    if (sdl_key == latest_controller_key_pressed) {
-                        latest_controller_key_pressed = SDLK_UNKNOWN;
-                    }
-                }
-                break;
-            }
-
-            // Send the event to RmlUi if this type of event is being captured.
-            if (is_mouse_input) {
-                if (context_capturing_mouse) {
-                    RmlSDL::InputEventHandler(ui_state->context, cur_event);
-                }
-            }
-            else {
-                if (context_capturing_input) {
-                    RmlSDL::InputEventHandler(ui_state->context, cur_event);
-                }
-            }
-        }
-
-        // If the config menu isn't open and the game has been started and either the escape key or select button are pressed, open the config menu.
-        if (!config_was_open && ultramodern::is_game_started()) {
-            bool open_config = false;
-
-            switch (cur_event.type) {
-            case SDL_EventType::SDL_KEYDOWN:
-                if (cur_event.key.keysym.scancode == SDL_Scancode::SDL_SCANCODE_ESCAPE) {
-                    open_config = true;
-                }
-                break;
-            case SDL_EventType::SDL_CONTROLLERBUTTONDOWN:
-                auto menuToggleBinding0 = recomp::get_input_binding(recomp::GameInput::TOGGLE_MENU, 0, recomp::InputDevice::Controller);
-                auto menuToggleBinding1 = recomp::get_input_binding(recomp::GameInput::TOGGLE_MENU, 1, recomp::InputDevice::Controller);
-                // note - magic number: 0 is InputType::None
-                if ((menuToggleBinding0.input_type != 0 && cur_event.cbutton.button == menuToggleBinding0.input_id) ||
-                    (menuToggleBinding1.input_type != 0 && cur_event.cbutton.button == menuToggleBinding1.input_id)) {
-                    open_config = true;
-                }
-                break;
-            }
-
-            if (open_config) {
-                recompui::show_context(recompui::get_config_context_id(), "");
-            }
-        }
-    } // end dequeue event loop
-
-    // Handle controller key repeats.
-    if (latest_controller_key_pressed != SDLK_UNKNOWN) {
-        clock::time_point now = clock::now();
-        if (now >= next_repeat_time) {
-            ui_state->context->ProcessKeyDown(RmlSDL::ConvertKey(latest_controller_key_pressed), 0);
-            next_repeat_time += repeat_rate;
-        }
-    }
-
-    if (cont_interacted || kb_interacted || mouse_clicked) {
-        recompui::set_cont_active(cont_interacted);
-    }
-    recomp::config_menu_set_cont_or_kb(ui_state->cont_is_active);
-
-    recomp::InputField scanned_field = recomp::get_scanned_input();
-    if (scanned_field != recomp::InputField{}) {
-        recomp::finish_scanning_input(scanned_field);
-    }
-
-    ui_state->update_primary_input(mouse_moved, non_mouse_interacted);
-    ui_state->update_focus(mouse_moved, non_mouse_interacted);
-
-    if (recompui::is_any_context_shown()) {
-        ui_state->update_contexts();
-
-        int width = swap_chain_framebuffer->getWidth();
-        int height = swap_chain_framebuffer->getHeight();
-
-        // Scale the UI based on the window size with 1080 vertical resolution as the reference point.
-        ui_state->context->SetDensityIndependentPixelRatio((height) / 1080.0f);
-
-        ui_state->render_interface.start(command_list, width, height);
-
-        static int prev_width = 0;
-        static int prev_height = 0;
-
-        if (prev_width != width || prev_height != height) {
-            ui_state->context->SetDimensions({ width, height });
-        }
-        prev_width = width;
-        prev_height = height;
-
-        ui_state->context->Update();
-        ui_state->context->Render();
-        ui_state->render_interface.end(command_list, swap_chain_framebuffer);
-    }
-}
-
-void deinit_hook() {
-    recompui::destroy_all_contexts();
-
-    std::lock_guard lock {ui_state_mutex};
-    Rml::Debugger::Shutdown();
-    Rml::Shutdown();
-    ui_state->unload();
-    ui_state.reset();
-}
-
-void recompui::set_render_hooks() {
-    RT64::SetRenderHooks(init_hook, draw_hook, deinit_hook);
-}
-
-void recompui::message_box(const char* msg) {
-    SDL_ShowSimpleMessageBox(SDL_MESSAGEBOX_ERROR, zelda64::program_name.data(), msg, nullptr);
-    printf("[ERROR] %s\n", msg);
-}
-
-void recompui::show_context(ContextId context, std::string_view param) {
-    ContextId prev_context = recompui::try_close_current_context();
-    {
-        std::lock_guard lock{ ui_state_mutex };
-
-        // TODO call the context's on_show callback with the param.
-        ui_state->show_context(context);
-    }
-    if (prev_context != ContextId::null()) {
-        prev_context.open();
-    }
-}
-
-void recompui::hide_context(ContextId context) {
-    ContextId prev_context = recompui::try_close_current_context();
-    {
-        std::lock_guard lock{ ui_state_mutex };
-
-        ui_state->hide_context(context);
-    }
-    if (prev_context != ContextId::null()) {
-        prev_context.open();
-    }
-}
-
-void recompui::hide_all_contexts() {
-    std::lock_guard lock{ui_state_mutex};
-
-    if (ui_state) {
-        ui_state->hide_all_contexts();
-    }
-}
-
-bool recompui::is_context_shown(ContextId context) {
-    std::lock_guard lock{ui_state_mutex};
-
-    if (!ui_state) {
-        return false;
-    }
-
-    return ui_state->is_context_shown(context);
-}
-
-bool recompui::is_context_capturing_input() {
-    std::lock_guard lock{ui_state_mutex};
-
-    if (!ui_state) {
-        return false;
-    }
-
-    return ui_state->is_context_capturing_input();
-}
-
-bool recompui::is_context_capturing_mouse() {
-    std::lock_guard lock{ui_state_mutex};
-
-    if (!ui_state) {
-        return false;
-    }
-
-    return ui_state->is_context_capturing_mouse();
-}
-
-bool recompui::is_any_context_shown() {
-    std::lock_guard lock{ui_state_mutex};
-
-    if (!ui_state) {
-        return false;
-    }
-
-    return ui_state->is_any_context_shown();
-}
-
-Rml::ElementDocument* recompui::load_document(const std::filesystem::path& path) {
-    std::lock_guard lock{ui_state_mutex};
-
-    return ui_state->context->LoadDocument(path.string());
-}
-
-Rml::ElementDocument* recompui::create_empty_document() {
-    std::lock_guard lock{ui_state_mutex};
-
-    return ui_state->context->CreateDocument();
-}
-
-void recompui::queue_image_from_bytes_file(const std::string &src, const std::vector<char> &bytes) {
-    ui_state->render_interface.queue_image_from_bytes_file(src, bytes);
-}
-
-void recompui::queue_image_from_bytes_rgba32(const std::string &src, const std::vector<char> &bytes, uint32_t width, uint32_t height) {
-    ui_state->render_interface.queue_image_from_bytes_rgba32(src, bytes, width, height);
-}
-
-void recompui::release_image(const std::string &src) {
-    Rml::ReleaseTexture(src);
-}
-
-void recompui::drop_files(const std::list<std::filesystem::path> &file_list) {
-    // Prevent mod installation after the game has started.
-    if (ultramodern::is_game_started()) {
-        return;
-    }
-
-    recompui::set_config_tab(recompui::ConfigTab::Mods);
-    // If the config menu isn't open, open it in the mods tab.
-    if (!recompui::is_context_shown(recompui::get_config_context_id())) {
-        recompui::hide_all_contexts();
-        recompui::show_context(recompui::get_config_context_id(), "");
-    }
-
-    recompui::open_notification("Installing Mods", "Please Wait");
-    // TODO: Needs a progress callback and a prompt for every mod that needs to be confirmed to be overwritten.
-    // TODO: Run this on a background thread and use the callbacks to advance the state instead of blocking.
-    ModInstaller::Result result;
-    ModInstaller::start_mod_installation(file_list, nullptr, result);
-
-    recompui::close_prompt();
-
-    if (!result.error_messages.empty()) {
-        std::string error_label = std::accumulate(result.error_messages.begin(), result.error_messages.end(), std::string{},
-            [](const std::string &lhs, const std::string &rhs)
-            {
-                return lhs.empty() ? rhs : lhs + '\n' + rhs;
-            });
-
-        recompui::open_info_prompt("Error Installing Mods", error_label, "OK", {}, recompui::ButtonVariant::Tertiary);
-        std::vector<std::string> dummy_error_messages{};
-        ModInstaller::cancel_mod_installation(result, dummy_error_messages);
-        return;
-    }
-
-    std::vector<ModInstaller::Confirmation> confirmations{};
-
-    for (const ModInstaller::Installation& pending_install : result.pending_installations) {
-        if (pending_install.needs_overwrite_confirmation) {
-            // Get the mod details for the current mod at this file path.
-            std::string old_mod_id = recomp::mods::get_mod_id_from_filename(pending_install.mod_file.filename());
-            std::optional<recomp::mods::ModDetails> old_mod_details = {};
-
-            if (!old_mod_id.empty()) {
-                old_mod_details = recomp::mods::get_details_for_mod(old_mod_id);
-            }
-
-            if (old_mod_details) {
-                confirmations.emplace_back(ModInstaller::Confirmation {
-                    .old_display_name = old_mod_details->display_name,
-                    .new_display_name = pending_install.display_name,
-                    .old_mod_id = old_mod_details->mod_id,
-                    .new_mod_id = pending_install.mod_id,
-                    .old_version = old_mod_details->version,
-                    .new_version = pending_install.mod_version
-                });
-            }
-            else {
-                confirmations.emplace_back(ModInstaller::Confirmation {
-                    .old_display_name = "?",
-                    .new_display_name = pending_install.display_name,
-                    .old_mod_id = "",
-                    .new_mod_id = pending_install.mod_id,
-                    .old_version = recomp::Version{0, 0, 0, ""},
-                    .new_version = pending_install.mod_version
-                });
-            }
-        }
-    }
-
-    if (confirmations.empty()) {
-        std::vector<std::string> error_messages{};
-        ModInstaller::finish_mod_installation(result, error_messages);
-        ContextId old_context = recompui::try_close_current_context();
-        recompui::update_mod_list();
-        if (old_context != ContextId::null()) {
-            old_context.open();
-        }
-        // TODO show errors
-    }
-    else {
-        std::string prompt_text = std::accumulate(confirmations.begin(), confirmations.end(), std::string{},
-            [](const std::string &cur_text, const ModInstaller::Confirmation &confirmation)
-            {
-                std::string new_text{};
-                if (confirmation.old_display_name == confirmation.new_display_name) {
-                    new_text = confirmation.old_display_name + " (" + confirmation.old_version.to_string() + " -> " + confirmation.new_version.to_string() + ")";
-                }
-                else {
-                    new_text =
-                        confirmation.old_display_name + " (" + confirmation.old_version.to_string() + ") -> " +
-                        confirmation.new_display_name + " (" + confirmation.new_version.to_string() + ")";
-                }
-                return cur_text.empty() ? new_text : cur_text + '\n' + new_text;
-            });
-
-        // open prompt where confirm finishes the mod installation with the overwritten files
-        recompui::open_choice_prompt("Overwrite Mods?",
-            prompt_text,
-            "Overwrite",
-            "Cancel",
-            [result]() {
-                std::vector<std::string> error_messages{};
-                recomp::mods::close_mods();
-                ModInstaller::finish_mod_installation(result, error_messages);
-                ContextId old_context = recompui::try_close_current_context();
-                recompui::update_mod_list();
-                if (old_context != ContextId::null()) {
-                    old_context.open();
-                }
-                // TODO show errors
-            },
-            [result]() {
-                std::vector<std::string> error_messages{};
-                ModInstaller::cancel_mod_installation(result, error_messages);
-                // TODO show errors
-            },
-            recompui::ButtonVariant::Success,
-            recompui::ButtonVariant::Error,
-            true,
-            ""
-        );
-    }
-}
diff --git a/src/ui/ui_utils.cpp b/src/ui/ui_utils.cpp
deleted file mode 100644
index 08b324e..0000000
--- a/src/ui/ui_utils.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "ultramodern/ultramodern.hpp"
-
-#include "ui_utils.h"
-
-recompui::Color recompui::lerp_color(const recompui::Color& a, const recompui::Color& b, float factor) {
-    return recompui::Color{
-        static_cast<uint8_t>(std::lerp(float(a.r), float(b.r), factor)),
-        static_cast<uint8_t>(std::lerp(float(a.g), float(b.g), factor)),
-        static_cast<uint8_t>(std::lerp(float(a.b), float(b.b), factor)),
-        static_cast<uint8_t>(std::lerp(float(a.a), float(b.a), factor)),
-    };
-}
-
-recompui::Color recompui::get_pulse_color(uint32_t pulse_milliseconds) {
-    uint64_t millis = std::chrono::duration_cast<std::chrono::milliseconds>(ultramodern::time_since_start()).count();
-    uint32_t anim_offset = millis % pulse_milliseconds;
-    
-    float factor = std::abs((2.0f * anim_offset / pulse_milliseconds) - 1.0f);
-    return lerp_color(Color{ 23, 214, 232, 255 }, Color{ 162, 239, 246, 255 }, factor);
-}
diff --git a/src/ui/ui_utils.h b/src/ui/ui_utils.h
deleted file mode 100644
index 944fe19..0000000
--- a/src/ui/ui_utils.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __UI_UTILS_H__
-#define __UI_UTILS_H__
-
-#include "elements/ui_types.h"
-
-namespace recompui {
-    Color lerp_color(const Color& a, const Color& b, float factor);
-    Color get_pulse_color(uint32_t millisecond_period);
-}
-
-#endif
diff --git a/src/ui/util/bem.h b/src/ui/util/bem.h
deleted file mode 100644
index f5ee7c2..0000000
--- a/src/ui/util/bem.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef RECOMPUI_ELEMENTS_BEM
-#define RECOMPUI_ELEMENTS_BEM
-
-#include <string>
-
-#define EL(bem, element) bem "__" element
-#define EL_DYN(bem, element) bem "__" + element
-#define MOD(bem, modifier) bem "--" modifier
-#define MOD_DYN(bem, modifier) bem "--" + modifier
-#define BLOCK(bem) bem
-
-#endif
diff --git a/src/ui/util/hsv.cpp b/src/ui/util/hsv.cpp
deleted file mode 100644
index 3de75ea..0000000
--- a/src/ui/util/hsv.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#include "hsv.h"
-#include <algorithm> // std::min, std::max and std::clamp
-#include <math.h>
-
-namespace recompui {
-
-void HsvToRgb(HsvColor& hsv, RgbColor& rgb)
-{
-    unsigned char region, remainder, p, q, t;
-    
-    if (hsv.s == 0)
-    {
-        rgb.r = hsv.v;
-        rgb.g = hsv.v;
-        rgb.b = hsv.v;
-        return;
-    }
-    
-    region = hsv.h / 43;
-    remainder = (hsv.h - (region * 43)) * 6; 
-    
-    p = (hsv.v * (255 - hsv.s)) >> 8;
-    q = (hsv.v * (255 - ((hsv.s * remainder) >> 8))) >> 8;
-    t = (hsv.v * (255 - ((hsv.s * (255 - remainder)) >> 8))) >> 8;
-    
-    switch (region)
-    {
-        case 0:
-            rgb.r = hsv.v; rgb.g = t; rgb.b = p;
-            break;
-        case 1:
-            rgb.r = q; rgb.g = hsv.v; rgb.b = p;
-            break;
-        case 2:
-            rgb.r = p; rgb.g = hsv.v; rgb.b = t;
-            break;
-        case 3:
-            rgb.r = p; rgb.g = q; rgb.b = hsv.v;
-            break;
-        case 4:
-            rgb.r = t; rgb.g = p; rgb.b = hsv.v;
-            break;
-        default:
-            rgb.r = hsv.v; rgb.g = p; rgb.b = q;
-            break;
-    }
-}
-
-void RgbToHsv(RgbColor& rgb, HsvColor& hsv)
-{
-    unsigned char rgbMin, rgbMax;
-
-    rgbMin = rgb.r < rgb.g ? (rgb.r < rgb.b ? rgb.r : rgb.b) : (rgb.g < rgb.b ? rgb.g : rgb.b);
-    rgbMax = rgb.r > rgb.g ? (rgb.r > rgb.b ? rgb.r : rgb.b) : (rgb.g > rgb.b ? rgb.g : rgb.b);
-    
-    hsv.v = rgbMax;
-    if (hsv.v == 0)
-    {
-        hsv.h = 0;
-        hsv.s = 0;
-        return;
-    }
-
-    hsv.s = 255 * long(rgbMax - rgbMin) / hsv.v;
-    if (hsv.s == 0)
-    {
-        hsv.h = 0;
-        return;
-    }
-
-    if (rgbMax == rgb.r)
-        hsv.h = 0 + 43 * (rgb.g - rgb.b) / (rgbMax - rgbMin);
-    else if (rgbMax == rgb.g)
-        hsv.h = 85 + 43 * (rgb.b - rgb.r) / (rgbMax - rgbMin);
-    else
-        hsv.h = 171 + 43 * (rgb.r - rgb.g) / (rgbMax - rgbMin);
-}
-
-static unsigned char clamp_255(float f) {
-    return std::clamp((int)round(f), 0, 255);
-}
-
-void HsvFToRgb(HsvColorF in, RgbColor& out)
-{
-    float      hh, p, q, t, ff;
-    long        i;
-
-    unsigned char val = clamp_255(in.v * 255.0f);
-
-    if (in.s <= 0.0) {
-        out.r = val;
-        out.g = val;
-        out.b = val;
-        return;
-    }
-
-    hh = in.h;
-    if (hh >= 360.0f) hh = 0.0f;
-    hh /= 60.0f;
-    i = (float)hh;
-    ff = hh - i;
-    p = in.v * (1.0f - in.s);
-    q = in.v * (1.0f - (in.s * ff));
-    t = in.v * (1.0f - (in.s * (1.0f - ff)));
-
-    unsigned char up = clamp_255(p * 255.0f);
-    unsigned char uq = clamp_255(q * 255.0f);
-    unsigned char ut = clamp_255(t * 255.0f);
-
-    switch (i) {
-    case 0:
-        out.r = val;
-        out.g = ut;
-        out.b = up;
-        return;
-    case 1:
-        out.r = uq;
-        out.g = val;
-        out.b = up;
-        return;
-    case 2:
-        out.r = up;
-        out.g = val;
-        out.b = ut;
-        return;
-    case 3:
-        out.r = up;
-        out.g = uq;
-        out.b = val;
-        return;
-    case 4:
-        out.r = ut;
-        out.g = up;
-        out.b = val;
-        return;
-    case 5:
-    default:
-        out.r = val;
-        out.g = up;
-        out.b = uq;
-        return;
-    }
-}
-
-}
diff --git a/src/ui/util/hsv.h b/src/ui/util/hsv.h
deleted file mode 100644
index 3bd9bc7..0000000
--- a/src/ui/util/hsv.h
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef RECOMP_UI_HSV
-#define RECOMP_UI_HSV
-
-
-namespace recompui {
-    typedef struct RgbColor
-    {
-        union {
-            struct {
-                unsigned char r;
-                unsigned char g;
-                unsigned char b;
-            };
-            unsigned char data[3]; // Array access
-        };
-
-        // Operator[] to access members by index
-        unsigned char& operator[](int index) {
-            return data[index];
-        }
-
-        // Const version for read-only access
-        const unsigned char& operator[](int index) const {
-            return data[index];
-        }
-    } RgbColor;
-
-    typedef struct HsvColor
-    {
-        union {
-            struct {
-                unsigned char h;
-                unsigned char s;
-                unsigned char v;
-            };
-            unsigned char data[3]; // Array access
-        };
-
-        // Operator[] to access members by index
-        unsigned char& operator[](int index) {
-            return data[index];
-        }
-
-        // Const version for read-only access
-        const unsigned char& operator[](int index) const {
-            return data[index];
-        }
-    } HsvColor;
-
-    typedef struct HsvColorF
-    {
-        union {
-            struct {
-                float h; // 0-360
-                float s; // 0-1
-                float v; // 0-1
-            };
-            float data[3]; // Array access
-        };
-
-        // Operator[] to access members by index
-        float& operator[](int index) {
-            return data[index];
-        }
-
-        // Const version for read-only access
-        const float& operator[](int index) const {
-            return data[index];
-        }
-    } HsvColorF;
-
-    void HsvToRgb(HsvColor& hsv, RgbColor& rgb);
-    void HsvFToRgb(HsvColorF in, RgbColor& out);
-    void RgbToHsv(RgbColor& rgb, HsvColor& hsv);
-}
-
-#endif