diff --git a/.gitignore b/.gitignore
index 76c99d48..6b001a19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,13 @@ src/wx/cmdtab.cpp
 src/wx/wxvbam.xrs
 build/*
 build32/*
+vsbuild/*
 dependencies/*
+vcpkg/*
 .vs/*
 *.o
 *.so
+*.dll
 *.exe
 
 # vim swap files
diff --git a/.gitmodules b/.gitmodules
index ff35d490..048fc2d6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "dependencies"]
 	path = dependencies
 	url = https://github.com/visualboyadvance-m/dependencies.git
+[submodule "vcpkg"]
+	path = vcpkg
+	url = https://github.com/Microsoft/vcpkg.git
diff --git a/.travis.yml b/.travis.yml
index a55a356f..740e3073 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,9 @@
 ---
 sudo: required
 
+services:
+    - xvfb
+
 matrix:
     fast_finish: true
     include:
@@ -15,38 +18,38 @@ matrix:
               - cd build
               - cmake ..
               - make -j2
-#              - ./visualboyadvance-m --help
+#              - xvfb-run ./visualboyadvance-m --help
+          cache:
+              directories:
+                  - "$HOME/.ccache"
+        - env: BUILD_ENV=mingw-w64
+          language: cpp
+          os: linux
+          dist: trusty
+          before_script:
+              - ./installdeps MinGW-w64-x86_64
+          script:
+              - mkdir build
+              - cd build
+              - /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake ..
+              - make -j2
+          cache:
+              directories:
+                  - "$HOME/.ccache"
+        - env: BUILD_ENV=mingw-w32
+          language: cpp
+          os: linux
+          dist: trusty
+          before_script:
+              - ./installdeps MinGW-w64-i686
+          script:
+              - mkdir build
+              - cd build
+              - /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake ..
+              - make -j2
           cache:
               directories:
                   - "$HOME/.ccache"
-#        - env: BUILD_ENV=mingw-w64
-#          language: cpp
-#          os: linux
-#          dist: trusty
-#          before_script:
-#              - ./installdeps MinGW-w64-x86_64
-#          script:
-#              - mkdir build
-#              - cd build
-#              - /usr/lib/mxe/usr/bin/x86_64-w64-mingw32.static-cmake ..
-#              - make -j2
-#          cache:
-#              directories:
-#                  - "$HOME/.ccache"
-#        - env: BUILD_ENV=mingw-w32
-#          language: cpp
-#          os: linux
-#          dist: trusty
-#          before_script:
-#              - ./installdeps MinGW-w64-i686
-#          script:
-#              - mkdir build
-#              - cd build
-#              - /usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake ..
-#              - make -j2
-#          cache:
-#              directories:
-#                  - "$HOME/.ccache"
         - env: BUILD_ENV=libretro
           language: cpp
           os: linux
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8073871a..ff7fb9ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,3 +1,25 @@
+if(COMMAND cmake_policy)
+    cmake_policy(SET CMP0003 NEW) # link to full path of libs
+    cmake_policy(SET CMP0005 NEW) # escapes in add_definitions
+
+    if(POLICY CMP0077)
+        cmake_policy(SET CMP0077 NEW) # use vars for options
+    endif()
+
+    if(NOT CMAKE_VERSION VERSION_LESS 3.0)
+        cmake_policy(SET CMP0043 NEW) # for wxWidgets, use generator expressions
+    endif()
+endif()
+
+option(ENABLE_VCPKG "Use dependencies for Visual Studio from vcpkg" ON)
+
+set(NLS_DEFAULT ON)
+
+# get win32 deps before project declaration, because toolchain is set for vcpkg
+set(VCPKG_DEPS zlib libpng SDL2 SFML gettext wxWidgets)
+
+include(${CMAKE_SOURCE_DIR}/cmake/Win32Deps.cmake)
+
 project(VBA-M C CXX)
 
 cmake_minimum_required(VERSION 2.8.12)
@@ -12,19 +34,13 @@ endif()
 
 set(ALL_TARGETS fex visualboyadvance-m vbamcore vbam)
 
-if(COMMAND cmake_policy)
-    cmake_policy(SET CMP0003 NEW) # link to full path of libs
-    cmake_policy(SET CMP0005 NEW) # escapes in add_definitions
-endif()
-
-set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 #Output all binaries at top level
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 
 option(ENABLE_SDL "Build the SDL port" OFF)
 option(ENABLE_WX "Build the wxWidgets port" ON)
 option(ENABLE_DEBUGGER "Enable the debugger" ON)
-option(ENABLE_NLS "Enable translations" ON)
 option(ENABLE_ASAN "Enable -fsanitize=<option>, address by default, requires debug build" OFF)
 
 option(VBAM_STATIC "Try to link all libraries statically" OFF)
@@ -37,7 +53,15 @@ if(VBAM_STATIC)
     set(OPENAL_STATIC ON)
 endif()
 
-set(ASM_DEFAULT OFF)
+set(ENABLE_BUNDLED_LIBS_DEFAULT OFF)
+
+# on visual studio use all bundled stuff
+if(MSVC)
+    set(ENABLE_BUNDLED_LIBS_DEFAULT ON)
+endif()
+
+# XXX: do some stuff with this
+#option(ENABLE_BUNDLED_LIBS "Use bundled libraries instead of system libraries" ${ENABLE_BUNDLED_LIBS_DEFAULT})
 
 # use ccache if available, and not already enabled on the command line
 # but not with ninja and msys ccache on msys2
@@ -51,32 +75,14 @@ if(NOT (WIN32 AND (NOT $ENV{MSYSTEM} STREQUAL "") AND CMAKE_GENERATOR STREQUAL N
     endif()
 endif()
 
-if(NOT CMAKE_SYSTEM_PROCESSOR)
-    if(NOT CMAKE_TOOLCHAIN_FILE AND CMAKE_HOST_SYSTEM_PROCESSOR)
-        set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
-    elseif(CMAKE_TOOLCHAIN_FILE MATCHES mxe)
-        if(CMAKE_TOOLCHAIN_FILE MATCHES "i[3-9]86")
-            set(CMAKE_SYSTEM_PROCESSOR i686)
-        else()
-            set(CMAKE_SYSTEM_PROCESSOR x86_64)
-        endif()
-    endif()
-endif()
-
-# turn asm on by default on 32bit x86
-if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
-    if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
-        set(ASM_DEFAULT ON)
-        set(X86_32 ON)
-    else()
-        set(AMD64 ON)
-    endif()
-endif()
-
 set(SSP_DEFAULT OFF)
 
 option(ENABLE_SSP "Enable gcc stack protector support" ${SSP_DEFAULT})
 
+set(ASM_DEFAULT OFF)
+
+include(Architecture)
+
 option(ENABLE_ASM "Enable x86 ASM related options" ${ASM_DEFAULT})
 
 # The ARM ASM core seems to be very buggy, see #98 and #54. Default to it being
@@ -110,8 +116,9 @@ option(ENABLE_FFMPEG "Enable ffmpeg A/V recording" ${FFMPEG_DEFAULT})
 
 set(LTO_DEFAULT ON)
 
-if(WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND AMD64)
-    # lto produces buggy binaries for 64 bit win32
+# lto produces buggy binaries for 64 bit win32
+# and we generally don't want it when debugging because it makes linking slow
+if((WIN32 AND CMAKE_COMPILER_IS_GNUCXX AND AMD64) OR CMAKE_BUILD_TYPE MATCHES Debug)
     set(LTO_DEFAULT OFF)
 endif()
 
@@ -123,15 +130,22 @@ endif()
 
 option(ENABLE_GBA_LOGGING "Enable extended GBA logging" ON)
 if(ENABLE_GBA_LOGGING)
-   add_definitions(-DGBA_LOGGING )
+    add_definitions(-DGBA_LOGGING )
 endif()
 if(ENABLE_MMX)
-  add_definitions(-DMMX)
+    add_definitions(-DMMX)
 endif()
 
 # The SDL port can't be built without debugging support
 if(NOT ENABLE_DEBUGGER AND ENABLE_SDL)
-        message(SEND_ERROR "The SDL port can't be built without debugging support")
+    message(SEND_ERROR "The SDL port can't be built without debugging support")
+endif()
+
+# this has to run after the toolchain is initialized so it can't be in
+# Win32deps.cmake
+if(MINGW)
+    include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-include")
+    include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
 endif()
 
 find_package(Git)
@@ -155,7 +169,7 @@ endif()
 include_directories(${CMAKE_BINARY_DIR})
 configure_file("${CMAKE_SOURCE_DIR}/src/version.h.in" "${CMAKE_BINARY_DIR}/version.h" @ONLY)
 
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+if(CMAKE_BUILD_TYPE MATCHES Debug)
     add_definitions(-DDEBUG)
 else()
     add_definitions(-DNDEBUG)
@@ -183,7 +197,11 @@ endif()
 
 # Look for some dependencies using CMake scripts
 find_package(ZLIB REQUIRED)
+
+set(OpenGL_GL_PREFERENCE GLVND)
+
 find_package(OpenGL REQUIRED)
+
 find_package(PNG REQUIRED)
 
 if(EXISTS /etc/redhat-release)
@@ -204,14 +222,21 @@ add_definitions(${SDL2_DEFINITIONS})
 if(ENABLE_LINK)
     # msys2 does not have static sfml libs atm
     # while on mxe we use static libs
-    if(WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe))
+    if(WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe) AND NOT CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
         set(SFML_STATIC_LIBRARIES TRUE)
     endif()
-    find_package(SFML 2 COMPONENTS network system REQUIRED)
+
+    find_package(SFML 2 COMPONENTS network system)
+
+    if(NOT SFML_FOUND)
+        message(WARNING "SFML not found, LINK will be disabled")
+        set(ENABLE_LINK NO)
+    endif()
 endif()
 
 # set the standard libraries all ports use
-set(VBAMCORE_LIBS
+set(
+    VBAMCORE_LIBS
     vbamcore
     fex
     ${SDL2_LIBRARY}
@@ -244,9 +269,9 @@ if(NOT ENABLE_FFMPEG)
 endif()
 
 if(ENABLE_LIRC)
-        set(WITHLIRC 1)
+    set(WITHLIRC 1)
 else()
-        set(WITHLIRC 0)
+    set(WITHLIRC 0)
 endif()
 
 include(GNUInstallDirs)
@@ -297,6 +322,8 @@ if(NOT ENABLE_ASM_CORE)
     add_definitions(-DC_CORE)
 endif()
 
+option(ENABLE_NLS "Enable translations" ${NLS_DEFAULT})
+
 # Enable internationalization
 if(ENABLE_NLS)
     set(LOCALEDIR ${CMAKE_INSTALL_PREFIX}/share/locale)
@@ -332,37 +359,17 @@ if(ENABLE_NLS)
     endif()
 endif()
 
-# Win32 deps submodule
-if(WIN32)
-    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
-        set(git_checkout FALSE)
-        find_package(Git)
-        if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
-            set(git_checkout TRUE)
-            execute_process(COMMAND "${GIT_EXECUTABLE}" submodule update --init --remote --recursive RESULT_VARIABLE git_status WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
-        endif()
-
-        if(NOT (git_checkout AND git_status EQUAL 0))
-            message(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --remote --recursive")
-        endif()
-    endif()
-
-    if(MINGW)
-        include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-include")
-        include_directories("${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include")
-    elseif(MSVC)
-        set(DEPS_MSVC "${CMAKE_SOURCE_DIR}/dependencies/msvc")
-        include_directories("${DEPS_MSVC}") # for GL/glext.h and getopt.h
-    endif()
-endif()
-
 include(ProcessorCount)
 ProcessorCount(num_cpus)
 
-# Compiler flags
+# Compiler stuff
+
+if(CMAKE_C_COMPILER_ID STREQUAL Clang AND CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+    include(LLVMToolchain)
+endif()
 
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-    set(LTO_FLAGS "")
+    unset(LTO_FLAGS)
     if(ENABLE_LTO)
         if(CMAKE_COMPILER_IS_GNUCXX)
             if(num_cpus GREATER 1)
@@ -373,6 +380,21 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
         else()
             set(LTO_FLAGS -flto)
         endif()
+
+        # check that LTO is not broken before enabling it
+        set(ORIG_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+        set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${LTO_FLAGS}")
+
+        include(CheckCXXSourceCompiles)
+        check_cxx_source_compiles("int main(int argc, char** argv) { return 0; }" LTO_WORKS)
+
+        set(CMAKE_REQUIRED_FLAGS ${ORIG_CMAKE_REQUIRED_FLAGS})
+
+        if(NOT LTO_WORKS)
+            message(WARNING "LTO does not seem to be working on your system, if using clang make sure LLVMGold is installed")
+            unset(LTO_FLAGS)
+            set(ENABLE_LTO OFF)
+        endif()
     endif()
 
     unset(MY_C_OPT_FLAGS)
@@ -441,20 +463,34 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
             endif()
         endif()
 
-
         set(MY_C_FLAGS ${MY_C_FLAGS} -fopenmp)
     endif()
 
-    check_cxx_compiler_flag(-fdiagnostics-color=auto COMPILER_COLOR_OUTPUT)
-    if(COMPILER_COLOR_OUTPUT)
-        add_compile_options(-fdiagnostics-color=auto)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL GNU)
+        unset(COMPILER_COLOR_DIAGNOSTICS)
+        check_cxx_compiler_flag(-fdiagnostics-color=always COMPILER_COLOR_DIAGNOSTICS)
+        if(COMPILER_COLOR_DIAGNOSTICS)
+            add_compile_options(-fdiagnostics-color=always)
+        else()
+            unset(COMPILER_COLOR_DIAGNOSTICS)
+            check_cxx_compiler_flag(-fdiagnostics-color COMPILER_COLOR_DIAGNOSTICS)
+            if(COMPILER_COLOR_DIAGNOSTICS)
+                add_compile_options(-fdiagnostics-color)
+            endif()
+        endif()
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+        unset(COMPILER_COLOR_DIAGNOSTICS)
+        check_cxx_compiler_flag(-fcolor-diagnostics COMPILER_COLOR_DIAGNOSTICS)
+        if(COMPILER_COLOR_DIAGNOSTICS)
+            add_compile_options(-fcolor-diagnostics)
+        endif()
     endif()
 
     if(MINGW)
         set(MY_C_FLAGS ${MY_C_FLAGS} -static-libgcc -static-libstdc++)
     endif()
 
-    if(CMAKE_BUILD_TYPE STREQUAL Debug)
+    if(CMAKE_BUILD_TYPE MATCHES Debug)
         set(MY_C_FLAGS   ${MY_C_FLAGS}   ${MY_C_DBG_FLAGS} -Wall -Wextra)
     else()
         set(MY_C_FLAGS   ${MY_C_FLAGS}   ${MY_C_OPT_FLAGS} -Wno-error)
@@ -537,7 +573,8 @@ endif()
 
 add_subdirectory (fex)
 
-set(SRC_MAIN
+set(
+    SRC_MAIN
     src/Util.cpp
     src/common/ConfigManager.cpp
     src/common/dictionary.c
@@ -551,7 +588,8 @@ if(MSVC)
 	set(SRC_MAIN ${SRC_MAIN} "dependencies/msvc/getopt.c")
 endif()
 
-set(HDR_MAIN
+set(
+    HDR_MAIN
     src/System.h
     src/Util.h
     src/common/array.h
@@ -577,7 +615,8 @@ if(ENABLE_NLS)
     set(HDR_MAIN ${HDR_MAIN} src/NLS.h)
 endif()
 
-set(SRC_GBA
+set(
+    SRC_GBA
     src/gba/agbprint.cpp
     src/gba/bios.cpp
     src/gba/BreakpointStructures.cpp
@@ -607,7 +646,8 @@ set(SRC_GBA
     src/gba/Sram.cpp
 )
 
-set(HDR_GBA
+set(
+    HDR_GBA
     src/gba/agbprint.h
     src/gba/bios.h
     src/gba/BreakpointStructures.h
@@ -630,7 +670,8 @@ set(HDR_GBA
     src/gba/Sram.h
 )
 
-set(SRC_GB
+set(
+    SRC_GB
     src/gb/GB.cpp
     src/gb/gbCheats.cpp
     src/gb/gbDis.cpp
@@ -642,7 +683,8 @@ set(SRC_GB
     src/gb/gbSound.cpp
 )
 
-set(HDR_GB
+set(
+    HDR_GB
     src/gb/gb.h
     src/gb/gbCheats.h
     src/gb/gbCodes.h
@@ -654,7 +696,8 @@ set(HDR_GB
     src/gb/gbSound.h
 )
 
-set(SRC_APU
+set(
+    SRC_APU
     src/apu/Blip_Buffer.cpp
     src/apu/Effects_Buffer.cpp
     src/apu/Gb_Apu.cpp
@@ -663,7 +706,8 @@ set(SRC_APU
     src/apu/Multi_Buffer.cpp
 )
 
-set(HDR_APU
+set(
+    HDR_APU
     src/apu/blargg_common.h #Unused(?) but in the VS projects
     src/apu/blargg_config.h #Unused(?) but in the VS projects
     src/apu/blargg_source.h
@@ -674,7 +718,8 @@ set(HDR_APU
     src/apu/Multi_Buffer.h
 )
 
-set(SRC_SDL
+set(
+    SRC_SDL
     src/sdl/SDL.cpp
     src/sdl/filters.cpp
     src/sdl/text.cpp
@@ -684,7 +729,8 @@ set(SRC_SDL
     src/sdl/expr-lex.cpp
 )
 
-set(HDR_SDL
+set(
+    HDR_SDL
     src/sdl/filters.h
     src/sdl/text.h
     src/sdl/inputSDL.h
@@ -692,7 +738,8 @@ set(HDR_SDL
     src/sdl/exprNode.h
 )
 
-set(SRC_FILTERS
+set(
+    SRC_FILTERS
     src/filters/2xSaI.cpp
     src/filters/admame.cpp
     src/filters/bilinear.cpp
@@ -705,7 +752,8 @@ set(SRC_FILTERS
     src/filters/xBRZ/xbrz.cpp
 )
 
-set(HDR_FILTERS
+set(
+    HDR_FILTERS
     src/filters/hq2x.h
     src/filters/interp.h
     src/filters/lq2x.h
@@ -713,18 +761,21 @@ set(HDR_FILTERS
     src/filters/xBRZ/xbrz.h
 )
 
-set(SRC_HQ_C
+set(
+    SRC_HQ_C
     src/filters/hq/c/hq_implementation.cpp
 )
 
-set(HDR_HQ_C
+set(
+    HDR_HQ_C
     src/filters/hq/c/hq3x_pattern.h
     src/filters/hq/c/hq4x_pattern.h
     src/filters/hq/c/hq_base.h
     src/filters/hq/c/hq_shared.h
 )
 
-set(SRC_HQ_ASM
+set(
+    SRC_HQ_ASM
     src/filters/hq/asm/hq3x_16.asm
     src/filters/hq/asm/hq3x_32.asm
     src/filters/hq/asm/hq4x_16.asm
@@ -744,12 +795,14 @@ else()
 endif()
 
 if(ENABLE_DEBUGGER)
-    set(SRC_DEBUGGER
+    set(
+        SRC_DEBUGGER
         src/gba/armdis.cpp
         src/gba/elf.cpp
         src/gba/remote.cpp
     )
-    set(HDR_DEBUGGER
+    set(
+        HDR_DEBUGGER
         src/gba/armdis.h
         src/gba/elf.h
         src/gba/remote.h
@@ -816,13 +869,17 @@ if(ENABLE_SDL)
     install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/vbam${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_INSTALL_FULL_BINDIR})
 
     if(WIN32)
-        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
-                DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
-                RENAME vbam.cfg)
+        install(
+            FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
+            DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
+            RENAME vbam.cfg
+        )
     else()
-        install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
-                DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
-                RENAME vbam.cfg)
+        install(
+            FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/sdl/vbam.cfg-example
+            DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}
+            RENAME vbam.cfg
+        )
     endif()
 endif()
 
@@ -864,4 +921,5 @@ set(CPACK_PACKAGE_VERSION_MAJOR "2")
 set(CPACK_PACKAGE_VERSION_MINOR "0")
 set(CPACK_PACKAGE_VERSION_PATCH "0-Git-" ${COMMITHASH})
 list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/dependencies")
+list(APPEND CPACK_SOURCE_IGNORE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg")
 include(CPack)
diff --git a/CMakeSettings.json b/CMakeSettings.json
new file mode 100644
index 00000000..58bbd405
--- /dev/null
+++ b/CMakeSettings.json
@@ -0,0 +1,53 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [
+        "msvc_x64"
+      ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": ""
+    }, {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "inheritEnvironments": [
+        "msvc_x64"
+      ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": ""
+    }, {
+      "name": "x86-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [
+        "msvc_x86"
+      ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": ""
+    }, {
+      "name": "x86-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "inheritEnvironments": [
+        "msvc_x86"
+      ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "installRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": ""
+    }
+  ]
+}
diff --git a/README.md b/README.md
index 9829ec6d..83467a4c 100644
--- a/README.md
+++ b/README.md
@@ -60,10 +60,23 @@ cmake ..
 make -j`nproc`
 ```
 
-`./installdeps` is supported on MSys2, Linux (Debian/Ubuntu, Fedora, Arch or
-Solus) and Mac OS X (homebrew, macports or fink.)
+`./installdeps` is supported on MSys2, Linux (Debian/Ubuntu, Fedora, Arch,
+Solus and RHEL/CentOS) and Mac OS X (homebrew, macports or fink.)
 
-The Ninja cmake generator is also now supported, including on msys2.
+The Ninja cmake generator is also now supported, including on msys2 and Visual Studio.
+
+### Visual Studio Support
+
+For visual studio, dependency management is handled automatically with vcpkg,
+just clone the repository with git and build with cmake. You can do this from
+the developer command line as well. 2019 will not work yet for building
+dependencies, but you can build the dependencies in 2017 and then use the
+project from 2019.
+
+Using your own user-wide installation of vcpkg is supported, just make sure the
+environment variable `VCPKG_ROOT` is set.
+
+### Dependencies
 
 If your OS is not supported, you will need the following:
 
diff --git a/cmake/Architecture.cmake b/cmake/Architecture.cmake
new file mode 100644
index 00000000..c0f055d7
--- /dev/null
+++ b/cmake/Architecture.cmake
@@ -0,0 +1,24 @@
+if(NOT CMAKE_SYSTEM_PROCESSOR)
+    if(NOT CMAKE_TOOLCHAIN_FILE AND CMAKE_HOST_SYSTEM_PROCESSOR)
+        set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
+    elseif(CMAKE_TOOLCHAIN_FILE MATCHES mxe)
+        if(CMAKE_TOOLCHAIN_FILE MATCHES "i[3-9]86")
+            set(CMAKE_SYSTEM_PROCESSOR i686)
+        else()
+            set(CMAKE_SYSTEM_PROCESSOR x86_64)
+        endif()
+    endif()
+endif()
+
+# turn asm on by default on 32bit x86
+# and set WINARCH for windows stuff
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86|i[3-9]86|[aA][mM][dD]64")
+    if(CMAKE_C_SIZEOF_DATA_PTR EQUAL 4) # 32 bit
+        if(NOT (MSVC AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg))
+            set(ASM_DEFAULT ON)
+        endif()
+        set(X86_32 ON)
+    else()
+        set(AMD64 ON)
+    endif()
+endif()
diff --git a/cmake/LLVMToolchain.cmake b/cmake/LLVMToolchain.cmake
new file mode 100644
index 00000000..0953f968
--- /dev/null
+++ b/cmake/LLVMToolchain.cmake
@@ -0,0 +1,32 @@
+function(use_llvm_toolchain)
+    if(CMAKE_C_COMPILER_ID STREQUAL Clang)
+        set(compiler "${CMAKE_C_COMPILER}")
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+        set(compiler "${CMAKE_CXX_COMPILER}")
+    else()
+        return()
+    endif()
+
+    foreach(tool ar ranlib ld nm objdump as)
+        execute_process(
+            COMMAND "${compiler}" -print-prog-name=llvm-${tool}
+            OUTPUT_VARIABLE prog_path
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+
+        if(prog_path MATCHES "^/")
+            if(tool STREQUAL ld)
+                set(tool linker)
+            elseif(tool STREQUAL as)
+                set(tool asm_compiler)
+            endif()
+
+            string(TOUPPER ${tool} utool)
+
+            set(CMAKE_${utool} "${prog_path}" PARENT_SCOPE)
+            set(CMAKE_${utool} "${prog_path}" CACHE FILEPATH "${tool}" FORCE)
+        endif()
+    endforeach()
+endfunction()
+
+use_llvm_toolchain()
diff --git a/cmake/Win32Deps.cmake b/cmake/Win32Deps.cmake
new file mode 100644
index 00000000..fa165fed
--- /dev/null
+++ b/cmake/Win32Deps.cmake
@@ -0,0 +1,62 @@
+if(WIN32)
+    # compiler has not been detected yet maybe
+    if(CMAKE_C_COMPILER MATCHES "cl\\.exe" OR CMAKE_CXX_COMPILER MATCHES "cl\\.exe" OR MSVC OR DEFINED ENV{VisualStudioVersion})
+        set(VS TRUE)
+    endif()
+
+    set(WINARCH x86)
+    if(CMAKE_C_COMPILER MATCHES x64 OR CMAKE_CXX_COMPILER MATCHES x64 OR "$ENV{VSCMD_ARG_TGT_ARCH}" MATCHES x64)
+        set(WINARCH x64)
+    endif()
+
+    # Win32 deps submodules (dependencies and vcpkg)
+    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/dependencies/mingw-xaudio/include" OR NOT EXISTS "${CMAKE_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake")
+        set(git_checkout FALSE)
+        #        find_package(Git)
+        #if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+        if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+            set(git_checkout TRUE)
+            execute_process(COMMAND git submodule update --init --remote --recursive RESULT_VARIABLE git_status WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
+        endif()
+
+        if(NOT (git_checkout AND git_status EQUAL 0))
+            message(FATAL_ERROR "Please pull in git submodules, e.g.\nrun: git submodule update --init --remote --recursive")
+        endif()
+    endif()
+
+    if(VS)
+        set(DEPS_MSVC "${CMAKE_SOURCE_DIR}/dependencies/msvc")
+        include_directories("${DEPS_MSVC}") # for GL/glext.h and getopt.h
+    endif()
+
+    if(VS AND ENABLE_VCPKG)
+        if(NOT DEFINED ENV{VCPKG_ROOT})
+            set(ENV{VCPKG_ROOT} "${CMAKE_SOURCE_DIR}/vcpkg")
+        endif()
+
+        # build vcpkg if not built
+        if(NOT EXISTS $ENV{VCPKG_ROOT}/vcpkg.exe)
+            execute_process(
+                COMMAND bootstrap-vcpkg.bat
+                WORKING_DIRECTORY $ENV{VCPKG_ROOT}
+            )
+        endif()
+
+        foreach(pkg ${VCPKG_DEPS})
+            #list(APPEND VCPKG_DEPS_QUALIFIED ${pkg}:${WINARCH}-windows-static)
+            list(APPEND VCPKG_DEPS_QUALIFIED ${pkg}:${WINARCH}-windows)
+        endforeach()
+
+        # build our deps
+        execute_process(
+            COMMAND vcpkg install ${VCPKG_DEPS_QUALIFIED}
+            WORKING_DIRECTORY $ENV{VCPKG_ROOT}
+        )
+
+        set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE FILEPATH '' FORCE)
+        include("$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake")
+
+        set(NLS_DEFAULT OFF)
+        set(ENABLE_NLS OFF) # not sure why this is necessary
+    endif()
+endif()
diff --git a/fex/7z_C/7zAlloc.c b/fex/7z_C/7zAlloc.c
index 7e1cc921..bff20f9f 100644
--- a/fex/7z_C/7zAlloc.c
+++ b/fex/7z_C/7zAlloc.c
@@ -20,6 +20,7 @@ int g_allocCountTemp = 0;
 
 void* SzAlloc(void* p, size_t size)
 {
+    (void)p; // unused param
     if (size == 0)
         return 0;
 #ifdef _SZ_ALLOC_DEBUG
@@ -31,6 +32,7 @@ void* SzAlloc(void* p, size_t size)
 
 void SzFree(void* p, void* address)
 {
+    (void)p; // unused param
 #ifdef _SZ_ALLOC_DEBUG
     if (address != 0) {
         g_allocCount--;
@@ -42,6 +44,7 @@ void SzFree(void* p, void* address)
 
 void* SzAllocTemp(void* p, size_t size)
 {
+    (void)p; // unused param
     if (size == 0)
         return 0;
 #ifdef _SZ_ALLOC_DEBUG
@@ -56,6 +59,7 @@ void* SzAllocTemp(void* p, size_t size)
 
 void SzFreeTemp(void* p, void* address)
 {
+    (void)p; // unused param
 #ifdef _SZ_ALLOC_DEBUG
     if (address != 0) {
         g_allocCountTemp--;
diff --git a/fex/fex/Data_Reader.cpp b/fex/fex/Data_Reader.cpp
index 04a7a3b9..bbdfaae4 100644
--- a/fex/fex/Data_Reader.cpp
+++ b/fex/fex/Data_Reader.cpp
@@ -325,24 +325,30 @@ size_t utf8_encode_char( unsigned wide, char * target )
 		target[5] = 0x80 | ( wide & 0x3F );
 		wide = wide >> 6;
 		wide |= 0x4000000;
+		break;
     case 5:
 		target[4] = 0x80 | ( wide & 0x3F );
 		wide = wide >> 6;
 		wide |= 0x200000;
+		break;
     case 4:
 		target[3] = 0x80 | ( wide & 0x3F );
 		wide = wide >> 6;
 		wide |= 0x10000;
+		break;
     case 3:
 		target[2] = 0x80 | ( wide & 0x3F );
 		wide = wide >> 6;
 		wide |= 0x800;
+		break;
     case 2:
 		target[1] = 0x80 | ( wide & 0x3F );
 		wide = wide >> 6;
 		wide |= 0xC0;
-	case 1:
+		break;
+    case 1:
 		target[0] = wide;
+		break;
 	}
 
 	return count;
diff --git a/headers/stb/stb_image.h b/headers/stb/stb_image.h
index f65e43c2..571b0dce 100644
--- a/headers/stb/stb_image.h
+++ b/headers/stb/stb_image.h
@@ -1,7462 +1,7462 @@
-/* stb_image - v2.19 - public domain image loader - http://nothings.org/stb
-                                  no warranty implied; use at your own risk
-
-   Do this:
-      #define STB_IMAGE_IMPLEMENTATION
-   before you include this file in *one* C or C++ file to create the implementation.
-
-   // i.e. it should look like this:
-   #include ...
-   #include ...
-   #include ...
-   #define STB_IMAGE_IMPLEMENTATION
-   #include "stb_image.h"
-
-   You can #define STBI_ASSERT(x) before the #include to avoid using assert.h.
-   And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free
-
-
-   QUICK NOTES:
-      Primarily of interest to game developers and other people who can
-          avoid problematic images and only need the trivial interface
-
-      JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib)
-      PNG 1/2/4/8/16-bit-per-channel
-
-      TGA (not sure what subset, if a subset)
-      BMP non-1bpp, non-RLE
-      PSD (composited view only, no extra channels, 8/16 bit-per-channel)
-
-      GIF (*comp always reports as 4-channel)
-      HDR (radiance rgbE format)
-      PIC (Softimage PIC)
-      PNM (PPM and PGM binary only)
-
-      Animated GIF still needs a proper API, but here's one way to do it:
-          http://gist.github.com/urraka/685d9a6340b26b830d49
-
-      - decode from memory or through FILE (define STBI_NO_STDIO to remove code)
-      - decode from arbitrary I/O callbacks
-      - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON)
-
-   Full documentation under "DOCUMENTATION" below.
-
-
-LICENSE
-
-  See end of file for license information.
-
-RECENT REVISION HISTORY:
-
-      2.19  (2018-02-11) fix warning
-      2.18  (2018-01-30) fix warnings
-      2.17  (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings
-      2.16  (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes
-      2.15  (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC
-      2.14  (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
-      2.13  (2016-12-04) experimental 16-bit API, only for PNG so far; fixes
-      2.12  (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
-      2.11  (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64
-                         RGB-format JPEG; remove white matting in PSD;
-                         allocate large structures on the stack;
-                         correct channel count for PNG & BMP
-      2.10  (2016-01-22) avoid warning introduced in 2.09
-      2.09  (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED
-
-   See end of file for full revision history.
-
-
- ============================    Contributors    =========================
-
- Image formats                          Extensions, features
-    Sean Barrett (jpeg, png, bmp)          Jetro Lauha (stbi_info)
-    Nicolas Schulz (hdr, psd)              Martin "SpartanJ" Golini (stbi_info)
-    Jonathan Dummer (tga)                  James "moose2000" Brown (iPhone PNG)
-    Jean-Marc Lienher (gif)                Ben "Disch" Wenger (io callbacks)
-    Tom Seddon (pic)                       Omar Cornut (1/2/4-bit PNG)
-    Thatcher Ulrich (psd)                  Nicolas Guillemot (vertical flip)
-    Ken Miller (pgm, ppm)                  Richard Mitton (16-bit PSD)
-    github:urraka (animated gif)           Junggon Kim (PNM comments)
-    Christopher Forseth (animated gif)     Daniel Gibson (16-bit TGA)
-                                           socks-the-fox (16-bit PNG)
-                                           Jeremy Sawicki (handle all ImageNet JPGs)
- Optimizations & bugfixes                  Mikhail Morozov (1-bit BMP)
-    Fabian "ryg" Giesen                    Anael Seghezzi (is-16-bit query)
-    Arseny Kapoulkine
-    John-Mark Allen
-
- Bug & warning fixes
-    Marc LeBlanc            David Woo          Guillaume George   Martins Mozeiko
-    Christpher Lloyd        Jerry Jansson      Joseph Thomson     Phil Jordan
-    Dave Moore              Roy Eltham         Hayaki Saito       Nathan Reed
-    Won Chun                Luke Graham        Johan Duparc       Nick Verigakis
-    the Horde3D community   Thomas Ruf         Ronny Chevalier    github:rlyeh
-    Janez Zemva             John Bartholomew   Michal Cichon      github:romigrou
-    Jonathan Blow           Ken Hamada         Tero Hanninen      github:svdijk
-    Laurent Gomila          Cort Stratton      Sergio Gonzalez    github:snagar
-    Aruelien Pocheville     Thibault Reuille   Cass Everitt       github:Zelex
-    Ryamond Barbiero        Paul Du Bois       Engin Manap        github:grim210
-    Aldo Culquicondor       Philipp Wiesemann  Dale Weiler        github:sammyhw
-    Oriol Ferrer Mesia      Josh Tobin         Matthew Gregan     github:phprus
-    Julian Raschke          Gregory Mullen     Baldur Karlsson    github:poppolopoppo
-    Christian Floisand      Kevin Schmidt                         github:darealshinji
-    Blazej Dariusz Roszkowski                                     github:Michaelangel007
-*/
-
-#ifndef STBI_INCLUDE_STB_IMAGE_H
-#define STBI_INCLUDE_STB_IMAGE_H
-
-// DOCUMENTATION
-//
-// Limitations:
-//    - no 12-bit-per-channel JPEG
-//    - no JPEGs with arithmetic coding
-//    - GIF always returns *comp=4
-//
-// Basic usage (see HDR discussion below for HDR usage):
-//    int x,y,n;
-//    unsigned char *data = stbi_load(filename, &x, &y, &n, 0);
-//    // ... process data if not NULL ...
-//    // ... x = width, y = height, n = # 8-bit components per pixel ...
-//    // ... replace '0' with '1'..'4' to force that many components per pixel
-//    // ... but 'n' will always be the number that it would have been if you said 0
-//    stbi_image_free(data)
-//
-// Standard parameters:
-//    int *x                 -- outputs image width in pixels
-//    int *y                 -- outputs image height in pixels
-//    int *channels_in_file  -- outputs # of image components in image file
-//    int desired_channels   -- if non-zero, # of image components requested in result
-//
-// The return value from an image loader is an 'unsigned char *' which points
-// to the pixel data, or NULL on an allocation failure or if the image is
-// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels,
-// with each pixel consisting of N interleaved 8-bit components; the first
-// pixel pointed to is top-left-most in the image. There is no padding between
-// image scanlines or between pixels, regardless of format. The number of
-// components N is 'desired_channels' if desired_channels is non-zero, or
-// *channels_in_file otherwise. If desired_channels is non-zero,
-// *channels_in_file has the number of components that _would_ have been
-// output otherwise. E.g. if you set desired_channels to 4, you will always
-// get RGBA output, but you can check *channels_in_file to see if it's trivially
-// opaque because e.g. there were only 3 channels in the source image.
-//
-// An output image with N components has the following components interleaved
-// in this order in each pixel:
-//
-//     N=#comp     components
-//       1           grey
-//       2           grey, alpha
-//       3           red, green, blue
-//       4           red, green, blue, alpha
-//
-// If image loading fails for any reason, the return value will be NULL,
-// and *x, *y, *channels_in_file will be unchanged. The function
-// stbi_failure_reason() can be queried for an extremely brief, end-user
-// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS
-// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly
-// more user-friendly ones.
-//
-// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized.
-//
-// ===========================================================================
-//
-// Philosophy
-//
-// stb libraries are designed with the following priorities:
-//
-//    1. easy to use
-//    2. easy to maintain
-//    3. good performance
-//
-// Sometimes I let "good performance" creep up in priority over "easy to maintain",
-// and for best performance I may provide less-easy-to-use APIs that give higher
-// performance, in addition to the easy to use ones. Nevertheless, it's important
-// to keep in mind that from the standpoint of you, a client of this library,
-// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all.
-//
-// Some secondary priorities arise directly from the first two, some of which
-// make more explicit reasons why performance can't be emphasized.
-//
-//    - Portable ("ease of use")
-//    - Small source code footprint ("easy to maintain")
-//    - No dependencies ("ease of use")
-//
-// ===========================================================================
-//
-// I/O callbacks
-//
-// I/O callbacks allow you to read from arbitrary sources, like packaged
-// files or some other source. Data read from callbacks are processed
-// through a small internal buffer (currently 128 bytes) to try to reduce
-// overhead.
-//
-// The three functions you must define are "read" (reads some bytes of data),
-// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end).
-//
-// ===========================================================================
-//
-// SIMD support
-//
-// The JPEG decoder will try to automatically use SIMD kernels on x86 when
-// supported by the compiler. For ARM Neon support, you must explicitly
-// request it.
-//
-// (The old do-it-yourself SIMD API is no longer supported in the current
-// code.)
-//
-// On x86, SSE2 will automatically be used when available based on a run-time
-// test; if not, the generic C versions are used as a fall-back. On ARM targets,
-// the typical path is to have separate builds for NEON and non-NEON devices
-// (at least this is true for iOS and Android). Therefore, the NEON support is
-// toggled by a build flag: define STBI_NEON to get NEON loops.
-//
-// If for some reason you do not want to use any of SIMD code, or if
-// you have issues compiling it, you can disable it entirely by
-// defining STBI_NO_SIMD.
-//
-// ===========================================================================
-//
-// HDR image support   (disable by defining STBI_NO_HDR)
-//
-// stb_image now supports loading HDR images in general, and currently
-// the Radiance .HDR file format, although the support is provided
-// generically. You can still load any file through the existing interface;
-// if you attempt to load an HDR file, it will be automatically remapped to
-// LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1;
-// both of these constants can be reconfigured through this interface:
-//
-//     stbi_hdr_to_ldr_gamma(2.2f);
-//     stbi_hdr_to_ldr_scale(1.0f);
-//
-// (note, do not use _inverse_ constants; stbi_image will invert them
-// appropriately).
-//
-// Additionally, there is a new, parallel interface for loading files as
-// (linear) floats to preserve the full dynamic range:
-//
-//    float *data = stbi_loadf(filename, &x, &y, &n, 0);
-//
-// If you load LDR images through this interface, those images will
-// be promoted to floating point values, run through the inverse of
-// constants corresponding to the above:
-//
-//     stbi_ldr_to_hdr_scale(1.0f);
-//     stbi_ldr_to_hdr_gamma(2.2f);
-//
-// Finally, given a filename (or an open file or memory block--see header
-// file for details) containing image data, you can query for the "most
-// appropriate" interface to use (that is, whether the image is HDR or
-// not), using:
-//
-//     stbi_is_hdr(char *filename);
-//
-// ===========================================================================
-//
-// iPhone PNG support:
-//
-// By default we convert iphone-formatted PNGs back to RGB, even though
-// they are internally encoded differently. You can disable this conversion
-// by by calling stbi_convert_iphone_png_to_rgb(0), in which case
-// you will always just get the native iphone "format" through (which
-// is BGR stored in RGB).
-//
-// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per
-// pixel to remove any premultiplied alpha *only* if the image file explicitly
-// says there's premultiplied data (currently only happens in iPhone images,
-// and only if iPhone convert-to-rgb processing is on).
-//
-// ===========================================================================
-//
-// ADDITIONAL CONFIGURATION
-//
-//  - You can suppress implementation of any of the decoders to reduce
-//    your code footprint by #defining one or more of the following
-//    symbols before creating the implementation.
-//
-//        STBI_NO_JPEG
-//        STBI_NO_PNG
-//        STBI_NO_BMP
-//        STBI_NO_PSD
-//        STBI_NO_TGA
-//        STBI_NO_GIF
-//        STBI_NO_HDR
-//        STBI_NO_PIC
-//        STBI_NO_PNM   (.ppm and .pgm)
-//
-//  - You can request *only* certain decoders and suppress all other ones
-//    (this will be more forward-compatible, as addition of new decoders
-//    doesn't require you to disable them explicitly):
-//
-//        STBI_ONLY_JPEG
-//        STBI_ONLY_PNG
-//        STBI_ONLY_BMP
-//        STBI_ONLY_PSD
-//        STBI_ONLY_TGA
-//        STBI_ONLY_GIF
-//        STBI_ONLY_HDR
-//        STBI_ONLY_PIC
-//        STBI_ONLY_PNM   (.ppm and .pgm)
-//
-//   - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still
-//     want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB
-//
-
-
-#ifndef STBI_NO_STDIO
-#include <stdio.h>
-#endif // STBI_NO_STDIO
-
-#define STBI_VERSION 1
-
-enum
-{
-   STBI_default = 0, // only used for desired_channels
-
-   STBI_grey       = 1,
-   STBI_grey_alpha = 2,
-   STBI_rgb        = 3,
-   STBI_rgb_alpha  = 4
-};
-
-typedef unsigned char stbi_uc;
-typedef unsigned short stbi_us;
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifdef STB_IMAGE_STATIC
-#define STBIDEF static
-#else
-#define STBIDEF extern
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// PRIMARY API - works on images of any type
-//
-
-//
-// load image by filename, open file, or memory buffer
-//
-
-typedef struct
-{
-   int      (*read)  (void *user,char *data,int size);   // fill 'data' with 'size' bytes.  return number of bytes actually read
-   void     (*skip)  (void *user,int n);                 // skip the next 'n' bytes, or 'unget' the last -n bytes if negative
-   int      (*eof)   (void *user);                       // returns nonzero if we are at end of file/data
-} stbi_io_callbacks;
-
-////////////////////////////////////
-//
-// 8-bits-per-channel interface
-//
-
-STBIDEF stbi_uc *stbi_load_from_memory   (stbi_uc           const *buffer, int len   , int *x, int *y, int *channels_in_file, int desired_channels);
-STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk  , void *user, int *x, int *y, int *channels_in_file, int desired_channels);
-#ifndef STBI_NO_GIF
-STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
-#endif
-
-
-#ifndef STBI_NO_STDIO
-STBIDEF stbi_uc *stbi_load            (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
-STBIDEF stbi_uc *stbi_load_from_file  (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
-// for stbi_load_from_file, file pointer is left pointing immediately after image
-#endif
-
-////////////////////////////////////
-//
-// 16-bits-per-channel interface
-//
-
-STBIDEF stbi_us *stbi_load_16_from_memory   (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
-STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels);
-
-#ifndef STBI_NO_STDIO
-STBIDEF stbi_us *stbi_load_16          (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
-STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
-#endif
-
-////////////////////////////////////
-//
-// float-per-channel interface
-//
-#ifndef STBI_NO_LINEAR
-   STBIDEF float *stbi_loadf_from_memory     (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
-   STBIDEF float *stbi_loadf_from_callbacks  (stbi_io_callbacks const *clbk, void *user, int *x, int *y,  int *channels_in_file, int desired_channels);
-
-   #ifndef STBI_NO_STDIO
-   STBIDEF float *stbi_loadf            (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
-   STBIDEF float *stbi_loadf_from_file  (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
-   #endif
-#endif
-
-#ifndef STBI_NO_HDR
-   STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma);
-   STBIDEF void   stbi_hdr_to_ldr_scale(float scale);
-#endif // STBI_NO_HDR
-
-#ifndef STBI_NO_LINEAR
-   STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma);
-   STBIDEF void   stbi_ldr_to_hdr_scale(float scale);
-#endif // STBI_NO_LINEAR
-
-// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR
-STBIDEF int    stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user);
-STBIDEF int    stbi_is_hdr_from_memory(stbi_uc const *buffer, int len);
-#ifndef STBI_NO_STDIO
-STBIDEF int      stbi_is_hdr          (char const *filename);
-STBIDEF int      stbi_is_hdr_from_file(FILE *f);
-#endif // STBI_NO_STDIO
-
-
-// get a VERY brief reason for failure
-// NOT THREADSAFE
-STBIDEF const char *stbi_failure_reason  (void);
-
-// free the loaded image -- this is just free()
-STBIDEF void     stbi_image_free      (void *retval_from_stbi_load);
-
-// get image dimensions & components without fully decoding
-STBIDEF int      stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
-STBIDEF int      stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp);
-STBIDEF int      stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len);
-STBIDEF int      stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user);
-
-#ifndef STBI_NO_STDIO
-STBIDEF int      stbi_info               (char const *filename,     int *x, int *y, int *comp);
-STBIDEF int      stbi_info_from_file     (FILE *f,                  int *x, int *y, int *comp);
-STBIDEF int      stbi_is_16_bit          (char const *filename);
-STBIDEF int      stbi_is_16_bit_from_file(FILE *f);
-#endif
-
-
-
-// for image formats that explicitly notate that they have premultiplied alpha,
-// we just return the colors as stored in the file. set this flag to force
-// unpremultiplication. results are undefined if the unpremultiply overflow.
-STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply);
-
-// indicate whether we should process iphone images back to canonical format,
-// or just pass them through "as-is"
-STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert);
-
-// flip the image vertically, so the first pixel in the output array is the bottom left
-STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip);
-
-// ZLIB client - used by PNG, available for other purposes
-
-STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen);
-STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header);
-STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen);
-STBIDEF int   stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
-
-STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen);
-STBIDEF int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-//
-//
-////   end header file   /////////////////////////////////////////////////////
-#endif // STBI_INCLUDE_STB_IMAGE_H
-
-#ifdef STB_IMAGE_IMPLEMENTATION
-
-#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \
-  || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \
-  || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \
-  || defined(STBI_ONLY_ZLIB)
-   #ifndef STBI_ONLY_JPEG
-   #define STBI_NO_JPEG
-   #endif
-   #ifndef STBI_ONLY_PNG
-   #define STBI_NO_PNG
-   #endif
-   #ifndef STBI_ONLY_BMP
-   #define STBI_NO_BMP
-   #endif
-   #ifndef STBI_ONLY_PSD
-   #define STBI_NO_PSD
-   #endif
-   #ifndef STBI_ONLY_TGA
-   #define STBI_NO_TGA
-   #endif
-   #ifndef STBI_ONLY_GIF
-   #define STBI_NO_GIF
-   #endif
-   #ifndef STBI_ONLY_HDR
-   #define STBI_NO_HDR
-   #endif
-   #ifndef STBI_ONLY_PIC
-   #define STBI_NO_PIC
-   #endif
-   #ifndef STBI_ONLY_PNM
-   #define STBI_NO_PNM
-   #endif
-#endif
-
-#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB)
-#define STBI_NO_ZLIB
-#endif
-
-
-#include <stdarg.h>
-#include <stddef.h> // ptrdiff_t on osx
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
-#include <math.h>  // ldexp, pow
-#endif
-
-#ifndef STBI_NO_STDIO
-#include <stdio.h>
-#endif
-
-#ifndef STBI_ASSERT
-#include <assert.h>
-#define STBI_ASSERT(x) assert(x)
-#endif
-
-
-#ifndef _MSC_VER
-   #ifdef __cplusplus
-   #define stbi_inline inline
-   #else
-   #define stbi_inline
-   #endif
-#else
-   #define stbi_inline __forceinline
-#endif
-
-
-#ifdef _MSC_VER
-typedef unsigned short stbi__uint16;
-typedef   signed short stbi__int16;
-typedef unsigned int   stbi__uint32;
-typedef   signed int   stbi__int32;
-#else
-#include <stdint.h>
-typedef uint16_t stbi__uint16;
-typedef int16_t  stbi__int16;
-typedef uint32_t stbi__uint32;
-typedef int32_t  stbi__int32;
-#endif
-
-// should produce compiler error if size is wrong
-typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
-
-#ifdef _MSC_VER
-#define STBI_NOTUSED(v)  (void)(v)
-#else
-#define STBI_NOTUSED(v)  (void)sizeof(v)
-#endif
-
-#ifdef _MSC_VER
-#define STBI_HAS_LROTL
-#endif
-
-#ifdef STBI_HAS_LROTL
-   #define stbi_lrot(x,y)  _lrotl(x,y)
-#else
-   #define stbi_lrot(x,y)  (((x) << (y)) | ((x) >> (32 - (y))))
-#endif
-
-#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED))
-// ok
-#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED)
-// ok
-#else
-#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)."
-#endif
-
-#ifndef STBI_MALLOC
-#define STBI_MALLOC(sz)           malloc(sz)
-#define STBI_REALLOC(p,newsz)     realloc(p,newsz)
-#define STBI_FREE(p)              free(p)
-#endif
-
-#ifndef STBI_REALLOC_SIZED
-#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz)
-#endif
-
-// x86/x64 detection
-#if defined(__x86_64__) || defined(_M_X64)
-#define STBI__X64_TARGET
-#elif defined(__i386) || defined(_M_IX86)
-#define STBI__X86_TARGET
-#endif
-
-#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD)
-// gcc doesn't support sse2 intrinsics unless you compile with -msse2,
-// which in turn means it gets to use SSE2 everywhere. This is unfortunate,
-// but previous attempts to provide the SSE2 functions with runtime
-// detection caused numerous issues. The way architecture extensions are
-// exposed in GCC/Clang is, sadly, not really suited for one-file libs.
-// New behavior: if compiled with -msse2, we use SSE2 without any
-// detection; if not, we don't use it at all.
-#define STBI_NO_SIMD
-#endif
-
-#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD)
-// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET
-//
-// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the
-// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant.
-// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not
-// simultaneously enabling "-mstackrealign".
-//
-// See https://github.com/nothings/stb/issues/81 for more information.
-//
-// So default to no SSE2 on 32-bit MinGW. If you've read this far and added
-// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2.
-#define STBI_NO_SIMD
-#endif
-
-#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET))
-#define STBI_SSE2
-#include <emmintrin.h>
-
-#ifdef _MSC_VER
-
-#if _MSC_VER >= 1400  // not VC6
-#include <intrin.h> // __cpuid
-static int stbi__cpuid3(void)
-{
-   int info[4];
-   __cpuid(info,1);
-   return info[3];
-}
-#else
-static int stbi__cpuid3(void)
-{
-   int res;
-   __asm {
-      mov  eax,1
-      cpuid
-      mov  res,edx
-   }
-   return res;
-}
-#endif
-
-#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name
-
-static int stbi__sse2_available(void)
-{
-   int info3 = stbi__cpuid3();
-   return ((info3 >> 26) & 1) != 0;
-}
-#else // assume GCC-style if not VC++
-#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
-
-static int stbi__sse2_available(void)
-{
-   // If we're even attempting to compile this on GCC/Clang, that means
-   // -msse2 is on, which means the compiler is allowed to use SSE2
-   // instructions at will, and so are we.
-   return 1;
-}
-#endif
-#endif
-
-// ARM NEON
-#if defined(STBI_NO_SIMD) && defined(STBI_NEON)
-#undef STBI_NEON
-#endif
-
-#ifdef STBI_NEON
-#include <arm_neon.h>
-// assume GCC or Clang on ARM targets
-#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
-#endif
-
-#ifndef STBI_SIMD_ALIGN
-#define STBI_SIMD_ALIGN(type, name) type name
-#endif
-
-///////////////////////////////////////////////
-//
-//  stbi__context struct and start_xxx functions
-
-// stbi__context structure is our basic context used by all images, so it
-// contains all the IO context, plus some basic image information
-typedef struct
-{
-   stbi__uint32 img_x, img_y;
-   int img_n, img_out_n;
-
-   stbi_io_callbacks io;
-   void *io_user_data;
-
-   int read_from_callbacks;
-   int buflen;
-   stbi_uc buffer_start[128];
-
-   stbi_uc *img_buffer, *img_buffer_end;
-   stbi_uc *img_buffer_original, *img_buffer_original_end;
-} stbi__context;
-
-
-static void stbi__refill_buffer(stbi__context *s);
-
-// initialize a memory-decode context
-static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len)
-{
-   s->io.read = NULL;
-   s->read_from_callbacks = 0;
-   s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer;
-   s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len;
-}
-
-// initialize a callback-based context
-static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user)
-{
-   s->io = *c;
-   s->io_user_data = user;
-   s->buflen = sizeof(s->buffer_start);
-   s->read_from_callbacks = 1;
-   s->img_buffer_original = s->buffer_start;
-   stbi__refill_buffer(s);
-   s->img_buffer_original_end = s->img_buffer_end;
-}
-
-#ifndef STBI_NO_STDIO
-
-static int stbi__stdio_read(void *user, char *data, int size)
-{
-   return (int) fread(data,1,size,(FILE*) user);
-}
-
-static void stbi__stdio_skip(void *user, int n)
-{
-   fseek((FILE*) user, n, SEEK_CUR);
-}
-
-static int stbi__stdio_eof(void *user)
-{
-   return feof((FILE*) user);
-}
-
-static stbi_io_callbacks stbi__stdio_callbacks =
-{
-   stbi__stdio_read,
-   stbi__stdio_skip,
-   stbi__stdio_eof,
-};
-
-static void stbi__start_file(stbi__context *s, FILE *f)
-{
-   stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f);
-}
-
-//static void stop_file(stbi__context *s) { }
-
-#endif // !STBI_NO_STDIO
-
-static void stbi__rewind(stbi__context *s)
-{
-   // conceptually rewind SHOULD rewind to the beginning of the stream,
-   // but we just rewind to the beginning of the initial buffer, because
-   // we only use it after doing 'test', which only ever looks at at most 92 bytes
-   s->img_buffer = s->img_buffer_original;
-   s->img_buffer_end = s->img_buffer_original_end;
-}
-
-enum
-{
-   STBI_ORDER_RGB,
-   STBI_ORDER_BGR
-};
-
-typedef struct
-{
-   int bits_per_channel;
-   int num_channels;
-   int channel_order;
-} stbi__result_info;
-
-#ifndef STBI_NO_JPEG
-static int      stbi__jpeg_test(stbi__context *s);
-static void    *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_PNG
-static int      stbi__png_test(stbi__context *s);
-static void    *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__png_info(stbi__context *s, int *x, int *y, int *comp);
-static int      stbi__png_is16(stbi__context *s);
-#endif
-
-#ifndef STBI_NO_BMP
-static int      stbi__bmp_test(stbi__context *s);
-static void    *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_TGA
-static int      stbi__tga_test(stbi__context *s);
-static void    *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__tga_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_PSD
-static int      stbi__psd_test(stbi__context *s);
-static void    *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc);
-static int      stbi__psd_info(stbi__context *s, int *x, int *y, int *comp);
-static int      stbi__psd_is16(stbi__context *s);
-#endif
-
-#ifndef STBI_NO_HDR
-static int      stbi__hdr_test(stbi__context *s);
-static float   *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_PIC
-static int      stbi__pic_test(stbi__context *s);
-static void    *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__pic_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_GIF
-static int      stbi__gif_test(stbi__context *s);
-static void    *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static void    *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
-static int      stbi__gif_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-#ifndef STBI_NO_PNM
-static int      stbi__pnm_test(stbi__context *s);
-static void    *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
-static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp);
-#endif
-
-// this is not threadsafe
-static const char *stbi__g_failure_reason;
-
-STBIDEF const char *stbi_failure_reason(void)
-{
-   return stbi__g_failure_reason;
-}
-
-static int stbi__err(const char *str)
-{
-   stbi__g_failure_reason = str;
-   return 0;
-}
-
-static void *stbi__malloc(size_t size)
-{
-    return STBI_MALLOC(size);
-}
-
-// stb_image uses ints pervasively, including for offset calculations.
-// therefore the largest decoded image size we can support with the
-// current code, even on 64-bit targets, is INT_MAX. this is not a
-// significant limitation for the intended use case.
-//
-// we do, however, need to make sure our size calculations don't
-// overflow. hence a few helper functions for size calculations that
-// multiply integers together, making sure that they're non-negative
-// and no overflow occurs.
-
-// return 1 if the sum is valid, 0 on overflow.
-// negative terms are considered invalid.
-static int stbi__addsizes_valid(int a, int b)
-{
-   if (b < 0) return 0;
-   // now 0 <= b <= INT_MAX, hence also
-   // 0 <= INT_MAX - b <= INTMAX.
-   // And "a + b <= INT_MAX" (which might overflow) is the
-   // same as a <= INT_MAX - b (no overflow)
-   return a <= INT_MAX - b;
-}
-
-// returns 1 if the product is valid, 0 on overflow.
-// negative factors are considered invalid.
-static int stbi__mul2sizes_valid(int a, int b)
-{
-   if (a < 0 || b < 0) return 0;
-   if (b == 0) return 1; // mul-by-0 is always safe
-   // portable way to check for no overflows in a*b
-   return a <= INT_MAX/b;
-}
-
-// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow
-static int stbi__mad2sizes_valid(int a, int b, int add)
-{
-   return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add);
-}
-
-// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow
-static int stbi__mad3sizes_valid(int a, int b, int c, int add)
-{
-   return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
-      stbi__addsizes_valid(a*b*c, add);
-}
-
-// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow
-#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
-static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add)
-{
-   return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
-      stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add);
-}
-#endif
-
-// mallocs with size overflow checking
-static void *stbi__malloc_mad2(int a, int b, int add)
-{
-   if (!stbi__mad2sizes_valid(a, b, add)) return NULL;
-   return stbi__malloc(a*b + add);
-}
-
-static void *stbi__malloc_mad3(int a, int b, int c, int add)
-{
-   if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL;
-   return stbi__malloc(a*b*c + add);
-}
-
-#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
-static void *stbi__malloc_mad4(int a, int b, int c, int d, int add)
-{
-   if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL;
-   return stbi__malloc(a*b*c*d + add);
-}
-#endif
-
-// stbi__err - error
-// stbi__errpf - error returning pointer to float
-// stbi__errpuc - error returning pointer to unsigned char
-
-#ifdef STBI_NO_FAILURE_STRINGS
-   #define stbi__err(x,y)  0
-#elif defined(STBI_FAILURE_USERMSG)
-   #define stbi__err(x,y)  stbi__err(y)
-#else
-   #define stbi__err(x,y)  stbi__err(x)
-#endif
-
-#define stbi__errpf(x,y)   ((float *)(size_t) (stbi__err(x,y)?NULL:NULL))
-#define stbi__errpuc(x,y)  ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL))
-
-STBIDEF void stbi_image_free(void *retval_from_stbi_load)
-{
-   STBI_FREE(retval_from_stbi_load);
-}
-
-#ifndef STBI_NO_LINEAR
-static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp);
-#endif
-
-#ifndef STBI_NO_HDR
-static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp);
-#endif
-
-static int stbi__vertically_flip_on_load = 0;
-
-STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip)
-{
-    stbi__vertically_flip_on_load = flag_true_if_should_flip;
-}
-
-static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
-{
-   memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields
-   ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed
-   ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order
-   ri->num_channels = 0;
-
-   #ifndef STBI_NO_JPEG
-   if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_PNG
-   if (stbi__png_test(s))  return stbi__png_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_BMP
-   if (stbi__bmp_test(s))  return stbi__bmp_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_GIF
-   if (stbi__gif_test(s))  return stbi__gif_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_PSD
-   if (stbi__psd_test(s))  return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
-   #endif
-   #ifndef STBI_NO_PIC
-   if (stbi__pic_test(s))  return stbi__pic_load(s,x,y,comp,req_comp, ri);
-   #endif
-   #ifndef STBI_NO_PNM
-   if (stbi__pnm_test(s))  return stbi__pnm_load(s,x,y,comp,req_comp, ri);
-   #endif
-
-   #ifndef STBI_NO_HDR
-   if (stbi__hdr_test(s)) {
-      float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri);
-      return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp);
-   }
-   #endif
-
-   #ifndef STBI_NO_TGA
-   // test tga last because it's a crappy test!
-   if (stbi__tga_test(s))
-      return stbi__tga_load(s,x,y,comp,req_comp, ri);
-   #endif
-
-   return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt");
-}
-
-static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels)
-{
-   int i;
-   int img_len = w * h * channels;
-   stbi_uc *reduced;
-
-   reduced = (stbi_uc *) stbi__malloc(img_len);
-   if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory");
-
-   for (i = 0; i < img_len; ++i)
-      reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling
-
-   STBI_FREE(orig);
-   return reduced;
-}
-
-static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels)
-{
-   int i;
-   int img_len = w * h * channels;
-   stbi__uint16 *enlarged;
-
-   enlarged = (stbi__uint16 *) stbi__malloc(img_len*2);
-   if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
-
-   for (i = 0; i < img_len; ++i)
-      enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff
-
-   STBI_FREE(orig);
-   return enlarged;
-}
-
-static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel)
-{
-   int row;
-   size_t bytes_per_row = (size_t)w * bytes_per_pixel;
-   stbi_uc temp[2048];
-   stbi_uc *bytes = (stbi_uc *)image;
-
-   for (row = 0; row < (h>>1); row++) {
-      stbi_uc *row0 = bytes + row*bytes_per_row;
-      stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row;
-      // swap row0 with row1
-      size_t bytes_left = bytes_per_row;
-      while (bytes_left) {
-         size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp);
-         memcpy(temp, row0, bytes_copy);
-         memcpy(row0, row1, bytes_copy);
-         memcpy(row1, temp, bytes_copy);
-         row0 += bytes_copy;
-         row1 += bytes_copy;
-         bytes_left -= bytes_copy;
-      }
-   }
-}
-
-static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel)
-{
-   int slice;
-   int slice_size = w * h * bytes_per_pixel;
-
-   stbi_uc *bytes = (stbi_uc *)image;
-   for (slice = 0; slice < z; ++slice) {
-      stbi__vertical_flip(bytes, w, h, bytes_per_pixel); 
-      bytes += slice_size; 
-   }
-}
-
-static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__result_info ri;
-   void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8);
-
-   if (result == NULL)
-      return NULL;
-
-   if (ri.bits_per_channel != 8) {
-      STBI_ASSERT(ri.bits_per_channel == 16);
-      result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
-      ri.bits_per_channel = 8;
-   }
-
-   // @TODO: move stbi__convert_format to here
-
-   if (stbi__vertically_flip_on_load) {
-      int channels = req_comp ? req_comp : *comp;
-      stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc));
-   }
-
-   return (unsigned char *) result;
-}
-
-static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__result_info ri;
-   void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16);
-
-   if (result == NULL)
-      return NULL;
-
-   if (ri.bits_per_channel != 16) {
-      STBI_ASSERT(ri.bits_per_channel == 8);
-      result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
-      ri.bits_per_channel = 16;
-   }
-
-   // @TODO: move stbi__convert_format16 to here
-   // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision
-
-   if (stbi__vertically_flip_on_load) {
-      int channels = req_comp ? req_comp : *comp;
-      stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16));
-   }
-
-   return (stbi__uint16 *) result;
-}
-
-#if !defined(STBI_NO_HDR) || !defined(STBI_NO_LINEAR)
-static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp)
-{
-   if (stbi__vertically_flip_on_load && result != NULL) {
-      int channels = req_comp ? req_comp : *comp;
-      stbi__vertical_flip(result, *x, *y, channels * sizeof(float));
-   }
-}
-#endif
-
-#ifndef STBI_NO_STDIO
-
-static FILE *stbi__fopen(char const *filename, char const *mode)
-{
-   FILE *f;
-#if defined(_MSC_VER) && _MSC_VER >= 1400
-   if (0 != fopen_s(&f, filename, mode))
-      f=0;
-#else
-   f = fopen(filename, mode);
-#endif
-   return f;
-}
-
-
-STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   FILE *f = stbi__fopen(filename, "rb");
-   unsigned char *result;
-   if (!f) return stbi__errpuc("can't fopen", "Unable to open file");
-   result = stbi_load_from_file(f,x,y,comp,req_comp);
-   fclose(f);
-   return result;
-}
-
-STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   unsigned char *result;
-   stbi__context s;
-   stbi__start_file(&s,f);
-   result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
-   if (result) {
-      // need to 'unget' all the characters in the IO buffer
-      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
-   }
-   return result;
-}
-
-STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__uint16 *result;
-   stbi__context s;
-   stbi__start_file(&s,f);
-   result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp);
-   if (result) {
-      // need to 'unget' all the characters in the IO buffer
-      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
-   }
-   return result;
-}
-
-STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   FILE *f = stbi__fopen(filename, "rb");
-   stbi__uint16 *result;
-   if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file");
-   result = stbi_load_from_file_16(f,x,y,comp,req_comp);
-   fclose(f);
-   return result;
-}
-
-
-#endif //!STBI_NO_STDIO
-
-STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
-}
-
-STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user);
-   return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
-}
-
-STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
-}
-
-STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
-   return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
-}
-
-#ifndef STBI_NO_GIF
-STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
-{
-   unsigned char *result;
-   stbi__context s; 
-   stbi__start_mem(&s,buffer,len); 
-   
-   result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp);
-   if (stbi__vertically_flip_on_load) {
-      stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); 
-   }
-
-   return result; 
-}
-#endif
-
-#ifndef STBI_NO_LINEAR
-static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp)
-{
-   unsigned char *data;
-   #ifndef STBI_NO_HDR
-   if (stbi__hdr_test(s)) {
-      stbi__result_info ri;
-      float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri);
-      if (hdr_data)
-         stbi__float_postprocess(hdr_data,x,y,comp,req_comp);
-      return hdr_data;
-   }
-   #endif
-   data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp);
-   if (data)
-      return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp);
-   return stbi__errpf("unknown image type", "Image not of any known type, or corrupt");
-}
-
-STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__loadf_main(&s,x,y,comp,req_comp);
-}
-
-STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
-   return stbi__loadf_main(&s,x,y,comp,req_comp);
-}
-
-#ifndef STBI_NO_STDIO
-STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp)
-{
-   float *result;
-   FILE *f = stbi__fopen(filename, "rb");
-   if (!f) return stbi__errpf("can't fopen", "Unable to open file");
-   result = stbi_loadf_from_file(f,x,y,comp,req_comp);
-   fclose(f);
-   return result;
-}
-
-STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
-{
-   stbi__context s;
-   stbi__start_file(&s,f);
-   return stbi__loadf_main(&s,x,y,comp,req_comp);
-}
-#endif // !STBI_NO_STDIO
-
-#endif // !STBI_NO_LINEAR
-
-// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is
-// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always
-// reports false!
-
-STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len)
-{
-   #ifndef STBI_NO_HDR
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__hdr_test(&s);
-   #else
-   STBI_NOTUSED(buffer);
-   STBI_NOTUSED(len);
-   return 0;
-   #endif
-}
-
-#ifndef STBI_NO_STDIO
-STBIDEF int      stbi_is_hdr          (char const *filename)
-{
-   FILE *f = stbi__fopen(filename, "rb");
-   int result=0;
-   if (f) {
-      result = stbi_is_hdr_from_file(f);
-      fclose(f);
-   }
-   return result;
-}
-
-STBIDEF int stbi_is_hdr_from_file(FILE *f)
-{
-   #ifndef STBI_NO_HDR
-   long pos = ftell(f);
-   int res;
-   stbi__context s;
-   stbi__start_file(&s,f);
-   res = stbi__hdr_test(&s);
-   fseek(f, pos, SEEK_SET);
-   return res;
-   #else
-   STBI_NOTUSED(f);
-   return 0;
-   #endif
-}
-#endif // !STBI_NO_STDIO
-
-STBIDEF int      stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user)
-{
-   #ifndef STBI_NO_HDR
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
-   return stbi__hdr_test(&s);
-   #else
-   STBI_NOTUSED(clbk);
-   STBI_NOTUSED(user);
-   return 0;
-   #endif
-}
-
-#ifndef STBI_NO_LINEAR
-static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f;
-
-STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; }
-STBIDEF void   stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; }
-#endif
-
-static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f;
-
-STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; }
-STBIDEF void   stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; }
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-// Common code used by all image loaders
-//
-
-enum
-{
-   STBI__SCAN_load=0,
-   STBI__SCAN_type,
-   STBI__SCAN_header
-};
-
-static void stbi__refill_buffer(stbi__context *s)
-{
-   int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen);
-   if (n == 0) {
-      // at end of file, treat same as if from memory, but need to handle case
-      // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file
-      s->read_from_callbacks = 0;
-      s->img_buffer = s->buffer_start;
-      s->img_buffer_end = s->buffer_start+1;
-      *s->img_buffer = 0;
-   } else {
-      s->img_buffer = s->buffer_start;
-      s->img_buffer_end = s->buffer_start + n;
-   }
-}
-
-stbi_inline static stbi_uc stbi__get8(stbi__context *s)
-{
-   if (s->img_buffer < s->img_buffer_end)
-      return *s->img_buffer++;
-   if (s->read_from_callbacks) {
-      stbi__refill_buffer(s);
-      return *s->img_buffer++;
-   }
-   return 0;
-}
-
-stbi_inline static int stbi__at_eof(stbi__context *s)
-{
-   if (s->io.read) {
-      if (!(s->io.eof)(s->io_user_data)) return 0;
-      // if feof() is true, check if buffer = end
-      // special case: we've only got the special 0 character at the end
-      if (s->read_from_callbacks == 0) return 1;
-   }
-
-   return s->img_buffer >= s->img_buffer_end;
-}
-
-static void stbi__skip(stbi__context *s, int n)
-{
-   if (n < 0) {
-      s->img_buffer = s->img_buffer_end;
-      return;
-   }
-   if (s->io.read) {
-      int blen = (int) (s->img_buffer_end - s->img_buffer);
-      if (blen < n) {
-         s->img_buffer = s->img_buffer_end;
-         (s->io.skip)(s->io_user_data, n - blen);
-         return;
-      }
-   }
-   s->img_buffer += n;
-}
-
-static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n)
-{
-   if (s->io.read) {
-      int blen = (int) (s->img_buffer_end - s->img_buffer);
-      if (blen < n) {
-         int res, count;
-
-         memcpy(buffer, s->img_buffer, blen);
-
-         count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen);
-         res = (count == (n-blen));
-         s->img_buffer = s->img_buffer_end;
-         return res;
-      }
-   }
-
-   if (s->img_buffer+n <= s->img_buffer_end) {
-      memcpy(buffer, s->img_buffer, n);
-      s->img_buffer += n;
-      return 1;
-   } else
-      return 0;
-}
-
-static int stbi__get16be(stbi__context *s)
-{
-   int z = stbi__get8(s);
-   return (z << 8) + stbi__get8(s);
-}
-
-static stbi__uint32 stbi__get32be(stbi__context *s)
-{
-   stbi__uint32 z = stbi__get16be(s);
-   return (z << 16) + stbi__get16be(s);
-}
-
-#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF)
-// nothing
-#else
-static int stbi__get16le(stbi__context *s)
-{
-   int z = stbi__get8(s);
-   return z + (stbi__get8(s) << 8);
-}
-#endif
-
-#ifndef STBI_NO_BMP
-static stbi__uint32 stbi__get32le(stbi__context *s)
-{
-   stbi__uint32 z = stbi__get16le(s);
-   return z + (stbi__get16le(s) << 16);
-}
-#endif
-
-#define STBI__BYTECAST(x)  ((stbi_uc) ((x) & 255))  // truncate int to byte without warnings
-
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  generic converter from built-in img_n to req_comp
-//    individual types do this automatically as much as possible (e.g. jpeg
-//    does all cases internally since it needs to colorspace convert anyway,
-//    and it never has alpha, so very few cases ). png can automatically
-//    interleave an alpha=255 channel, but falls back to this for other cases
-//
-//  assume data buffer is malloced, so malloc a new one and free that one
-//  only failure mode is malloc failing
-
-static stbi_uc stbi__compute_y(int r, int g, int b)
-{
-   return (stbi_uc) (((r*77) + (g*150) +  (29*b)) >> 8);
-}
-
-static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y)
-{
-   int i,j;
-   unsigned char *good;
-
-   if (req_comp == img_n) return data;
-   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
-
-   good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0);
-   if (good == NULL) {
-      STBI_FREE(data);
-      return stbi__errpuc("outofmem", "Out of memory");
-   }
-
-   for (j=0; j < (int) y; ++j) {
-      unsigned char *src  = data + j * x * img_n   ;
-      unsigned char *dest = good + j * x * req_comp;
-
-      #define STBI__COMBO(a,b)  ((a)*8+(b))
-      #define STBI__CASE(a,b)   case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
-      // convert source image with img_n components to one with req_comp components;
-      // avoid switch per pixel, so use switch per scanline and massive macros
-      switch (STBI__COMBO(img_n, req_comp)) {
-         STBI__CASE(1,2) { dest[0]=src[0], dest[1]=255;                                     } break;
-         STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0];                                  } break;
-         STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=255;                     } break;
-         STBI__CASE(2,1) { dest[0]=src[0];                                                  } break;
-         STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0];                                  } break;
-         STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1];                  } break;
-         STBI__CASE(3,4) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255;        } break;
-         STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
-         STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = 255;    } break;
-         STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
-         STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = src[3]; } break;
-         STBI__CASE(4,3) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];                    } break;
-         default: STBI_ASSERT(0);
-      }
-      #undef STBI__CASE
-   }
-
-   STBI_FREE(data);
-   return good;
-}
-
-static stbi__uint16 stbi__compute_y_16(int r, int g, int b)
-{
-   return (stbi__uint16) (((r*77) + (g*150) +  (29*b)) >> 8);
-}
-
-static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y)
-{
-   int i,j;
-   stbi__uint16 *good;
-
-   if (req_comp == img_n) return data;
-   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
-
-   good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2);
-   if (good == NULL) {
-      STBI_FREE(data);
-      return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
-   }
-
-   for (j=0; j < (int) y; ++j) {
-      stbi__uint16 *src  = data + j * x * img_n   ;
-      stbi__uint16 *dest = good + j * x * req_comp;
-
-      #define STBI__COMBO(a,b)  ((a)*8+(b))
-      #define STBI__CASE(a,b)   case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
-      // convert source image with img_n components to one with req_comp components;
-      // avoid switch per pixel, so use switch per scanline and massive macros
-      switch (STBI__COMBO(img_n, req_comp)) {
-         STBI__CASE(1,2) { dest[0]=src[0], dest[1]=0xffff;                                     } break;
-         STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0];                                     } break;
-         STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=0xffff;                     } break;
-         STBI__CASE(2,1) { dest[0]=src[0];                                                     } break;
-         STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0];                                     } break;
-         STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1];                     } break;
-         STBI__CASE(3,4) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=0xffff;        } break;
-         STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
-         STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]), dest[1] = 0xffff; } break;
-         STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
-         STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]), dest[1] = src[3]; } break;
-         STBI__CASE(4,3) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];                       } break;
-         default: STBI_ASSERT(0);
-      }
-      #undef STBI__CASE
-   }
-
-   STBI_FREE(data);
-   return good;
-}
-
-#ifndef STBI_NO_LINEAR
-static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
-{
-   int i,k,n;
-   float *output;
-   if (!data) return NULL;
-   output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0);
-   if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); }
-   // compute number of non-alpha components
-   if (comp & 1) n = comp; else n = comp-1;
-   for (i=0; i < x*y; ++i) {
-      for (k=0; k < n; ++k) {
-         output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale);
-      }
-      if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f;
-   }
-   STBI_FREE(data);
-   return output;
-}
-#endif
-
-#ifndef STBI_NO_HDR
-#define stbi__float2int(x)   ((int) (x))
-static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp)
-{
-   int i,k,n;
-   stbi_uc *output;
-   if (!data) return NULL;
-   output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0);
-   if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); }
-   // compute number of non-alpha components
-   if (comp & 1) n = comp; else n = comp-1;
-   for (i=0; i < x*y; ++i) {
-      for (k=0; k < n; ++k) {
-         float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f;
-         if (z < 0) z = 0;
-         if (z > 255) z = 255;
-         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
-      }
-      if (k < comp) {
-         float z = data[i*comp+k] * 255 + 0.5f;
-         if (z < 0) z = 0;
-         if (z > 255) z = 255;
-         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
-      }
-   }
-   STBI_FREE(data);
-   return output;
-}
-#endif
-
-//////////////////////////////////////////////////////////////////////////////
-//
-//  "baseline" JPEG/JFIF decoder
-//
-//    simple implementation
-//      - doesn't support delayed output of y-dimension
-//      - simple interface (only one output format: 8-bit interleaved RGB)
-//      - doesn't try to recover corrupt jpegs
-//      - doesn't allow partial loading, loading multiple at once
-//      - still fast on x86 (copying globals into locals doesn't help x86)
-//      - allocates lots of intermediate memory (full size of all components)
-//        - non-interleaved case requires this anyway
-//        - allows good upsampling (see next)
-//    high-quality
-//      - upsampled channels are bilinearly interpolated, even across blocks
-//      - quality integer IDCT derived from IJG's 'slow'
-//    performance
-//      - fast huffman; reasonable integer IDCT
-//      - some SIMD kernels for common paths on targets with SSE2/NEON
-//      - uses a lot of intermediate memory, could cache poorly
-
-#ifndef STBI_NO_JPEG
-
-// huffman decoding acceleration
-#define FAST_BITS   9  // larger handles more cases; smaller stomps less cache
-
-typedef struct
-{
-   stbi_uc  fast[1 << FAST_BITS];
-   // weirdly, repacking this into AoS is a 10% speed loss, instead of a win
-   stbi__uint16 code[256];
-   stbi_uc  values[256];
-   stbi_uc  size[257];
-   unsigned int maxcode[18];
-   int    delta[17];   // old 'firstsymbol' - old 'firstcode'
-} stbi__huffman;
-
-typedef struct
-{
-   stbi__context *s;
-   stbi__huffman huff_dc[4];
-   stbi__huffman huff_ac[4];
-   stbi__uint16 dequant[4][64];
-   stbi__int16 fast_ac[4][1 << FAST_BITS];
-
-// sizes for components, interleaved MCUs
-   int img_h_max, img_v_max;
-   int img_mcu_x, img_mcu_y;
-   int img_mcu_w, img_mcu_h;
-
-// definition of jpeg image component
-   struct
-   {
-      int id;
-      int h,v;
-      int tq;
-      int hd,ha;
-      int dc_pred;
-
-      int x,y,w2,h2;
-      stbi_uc *data;
-      void *raw_data, *raw_coeff;
-      stbi_uc *linebuf;
-      short   *coeff;   // progressive only
-      int      coeff_w, coeff_h; // number of 8x8 coefficient blocks
-   } img_comp[4];
-
-   stbi__uint32   code_buffer; // jpeg entropy-coded buffer
-   int            code_bits;   // number of valid bits
-   unsigned char  marker;      // marker seen while filling entropy buffer
-   int            nomore;      // flag if we saw a marker so must stop
-
-   int            progressive;
-   int            spec_start;
-   int            spec_end;
-   int            succ_high;
-   int            succ_low;
-   int            eob_run;
-   int            jfif;
-   int            app14_color_transform; // Adobe APP14 tag
-   int            rgb;
-
-   int scan_n, order[4];
-   int restart_interval, todo;
-
-// kernels
-   void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]);
-   void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step);
-   stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs);
-} stbi__jpeg;
-
-static int stbi__build_huffman(stbi__huffman *h, int *count)
-{
-   int i,j,k=0;
-   unsigned int code;
-   // build size list for each symbol (from JPEG spec)
-   for (i=0; i < 16; ++i)
-      for (j=0; j < count[i]; ++j)
-         h->size[k++] = (stbi_uc) (i+1);
-   h->size[k] = 0;
-
-   // compute actual symbols (from jpeg spec)
-   code = 0;
-   k = 0;
-   for(j=1; j <= 16; ++j) {
-      // compute delta to add to code to compute symbol id
-      h->delta[j] = k - code;
-      if (h->size[k] == j) {
-         while (h->size[k] == j)
-            h->code[k++] = (stbi__uint16) (code++);
-         if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG");
-      }
-      // compute largest code + 1 for this size, preshifted as needed later
-      h->maxcode[j] = code << (16-j);
-      code <<= 1;
-   }
-   h->maxcode[j] = 0xffffffff;
-
-   // build non-spec acceleration table; 255 is flag for not-accelerated
-   memset(h->fast, 255, 1 << FAST_BITS);
-   for (i=0; i < k; ++i) {
-      int s = h->size[i];
-      if (s <= FAST_BITS) {
-         int c = h->code[i] << (FAST_BITS-s);
-         int m = 1 << (FAST_BITS-s);
-         for (j=0; j < m; ++j) {
-            h->fast[c+j] = (stbi_uc) i;
-         }
-      }
-   }
-   return 1;
-}
-
-// build a table that decodes both magnitude and value of small ACs in
-// one go.
-static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h)
-{
-   int i;
-   for (i=0; i < (1 << FAST_BITS); ++i) {
-      stbi_uc fast = h->fast[i];
-      fast_ac[i] = 0;
-      if (fast < 255) {
-         int rs = h->values[fast];
-         int run = (rs >> 4) & 15;
-         int magbits = rs & 15;
-         int len = h->size[fast];
-
-         if (magbits && len + magbits <= FAST_BITS) {
-            // magnitude code followed by receive_extend code
-            int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
-            int m = 1 << (magbits - 1);
-            if (k < m) k += (~0U << magbits) + 1;
-            // if the result is small enough, we can fit it in fast_ac table
-            if (k >= -128 && k <= 127)
-               fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits));
-         }
-      }
-   }
-}
-
-static void stbi__grow_buffer_unsafe(stbi__jpeg *j)
-{
-   do {
-      unsigned int b = j->nomore ? 0 : stbi__get8(j->s);
-      if (b == 0xff) {
-         int c = stbi__get8(j->s);
-         while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes
-         if (c != 0) {
-            j->marker = (unsigned char) c;
-            j->nomore = 1;
-            return;
-         }
-      }
-      j->code_buffer |= b << (24 - j->code_bits);
-      j->code_bits += 8;
-   } while (j->code_bits <= 24);
-}
-
-// (1 << n) - 1
-static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
-
-// decode a jpeg huffman value from the bitstream
-stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
-{
-   unsigned int temp;
-   int c,k;
-
-   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-
-   // look at the top FAST_BITS and determine what symbol ID it is,
-   // if the code is <= FAST_BITS
-   c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-   k = h->fast[c];
-   if (k < 255) {
-      int s = h->size[k];
-      if (s > j->code_bits)
-         return -1;
-      j->code_buffer <<= s;
-      j->code_bits -= s;
-      return h->values[k];
-   }
-
-   // naive test is to shift the code_buffer down so k bits are
-   // valid, then test against maxcode. To speed this up, we've
-   // preshifted maxcode left so that it has (16-k) 0s at the
-   // end; in other words, regardless of the number of bits, it
-   // wants to be compared against something shifted to have 16;
-   // that way we don't need to shift inside the loop.
-   temp = j->code_buffer >> 16;
-   for (k=FAST_BITS+1 ; ; ++k)
-      if (temp < h->maxcode[k])
-         break;
-   if (k == 17) {
-      // error! code not found
-      j->code_bits -= 16;
-      return -1;
-   }
-
-   if (k > j->code_bits)
-      return -1;
-
-   // convert the huffman code to the symbol id
-   c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k];
-   STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]);
-
-   // convert the id to a symbol
-   j->code_bits -= k;
-   j->code_buffer <<= k;
-   return h->values[c];
-}
-
-// bias[n] = (-1<<n) + 1
-static const int stbi__jbias[16] = {0,-1,-3,-7,-15,-31,-63,-127,-255,-511,-1023,-2047,-4095,-8191,-16383,-32767};
-
-// combined JPEG 'receive' and JPEG 'extend', since baseline
-// always extends everything it receives.
-stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n)
-{
-   unsigned int k;
-   int sgn;
-   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
-
-   sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB
-   k = stbi_lrot(j->code_buffer, n);
-   STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask)));
-   j->code_buffer = k & ~stbi__bmask[n];
-   k &= stbi__bmask[n];
-   j->code_bits -= n;
-   return k + (stbi__jbias[n] & ~sgn);
-}
-
-// get some unsigned bits
-stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n)
-{
-   unsigned int k;
-   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
-   k = stbi_lrot(j->code_buffer, n);
-   j->code_buffer = k & ~stbi__bmask[n];
-   k &= stbi__bmask[n];
-   j->code_bits -= n;
-   return k;
-}
-
-stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j)
-{
-   unsigned int k;
-   if (j->code_bits < 1) stbi__grow_buffer_unsafe(j);
-   k = j->code_buffer;
-   j->code_buffer <<= 1;
-   --j->code_bits;
-   return k & 0x80000000;
-}
-
-// given a value that's at position X in the zigzag stream,
-// where does it appear in the 8x8 matrix coded as row-major?
-static const stbi_uc stbi__jpeg_dezigzag[64+15] =
-{
-    0,  1,  8, 16,  9,  2,  3, 10,
-   17, 24, 32, 25, 18, 11,  4,  5,
-   12, 19, 26, 33, 40, 48, 41, 34,
-   27, 20, 13,  6,  7, 14, 21, 28,
-   35, 42, 49, 56, 57, 50, 43, 36,
-   29, 22, 15, 23, 30, 37, 44, 51,
-   58, 59, 52, 45, 38, 31, 39, 46,
-   53, 60, 61, 54, 47, 55, 62, 63,
-   // let corrupt input sample past end
-   63, 63, 63, 63, 63, 63, 63, 63,
-   63, 63, 63, 63, 63, 63, 63
-};
-
-// decode one 64-entry block--
-static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant)
-{
-   int diff,dc,k;
-   int t;
-
-   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-   t = stbi__jpeg_huff_decode(j, hdc);
-   if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG");
-
-   // 0 all the ac values now so we can do it 32-bits at a time
-   memset(data,0,64*sizeof(data[0]));
-
-   diff = t ? stbi__extend_receive(j, t) : 0;
-   dc = j->img_comp[b].dc_pred + diff;
-   j->img_comp[b].dc_pred = dc;
-   data[0] = (short) (dc * dequant[0]);
-
-   // decode AC components, see JPEG spec
-   k = 1;
-   do {
-      unsigned int zig;
-      int c,r,s;
-      if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-      c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-      r = fac[c];
-      if (r) { // fast-AC path
-         k += (r >> 4) & 15; // run
-         s = r & 15; // combined length
-         j->code_buffer <<= s;
-         j->code_bits -= s;
-         // decode into unzigzag'd location
-         zig = stbi__jpeg_dezigzag[k++];
-         data[zig] = (short) ((r >> 8) * dequant[zig]);
-      } else {
-         int rs = stbi__jpeg_huff_decode(j, hac);
-         if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
-         s = rs & 15;
-         r = rs >> 4;
-         if (s == 0) {
-            if (rs != 0xf0) break; // end block
-            k += 16;
-         } else {
-            k += r;
-            // decode into unzigzag'd location
-            zig = stbi__jpeg_dezigzag[k++];
-            data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]);
-         }
-      }
-   } while (k < 64);
-   return 1;
-}
-
-static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b)
-{
-   int diff,dc;
-   int t;
-   if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
-
-   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-
-   if (j->succ_high == 0) {
-      // first scan for DC coefficient, must be first
-      memset(data,0,64*sizeof(data[0])); // 0 all the ac values now
-      t = stbi__jpeg_huff_decode(j, hdc);
-      diff = t ? stbi__extend_receive(j, t) : 0;
-
-      dc = j->img_comp[b].dc_pred + diff;
-      j->img_comp[b].dc_pred = dc;
-      data[0] = (short) (dc << j->succ_low);
-   } else {
-      // refinement scan for DC coefficient
-      if (stbi__jpeg_get_bit(j))
-         data[0] += (short) (1 << j->succ_low);
-   }
-   return 1;
-}
-
-// @OPTIMIZE: store non-zigzagged during the decode passes,
-// and only de-zigzag when dequantizing
-static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac)
-{
-   int k;
-   if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
-
-   if (j->succ_high == 0) {
-      int shift = j->succ_low;
-
-      if (j->eob_run) {
-         --j->eob_run;
-         return 1;
-      }
-
-      k = j->spec_start;
-      do {
-         unsigned int zig;
-         int c,r,s;
-         if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
-         c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-         r = fac[c];
-         if (r) { // fast-AC path
-            k += (r >> 4) & 15; // run
-            s = r & 15; // combined length
-            j->code_buffer <<= s;
-            j->code_bits -= s;
-            zig = stbi__jpeg_dezigzag[k++];
-            data[zig] = (short) ((r >> 8) << shift);
-         } else {
-            int rs = stbi__jpeg_huff_decode(j, hac);
-            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
-            s = rs & 15;
-            r = rs >> 4;
-            if (s == 0) {
-               if (r < 15) {
-                  j->eob_run = (1 << r);
-                  if (r)
-                     j->eob_run += stbi__jpeg_get_bits(j, r);
-                  --j->eob_run;
-                  break;
-               }
-               k += 16;
-            } else {
-               k += r;
-               zig = stbi__jpeg_dezigzag[k++];
-               data[zig] = (short) (stbi__extend_receive(j,s) << shift);
-            }
-         }
-      } while (k <= j->spec_end);
-   } else {
-      // refinement scan for these AC coefficients
-
-      short bit = (short) (1 << j->succ_low);
-
-      if (j->eob_run) {
-         --j->eob_run;
-         for (k = j->spec_start; k <= j->spec_end; ++k) {
-            short *p = &data[stbi__jpeg_dezigzag[k]];
-            if (*p != 0)
-               if (stbi__jpeg_get_bit(j))
-                  if ((*p & bit)==0) {
-                     if (*p > 0)
-                        *p += bit;
-                     else
-                        *p -= bit;
-                  }
-         }
-      } else {
-         k = j->spec_start;
-         do {
-            int r,s;
-            int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh
-            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
-            s = rs & 15;
-            r = rs >> 4;
-            if (s == 0) {
-               if (r < 15) {
-                  j->eob_run = (1 << r) - 1;
-                  if (r)
-                     j->eob_run += stbi__jpeg_get_bits(j, r);
-                  r = 64; // force end of block
-               } else {
-                  // r=15 s=0 should write 16 0s, so we just do
-                  // a run of 15 0s and then write s (which is 0),
-                  // so we don't have to do anything special here
-               }
-            } else {
-               if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG");
-               // sign bit
-               if (stbi__jpeg_get_bit(j))
-                  s = bit;
-               else
-                  s = -bit;
-            }
-
-            // advance by r
-            while (k <= j->spec_end) {
-               short *p = &data[stbi__jpeg_dezigzag[k++]];
-               if (*p != 0) {
-                  if (stbi__jpeg_get_bit(j))
-                     if ((*p & bit)==0) {
-                        if (*p > 0)
-                           *p += bit;
-                        else
-                           *p -= bit;
-                     }
-               } else {
-                  if (r == 0) {
-                     *p = (short) s;
-                     break;
-                  }
-                  --r;
-               }
-            }
-         } while (k <= j->spec_end);
-      }
-   }
-   return 1;
-}
-
-// take a -128..127 value and stbi__clamp it and convert to 0..255
-stbi_inline static stbi_uc stbi__clamp(int x)
-{
-   // trick to use a single test to catch both cases
-   if ((unsigned int) x > 255) {
-      if (x < 0) return 0;
-      if (x > 255) return 255;
-   }
-   return (stbi_uc) x;
-}
-
-#define stbi__f2f(x)  ((int) (((x) * 4096 + 0.5)))
-#define stbi__fsh(x)  ((x) * 4096)
-
-// derived from jidctint -- DCT_ISLOW
-#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \
-   int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \
-   p2 = s2;                                    \
-   p3 = s6;                                    \
-   p1 = (p2+p3) * stbi__f2f(0.5411961f);       \
-   t2 = p1 + p3*stbi__f2f(-1.847759065f);      \
-   t3 = p1 + p2*stbi__f2f( 0.765366865f);      \
-   p2 = s0;                                    \
-   p3 = s4;                                    \
-   t0 = stbi__fsh(p2+p3);                      \
-   t1 = stbi__fsh(p2-p3);                      \
-   x0 = t0+t3;                                 \
-   x3 = t0-t3;                                 \
-   x1 = t1+t2;                                 \
-   x2 = t1-t2;                                 \
-   t0 = s7;                                    \
-   t1 = s5;                                    \
-   t2 = s3;                                    \
-   t3 = s1;                                    \
-   p3 = t0+t2;                                 \
-   p4 = t1+t3;                                 \
-   p1 = t0+t3;                                 \
-   p2 = t1+t2;                                 \
-   p5 = (p3+p4)*stbi__f2f( 1.175875602f);      \
-   t0 = t0*stbi__f2f( 0.298631336f);           \
-   t1 = t1*stbi__f2f( 2.053119869f);           \
-   t2 = t2*stbi__f2f( 3.072711026f);           \
-   t3 = t3*stbi__f2f( 1.501321110f);           \
-   p1 = p5 + p1*stbi__f2f(-0.899976223f);      \
-   p2 = p5 + p2*stbi__f2f(-2.562915447f);      \
-   p3 = p3*stbi__f2f(-1.961570560f);           \
-   p4 = p4*stbi__f2f(-0.390180644f);           \
-   t3 += p1+p4;                                \
-   t2 += p2+p3;                                \
-   t1 += p2+p4;                                \
-   t0 += p1+p3;
-
-static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64])
-{
-   int i,val[64],*v=val;
-   stbi_uc *o;
-   short *d = data;
-
-   // columns
-   for (i=0; i < 8; ++i,++d, ++v) {
-      // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing
-      if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0
-           && d[40]==0 && d[48]==0 && d[56]==0) {
-         //    no shortcut                 0     seconds
-         //    (1|2|3|4|5|6|7)==0          0     seconds
-         //    all separate               -0.047 seconds
-         //    1 && 2|3 && 4|5 && 6|7:    -0.047 seconds
-         int dcterm = d[0]*4;
-         v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
-      } else {
-         STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56])
-         // constants scaled things up by 1<<12; let's bring them back
-         // down, but keep 2 extra bits of precision
-         x0 += 512; x1 += 512; x2 += 512; x3 += 512;
-         v[ 0] = (x0+t3) >> 10;
-         v[56] = (x0-t3) >> 10;
-         v[ 8] = (x1+t2) >> 10;
-         v[48] = (x1-t2) >> 10;
-         v[16] = (x2+t1) >> 10;
-         v[40] = (x2-t1) >> 10;
-         v[24] = (x3+t0) >> 10;
-         v[32] = (x3-t0) >> 10;
-      }
-   }
-
-   for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) {
-      // no fast case since the first 1D IDCT spread components out
-      STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7])
-      // constants scaled things up by 1<<12, plus we had 1<<2 from first
-      // loop, plus horizontal and vertical each scale by sqrt(8) so together
-      // we've got an extra 1<<3, so 1<<17 total we need to remove.
-      // so we want to round that, which means adding 0.5 * 1<<17,
-      // aka 65536. Also, we'll end up with -128 to 127 that we want
-      // to encode as 0..255 by adding 128, so we'll add that before the shift
-      x0 += 65536 + (128<<17);
-      x1 += 65536 + (128<<17);
-      x2 += 65536 + (128<<17);
-      x3 += 65536 + (128<<17);
-      // tried computing the shifts into temps, or'ing the temps to see
-      // if any were out of range, but that was slower
-      o[0] = stbi__clamp((x0+t3) >> 17);
-      o[7] = stbi__clamp((x0-t3) >> 17);
-      o[1] = stbi__clamp((x1+t2) >> 17);
-      o[6] = stbi__clamp((x1-t2) >> 17);
-      o[2] = stbi__clamp((x2+t1) >> 17);
-      o[5] = stbi__clamp((x2-t1) >> 17);
-      o[3] = stbi__clamp((x3+t0) >> 17);
-      o[4] = stbi__clamp((x3-t0) >> 17);
-   }
-}
-
-#ifdef STBI_SSE2
-// sse2 integer IDCT. not the fastest possible implementation but it
-// produces bit-identical results to the generic C version so it's
-// fully "transparent".
-static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
-{
-   // This is constructed to match our regular (generic) integer IDCT exactly.
-   __m128i row0, row1, row2, row3, row4, row5, row6, row7;
-   __m128i tmp;
-
-   // dot product constant: even elems=x, odd elems=y
-   #define dct_const(x,y)  _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y))
-
-   // out(0) = c0[even]*x + c0[odd]*y   (c0, x, y 16-bit, out 32-bit)
-   // out(1) = c1[even]*x + c1[odd]*y
-   #define dct_rot(out0,out1, x,y,c0,c1) \
-      __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \
-      __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \
-      __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \
-      __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \
-      __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \
-      __m128i out1##_h = _mm_madd_epi16(c0##hi, c1)
-
-   // out = in << 12  (in 16-bit, out 32-bit)
-   #define dct_widen(out, in) \
-      __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \
-      __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4)
-
-   // wide add
-   #define dct_wadd(out, a, b) \
-      __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \
-      __m128i out##_h = _mm_add_epi32(a##_h, b##_h)
-
-   // wide sub
-   #define dct_wsub(out, a, b) \
-      __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \
-      __m128i out##_h = _mm_sub_epi32(a##_h, b##_h)
-
-   // butterfly a/b, add bias, then shift by "s" and pack
-   #define dct_bfly32o(out0, out1, a,b,bias,s) \
-      { \
-         __m128i abiased_l = _mm_add_epi32(a##_l, bias); \
-         __m128i abiased_h = _mm_add_epi32(a##_h, bias); \
-         dct_wadd(sum, abiased, b); \
-         dct_wsub(dif, abiased, b); \
-         out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \
-         out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \
-      }
-
-   // 8-bit interleave step (for transposes)
-   #define dct_interleave8(a, b) \
-      tmp = a; \
-      a = _mm_unpacklo_epi8(a, b); \
-      b = _mm_unpackhi_epi8(tmp, b)
-
-   // 16-bit interleave step (for transposes)
-   #define dct_interleave16(a, b) \
-      tmp = a; \
-      a = _mm_unpacklo_epi16(a, b); \
-      b = _mm_unpackhi_epi16(tmp, b)
-
-   #define dct_pass(bias,shift) \
-      { \
-         /* even part */ \
-         dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \
-         __m128i sum04 = _mm_add_epi16(row0, row4); \
-         __m128i dif04 = _mm_sub_epi16(row0, row4); \
-         dct_widen(t0e, sum04); \
-         dct_widen(t1e, dif04); \
-         dct_wadd(x0, t0e, t3e); \
-         dct_wsub(x3, t0e, t3e); \
-         dct_wadd(x1, t1e, t2e); \
-         dct_wsub(x2, t1e, t2e); \
-         /* odd part */ \
-         dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \
-         dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \
-         __m128i sum17 = _mm_add_epi16(row1, row7); \
-         __m128i sum35 = _mm_add_epi16(row3, row5); \
-         dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \
-         dct_wadd(x4, y0o, y4o); \
-         dct_wadd(x5, y1o, y5o); \
-         dct_wadd(x6, y2o, y5o); \
-         dct_wadd(x7, y3o, y4o); \
-         dct_bfly32o(row0,row7, x0,x7,bias,shift); \
-         dct_bfly32o(row1,row6, x1,x6,bias,shift); \
-         dct_bfly32o(row2,row5, x2,x5,bias,shift); \
-         dct_bfly32o(row3,row4, x3,x4,bias,shift); \
-      }
-
-   __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f));
-   __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f));
-   __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f));
-   __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f));
-   __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f));
-   __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f));
-   __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f));
-   __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f));
-
-   // rounding biases in column/row passes, see stbi__idct_block for explanation.
-   __m128i bias_0 = _mm_set1_epi32(512);
-   __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17));
-
-   // load
-   row0 = _mm_load_si128((const __m128i *) (data + 0*8));
-   row1 = _mm_load_si128((const __m128i *) (data + 1*8));
-   row2 = _mm_load_si128((const __m128i *) (data + 2*8));
-   row3 = _mm_load_si128((const __m128i *) (data + 3*8));
-   row4 = _mm_load_si128((const __m128i *) (data + 4*8));
-   row5 = _mm_load_si128((const __m128i *) (data + 5*8));
-   row6 = _mm_load_si128((const __m128i *) (data + 6*8));
-   row7 = _mm_load_si128((const __m128i *) (data + 7*8));
-
-   // column pass
-   dct_pass(bias_0, 10);
-
-   {
-      // 16bit 8x8 transpose pass 1
-      dct_interleave16(row0, row4);
-      dct_interleave16(row1, row5);
-      dct_interleave16(row2, row6);
-      dct_interleave16(row3, row7);
-
-      // transpose pass 2
-      dct_interleave16(row0, row2);
-      dct_interleave16(row1, row3);
-      dct_interleave16(row4, row6);
-      dct_interleave16(row5, row7);
-
-      // transpose pass 3
-      dct_interleave16(row0, row1);
-      dct_interleave16(row2, row3);
-      dct_interleave16(row4, row5);
-      dct_interleave16(row6, row7);
-   }
-
-   // row pass
-   dct_pass(bias_1, 17);
-
-   {
-      // pack
-      __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7
-      __m128i p1 = _mm_packus_epi16(row2, row3);
-      __m128i p2 = _mm_packus_epi16(row4, row5);
-      __m128i p3 = _mm_packus_epi16(row6, row7);
-
-      // 8bit 8x8 transpose pass 1
-      dct_interleave8(p0, p2); // a0e0a1e1...
-      dct_interleave8(p1, p3); // c0g0c1g1...
-
-      // transpose pass 2
-      dct_interleave8(p0, p1); // a0c0e0g0...
-      dct_interleave8(p2, p3); // b0d0f0h0...
-
-      // transpose pass 3
-      dct_interleave8(p0, p2); // a0b0c0d0...
-      dct_interleave8(p1, p3); // a4b4c4d4...
-
-      // store
-      _mm_storel_epi64((__m128i *) out, p0); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p2); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p1); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p3); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e));
-   }
-
-#undef dct_const
-#undef dct_rot
-#undef dct_widen
-#undef dct_wadd
-#undef dct_wsub
-#undef dct_bfly32o
-#undef dct_interleave8
-#undef dct_interleave16
-#undef dct_pass
-}
-
-#endif // STBI_SSE2
-
-#ifdef STBI_NEON
-
-// NEON integer IDCT. should produce bit-identical
-// results to the generic C version.
-static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
-{
-   int16x8_t row0, row1, row2, row3, row4, row5, row6, row7;
-
-   int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f));
-   int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f));
-   int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f));
-   int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f));
-   int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f));
-   int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f));
-   int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f));
-   int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f));
-   int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f));
-   int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f));
-   int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f));
-   int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f));
-
-#define dct_long_mul(out, inq, coeff) \
-   int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \
-   int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff)
-
-#define dct_long_mac(out, acc, inq, coeff) \
-   int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \
-   int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff)
-
-#define dct_widen(out, inq) \
-   int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \
-   int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12)
-
-// wide add
-#define dct_wadd(out, a, b) \
-   int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \
-   int32x4_t out##_h = vaddq_s32(a##_h, b##_h)
-
-// wide sub
-#define dct_wsub(out, a, b) \
-   int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \
-   int32x4_t out##_h = vsubq_s32(a##_h, b##_h)
-
-// butterfly a/b, then shift using "shiftop" by "s" and pack
-#define dct_bfly32o(out0,out1, a,b,shiftop,s) \
-   { \
-      dct_wadd(sum, a, b); \
-      dct_wsub(dif, a, b); \
-      out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \
-      out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \
-   }
-
-#define dct_pass(shiftop, shift) \
-   { \
-      /* even part */ \
-      int16x8_t sum26 = vaddq_s16(row2, row6); \
-      dct_long_mul(p1e, sum26, rot0_0); \
-      dct_long_mac(t2e, p1e, row6, rot0_1); \
-      dct_long_mac(t3e, p1e, row2, rot0_2); \
-      int16x8_t sum04 = vaddq_s16(row0, row4); \
-      int16x8_t dif04 = vsubq_s16(row0, row4); \
-      dct_widen(t0e, sum04); \
-      dct_widen(t1e, dif04); \
-      dct_wadd(x0, t0e, t3e); \
-      dct_wsub(x3, t0e, t3e); \
-      dct_wadd(x1, t1e, t2e); \
-      dct_wsub(x2, t1e, t2e); \
-      /* odd part */ \
-      int16x8_t sum15 = vaddq_s16(row1, row5); \
-      int16x8_t sum17 = vaddq_s16(row1, row7); \
-      int16x8_t sum35 = vaddq_s16(row3, row5); \
-      int16x8_t sum37 = vaddq_s16(row3, row7); \
-      int16x8_t sumodd = vaddq_s16(sum17, sum35); \
-      dct_long_mul(p5o, sumodd, rot1_0); \
-      dct_long_mac(p1o, p5o, sum17, rot1_1); \
-      dct_long_mac(p2o, p5o, sum35, rot1_2); \
-      dct_long_mul(p3o, sum37, rot2_0); \
-      dct_long_mul(p4o, sum15, rot2_1); \
-      dct_wadd(sump13o, p1o, p3o); \
-      dct_wadd(sump24o, p2o, p4o); \
-      dct_wadd(sump23o, p2o, p3o); \
-      dct_wadd(sump14o, p1o, p4o); \
-      dct_long_mac(x4, sump13o, row7, rot3_0); \
-      dct_long_mac(x5, sump24o, row5, rot3_1); \
-      dct_long_mac(x6, sump23o, row3, rot3_2); \
-      dct_long_mac(x7, sump14o, row1, rot3_3); \
-      dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \
-      dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \
-      dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \
-      dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \
-   }
-
-   // load
-   row0 = vld1q_s16(data + 0*8);
-   row1 = vld1q_s16(data + 1*8);
-   row2 = vld1q_s16(data + 2*8);
-   row3 = vld1q_s16(data + 3*8);
-   row4 = vld1q_s16(data + 4*8);
-   row5 = vld1q_s16(data + 5*8);
-   row6 = vld1q_s16(data + 6*8);
-   row7 = vld1q_s16(data + 7*8);
-
-   // add DC bias
-   row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0));
-
-   // column pass
-   dct_pass(vrshrn_n_s32, 10);
-
-   // 16bit 8x8 transpose
-   {
-// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively.
-// whether compilers actually get this is another story, sadly.
-#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; }
-#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); }
-#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); }
-
-      // pass 1
-      dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6
-      dct_trn16(row2, row3);
-      dct_trn16(row4, row5);
-      dct_trn16(row6, row7);
-
-      // pass 2
-      dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4
-      dct_trn32(row1, row3);
-      dct_trn32(row4, row6);
-      dct_trn32(row5, row7);
-
-      // pass 3
-      dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0
-      dct_trn64(row1, row5);
-      dct_trn64(row2, row6);
-      dct_trn64(row3, row7);
-
-#undef dct_trn16
-#undef dct_trn32
-#undef dct_trn64
-   }
-
-   // row pass
-   // vrshrn_n_s32 only supports shifts up to 16, we need
-   // 17. so do a non-rounding shift of 16 first then follow
-   // up with a rounding shift by 1.
-   dct_pass(vshrn_n_s32, 16);
-
-   {
-      // pack and round
-      uint8x8_t p0 = vqrshrun_n_s16(row0, 1);
-      uint8x8_t p1 = vqrshrun_n_s16(row1, 1);
-      uint8x8_t p2 = vqrshrun_n_s16(row2, 1);
-      uint8x8_t p3 = vqrshrun_n_s16(row3, 1);
-      uint8x8_t p4 = vqrshrun_n_s16(row4, 1);
-      uint8x8_t p5 = vqrshrun_n_s16(row5, 1);
-      uint8x8_t p6 = vqrshrun_n_s16(row6, 1);
-      uint8x8_t p7 = vqrshrun_n_s16(row7, 1);
-
-      // again, these can translate into one instruction, but often don't.
-#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; }
-#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); }
-#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); }
-
-      // sadly can't use interleaved stores here since we only write
-      // 8 bytes to each scan line!
-
-      // 8x8 8-bit transpose pass 1
-      dct_trn8_8(p0, p1);
-      dct_trn8_8(p2, p3);
-      dct_trn8_8(p4, p5);
-      dct_trn8_8(p6, p7);
-
-      // pass 2
-      dct_trn8_16(p0, p2);
-      dct_trn8_16(p1, p3);
-      dct_trn8_16(p4, p6);
-      dct_trn8_16(p5, p7);
-
-      // pass 3
-      dct_trn8_32(p0, p4);
-      dct_trn8_32(p1, p5);
-      dct_trn8_32(p2, p6);
-      dct_trn8_32(p3, p7);
-
-      // store
-      vst1_u8(out, p0); out += out_stride;
-      vst1_u8(out, p1); out += out_stride;
-      vst1_u8(out, p2); out += out_stride;
-      vst1_u8(out, p3); out += out_stride;
-      vst1_u8(out, p4); out += out_stride;
-      vst1_u8(out, p5); out += out_stride;
-      vst1_u8(out, p6); out += out_stride;
-      vst1_u8(out, p7);
-
-#undef dct_trn8_8
-#undef dct_trn8_16
-#undef dct_trn8_32
-   }
-
-#undef dct_long_mul
-#undef dct_long_mac
-#undef dct_widen
-#undef dct_wadd
-#undef dct_wsub
-#undef dct_bfly32o
-#undef dct_pass
-}
-
-#endif // STBI_NEON
-
-#define STBI__MARKER_none  0xff
-// if there's a pending marker from the entropy stream, return that
-// otherwise, fetch from the stream and get a marker. if there's no
-// marker, return 0xff, which is never a valid marker value
-static stbi_uc stbi__get_marker(stbi__jpeg *j)
-{
-   stbi_uc x;
-   if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; }
-   x = stbi__get8(j->s);
-   if (x != 0xff) return STBI__MARKER_none;
-   while (x == 0xff)
-      x = stbi__get8(j->s); // consume repeated 0xff fill bytes
-   return x;
-}
-
-// in each scan, we'll have scan_n components, and the order
-// of the components is specified by order[]
-#define STBI__RESTART(x)     ((x) >= 0xd0 && (x) <= 0xd7)
-
-// after a restart interval, stbi__jpeg_reset the entropy decoder and
-// the dc prediction
-static void stbi__jpeg_reset(stbi__jpeg *j)
-{
-   j->code_bits = 0;
-   j->code_buffer = 0;
-   j->nomore = 0;
-   j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0;
-   j->marker = STBI__MARKER_none;
-   j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff;
-   j->eob_run = 0;
-   // no more than 1<<31 MCUs if no restart_interal? that's plenty safe,
-   // since we don't even allow 1<<30 pixels
-}
-
-static int stbi__parse_entropy_coded_data(stbi__jpeg *z)
-{
-   stbi__jpeg_reset(z);
-   if (!z->progressive) {
-      if (z->scan_n == 1) {
-         int i,j;
-         STBI_SIMD_ALIGN(short, data[64]);
-         int n = z->order[0];
-         // non-interleaved data, we just need to process one block at a time,
-         // in trivial scanline order
-         // number of blocks to do just depends on how many actual "pixels" this
-         // component has, independent of interleaved MCU blocking and such
-         int w = (z->img_comp[n].x+7) >> 3;
-         int h = (z->img_comp[n].y+7) >> 3;
-         for (j=0; j < h; ++j) {
-            for (i=0; i < w; ++i) {
-               int ha = z->img_comp[n].ha;
-               if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
-               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
-               // every data block is an MCU, so countdown the restart interval
-               if (--z->todo <= 0) {
-                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
-                  // if it's NOT a restart, then just bail, so we get corrupt data
-                  // rather than no data
-                  if (!STBI__RESTART(z->marker)) return 1;
-                  stbi__jpeg_reset(z);
-               }
-            }
-         }
-         return 1;
-      } else { // interleaved
-         int i,j,k,x,y;
-         STBI_SIMD_ALIGN(short, data[64]);
-         for (j=0; j < z->img_mcu_y; ++j) {
-            for (i=0; i < z->img_mcu_x; ++i) {
-               // scan an interleaved mcu... process scan_n components in order
-               for (k=0; k < z->scan_n; ++k) {
-                  int n = z->order[k];
-                  // scan out an mcu's worth of this component; that's just determined
-                  // by the basic H and V specified for the component
-                  for (y=0; y < z->img_comp[n].v; ++y) {
-                     for (x=0; x < z->img_comp[n].h; ++x) {
-                        int x2 = (i*z->img_comp[n].h + x)*8;
-                        int y2 = (j*z->img_comp[n].v + y)*8;
-                        int ha = z->img_comp[n].ha;
-                        if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
-                        z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data);
-                     }
-                  }
-               }
-               // after all interleaved components, that's an interleaved MCU,
-               // so now count down the restart interval
-               if (--z->todo <= 0) {
-                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
-                  if (!STBI__RESTART(z->marker)) return 1;
-                  stbi__jpeg_reset(z);
-               }
-            }
-         }
-         return 1;
-      }
-   } else {
-      if (z->scan_n == 1) {
-         int i,j;
-         int n = z->order[0];
-         // non-interleaved data, we just need to process one block at a time,
-         // in trivial scanline order
-         // number of blocks to do just depends on how many actual "pixels" this
-         // component has, independent of interleaved MCU blocking and such
-         int w = (z->img_comp[n].x+7) >> 3;
-         int h = (z->img_comp[n].y+7) >> 3;
-         for (j=0; j < h; ++j) {
-            for (i=0; i < w; ++i) {
-               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
-               if (z->spec_start == 0) {
-                  if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
-                     return 0;
-               } else {
-                  int ha = z->img_comp[n].ha;
-                  if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha]))
-                     return 0;
-               }
-               // every data block is an MCU, so countdown the restart interval
-               if (--z->todo <= 0) {
-                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
-                  if (!STBI__RESTART(z->marker)) return 1;
-                  stbi__jpeg_reset(z);
-               }
-            }
-         }
-         return 1;
-      } else { // interleaved
-         int i,j,k,x,y;
-         for (j=0; j < z->img_mcu_y; ++j) {
-            for (i=0; i < z->img_mcu_x; ++i) {
-               // scan an interleaved mcu... process scan_n components in order
-               for (k=0; k < z->scan_n; ++k) {
-                  int n = z->order[k];
-                  // scan out an mcu's worth of this component; that's just determined
-                  // by the basic H and V specified for the component
-                  for (y=0; y < z->img_comp[n].v; ++y) {
-                     for (x=0; x < z->img_comp[n].h; ++x) {
-                        int x2 = (i*z->img_comp[n].h + x);
-                        int y2 = (j*z->img_comp[n].v + y);
-                        short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w);
-                        if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
-                           return 0;
-                     }
-                  }
-               }
-               // after all interleaved components, that's an interleaved MCU,
-               // so now count down the restart interval
-               if (--z->todo <= 0) {
-                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
-                  if (!STBI__RESTART(z->marker)) return 1;
-                  stbi__jpeg_reset(z);
-               }
-            }
-         }
-         return 1;
-      }
-   }
-}
-
-static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant)
-{
-   int i;
-   for (i=0; i < 64; ++i)
-      data[i] *= dequant[i];
-}
-
-static void stbi__jpeg_finish(stbi__jpeg *z)
-{
-   if (z->progressive) {
-      // dequantize and idct the data
-      int i,j,n;
-      for (n=0; n < z->s->img_n; ++n) {
-         int w = (z->img_comp[n].x+7) >> 3;
-         int h = (z->img_comp[n].y+7) >> 3;
-         for (j=0; j < h; ++j) {
-            for (i=0; i < w; ++i) {
-               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
-               stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]);
-               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
-            }
-         }
-      }
-   }
-}
-
-static int stbi__process_marker(stbi__jpeg *z, int m)
-{
-   int L;
-   switch (m) {
-      case STBI__MARKER_none: // no marker found
-         return stbi__err("expected marker","Corrupt JPEG");
-
-      case 0xDD: // DRI - specify restart interval
-         if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG");
-         z->restart_interval = stbi__get16be(z->s);
-         return 1;
-
-      case 0xDB: // DQT - define quantization table
-         L = stbi__get16be(z->s)-2;
-         while (L > 0) {
-            int q = stbi__get8(z->s);
-            int p = q >> 4, sixteen = (p != 0);
-            int t = q & 15,i;
-            if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG");
-            if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG");
-
-            for (i=0; i < 64; ++i)
-               z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s));
-            L -= (sixteen ? 129 : 65);
-         }
-         return L==0;
-
-      case 0xC4: // DHT - define huffman table
-         L = stbi__get16be(z->s)-2;
-         while (L > 0) {
-            stbi_uc *v;
-            int sizes[16],i,n=0;
-            int q = stbi__get8(z->s);
-            int tc = q >> 4;
-            int th = q & 15;
-            if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG");
-            for (i=0; i < 16; ++i) {
-               sizes[i] = stbi__get8(z->s);
-               n += sizes[i];
-            }
-            L -= 17;
-            if (tc == 0) {
-               if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0;
-               v = z->huff_dc[th].values;
-            } else {
-               if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0;
-               v = z->huff_ac[th].values;
-            }
-            for (i=0; i < n; ++i)
-               v[i] = stbi__get8(z->s);
-            if (tc != 0)
-               stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th);
-            L -= n;
-         }
-         return L==0;
-   }
-
-   // check for comment block or APP blocks
-   if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) {
-      L = stbi__get16be(z->s);
-      if (L < 2) {
-         if (m == 0xFE)
-            return stbi__err("bad COM len","Corrupt JPEG");
-         else
-            return stbi__err("bad APP len","Corrupt JPEG");
-      }
-      L -= 2;
-
-      if (m == 0xE0 && L >= 5) { // JFIF APP0 segment
-         static const unsigned char tag[5] = {'J','F','I','F','\0'};
-         int ok = 1;
-         int i;
-         for (i=0; i < 5; ++i)
-            if (stbi__get8(z->s) != tag[i])
-               ok = 0;
-         L -= 5;
-         if (ok)
-            z->jfif = 1;
-      } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment
-         static const unsigned char tag[6] = {'A','d','o','b','e','\0'};
-         int ok = 1;
-         int i;
-         for (i=0; i < 6; ++i)
-            if (stbi__get8(z->s) != tag[i])
-               ok = 0;
-         L -= 6;
-         if (ok) {
-            stbi__get8(z->s); // version
-            stbi__get16be(z->s); // flags0
-            stbi__get16be(z->s); // flags1
-            z->app14_color_transform = stbi__get8(z->s); // color transform
-            L -= 6;
-         }
-      }
-
-      stbi__skip(z->s, L);
-      return 1;
-   }
-
-   return stbi__err("unknown marker","Corrupt JPEG");
-}
-
-// after we see SOS
-static int stbi__process_scan_header(stbi__jpeg *z)
-{
-   int i;
-   int Ls = stbi__get16be(z->s);
-   z->scan_n = stbi__get8(z->s);
-   if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG");
-   if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG");
-   for (i=0; i < z->scan_n; ++i) {
-      int id = stbi__get8(z->s), which;
-      int q = stbi__get8(z->s);
-      for (which = 0; which < z->s->img_n; ++which)
-         if (z->img_comp[which].id == id)
-            break;
-      if (which == z->s->img_n) return 0; // no match
-      z->img_comp[which].hd = q >> 4;   if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG");
-      z->img_comp[which].ha = q & 15;   if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG");
-      z->order[i] = which;
-   }
-
-   {
-      int aa;
-      z->spec_start = stbi__get8(z->s);
-      z->spec_end   = stbi__get8(z->s); // should be 63, but might be 0
-      aa = stbi__get8(z->s);
-      z->succ_high = (aa >> 4);
-      z->succ_low  = (aa & 15);
-      if (z->progressive) {
-         if (z->spec_start > 63 || z->spec_end > 63  || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13)
-            return stbi__err("bad SOS", "Corrupt JPEG");
-      } else {
-         if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG");
-         if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG");
-         z->spec_end = 63;
-      }
-   }
-
-   return 1;
-}
-
-static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why)
-{
-   int i;
-   for (i=0; i < ncomp; ++i) {
-      if (z->img_comp[i].raw_data) {
-         STBI_FREE(z->img_comp[i].raw_data);
-         z->img_comp[i].raw_data = NULL;
-         z->img_comp[i].data = NULL;
-      }
-      if (z->img_comp[i].raw_coeff) {
-         STBI_FREE(z->img_comp[i].raw_coeff);
-         z->img_comp[i].raw_coeff = 0;
-         z->img_comp[i].coeff = 0;
-      }
-      if (z->img_comp[i].linebuf) {
-         STBI_FREE(z->img_comp[i].linebuf);
-         z->img_comp[i].linebuf = NULL;
-      }
-   }
-   return why;
-}
-
-static int stbi__process_frame_header(stbi__jpeg *z, int scan)
-{
-   stbi__context *s = z->s;
-   int Lf,p,i,q, h_max=1,v_max=1,c;
-   Lf = stbi__get16be(s);         if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG
-   p  = stbi__get8(s);            if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline
-   s->img_y = stbi__get16be(s);   if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG
-   s->img_x = stbi__get16be(s);   if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires
-   c = stbi__get8(s);
-   if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG");
-   s->img_n = c;
-   for (i=0; i < c; ++i) {
-      z->img_comp[i].data = NULL;
-      z->img_comp[i].linebuf = NULL;
-   }
-
-   if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG");
-
-   z->rgb = 0;
-   for (i=0; i < s->img_n; ++i) {
-      static const unsigned char rgb[3] = { 'R', 'G', 'B' };
-      z->img_comp[i].id = stbi__get8(s);
-      if (s->img_n == 3 && z->img_comp[i].id == rgb[i])
-         ++z->rgb;
-      q = stbi__get8(s);
-      z->img_comp[i].h = (q >> 4);  if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG");
-      z->img_comp[i].v = q & 15;    if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG");
-      z->img_comp[i].tq = stbi__get8(s);  if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG");
-   }
-
-   if (scan != STBI__SCAN_load) return 1;
-
-   if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode");
-
-   for (i=0; i < s->img_n; ++i) {
-      if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h;
-      if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v;
-   }
-
-   // compute interleaved mcu info
-   z->img_h_max = h_max;
-   z->img_v_max = v_max;
-   z->img_mcu_w = h_max * 8;
-   z->img_mcu_h = v_max * 8;
-   // these sizes can't be more than 17 bits
-   z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w;
-   z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h;
-
-   for (i=0; i < s->img_n; ++i) {
-      // number of effective pixels (e.g. for non-interleaved MCU)
-      z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max;
-      z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max;
-      // to simplify generation, we'll allocate enough memory to decode
-      // the bogus oversized data from using interleaved MCUs and their
-      // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
-      // discard the extra data until colorspace conversion
-      //
-      // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier)
-      // so these muls can't overflow with 32-bit ints (which we require)
-      z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8;
-      z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8;
-      z->img_comp[i].coeff = 0;
-      z->img_comp[i].raw_coeff = 0;
-      z->img_comp[i].linebuf = NULL;
-      z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15);
-      if (z->img_comp[i].raw_data == NULL)
-         return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
-      // align blocks for idct using mmx/sse
-      z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
-      if (z->progressive) {
-         // w2, h2 are multiples of 8 (see above)
-         z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8;
-         z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8;
-         z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15);
-         if (z->img_comp[i].raw_coeff == NULL)
-            return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
-         z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15);
-      }
-   }
-
-   return 1;
-}
-
-// use comparisons since in some cases we handle more than one case (e.g. SOF)
-#define stbi__DNL(x)         ((x) == 0xdc)
-#define stbi__SOI(x)         ((x) == 0xd8)
-#define stbi__EOI(x)         ((x) == 0xd9)
-#define stbi__SOF(x)         ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2)
-#define stbi__SOS(x)         ((x) == 0xda)
-
-#define stbi__SOF_progressive(x)   ((x) == 0xc2)
-
-static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
-{
-   int m;
-   z->jfif = 0;
-   z->app14_color_transform = -1; // valid values are 0,1,2
-   z->marker = STBI__MARKER_none; // initialize cached marker to empty
-   m = stbi__get_marker(z);
-   if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG");
-   if (scan == STBI__SCAN_type) return 1;
-   m = stbi__get_marker(z);
-   while (!stbi__SOF(m)) {
-      if (!stbi__process_marker(z,m)) return 0;
-      m = stbi__get_marker(z);
-      while (m == STBI__MARKER_none) {
-         // some files have extra padding after their blocks, so ok, we'll scan
-         if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG");
-         m = stbi__get_marker(z);
-      }
-   }
-   z->progressive = stbi__SOF_progressive(m);
-   if (!stbi__process_frame_header(z, scan)) return 0;
-   return 1;
-}
-
-// decode image to YCbCr format
-static int stbi__decode_jpeg_image(stbi__jpeg *j)
-{
-   int m;
-   for (m = 0; m < 4; m++) {
-      j->img_comp[m].raw_data = NULL;
-      j->img_comp[m].raw_coeff = NULL;
-   }
-   j->restart_interval = 0;
-   if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0;
-   m = stbi__get_marker(j);
-   while (!stbi__EOI(m)) {
-      if (stbi__SOS(m)) {
-         if (!stbi__process_scan_header(j)) return 0;
-         if (!stbi__parse_entropy_coded_data(j)) return 0;
-         if (j->marker == STBI__MARKER_none ) {
-            // handle 0s at the end of image data from IP Kamera 9060
-            while (!stbi__at_eof(j->s)) {
-               int x = stbi__get8(j->s);
-               if (x == 255) {
-                  j->marker = stbi__get8(j->s);
-                  break;
-               }
-            }
-            // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0
-         }
-      } else if (stbi__DNL(m)) {
-         int Ld = stbi__get16be(j->s);
-         stbi__uint32 NL = stbi__get16be(j->s);
-         if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG");
-         if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG");
-      } else {
-         if (!stbi__process_marker(j, m)) return 0;
-      }
-      m = stbi__get_marker(j);
-   }
-   if (j->progressive)
-      stbi__jpeg_finish(j);
-   return 1;
-}
-
-// static jfif-centered resampling (across block boundaries)
-
-typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1,
-                                    int w, int hs);
-
-#define stbi__div4(x) ((stbi_uc) ((x) >> 2))
-
-static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   STBI_NOTUSED(out);
-   STBI_NOTUSED(in_far);
-   STBI_NOTUSED(w);
-   STBI_NOTUSED(hs);
-   return in_near;
-}
-
-static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // need to generate two samples vertically for every one in input
-   int i;
-   STBI_NOTUSED(hs);
-   for (i=0; i < w; ++i)
-      out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2);
-   return out;
-}
-
-static stbi_uc*  stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // need to generate two samples horizontally for every one in input
-   int i;
-   stbi_uc *input = in_near;
-
-   if (w == 1) {
-      // if only one sample, can't do any interpolation
-      out[0] = out[1] = input[0];
-      return out;
-   }
-
-   out[0] = input[0];
-   out[1] = stbi__div4(input[0]*3 + input[1] + 2);
-   for (i=1; i < w-1; ++i) {
-      int n = 3*input[i]+2;
-      out[i*2+0] = stbi__div4(n+input[i-1]);
-      out[i*2+1] = stbi__div4(n+input[i+1]);
-   }
-   out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2);
-   out[i*2+1] = input[w-1];
-
-   STBI_NOTUSED(in_far);
-   STBI_NOTUSED(hs);
-
-   return out;
-}
-
-#define stbi__div16(x) ((stbi_uc) ((x) >> 4))
-
-static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // need to generate 2x2 samples for every one in input
-   int i,t0,t1;
-   if (w == 1) {
-      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
-      return out;
-   }
-
-   t1 = 3*in_near[0] + in_far[0];
-   out[0] = stbi__div4(t1+2);
-   for (i=1; i < w; ++i) {
-      t0 = t1;
-      t1 = 3*in_near[i]+in_far[i];
-      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
-      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
-   }
-   out[w*2-1] = stbi__div4(t1+2);
-
-   STBI_NOTUSED(hs);
-
-   return out;
-}
-
-#if defined(STBI_SSE2) || defined(STBI_NEON)
-static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // need to generate 2x2 samples for every one in input
-   int i=0,t0,t1;
-
-   if (w == 1) {
-      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
-      return out;
-   }
-
-   t1 = 3*in_near[0] + in_far[0];
-   // process groups of 8 pixels for as long as we can.
-   // note we can't handle the last pixel in a row in this loop
-   // because we need to handle the filter boundary conditions.
-   for (; i < ((w-1) & ~7); i += 8) {
-#if defined(STBI_SSE2)
-      // load and perform the vertical filtering pass
-      // this uses 3*x + y = 4*x + (y - x)
-      __m128i zero  = _mm_setzero_si128();
-      __m128i farb  = _mm_loadl_epi64((__m128i *) (in_far + i));
-      __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i));
-      __m128i farw  = _mm_unpacklo_epi8(farb, zero);
-      __m128i nearw = _mm_unpacklo_epi8(nearb, zero);
-      __m128i diff  = _mm_sub_epi16(farw, nearw);
-      __m128i nears = _mm_slli_epi16(nearw, 2);
-      __m128i curr  = _mm_add_epi16(nears, diff); // current row
-
-      // horizontal filter works the same based on shifted vers of current
-      // row. "prev" is current row shifted right by 1 pixel; we need to
-      // insert the previous pixel value (from t1).
-      // "next" is current row shifted left by 1 pixel, with first pixel
-      // of next block of 8 pixels added in.
-      __m128i prv0 = _mm_slli_si128(curr, 2);
-      __m128i nxt0 = _mm_srli_si128(curr, 2);
-      __m128i prev = _mm_insert_epi16(prv0, t1, 0);
-      __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7);
-
-      // horizontal filter, polyphase implementation since it's convenient:
-      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
-      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
-      // note the shared term.
-      __m128i bias  = _mm_set1_epi16(8);
-      __m128i curs = _mm_slli_epi16(curr, 2);
-      __m128i prvd = _mm_sub_epi16(prev, curr);
-      __m128i nxtd = _mm_sub_epi16(next, curr);
-      __m128i curb = _mm_add_epi16(curs, bias);
-      __m128i even = _mm_add_epi16(prvd, curb);
-      __m128i odd  = _mm_add_epi16(nxtd, curb);
-
-      // interleave even and odd pixels, then undo scaling.
-      __m128i int0 = _mm_unpacklo_epi16(even, odd);
-      __m128i int1 = _mm_unpackhi_epi16(even, odd);
-      __m128i de0  = _mm_srli_epi16(int0, 4);
-      __m128i de1  = _mm_srli_epi16(int1, 4);
-
-      // pack and write output
-      __m128i outv = _mm_packus_epi16(de0, de1);
-      _mm_storeu_si128((__m128i *) (out + i*2), outv);
-#elif defined(STBI_NEON)
-      // load and perform the vertical filtering pass
-      // this uses 3*x + y = 4*x + (y - x)
-      uint8x8_t farb  = vld1_u8(in_far + i);
-      uint8x8_t nearb = vld1_u8(in_near + i);
-      int16x8_t diff  = vreinterpretq_s16_u16(vsubl_u8(farb, nearb));
-      int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2));
-      int16x8_t curr  = vaddq_s16(nears, diff); // current row
-
-      // horizontal filter works the same based on shifted vers of current
-      // row. "prev" is current row shifted right by 1 pixel; we need to
-      // insert the previous pixel value (from t1).
-      // "next" is current row shifted left by 1 pixel, with first pixel
-      // of next block of 8 pixels added in.
-      int16x8_t prv0 = vextq_s16(curr, curr, 7);
-      int16x8_t nxt0 = vextq_s16(curr, curr, 1);
-      int16x8_t prev = vsetq_lane_s16(t1, prv0, 0);
-      int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7);
-
-      // horizontal filter, polyphase implementation since it's convenient:
-      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
-      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
-      // note the shared term.
-      int16x8_t curs = vshlq_n_s16(curr, 2);
-      int16x8_t prvd = vsubq_s16(prev, curr);
-      int16x8_t nxtd = vsubq_s16(next, curr);
-      int16x8_t even = vaddq_s16(curs, prvd);
-      int16x8_t odd  = vaddq_s16(curs, nxtd);
-
-      // undo scaling and round, then store with even/odd phases interleaved
-      uint8x8x2_t o;
-      o.val[0] = vqrshrun_n_s16(even, 4);
-      o.val[1] = vqrshrun_n_s16(odd,  4);
-      vst2_u8(out + i*2, o);
-#endif
-
-      // "previous" value for next iter
-      t1 = 3*in_near[i+7] + in_far[i+7];
-   }
-
-   t0 = t1;
-   t1 = 3*in_near[i] + in_far[i];
-   out[i*2] = stbi__div16(3*t1 + t0 + 8);
-
-   for (++i; i < w; ++i) {
-      t0 = t1;
-      t1 = 3*in_near[i]+in_far[i];
-      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
-      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
-   }
-   out[w*2-1] = stbi__div4(t1+2);
-
-   STBI_NOTUSED(hs);
-
-   return out;
-}
-#endif
-
-static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
-{
-   // resample with nearest-neighbor
-   int i,j;
-   STBI_NOTUSED(in_far);
-   for (i=0; i < w; ++i)
-      for (j=0; j < hs; ++j)
-         out[i*hs+j] = in_near[i];
-   return out;
-}
-
-// this is a reduced-precision calculation of YCbCr-to-RGB introduced
-// to make sure the code produces the same results in both SIMD and scalar
-#define stbi__float2fixed(x)  (((int) ((x) * 4096.0f + 0.5f)) << 8)
-static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step)
-{
-   int i;
-   for (i=0; i < count; ++i) {
-      int y_fixed = (y[i] << 20) + (1<<19); // rounding
-      int r,g,b;
-      int cr = pcr[i] - 128;
-      int cb = pcb[i] - 128;
-      r = y_fixed +  cr* stbi__float2fixed(1.40200f);
-      g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
-      b = y_fixed                                     +   cb* stbi__float2fixed(1.77200f);
-      r >>= 20;
-      g >>= 20;
-      b >>= 20;
-      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
-      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
-      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
-      out[0] = (stbi_uc)r;
-      out[1] = (stbi_uc)g;
-      out[2] = (stbi_uc)b;
-      out[3] = 255;
-      out += step;
-   }
-}
-
-#if defined(STBI_SSE2) || defined(STBI_NEON)
-static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step)
-{
-   int i = 0;
-
-#ifdef STBI_SSE2
-   // step == 3 is pretty ugly on the final interleave, and i'm not convinced
-   // it's useful in practice (you wouldn't use it for textures, for example).
-   // so just accelerate step == 4 case.
-   if (step == 4) {
-      // this is a fairly straightforward implementation and not super-optimized.
-      __m128i signflip  = _mm_set1_epi8(-0x80);
-      __m128i cr_const0 = _mm_set1_epi16(   (short) ( 1.40200f*4096.0f+0.5f));
-      __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f));
-      __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f));
-      __m128i cb_const1 = _mm_set1_epi16(   (short) ( 1.77200f*4096.0f+0.5f));
-      __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128);
-      __m128i xw = _mm_set1_epi16(255); // alpha channel
-
-      for (; i+7 < count; i += 8) {
-         // load
-         __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i));
-         __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i));
-         __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i));
-         __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128
-         __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128
-
-         // unpack to short (and left-shift cr, cb by 8)
-         __m128i yw  = _mm_unpacklo_epi8(y_bias, y_bytes);
-         __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased);
-         __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased);
-
-         // color transform
-         __m128i yws = _mm_srli_epi16(yw, 4);
-         __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw);
-         __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw);
-         __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1);
-         __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1);
-         __m128i rws = _mm_add_epi16(cr0, yws);
-         __m128i gwt = _mm_add_epi16(cb0, yws);
-         __m128i bws = _mm_add_epi16(yws, cb1);
-         __m128i gws = _mm_add_epi16(gwt, cr1);
-
-         // descale
-         __m128i rw = _mm_srai_epi16(rws, 4);
-         __m128i bw = _mm_srai_epi16(bws, 4);
-         __m128i gw = _mm_srai_epi16(gws, 4);
-
-         // back to byte, set up for transpose
-         __m128i brb = _mm_packus_epi16(rw, bw);
-         __m128i gxb = _mm_packus_epi16(gw, xw);
-
-         // transpose to interleave channels
-         __m128i t0 = _mm_unpacklo_epi8(brb, gxb);
-         __m128i t1 = _mm_unpackhi_epi8(brb, gxb);
-         __m128i o0 = _mm_unpacklo_epi16(t0, t1);
-         __m128i o1 = _mm_unpackhi_epi16(t0, t1);
-
-         // store
-         _mm_storeu_si128((__m128i *) (out + 0), o0);
-         _mm_storeu_si128((__m128i *) (out + 16), o1);
-         out += 32;
-      }
-   }
-#endif
-
-#ifdef STBI_NEON
-   // in this version, step=3 support would be easy to add. but is there demand?
-   if (step == 4) {
-      // this is a fairly straightforward implementation and not super-optimized.
-      uint8x8_t signflip = vdup_n_u8(0x80);
-      int16x8_t cr_const0 = vdupq_n_s16(   (short) ( 1.40200f*4096.0f+0.5f));
-      int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f));
-      int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f));
-      int16x8_t cb_const1 = vdupq_n_s16(   (short) ( 1.77200f*4096.0f+0.5f));
-
-      for (; i+7 < count; i += 8) {
-         // load
-         uint8x8_t y_bytes  = vld1_u8(y + i);
-         uint8x8_t cr_bytes = vld1_u8(pcr + i);
-         uint8x8_t cb_bytes = vld1_u8(pcb + i);
-         int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip));
-         int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip));
-
-         // expand to s16
-         int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4));
-         int16x8_t crw = vshll_n_s8(cr_biased, 7);
-         int16x8_t cbw = vshll_n_s8(cb_biased, 7);
-
-         // color transform
-         int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0);
-         int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0);
-         int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1);
-         int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1);
-         int16x8_t rws = vaddq_s16(yws, cr0);
-         int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1);
-         int16x8_t bws = vaddq_s16(yws, cb1);
-
-         // undo scaling, round, convert to byte
-         uint8x8x4_t o;
-         o.val[0] = vqrshrun_n_s16(rws, 4);
-         o.val[1] = vqrshrun_n_s16(gws, 4);
-         o.val[2] = vqrshrun_n_s16(bws, 4);
-         o.val[3] = vdup_n_u8(255);
-
-         // store, interleaving r/g/b/a
-         vst4_u8(out, o);
-         out += 8*4;
-      }
-   }
-#endif
-
-   for (; i < count; ++i) {
-      int y_fixed = (y[i] << 20) + (1<<19); // rounding
-      int r,g,b;
-      int cr = pcr[i] - 128;
-      int cb = pcb[i] - 128;
-      r = y_fixed + cr* stbi__float2fixed(1.40200f);
-      g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
-      b = y_fixed                                   +   cb* stbi__float2fixed(1.77200f);
-      r >>= 20;
-      g >>= 20;
-      b >>= 20;
-      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
-      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
-      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
-      out[0] = (stbi_uc)r;
-      out[1] = (stbi_uc)g;
-      out[2] = (stbi_uc)b;
-      out[3] = 255;
-      out += step;
-   }
-}
-#endif
-
-// set up the kernels
-static void stbi__setup_jpeg(stbi__jpeg *j)
-{
-   j->idct_block_kernel = stbi__idct_block;
-   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row;
-   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2;
-
-#ifdef STBI_SSE2
-   if (stbi__sse2_available()) {
-      j->idct_block_kernel = stbi__idct_simd;
-      j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
-      j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
-   }
-#endif
-
-#ifdef STBI_NEON
-   j->idct_block_kernel = stbi__idct_simd;
-   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
-   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
-#endif
-}
-
-// clean up the temporary component buffers
-static void stbi__cleanup_jpeg(stbi__jpeg *j)
-{
-   stbi__free_jpeg_components(j, j->s->img_n, 0);
-}
-
-typedef struct
-{
-   resample_row_func resample;
-   stbi_uc *line0,*line1;
-   int hs,vs;   // expansion factor in each axis
-   int w_lores; // horizontal pixels pre-expansion
-   int ystep;   // how far through vertical expansion we are
-   int ypos;    // which pre-expansion row we're on
-} stbi__resample;
-
-// fast 0..255 * 0..255 => 0..255 rounded multiplication
-static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y)
-{
-   unsigned int t = x*y + 128;
-   return (stbi_uc) ((t + (t >>8)) >> 8);
-}
-
-static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp)
-{
-   int n, decode_n, is_rgb;
-   z->s->img_n = 0; // make stbi__cleanup_jpeg safe
-
-   // validate req_comp
-   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
-
-   // load a jpeg image from whichever source, but leave in YCbCr format
-   if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; }
-
-   // determine actual number of components to generate
-   n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1;
-
-   is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif));
-
-   if (z->s->img_n == 3 && n < 3 && !is_rgb)
-      decode_n = 1;
-   else
-      decode_n = z->s->img_n;
-
-   // resample and color-convert
-   {
-      int k;
-      unsigned int i,j;
-      stbi_uc *output;
-      stbi_uc *coutput[4];
-
-      stbi__resample res_comp[4];
-
-      for (k=0; k < decode_n; ++k) {
-         stbi__resample *r = &res_comp[k];
-
-         // allocate line buffer big enough for upsampling off the edges
-         // with upsample factor of 4
-         z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3);
-         if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
-
-         r->hs      = z->img_h_max / z->img_comp[k].h;
-         r->vs      = z->img_v_max / z->img_comp[k].v;
-         r->ystep   = r->vs >> 1;
-         r->w_lores = (z->s->img_x + r->hs-1) / r->hs;
-         r->ypos    = 0;
-         r->line0   = r->line1 = z->img_comp[k].data;
-
-         if      (r->hs == 1 && r->vs == 1) r->resample = resample_row_1;
-         else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2;
-         else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2;
-         else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel;
-         else                               r->resample = stbi__resample_row_generic;
-      }
-
-      // can't error after this so, this is safe
-      output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1);
-      if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
-
-      // now go ahead and resample
-      for (j=0; j < z->s->img_y; ++j) {
-         stbi_uc *out = output + n * z->s->img_x * j;
-         for (k=0; k < decode_n; ++k) {
-            stbi__resample *r = &res_comp[k];
-            int y_bot = r->ystep >= (r->vs >> 1);
-            coutput[k] = r->resample(z->img_comp[k].linebuf,
-                                     y_bot ? r->line1 : r->line0,
-                                     y_bot ? r->line0 : r->line1,
-                                     r->w_lores, r->hs);
-            if (++r->ystep >= r->vs) {
-               r->ystep = 0;
-               r->line0 = r->line1;
-               if (++r->ypos < z->img_comp[k].y)
-                  r->line1 += z->img_comp[k].w2;
-            }
-         }
-         if (n >= 3) {
-            stbi_uc *y = coutput[0];
-            if (z->s->img_n == 3) {
-               if (is_rgb) {
-                  for (i=0; i < z->s->img_x; ++i) {
-                     out[0] = y[i];
-                     out[1] = coutput[1][i];
-                     out[2] = coutput[2][i];
-                     out[3] = 255;
-                     out += n;
-                  }
-               } else {
-                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
-               }
-            } else if (z->s->img_n == 4) {
-               if (z->app14_color_transform == 0) { // CMYK
-                  for (i=0; i < z->s->img_x; ++i) {
-                     stbi_uc m = coutput[3][i];
-                     out[0] = stbi__blinn_8x8(coutput[0][i], m);
-                     out[1] = stbi__blinn_8x8(coutput[1][i], m);
-                     out[2] = stbi__blinn_8x8(coutput[2][i], m);
-                     out[3] = 255;
-                     out += n;
-                  }
-               } else if (z->app14_color_transform == 2) { // YCCK
-                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
-                  for (i=0; i < z->s->img_x; ++i) {
-                     stbi_uc m = coutput[3][i];
-                     out[0] = stbi__blinn_8x8(255 - out[0], m);
-                     out[1] = stbi__blinn_8x8(255 - out[1], m);
-                     out[2] = stbi__blinn_8x8(255 - out[2], m);
-                     out += n;
-                  }
-               } else { // YCbCr + alpha?  Ignore the fourth channel for now
-                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
-               }
-            } else
-               for (i=0; i < z->s->img_x; ++i) {
-                  out[0] = out[1] = out[2] = y[i];
-                  out[3] = 255; // not used if n==3
-                  out += n;
-               }
-         } else {
-            if (is_rgb) {
-               if (n == 1)
-                  for (i=0; i < z->s->img_x; ++i)
-                     *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
-               else {
-                  for (i=0; i < z->s->img_x; ++i, out += 2) {
-                     out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
-                     out[1] = 255;
-                  }
-               }
-            } else if (z->s->img_n == 4 && z->app14_color_transform == 0) {
-               for (i=0; i < z->s->img_x; ++i) {
-                  stbi_uc m = coutput[3][i];
-                  stbi_uc r = stbi__blinn_8x8(coutput[0][i], m);
-                  stbi_uc g = stbi__blinn_8x8(coutput[1][i], m);
-                  stbi_uc b = stbi__blinn_8x8(coutput[2][i], m);
-                  out[0] = stbi__compute_y(r, g, b);
-                  out[1] = 255;
-                  out += n;
-               }
-            } else if (z->s->img_n == 4 && z->app14_color_transform == 2) {
-               for (i=0; i < z->s->img_x; ++i) {
-                  out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]);
-                  out[1] = 255;
-                  out += n;
-               }
-            } else {
-               stbi_uc *y = coutput[0];
-               if (n == 1)
-                  for (i=0; i < z->s->img_x; ++i) out[i] = y[i];
-               else
-                  for (i=0; i < z->s->img_x; ++i) *out++ = y[i], *out++ = 255;
-            }
-         }
-      }
-      stbi__cleanup_jpeg(z);
-      *out_x = z->s->img_x;
-      *out_y = z->s->img_y;
-      if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output
-      return output;
-   }
-}
-
-static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   unsigned char* result;
-   stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg));
-   STBI_NOTUSED(ri);
-   j->s = s;
-   stbi__setup_jpeg(j);
-   result = load_jpeg_image(j, x,y,comp,req_comp);
-   STBI_FREE(j);
-   return result;
-}
-
-static int stbi__jpeg_test(stbi__context *s)
-{
-   int r;
-   stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg));
-   j->s = s;
-   stbi__setup_jpeg(j);
-   r = stbi__decode_jpeg_header(j, STBI__SCAN_type);
-   stbi__rewind(s);
-   STBI_FREE(j);
-   return r;
-}
-
-static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp)
-{
-   if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) {
-      stbi__rewind( j->s );
-      return 0;
-   }
-   if (x) *x = j->s->img_x;
-   if (y) *y = j->s->img_y;
-   if (comp) *comp = j->s->img_n >= 3 ? 3 : 1;
-   return 1;
-}
-
-static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   int result;
-   stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg)));
-   j->s = s;
-   result = stbi__jpeg_info_raw(j, x, y, comp);
-   STBI_FREE(j);
-   return result;
-}
-#endif
-
-// public domain zlib decode    v0.2  Sean Barrett 2006-11-18
-//    simple implementation
-//      - all input must be provided in an upfront buffer
-//      - all output is written to a single output buffer (can malloc/realloc)
-//    performance
-//      - fast huffman
-
-#ifndef STBI_NO_ZLIB
-
-// fast-way is faster to check than jpeg huffman, but slow way is slower
-#define STBI__ZFAST_BITS  9 // accelerate all cases in default tables
-#define STBI__ZFAST_MASK  ((1 << STBI__ZFAST_BITS) - 1)
-
-// zlib-style huffman encoding
-// (jpegs packs from left, zlib from right, so can't share code)
-typedef struct
-{
-   stbi__uint16 fast[1 << STBI__ZFAST_BITS];
-   stbi__uint16 firstcode[16];
-   int maxcode[17];
-   stbi__uint16 firstsymbol[16];
-   stbi_uc  size[288];
-   stbi__uint16 value[288];
-} stbi__zhuffman;
-
-stbi_inline static int stbi__bitreverse16(int n)
-{
-  n = ((n & 0xAAAA) >>  1) | ((n & 0x5555) << 1);
-  n = ((n & 0xCCCC) >>  2) | ((n & 0x3333) << 2);
-  n = ((n & 0xF0F0) >>  4) | ((n & 0x0F0F) << 4);
-  n = ((n & 0xFF00) >>  8) | ((n & 0x00FF) << 8);
-  return n;
-}
-
-stbi_inline static int stbi__bit_reverse(int v, int bits)
-{
-   STBI_ASSERT(bits <= 16);
-   // to bit reverse n bits, reverse 16 and shift
-   // e.g. 11 bits, bit reverse and shift away 5
-   return stbi__bitreverse16(v) >> (16-bits);
-}
-
-static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num)
-{
-   int i,k=0;
-   int code, next_code[16], sizes[17];
-
-   // DEFLATE spec for generating codes
-   memset(sizes, 0, sizeof(sizes));
-   memset(z->fast, 0, sizeof(z->fast));
-   for (i=0; i < num; ++i)
-      ++sizes[sizelist[i]];
-   sizes[0] = 0;
-   for (i=1; i < 16; ++i)
-      if (sizes[i] > (1 << i))
-         return stbi__err("bad sizes", "Corrupt PNG");
-   code = 0;
-   for (i=1; i < 16; ++i) {
-      next_code[i] = code;
-      z->firstcode[i] = (stbi__uint16) code;
-      z->firstsymbol[i] = (stbi__uint16) k;
-      code = (code + sizes[i]);
-      if (sizes[i])
-         if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG");
-      z->maxcode[i] = code << (16-i); // preshift for inner loop
-      code <<= 1;
-      k += sizes[i];
-   }
-   z->maxcode[16] = 0x10000; // sentinel
-   for (i=0; i < num; ++i) {
-      int s = sizelist[i];
-      if (s) {
-         int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s];
-         stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i);
-         z->size [c] = (stbi_uc     ) s;
-         z->value[c] = (stbi__uint16) i;
-         if (s <= STBI__ZFAST_BITS) {
-            int j = stbi__bit_reverse(next_code[s],s);
-            while (j < (1 << STBI__ZFAST_BITS)) {
-               z->fast[j] = fastv;
-               j += (1 << s);
-            }
-         }
-         ++next_code[s];
-      }
-   }
-   return 1;
-}
-
-// zlib-from-memory implementation for PNG reading
-//    because PNG allows splitting the zlib stream arbitrarily,
-//    and it's annoying structurally to have PNG call ZLIB call PNG,
-//    we require PNG read all the IDATs and combine them into a single
-//    memory buffer
-
-typedef struct
-{
-   stbi_uc *zbuffer, *zbuffer_end;
-   int num_bits;
-   stbi__uint32 code_buffer;
-
-   char *zout;
-   char *zout_start;
-   char *zout_end;
-   int   z_expandable;
-
-   stbi__zhuffman z_length, z_distance;
-} stbi__zbuf;
-
-stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z)
-{
-   if (z->zbuffer >= z->zbuffer_end) return 0;
-   return *z->zbuffer++;
-}
-
-static void stbi__fill_bits(stbi__zbuf *z)
-{
-   do {
-      STBI_ASSERT(z->code_buffer < (1U << z->num_bits));
-      z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits;
-      z->num_bits += 8;
-   } while (z->num_bits <= 24);
-}
-
-stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n)
-{
-   unsigned int k;
-   if (z->num_bits < n) stbi__fill_bits(z);
-   k = z->code_buffer & ((1 << n) - 1);
-   z->code_buffer >>= n;
-   z->num_bits -= n;
-   return k;
-}
-
-static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
-{
-   int b,s,k;
-   // not resolved by fast table, so compute it the slow way
-   // use jpeg approach, which requires MSbits at top
-   k = stbi__bit_reverse(a->code_buffer, 16);
-   for (s=STBI__ZFAST_BITS+1; ; ++s)
-      if (k < z->maxcode[s])
-         break;
-   if (s == 16) return -1; // invalid code!
-   // code size is s, so:
-   b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
-   STBI_ASSERT(z->size[b] == s);
-   a->code_buffer >>= s;
-   a->num_bits -= s;
-   return z->value[b];
-}
-
-stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
-{
-   int b,s;
-   if (a->num_bits < 16) stbi__fill_bits(a);
-   b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
-   if (b) {
-      s = b >> 9;
-      a->code_buffer >>= s;
-      a->num_bits -= s;
-      return b & 511;
-   }
-   return stbi__zhuffman_decode_slowpath(a, z);
-}
-
-static int stbi__zexpand(stbi__zbuf *z, char *zout, int n)  // need to make room for n bytes
-{
-   char *q;
-   int cur, limit, old_limit;
-   z->zout = zout;
-   if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG");
-   cur   = (int) (z->zout     - z->zout_start);
-   limit = old_limit = (int) (z->zout_end - z->zout_start);
-   while (cur + n > limit)
-      limit *= 2;
-   q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit);
-   STBI_NOTUSED(old_limit);
-   if (q == NULL) return stbi__err("outofmem", "Out of memory");
-   z->zout_start = q;
-   z->zout       = q + cur;
-   z->zout_end   = q + limit;
-   return 1;
-}
-
-static const int stbi__zlength_base[31] = {
-   3,4,5,6,7,8,9,10,11,13,
-   15,17,19,23,27,31,35,43,51,59,
-   67,83,99,115,131,163,195,227,258,0,0 };
-
-static const int stbi__zlength_extra[31]=
-{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
-
-static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,
-257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
-
-static const int stbi__zdist_extra[32] =
-{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
-
-static int stbi__parse_huffman_block(stbi__zbuf *a)
-{
-   char *zout = a->zout;
-   for(;;) {
-      int z = stbi__zhuffman_decode(a, &a->z_length);
-      if (z < 256) {
-         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes
-         if (zout >= a->zout_end) {
-            if (!stbi__zexpand(a, zout, 1)) return 0;
-            zout = a->zout;
-         }
-         *zout++ = (char) z;
-      } else {
-         stbi_uc *p;
-         int len,dist;
-         if (z == 256) {
-            a->zout = zout;
-            return 1;
-         }
-         z -= 257;
-         len = stbi__zlength_base[z];
-         if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]);
-         z = stbi__zhuffman_decode(a, &a->z_distance);
-         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG");
-         dist = stbi__zdist_base[z];
-         if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]);
-         if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG");
-         if (zout + len > a->zout_end) {
-            if (!stbi__zexpand(a, zout, len)) return 0;
-            zout = a->zout;
-         }
-         p = (stbi_uc *) (zout - dist);
-         if (dist == 1) { // run of one byte; common in images.
-            stbi_uc v = *p;
-            if (len) { do *zout++ = v; while (--len); }
-         } else {
-            if (len) { do *zout++ = *p++; while (--len); }
-         }
-      }
-   }
-}
-
-static int stbi__compute_huffman_codes(stbi__zbuf *a)
-{
-   static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
-   stbi__zhuffman z_codelength;
-   stbi_uc lencodes[286+32+137];//padding for maximum single op
-   stbi_uc codelength_sizes[19];
-   int i,n;
-
-   int hlit  = stbi__zreceive(a,5) + 257;
-   int hdist = stbi__zreceive(a,5) + 1;
-   int hclen = stbi__zreceive(a,4) + 4;
-   int ntot  = hlit + hdist;
-
-   memset(codelength_sizes, 0, sizeof(codelength_sizes));
-   for (i=0; i < hclen; ++i) {
-      int s = stbi__zreceive(a,3);
-      codelength_sizes[length_dezigzag[i]] = (stbi_uc) s;
-   }
-   if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0;
-
-   n = 0;
-   while (n < ntot) {
-      int c = stbi__zhuffman_decode(a, &z_codelength);
-      if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG");
-      if (c < 16)
-         lencodes[n++] = (stbi_uc) c;
-      else {
-         stbi_uc fill = 0;
-         if (c == 16) {
-            c = stbi__zreceive(a,2)+3;
-            if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG");
-            fill = lencodes[n-1];
-         } else if (c == 17)
-            c = stbi__zreceive(a,3)+3;
-         else {
-            STBI_ASSERT(c == 18);
-            c = stbi__zreceive(a,7)+11;
-         }
-         if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG");
-         memset(lencodes+n, fill, c);
-         n += c;
-      }
-   }
-   if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG");
-   if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0;
-   if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0;
-   return 1;
-}
-
-static int stbi__parse_uncompressed_block(stbi__zbuf *a)
-{
-   stbi_uc header[4];
-   int len,nlen,k;
-   if (a->num_bits & 7)
-      stbi__zreceive(a, a->num_bits & 7); // discard
-   // drain the bit-packed data into header
-   k = 0;
-   while (a->num_bits > 0) {
-      header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check
-      a->code_buffer >>= 8;
-      a->num_bits -= 8;
-   }
-   STBI_ASSERT(a->num_bits == 0);
-   // now fill header the normal way
-   while (k < 4)
-      header[k++] = stbi__zget8(a);
-   len  = header[1] * 256 + header[0];
-   nlen = header[3] * 256 + header[2];
-   if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG");
-   if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG");
-   if (a->zout + len > a->zout_end)
-      if (!stbi__zexpand(a, a->zout, len)) return 0;
-   memcpy(a->zout, a->zbuffer, len);
-   a->zbuffer += len;
-   a->zout += len;
-   return 1;
-}
-
-static int stbi__parse_zlib_header(stbi__zbuf *a)
-{
-   int cmf   = stbi__zget8(a);
-   int cm    = cmf & 15;
-   /* int cinfo = cmf >> 4; */
-   int flg   = stbi__zget8(a);
-   if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
-   if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png
-   if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png
-   // window = 1 << (8 + cinfo)... but who cares, we fully buffer output
-   return 1;
-}
-
-static const stbi_uc stbi__zdefault_length[288] =
-{
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
-   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8
-};
-static const stbi_uc stbi__zdefault_distance[32] =
-{
-   5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
-};
-/*
-Init algorithm:
-{
-   int i;   // use <= to match clearly with spec
-   for (i=0; i <= 143; ++i)     stbi__zdefault_length[i]   = 8;
-   for (   ; i <= 255; ++i)     stbi__zdefault_length[i]   = 9;
-   for (   ; i <= 279; ++i)     stbi__zdefault_length[i]   = 7;
-   for (   ; i <= 287; ++i)     stbi__zdefault_length[i]   = 8;
-
-   for (i=0; i <=  31; ++i)     stbi__zdefault_distance[i] = 5;
-}
-*/
-
-static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
-{
-   int final, type;
-   if (parse_header)
-      if (!stbi__parse_zlib_header(a)) return 0;
-   a->num_bits = 0;
-   a->code_buffer = 0;
-   do {
-      final = stbi__zreceive(a,1);
-      type = stbi__zreceive(a,2);
-      if (type == 0) {
-         if (!stbi__parse_uncompressed_block(a)) return 0;
-      } else if (type == 3) {
-         return 0;
-      } else {
-         if (type == 1) {
-            // use fixed code lengths
-            if (!stbi__zbuild_huffman(&a->z_length  , stbi__zdefault_length  , 288)) return 0;
-            if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance,  32)) return 0;
-         } else {
-            if (!stbi__compute_huffman_codes(a)) return 0;
-         }
-         if (!stbi__parse_huffman_block(a)) return 0;
-      }
-   } while (!final);
-   return 1;
-}
-
-static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header)
-{
-   a->zout_start = obuf;
-   a->zout       = obuf;
-   a->zout_end   = obuf + olen;
-   a->z_expandable = exp;
-
-   return stbi__parse_zlib(a, parse_header);
-}
-
-STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen)
-{
-   stbi__zbuf a;
-   char *p = (char *) stbi__malloc(initial_size);
-   if (p == NULL) return NULL;
-   a.zbuffer = (stbi_uc *) buffer;
-   a.zbuffer_end = (stbi_uc *) buffer + len;
-   if (stbi__do_zlib(&a, p, initial_size, 1, 1)) {
-      if (outlen) *outlen = (int) (a.zout - a.zout_start);
-      return a.zout_start;
-   } else {
-      STBI_FREE(a.zout_start);
-      return NULL;
-   }
-}
-
-STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen)
-{
-   return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen);
-}
-
-STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header)
-{
-   stbi__zbuf a;
-   char *p = (char *) stbi__malloc(initial_size);
-   if (p == NULL) return NULL;
-   a.zbuffer = (stbi_uc *) buffer;
-   a.zbuffer_end = (stbi_uc *) buffer + len;
-   if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) {
-      if (outlen) *outlen = (int) (a.zout - a.zout_start);
-      return a.zout_start;
-   } else {
-      STBI_FREE(a.zout_start);
-      return NULL;
-   }
-}
-
-STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen)
-{
-   stbi__zbuf a;
-   a.zbuffer = (stbi_uc *) ibuffer;
-   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
-   if (stbi__do_zlib(&a, obuffer, olen, 0, 1))
-      return (int) (a.zout - a.zout_start);
-   else
-      return -1;
-}
-
-STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen)
-{
-   stbi__zbuf a;
-   char *p = (char *) stbi__malloc(16384);
-   if (p == NULL) return NULL;
-   a.zbuffer = (stbi_uc *) buffer;
-   a.zbuffer_end = (stbi_uc *) buffer+len;
-   if (stbi__do_zlib(&a, p, 16384, 1, 0)) {
-      if (outlen) *outlen = (int) (a.zout - a.zout_start);
-      return a.zout_start;
-   } else {
-      STBI_FREE(a.zout_start);
-      return NULL;
-   }
-}
-
-STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen)
-{
-   stbi__zbuf a;
-   a.zbuffer = (stbi_uc *) ibuffer;
-   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
-   if (stbi__do_zlib(&a, obuffer, olen, 0, 0))
-      return (int) (a.zout - a.zout_start);
-   else
-      return -1;
-}
-#endif
-
-// public domain "baseline" PNG decoder   v0.10  Sean Barrett 2006-11-18
-//    simple implementation
-//      - only 8-bit samples
-//      - no CRC checking
-//      - allocates lots of intermediate memory
-//        - avoids problem of streaming data between subsystems
-//        - avoids explicit window management
-//    performance
-//      - uses stb_zlib, a PD zlib implementation with fast huffman decoding
-
-#ifndef STBI_NO_PNG
-typedef struct
-{
-   stbi__uint32 length;
-   stbi__uint32 type;
-} stbi__pngchunk;
-
-static stbi__pngchunk stbi__get_chunk_header(stbi__context *s)
-{
-   stbi__pngchunk c;
-   c.length = stbi__get32be(s);
-   c.type   = stbi__get32be(s);
-   return c;
-}
-
-static int stbi__check_png_header(stbi__context *s)
-{
-   static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 };
-   int i;
-   for (i=0; i < 8; ++i)
-      if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG");
-   return 1;
-}
-
-typedef struct
-{
-   stbi__context *s;
-   stbi_uc *idata, *expanded, *out;
-   int depth;
-} stbi__png;
-
-
-enum {
-   STBI__F_none=0,
-   STBI__F_sub=1,
-   STBI__F_up=2,
-   STBI__F_avg=3,
-   STBI__F_paeth=4,
-   // synthetic filters used for first scanline to avoid needing a dummy row of 0s
-   STBI__F_avg_first,
-   STBI__F_paeth_first
-};
-
-static stbi_uc first_row_filter[5] =
-{
-   STBI__F_none,
-   STBI__F_sub,
-   STBI__F_none,
-   STBI__F_avg_first,
-   STBI__F_paeth_first
-};
-
-static int stbi__paeth(int a, int b, int c)
-{
-   int p = a + b - c;
-   int pa = abs(p-a);
-   int pb = abs(p-b);
-   int pc = abs(p-c);
-   if (pa <= pb && pa <= pc) return a;
-   if (pb <= pc) return b;
-   return c;
-}
-
-static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
-
-// create the png data from post-deflated data
-static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color)
-{
-   int bytes = (depth == 16? 2 : 1);
-   stbi__context *s = a->s;
-   stbi__uint32 i,j,stride = x*out_n*bytes;
-   stbi__uint32 img_len, img_width_bytes;
-   int k;
-   int img_n = s->img_n; // copy it into a local for later
-
-   int output_bytes = out_n*bytes;
-   int filter_bytes = img_n*bytes;
-   int width = x;
-
-   STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1);
-   a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into
-   if (!a->out) return stbi__err("outofmem", "Out of memory");
-
-   if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG");
-   img_width_bytes = (((img_n * x * depth) + 7) >> 3);
-   img_len = (img_width_bytes + 1) * y;
-
-   // we used to check for exact match between raw_len and img_len on non-interlaced PNGs,
-   // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros),
-   // so just check for raw_len < img_len always.
-   if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
-
-   for (j=0; j < y; ++j) {
-      stbi_uc *cur = a->out + stride*j;
-      stbi_uc *prior;
-      int filter = *raw++;
-
-      if (filter > 4)
-         return stbi__err("invalid filter","Corrupt PNG");
-
-      if (depth < 8) {
-         STBI_ASSERT(img_width_bytes <= x);
-         cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
-         filter_bytes = 1;
-         width = img_width_bytes;
-      }
-      prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above
-
-      // if first row, use special filter that doesn't sample previous row
-      if (j == 0) filter = first_row_filter[filter];
-
-      // handle first byte explicitly
-      for (k=0; k < filter_bytes; ++k) {
-         switch (filter) {
-            case STBI__F_none       : cur[k] = raw[k]; break;
-            case STBI__F_sub        : cur[k] = raw[k]; break;
-            case STBI__F_up         : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
-            case STBI__F_avg        : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break;
-            case STBI__F_paeth      : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break;
-            case STBI__F_avg_first  : cur[k] = raw[k]; break;
-            case STBI__F_paeth_first: cur[k] = raw[k]; break;
-         }
-      }
-
-      if (depth == 8) {
-         if (img_n != out_n)
-            cur[img_n] = 255; // first pixel
-         raw += img_n;
-         cur += out_n;
-         prior += out_n;
-      } else if (depth == 16) {
-         if (img_n != out_n) {
-            cur[filter_bytes]   = 255; // first pixel top byte
-            cur[filter_bytes+1] = 255; // first pixel bottom byte
-         }
-         raw += filter_bytes;
-         cur += output_bytes;
-         prior += output_bytes;
-      } else {
-         raw += 1;
-         cur += 1;
-         prior += 1;
-      }
-
-      // this is a little gross, so that we don't switch per-pixel or per-component
-      if (depth < 8 || img_n == out_n) {
-         int nk = (width - 1)*filter_bytes;
-         #define STBI__CASE(f) \
-             case f:     \
-                for (k=0; k < nk; ++k)
-         switch (filter) {
-            // "none" filter turns into a memcpy here; make that explicit.
-            case STBI__F_none:         memcpy(cur, raw, nk); break;
-            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break;
-            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
-            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break;
-            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break;
-            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break;
-            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break;
-         }
-         #undef STBI__CASE
-         raw += nk;
-      } else {
-         STBI_ASSERT(img_n+1 == out_n);
-         #define STBI__CASE(f) \
-             case f:     \
-                for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \
-                   for (k=0; k < filter_bytes; ++k)
-         switch (filter) {
-            STBI__CASE(STBI__F_none)         { cur[k] = raw[k]; } break;
-            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break;
-            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
-            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break;
-            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break;
-            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break;
-            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break;
-         }
-         #undef STBI__CASE
-
-         // the loop above sets the high byte of the pixels' alpha, but for
-         // 16 bit png files we also need the low byte set. we'll do that here.
-         if (depth == 16) {
-            cur = a->out + stride*j; // start at the beginning of the row again
-            for (i=0; i < x; ++i,cur+=output_bytes) {
-               cur[filter_bytes+1] = 255;
-            }
-         }
-      }
-   }
-
-   // we make a separate pass to expand bits to pixels; for performance,
-   // this could run two scanlines behind the above code, so it won't
-   // intefere with filtering but will still be in the cache.
-   if (depth < 8) {
-      for (j=0; j < y; ++j) {
-         stbi_uc *cur = a->out + stride*j;
-         stbi_uc *in  = a->out + stride*j + x*out_n - img_width_bytes;
-         // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit
-         // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop
-         stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range
-
-         // note that the final byte might overshoot and write more data than desired.
-         // we can allocate enough data that this never writes out of memory, but it
-         // could also overwrite the next scanline. can it overwrite non-empty data
-         // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel.
-         // so we need to explicitly clamp the final ones
-
-         if (depth == 4) {
-            for (k=x*img_n; k >= 2; k-=2, ++in) {
-               *cur++ = scale * ((*in >> 4)       );
-               *cur++ = scale * ((*in     ) & 0x0f);
-            }
-            if (k > 0) *cur++ = scale * ((*in >> 4)       );
-         } else if (depth == 2) {
-            for (k=x*img_n; k >= 4; k-=4, ++in) {
-               *cur++ = scale * ((*in >> 6)       );
-               *cur++ = scale * ((*in >> 4) & 0x03);
-               *cur++ = scale * ((*in >> 2) & 0x03);
-               *cur++ = scale * ((*in     ) & 0x03);
-            }
-            if (k > 0) *cur++ = scale * ((*in >> 6)       );
-            if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03);
-            if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03);
-         } else if (depth == 1) {
-            for (k=x*img_n; k >= 8; k-=8, ++in) {
-               *cur++ = scale * ((*in >> 7)       );
-               *cur++ = scale * ((*in >> 6) & 0x01);
-               *cur++ = scale * ((*in >> 5) & 0x01);
-               *cur++ = scale * ((*in >> 4) & 0x01);
-               *cur++ = scale * ((*in >> 3) & 0x01);
-               *cur++ = scale * ((*in >> 2) & 0x01);
-               *cur++ = scale * ((*in >> 1) & 0x01);
-               *cur++ = scale * ((*in     ) & 0x01);
-            }
-            if (k > 0) *cur++ = scale * ((*in >> 7)       );
-            if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01);
-            if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01);
-            if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01);
-            if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01);
-            if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01);
-            if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01);
-         }
-         if (img_n != out_n) {
-            int q;
-            // insert alpha = 255
-            cur = a->out + stride*j;
-            if (img_n == 1) {
-               for (q=x-1; q >= 0; --q) {
-                  cur[q*2+1] = 255;
-                  cur[q*2+0] = cur[q];
-               }
-            } else {
-               STBI_ASSERT(img_n == 3);
-               for (q=x-1; q >= 0; --q) {
-                  cur[q*4+3] = 255;
-                  cur[q*4+2] = cur[q*3+2];
-                  cur[q*4+1] = cur[q*3+1];
-                  cur[q*4+0] = cur[q*3+0];
-               }
-            }
-         }
-      }
-   } else if (depth == 16) {
-      // force the image data from big-endian to platform-native.
-      // this is done in a separate pass due to the decoding relying
-      // on the data being untouched, but could probably be done
-      // per-line during decode if care is taken.
-      stbi_uc *cur = a->out;
-      stbi__uint16 *cur16 = (stbi__uint16*)cur;
-
-      for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) {
-         *cur16 = (cur[0] << 8) | cur[1];
-      }
-   }
-
-   return 1;
-}
-
-static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced)
-{
-   int bytes = (depth == 16 ? 2 : 1);
-   int out_bytes = out_n * bytes;
-   stbi_uc *final;
-   int p;
-   if (!interlaced)
-      return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color);
-
-   // de-interlacing
-   final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0);
-   for (p=0; p < 7; ++p) {
-      int xorig[] = { 0,4,0,2,0,1,0 };
-      int yorig[] = { 0,0,4,0,2,0,1 };
-      int xspc[]  = { 8,8,4,4,2,2,1 };
-      int yspc[]  = { 8,8,8,4,4,2,2 };
-      int i,j,x,y;
-      // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1
-      x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p];
-      y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p];
-      if (x && y) {
-         stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y;
-         if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) {
-            STBI_FREE(final);
-            return 0;
-         }
-         for (j=0; j < y; ++j) {
-            for (i=0; i < x; ++i) {
-               int out_y = j*yspc[p]+yorig[p];
-               int out_x = i*xspc[p]+xorig[p];
-               memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes,
-                      a->out + (j*x+i)*out_bytes, out_bytes);
-            }
-         }
-         STBI_FREE(a->out);
-         image_data += img_len;
-         image_data_len -= img_len;
-      }
-   }
-   a->out = final;
-
-   return 1;
-}
-
-static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n)
-{
-   stbi__context *s = z->s;
-   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
-   stbi_uc *p = z->out;
-
-   // compute color-based transparency, assuming we've
-   // already got 255 as the alpha value in the output
-   STBI_ASSERT(out_n == 2 || out_n == 4);
-
-   if (out_n == 2) {
-      for (i=0; i < pixel_count; ++i) {
-         p[1] = (p[0] == tc[0] ? 0 : 255);
-         p += 2;
-      }
-   } else {
-      for (i=0; i < pixel_count; ++i) {
-         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
-            p[3] = 0;
-         p += 4;
-      }
-   }
-   return 1;
-}
-
-static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n)
-{
-   stbi__context *s = z->s;
-   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
-   stbi__uint16 *p = (stbi__uint16*) z->out;
-
-   // compute color-based transparency, assuming we've
-   // already got 65535 as the alpha value in the output
-   STBI_ASSERT(out_n == 2 || out_n == 4);
-
-   if (out_n == 2) {
-      for (i = 0; i < pixel_count; ++i) {
-         p[1] = (p[0] == tc[0] ? 0 : 65535);
-         p += 2;
-      }
-   } else {
-      for (i = 0; i < pixel_count; ++i) {
-         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
-            p[3] = 0;
-         p += 4;
-      }
-   }
-   return 1;
-}
-
-static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n)
-{
-   stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y;
-   stbi_uc *p, *temp_out, *orig = a->out;
-
-   p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0);
-   if (p == NULL) return stbi__err("outofmem", "Out of memory");
-
-   // between here and free(out) below, exitting would leak
-   temp_out = p;
-
-   if (pal_img_n == 3) {
-      for (i=0; i < pixel_count; ++i) {
-         int n = orig[i]*4;
-         p[0] = palette[n  ];
-         p[1] = palette[n+1];
-         p[2] = palette[n+2];
-         p += 3;
-      }
-   } else {
-      for (i=0; i < pixel_count; ++i) {
-         int n = orig[i]*4;
-         p[0] = palette[n  ];
-         p[1] = palette[n+1];
-         p[2] = palette[n+2];
-         p[3] = palette[n+3];
-         p += 4;
-      }
-   }
-   STBI_FREE(a->out);
-   a->out = temp_out;
-
-   STBI_NOTUSED(len);
-
-   return 1;
-}
-
-static int stbi__unpremultiply_on_load = 0;
-static int stbi__de_iphone_flag = 0;
-
-STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply)
-{
-   stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply;
-}
-
-STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert)
-{
-   stbi__de_iphone_flag = flag_true_if_should_convert;
-}
-
-static void stbi__de_iphone(stbi__png *z)
-{
-   stbi__context *s = z->s;
-   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
-   stbi_uc *p = z->out;
-
-   if (s->img_out_n == 3) {  // convert bgr to rgb
-      for (i=0; i < pixel_count; ++i) {
-         stbi_uc t = p[0];
-         p[0] = p[2];
-         p[2] = t;
-         p += 3;
-      }
-   } else {
-      STBI_ASSERT(s->img_out_n == 4);
-      if (stbi__unpremultiply_on_load) {
-         // convert bgr to rgb and unpremultiply
-         for (i=0; i < pixel_count; ++i) {
-            stbi_uc a = p[3];
-            stbi_uc t = p[0];
-            if (a) {
-               stbi_uc half = a / 2;
-               p[0] = (p[2] * 255 + half) / a;
-               p[1] = (p[1] * 255 + half) / a;
-               p[2] = ( t   * 255 + half) / a;
-            } else {
-               p[0] = p[2];
-               p[2] = t;
-            }
-            p += 4;
-         }
-      } else {
-         // convert bgr to rgb
-         for (i=0; i < pixel_count; ++i) {
-            stbi_uc t = p[0];
-            p[0] = p[2];
-            p[2] = t;
-            p += 4;
-         }
-      }
-   }
-}
-
-#define STBI__PNG_TYPE(a,b,c,d)  (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d))
-
-static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
-{
-   stbi_uc palette[1024], pal_img_n=0;
-   stbi_uc has_trans=0, tc[3];
-   stbi__uint16 tc16[3];
-   stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0;
-   int first=1,k,interlace=0, color=0, is_iphone=0;
-   stbi__context *s = z->s;
-
-   z->expanded = NULL;
-   z->idata = NULL;
-   z->out = NULL;
-
-   if (!stbi__check_png_header(s)) return 0;
-
-   if (scan == STBI__SCAN_type) return 1;
-
-   for (;;) {
-      stbi__pngchunk c = stbi__get_chunk_header(s);
-      switch (c.type) {
-         case STBI__PNG_TYPE('C','g','B','I'):
-            is_iphone = 1;
-            stbi__skip(s, c.length);
-            break;
-         case STBI__PNG_TYPE('I','H','D','R'): {
-            int comp,filter;
-            if (!first) return stbi__err("multiple IHDR","Corrupt PNG");
-            first = 0;
-            if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG");
-            s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
-            s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
-            z->depth = stbi__get8(s);  if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16)  return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only");
-            color = stbi__get8(s);  if (color > 6)         return stbi__err("bad ctype","Corrupt PNG");
-            if (color == 3 && z->depth == 16)                  return stbi__err("bad ctype","Corrupt PNG");
-            if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG");
-            comp  = stbi__get8(s);  if (comp) return stbi__err("bad comp method","Corrupt PNG");
-            filter= stbi__get8(s);  if (filter) return stbi__err("bad filter method","Corrupt PNG");
-            interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG");
-            if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG");
-            if (!pal_img_n) {
-               s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
-               if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
-               if (scan == STBI__SCAN_header) return 1;
-            } else {
-               // if paletted, then pal_n is our final components, and
-               // img_n is # components to decompress/filter.
-               s->img_n = 1;
-               if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG");
-               // if SCAN_header, have to scan to see if we have a tRNS
-            }
-            break;
-         }
-
-         case STBI__PNG_TYPE('P','L','T','E'):  {
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG");
-            pal_len = c.length / 3;
-            if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG");
-            for (i=0; i < pal_len; ++i) {
-               palette[i*4+0] = stbi__get8(s);
-               palette[i*4+1] = stbi__get8(s);
-               palette[i*4+2] = stbi__get8(s);
-               palette[i*4+3] = 255;
-            }
-            break;
-         }
-
-         case STBI__PNG_TYPE('t','R','N','S'): {
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG");
-            if (pal_img_n) {
-               if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; }
-               if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG");
-               if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG");
-               pal_img_n = 4;
-               for (i=0; i < c.length; ++i)
-                  palette[i*4+3] = stbi__get8(s);
-            } else {
-               if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG");
-               if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG");
-               has_trans = 1;
-               if (z->depth == 16) {
-                  for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
-               } else {
-                  for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
-               }
-            }
-            break;
-         }
-
-         case STBI__PNG_TYPE('I','D','A','T'): {
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG");
-            if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; }
-            if ((int)(ioff + c.length) < (int)ioff) return 0;
-            if (ioff + c.length > idata_limit) {
-               stbi__uint32 idata_limit_old = idata_limit;
-               stbi_uc *p;
-               if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
-               while (ioff + c.length > idata_limit)
-                  idata_limit *= 2;
-               STBI_NOTUSED(idata_limit_old);
-               p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory");
-               z->idata = p;
-            }
-            if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG");
-            ioff += c.length;
-            break;
-         }
-
-         case STBI__PNG_TYPE('I','E','N','D'): {
-            stbi__uint32 raw_len, bpl;
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if (scan != STBI__SCAN_load) return 1;
-            if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG");
-            // initial guess for decoded data size to avoid unnecessary reallocs
-            bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component
-            raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */;
-            z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone);
-            if (z->expanded == NULL) return 0; // zlib should set error
-            STBI_FREE(z->idata); z->idata = NULL;
-            if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans)
-               s->img_out_n = s->img_n+1;
-            else
-               s->img_out_n = s->img_n;
-            if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0;
-            if (has_trans) {
-               if (z->depth == 16) {
-                  if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0;
-               } else {
-                  if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0;
-               }
-            }
-            if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2)
-               stbi__de_iphone(z);
-            if (pal_img_n) {
-               // pal_img_n == 3 or 4
-               s->img_n = pal_img_n; // record the actual colors we had
-               s->img_out_n = pal_img_n;
-               if (req_comp >= 3) s->img_out_n = req_comp;
-               if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n))
-                  return 0;
-            } else if (has_trans) {
-               // non-paletted image with tRNS -> source image has (constant) alpha
-               ++s->img_n;
-            }
-            STBI_FREE(z->expanded); z->expanded = NULL;
-            return 1;
-         }
-
-         default:
-            // if critical, fail
-            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
-            if ((c.type & (1 << 29)) == 0) {
-               #ifndef STBI_NO_FAILURE_STRINGS
-               // not threadsafe
-               static char invalid_chunk[] = "XXXX PNG chunk not known";
-               invalid_chunk[0] = STBI__BYTECAST(c.type >> 24);
-               invalid_chunk[1] = STBI__BYTECAST(c.type >> 16);
-               invalid_chunk[2] = STBI__BYTECAST(c.type >>  8);
-               invalid_chunk[3] = STBI__BYTECAST(c.type >>  0);
-               #endif
-               return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type");
-            }
-            stbi__skip(s, c.length);
-            break;
-      }
-      // end of PNG chunk, read and skip CRC
-      stbi__get32be(s);
-   }
-}
-
-static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri)
-{
-   void *result=NULL;
-   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
-   if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) {
-      if (p->depth < 8)
-         ri->bits_per_channel = 8;
-      else
-         ri->bits_per_channel = p->depth;
-      result = p->out;
-      p->out = NULL;
-      if (req_comp && req_comp != p->s->img_out_n) {
-         if (ri->bits_per_channel == 8)
-            result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
-         else
-            result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
-         p->s->img_out_n = req_comp;
-         if (result == NULL) return result;
-      }
-      *x = p->s->img_x;
-      *y = p->s->img_y;
-      if (n) *n = p->s->img_n;
-   }
-   STBI_FREE(p->out);      p->out      = NULL;
-   STBI_FREE(p->expanded); p->expanded = NULL;
-   STBI_FREE(p->idata);    p->idata    = NULL;
-
-   return result;
-}
-
-static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   stbi__png p;
-   p.s = s;
-   return stbi__do_png(&p, x,y,comp,req_comp, ri);
-}
-
-static int stbi__png_test(stbi__context *s)
-{
-   int r;
-   r = stbi__check_png_header(s);
-   stbi__rewind(s);
-   return r;
-}
-
-static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp)
-{
-   if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) {
-      stbi__rewind( p->s );
-      return 0;
-   }
-   if (x) *x = p->s->img_x;
-   if (y) *y = p->s->img_y;
-   if (comp) *comp = p->s->img_n;
-   return 1;
-}
-
-static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   stbi__png p;
-   p.s = s;
-   return stbi__png_info_raw(&p, x, y, comp);
-}
-
-static int stbi__png_is16(stbi__context *s)
-{
-   stbi__png p;
-   p.s = s;
-   if (!stbi__png_info_raw(&p, NULL, NULL, NULL))
-	   return 0;
-   if (p.depth != 16) {
-      stbi__rewind(p.s);
-      return 0;
-   }
-   return 1;
-}
-#endif
-
-// Microsoft/Windows BMP image
-
-#ifndef STBI_NO_BMP
-static int stbi__bmp_test_raw(stbi__context *s)
-{
-   int r;
-   int sz;
-   if (stbi__get8(s) != 'B') return 0;
-   if (stbi__get8(s) != 'M') return 0;
-   stbi__get32le(s); // discard filesize
-   stbi__get16le(s); // discard reserved
-   stbi__get16le(s); // discard reserved
-   stbi__get32le(s); // discard data offset
-   sz = stbi__get32le(s);
-   r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124);
-   return r;
-}
-
-static int stbi__bmp_test(stbi__context *s)
-{
-   int r = stbi__bmp_test_raw(s);
-   stbi__rewind(s);
-   return r;
-}
-
-
-// returns 0..31 for the highest set bit
-static int stbi__high_bit(unsigned int z)
-{
-   int n=0;
-   if (z == 0) return -1;
-   if (z >= 0x10000) n += 16, z >>= 16;
-   if (z >= 0x00100) n +=  8, z >>=  8;
-   if (z >= 0x00010) n +=  4, z >>=  4;
-   if (z >= 0x00004) n +=  2, z >>=  2;
-   if (z >= 0x00002) n +=  1, z >>=  1;
-   return n;
-}
-
-static int stbi__bitcount(unsigned int a)
-{
-   a = (a & 0x55555555) + ((a >>  1) & 0x55555555); // max 2
-   a = (a & 0x33333333) + ((a >>  2) & 0x33333333); // max 4
-   a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits
-   a = (a + (a >> 8)); // max 16 per 8 bits
-   a = (a + (a >> 16)); // max 32 per 8 bits
-   return a & 0xff;
-}
-
-// extract an arbitrarily-aligned N-bit value (N=bits)
-// from v, and then make it 8-bits long and fractionally
-// extend it to full full range.
-static int stbi__shiftsigned(int v, int shift, int bits)
-{
-   static unsigned int mul_table[9] = {
-      0,
-      0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/,
-      0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/,
-   };
-   static unsigned int shift_table[9] = {
-      0, 0,0,1,0,2,4,6,0,
-   };
-   if (shift < 0)
-      v <<= -shift;
-   else
-      v >>= shift;
-   STBI_ASSERT(v >= 0 && v < 256);
-   v >>= (8-bits);
-   STBI_ASSERT(bits >= 0 && bits <= 8);
-   return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits];
-}
-
-typedef struct
-{
-   int bpp, offset, hsz;
-   unsigned int mr,mg,mb,ma, all_a;
-} stbi__bmp_data;
-
-static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info)
-{
-   int hsz;
-   if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP");
-   stbi__get32le(s); // discard filesize
-   stbi__get16le(s); // discard reserved
-   stbi__get16le(s); // discard reserved
-   info->offset = stbi__get32le(s);
-   info->hsz = hsz = stbi__get32le(s);
-   info->mr = info->mg = info->mb = info->ma = 0;
-
-   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown");
-   if (hsz == 12) {
-      s->img_x = stbi__get16le(s);
-      s->img_y = stbi__get16le(s);
-   } else {
-      s->img_x = stbi__get32le(s);
-      s->img_y = stbi__get32le(s);
-   }
-   if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP");
-   info->bpp = stbi__get16le(s);
-   if (hsz != 12) {
-      int compress = stbi__get32le(s);
-      if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE");
-      stbi__get32le(s); // discard sizeof
-      stbi__get32le(s); // discard hres
-      stbi__get32le(s); // discard vres
-      stbi__get32le(s); // discard colorsused
-      stbi__get32le(s); // discard max important
-      if (hsz == 40 || hsz == 56) {
-         if (hsz == 56) {
-            stbi__get32le(s);
-            stbi__get32le(s);
-            stbi__get32le(s);
-            stbi__get32le(s);
-         }
-         if (info->bpp == 16 || info->bpp == 32) {
-            if (compress == 0) {
-               if (info->bpp == 32) {
-                  info->mr = 0xffu << 16;
-                  info->mg = 0xffu <<  8;
-                  info->mb = 0xffu <<  0;
-                  info->ma = 0xffu << 24;
-                  info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0
-               } else {
-                  info->mr = 31u << 10;
-                  info->mg = 31u <<  5;
-                  info->mb = 31u <<  0;
-               }
-            } else if (compress == 3) {
-               info->mr = stbi__get32le(s);
-               info->mg = stbi__get32le(s);
-               info->mb = stbi__get32le(s);
-               // not documented, but generated by photoshop and handled by mspaint
-               if (info->mr == info->mg && info->mg == info->mb) {
-                  // ?!?!?
-                  return stbi__errpuc("bad BMP", "bad BMP");
-               }
-            } else
-               return stbi__errpuc("bad BMP", "bad BMP");
-         }
-      } else {
-         int i;
-         if (hsz != 108 && hsz != 124)
-            return stbi__errpuc("bad BMP", "bad BMP");
-         info->mr = stbi__get32le(s);
-         info->mg = stbi__get32le(s);
-         info->mb = stbi__get32le(s);
-         info->ma = stbi__get32le(s);
-         stbi__get32le(s); // discard color space
-         for (i=0; i < 12; ++i)
-            stbi__get32le(s); // discard color space parameters
-         if (hsz == 124) {
-            stbi__get32le(s); // discard rendering intent
-            stbi__get32le(s); // discard offset of profile data
-            stbi__get32le(s); // discard size of profile data
-            stbi__get32le(s); // discard reserved
-         }
-      }
-   }
-   return (void *) 1;
-}
-
-
-static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   stbi_uc *out;
-   unsigned int mr=0,mg=0,mb=0,ma=0, all_a;
-   stbi_uc pal[256][4];
-   int psize=0,i,j,width;
-   int flip_vertically, pad, target;
-   stbi__bmp_data info;
-   STBI_NOTUSED(ri);
-
-   info.all_a = 255;
-   if (stbi__bmp_parse_header(s, &info) == NULL)
-      return NULL; // error code already set
-
-   flip_vertically = ((int) s->img_y) > 0;
-   s->img_y = abs((int) s->img_y);
-
-   mr = info.mr;
-   mg = info.mg;
-   mb = info.mb;
-   ma = info.ma;
-   all_a = info.all_a;
-
-   if (info.hsz == 12) {
-      if (info.bpp < 24)
-         psize = (info.offset - 14 - 24) / 3;
-   } else {
-      if (info.bpp < 16)
-         psize = (info.offset - 14 - info.hsz) >> 2;
-   }
-
-   s->img_n = ma ? 4 : 3;
-   if (req_comp && req_comp >= 3) // we can directly decode 3 or 4
-      target = req_comp;
-   else
-      target = s->img_n; // if they want monochrome, we'll post-convert
-
-   // sanity-check size
-   if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0))
-      return stbi__errpuc("too large", "Corrupt BMP");
-
-   out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0);
-   if (!out) return stbi__errpuc("outofmem", "Out of memory");
-   if (info.bpp < 16) {
-      int z=0;
-      if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); }
-      for (i=0; i < psize; ++i) {
-         pal[i][2] = stbi__get8(s);
-         pal[i][1] = stbi__get8(s);
-         pal[i][0] = stbi__get8(s);
-         if (info.hsz != 12) stbi__get8(s);
-         pal[i][3] = 255;
-      }
-      stbi__skip(s, info.offset - 14 - info.hsz - psize * (info.hsz == 12 ? 3 : 4));
-      if (info.bpp == 1) width = (s->img_x + 7) >> 3;
-      else if (info.bpp == 4) width = (s->img_x + 1) >> 1;
-      else if (info.bpp == 8) width = s->img_x;
-      else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); }
-      pad = (-width)&3;
-      if (info.bpp == 1) {
-         for (j=0; j < (int) s->img_y; ++j) {
-            int bit_offset = 7, v = stbi__get8(s);
-            for (i=0; i < (int) s->img_x; ++i) {
-               int color = (v>>bit_offset)&0x1;
-               out[z++] = pal[color][0];
-               out[z++] = pal[color][1];
-               out[z++] = pal[color][2];
-               if((--bit_offset) < 0) {
-                  bit_offset = 7;
-                  v = stbi__get8(s);
-               }
-            }
-            stbi__skip(s, pad);
-         }
-      } else {
-         for (j=0; j < (int) s->img_y; ++j) {
-            for (i=0; i < (int) s->img_x; i += 2) {
-               int v=stbi__get8(s),v2=0;
-               if (info.bpp == 4) {
-                  v2 = v & 15;
-                  v >>= 4;
-               }
-               out[z++] = pal[v][0];
-               out[z++] = pal[v][1];
-               out[z++] = pal[v][2];
-               if (target == 4) out[z++] = 255;
-               if (i+1 == (int) s->img_x) break;
-               v = (info.bpp == 8) ? stbi__get8(s) : v2;
-               out[z++] = pal[v][0];
-               out[z++] = pal[v][1];
-               out[z++] = pal[v][2];
-               if (target == 4) out[z++] = 255;
-            }
-            stbi__skip(s, pad);
-         }
-      }
-   } else {
-      int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0;
-      int z = 0;
-      int easy=0;
-      stbi__skip(s, info.offset - 14 - info.hsz);
-      if (info.bpp == 24) width = 3 * s->img_x;
-      else if (info.bpp == 16) width = 2*s->img_x;
-      else /* bpp = 32 and pad = 0 */ width=0;
-      pad = (-width) & 3;
-      if (info.bpp == 24) {
-         easy = 1;
-      } else if (info.bpp == 32) {
-         if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000)
-            easy = 2;
-      }
-      if (!easy) {
-         if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); }
-         // right shift amt to put high bit in position #7
-         rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr);
-         gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg);
-         bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb);
-         ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma);
-      }
-      for (j=0; j < (int) s->img_y; ++j) {
-         if (easy) {
-            for (i=0; i < (int) s->img_x; ++i) {
-               unsigned char a;
-               out[z+2] = stbi__get8(s);
-               out[z+1] = stbi__get8(s);
-               out[z+0] = stbi__get8(s);
-               z += 3;
-               a = (easy == 2 ? stbi__get8(s) : 255);
-               all_a |= a;
-               if (target == 4) out[z++] = a;
-            }
-         } else {
-            int bpp = info.bpp;
-            for (i=0; i < (int) s->img_x; ++i) {
-               stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s));
-               unsigned int a;
-               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount));
-               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount));
-               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount));
-               a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255);
-               all_a |= a;
-               if (target == 4) out[z++] = STBI__BYTECAST(a);
-            }
-         }
-         stbi__skip(s, pad);
-      }
-   }
-
-   // if alpha channel is all 0s, replace with all 255s
-   if (target == 4 && all_a == 0)
-      for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4)
-         out[i] = 255;
-
-   if (flip_vertically) {
-      stbi_uc t;
-      for (j=0; j < (int) s->img_y>>1; ++j) {
-         stbi_uc *p1 = out +      j     *s->img_x*target;
-         stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target;
-         for (i=0; i < (int) s->img_x*target; ++i) {
-            t = p1[i], p1[i] = p2[i], p2[i] = t;
-         }
-      }
-   }
-
-   if (req_comp && req_comp != target) {
-      out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y);
-      if (out == NULL) return out; // stbi__convert_format frees input on failure
-   }
-
-   *x = s->img_x;
-   *y = s->img_y;
-   if (comp) *comp = s->img_n;
-   return out;
-}
-#endif
-
-// Targa Truevision - TGA
-// by Jonathan Dummer
-#ifndef STBI_NO_TGA
-// returns STBI_rgb or whatever, 0 on error
-static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16)
-{
-   // only RGB or RGBA (incl. 16bit) or grey allowed
-   if (is_rgb16) *is_rgb16 = 0;
-   switch(bits_per_pixel) {
-      case 8:  return STBI_grey;
-      case 16: if(is_grey) return STBI_grey_alpha;
-               // fallthrough
-      case 15: if(is_rgb16) *is_rgb16 = 1;
-               return STBI_rgb;
-      case 24: // fallthrough
-      case 32: return bits_per_pixel/8;
-      default: return 0;
-   }
-}
-
-static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp)
-{
-    int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp;
-    int sz, tga_colormap_type;
-    stbi__get8(s);                   // discard Offset
-    tga_colormap_type = stbi__get8(s); // colormap type
-    if( tga_colormap_type > 1 ) {
-        stbi__rewind(s);
-        return 0;      // only RGB or indexed allowed
-    }
-    tga_image_type = stbi__get8(s); // image type
-    if ( tga_colormap_type == 1 ) { // colormapped (paletted) image
-        if (tga_image_type != 1 && tga_image_type != 9) {
-            stbi__rewind(s);
-            return 0;
-        }
-        stbi__skip(s,4);       // skip index of first colormap entry and number of entries
-        sz = stbi__get8(s);    //   check bits per palette color entry
-        if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) {
-            stbi__rewind(s);
-            return 0;
-        }
-        stbi__skip(s,4);       // skip image x and y origin
-        tga_colormap_bpp = sz;
-    } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE
-        if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) {
-            stbi__rewind(s);
-            return 0; // only RGB or grey allowed, +/- RLE
-        }
-        stbi__skip(s,9); // skip colormap specification and image x/y origin
-        tga_colormap_bpp = 0;
-    }
-    tga_w = stbi__get16le(s);
-    if( tga_w < 1 ) {
-        stbi__rewind(s);
-        return 0;   // test width
-    }
-    tga_h = stbi__get16le(s);
-    if( tga_h < 1 ) {
-        stbi__rewind(s);
-        return 0;   // test height
-    }
-    tga_bits_per_pixel = stbi__get8(s); // bits per pixel
-    stbi__get8(s); // ignore alpha bits
-    if (tga_colormap_bpp != 0) {
-        if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) {
-            // when using a colormap, tga_bits_per_pixel is the size of the indexes
-            // I don't think anything but 8 or 16bit indexes makes sense
-            stbi__rewind(s);
-            return 0;
-        }
-        tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL);
-    } else {
-        tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL);
-    }
-    if(!tga_comp) {
-      stbi__rewind(s);
-      return 0;
-    }
-    if (x) *x = tga_w;
-    if (y) *y = tga_h;
-    if (comp) *comp = tga_comp;
-    return 1;                   // seems to have passed everything
-}
-
-static int stbi__tga_test(stbi__context *s)
-{
-   int res = 0;
-   int sz, tga_color_type;
-   stbi__get8(s);      //   discard Offset
-   tga_color_type = stbi__get8(s);   //   color type
-   if ( tga_color_type > 1 ) goto errorEnd;   //   only RGB or indexed allowed
-   sz = stbi__get8(s);   //   image type
-   if ( tga_color_type == 1 ) { // colormapped (paletted) image
-      if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9
-      stbi__skip(s,4);       // skip index of first colormap entry and number of entries
-      sz = stbi__get8(s);    //   check bits per palette color entry
-      if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
-      stbi__skip(s,4);       // skip image x and y origin
-   } else { // "normal" image w/o colormap
-      if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE
-      stbi__skip(s,9); // skip colormap specification and image x/y origin
-   }
-   if ( stbi__get16le(s) < 1 ) goto errorEnd;      //   test width
-   if ( stbi__get16le(s) < 1 ) goto errorEnd;      //   test height
-   sz = stbi__get8(s);   //   bits per pixel
-   if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index
-   if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
-
-   res = 1; // if we got this far, everything's good and we can return 1 instead of 0
-
-errorEnd:
-   stbi__rewind(s);
-   return res;
-}
-
-// read 16bit value and convert to 24bit RGB
-static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out)
-{
-   stbi__uint16 px = (stbi__uint16)stbi__get16le(s);
-   stbi__uint16 fiveBitMask = 31;
-   // we have 3 channels with 5bits each
-   int r = (px >> 10) & fiveBitMask;
-   int g = (px >> 5) & fiveBitMask;
-   int b = px & fiveBitMask;
-   // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later
-   out[0] = (stbi_uc)((r * 255)/31);
-   out[1] = (stbi_uc)((g * 255)/31);
-   out[2] = (stbi_uc)((b * 255)/31);
-
-   // some people claim that the most significant bit might be used for alpha
-   // (possibly if an alpha-bit is set in the "image descriptor byte")
-   // but that only made 16bit test images completely translucent..
-   // so let's treat all 15 and 16bit TGAs as RGB with no alpha.
-}
-
-static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   //   read in the TGA header stuff
-   int tga_offset = stbi__get8(s);
-   int tga_indexed = stbi__get8(s);
-   int tga_image_type = stbi__get8(s);
-   int tga_is_RLE = 0;
-   int tga_palette_start = stbi__get16le(s);
-   int tga_palette_len = stbi__get16le(s);
-   int tga_palette_bits = stbi__get8(s);
-   int tga_x_origin = stbi__get16le(s);
-   int tga_y_origin = stbi__get16le(s);
-   int tga_width = stbi__get16le(s);
-   int tga_height = stbi__get16le(s);
-   int tga_bits_per_pixel = stbi__get8(s);
-   int tga_comp, tga_rgb16=0;
-   int tga_inverted = stbi__get8(s);
-   // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?)
-   //   image data
-   unsigned char *tga_data;
-   unsigned char *tga_palette = NULL;
-   int i, j;
-   unsigned char raw_data[4] = {0};
-   int RLE_count = 0;
-   int RLE_repeating = 0;
-   int read_next_pixel = 1;
-   STBI_NOTUSED(ri);
-
-   //   do a tiny bit of precessing
-   if ( tga_image_type >= 8 )
-   {
-      tga_image_type -= 8;
-      tga_is_RLE = 1;
-   }
-   tga_inverted = 1 - ((tga_inverted >> 5) & 1);
-
-   //   If I'm paletted, then I'll use the number of bits from the palette
-   if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16);
-   else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16);
-
-   if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency
-      return stbi__errpuc("bad format", "Can't find out TGA pixelformat");
-
-   //   tga info
-   *x = tga_width;
-   *y = tga_height;
-   if (comp) *comp = tga_comp;
-
-   if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0))
-      return stbi__errpuc("too large", "Corrupt TGA");
-
-   tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0);
-   if (!tga_data) return stbi__errpuc("outofmem", "Out of memory");
-
-   // skip to the data's starting position (offset usually = 0)
-   stbi__skip(s, tga_offset );
-
-   if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) {
-      for (i=0; i < tga_height; ++i) {
-         int row = tga_inverted ? tga_height -i - 1 : i;
-         stbi_uc *tga_row = tga_data + row*tga_width*tga_comp;
-         stbi__getn(s, tga_row, tga_width * tga_comp);
-      }
-   } else  {
-      //   do I need to load a palette?
-      if ( tga_indexed)
-      {
-         //   any data to skip? (offset usually = 0)
-         stbi__skip(s, tga_palette_start );
-         //   load the palette
-         tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0);
-         if (!tga_palette) {
-            STBI_FREE(tga_data);
-            return stbi__errpuc("outofmem", "Out of memory");
-         }
-         if (tga_rgb16) {
-            stbi_uc *pal_entry = tga_palette;
-            STBI_ASSERT(tga_comp == STBI_rgb);
-            for (i=0; i < tga_palette_len; ++i) {
-               stbi__tga_read_rgb16(s, pal_entry);
-               pal_entry += tga_comp;
-            }
-         } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) {
-               STBI_FREE(tga_data);
-               STBI_FREE(tga_palette);
-               return stbi__errpuc("bad palette", "Corrupt TGA");
-         }
-      }
-      //   load the data
-      for (i=0; i < tga_width * tga_height; ++i)
-      {
-         //   if I'm in RLE mode, do I need to get a RLE stbi__pngchunk?
-         if ( tga_is_RLE )
-         {
-            if ( RLE_count == 0 )
-            {
-               //   yep, get the next byte as a RLE command
-               int RLE_cmd = stbi__get8(s);
-               RLE_count = 1 + (RLE_cmd & 127);
-               RLE_repeating = RLE_cmd >> 7;
-               read_next_pixel = 1;
-            } else if ( !RLE_repeating )
-            {
-               read_next_pixel = 1;
-            }
-         } else
-         {
-            read_next_pixel = 1;
-         }
-         //   OK, if I need to read a pixel, do it now
-         if ( read_next_pixel )
-         {
-            //   load however much data we did have
-            if ( tga_indexed )
-            {
-               // read in index, then perform the lookup
-               int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s);
-               if ( pal_idx >= tga_palette_len ) {
-                  // invalid index
-                  pal_idx = 0;
-               }
-               pal_idx *= tga_comp;
-               for (j = 0; j < tga_comp; ++j) {
-                  raw_data[j] = tga_palette[pal_idx+j];
-               }
-            } else if(tga_rgb16) {
-               STBI_ASSERT(tga_comp == STBI_rgb);
-               stbi__tga_read_rgb16(s, raw_data);
-            } else {
-               //   read in the data raw
-               for (j = 0; j < tga_comp; ++j) {
-                  raw_data[j] = stbi__get8(s);
-               }
-            }
-            //   clear the reading flag for the next pixel
-            read_next_pixel = 0;
-         } // end of reading a pixel
-
-         // copy data
-         for (j = 0; j < tga_comp; ++j)
-           tga_data[i*tga_comp+j] = raw_data[j];
-
-         //   in case we're in RLE mode, keep counting down
-         --RLE_count;
-      }
-      //   do I need to invert the image?
-      if ( tga_inverted )
-      {
-         for (j = 0; j*2 < tga_height; ++j)
-         {
-            int index1 = j * tga_width * tga_comp;
-            int index2 = (tga_height - 1 - j) * tga_width * tga_comp;
-            for (i = tga_width * tga_comp; i > 0; --i)
-            {
-               unsigned char temp = tga_data[index1];
-               tga_data[index1] = tga_data[index2];
-               tga_data[index2] = temp;
-               ++index1;
-               ++index2;
-            }
-         }
-      }
-      //   clear my palette, if I had one
-      if ( tga_palette != NULL )
-      {
-         STBI_FREE( tga_palette );
-      }
-   }
-
-   // swap RGB - if the source data was RGB16, it already is in the right order
-   if (tga_comp >= 3 && !tga_rgb16)
-   {
-      unsigned char* tga_pixel = tga_data;
-      for (i=0; i < tga_width * tga_height; ++i)
-      {
-         unsigned char temp = tga_pixel[0];
-         tga_pixel[0] = tga_pixel[2];
-         tga_pixel[2] = temp;
-         tga_pixel += tga_comp;
-      }
-   }
-
-   // convert to target component count
-   if (req_comp && req_comp != tga_comp)
-      tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height);
-
-   //   the things I do to get rid of an error message, and yet keep
-   //   Microsoft's C compilers happy... [8^(
-   tga_palette_start = tga_palette_len = tga_palette_bits =
-         tga_x_origin = tga_y_origin = 0;
-   //   OK, done
-   return tga_data;
-}
-#endif
-
-// *************************************************************************************************
-// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB
-
-#ifndef STBI_NO_PSD
-static int stbi__psd_test(stbi__context *s)
-{
-   int r = (stbi__get32be(s) == 0x38425053);
-   stbi__rewind(s);
-   return r;
-}
-
-static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount)
-{
-   int count, nleft, len;
-
-   count = 0;
-   while ((nleft = pixelCount - count) > 0) {
-      len = stbi__get8(s);
-      if (len == 128) {
-         // No-op.
-      } else if (len < 128) {
-         // Copy next len+1 bytes literally.
-         len++;
-         if (len > nleft) return 0; // corrupt data
-         count += len;
-         while (len) {
-            *p = stbi__get8(s);
-            p += 4;
-            len--;
-         }
-      } else if (len > 128) {
-         stbi_uc   val;
-         // Next -len+1 bytes in the dest are replicated from next source byte.
-         // (Interpret len as a negative 8-bit int.)
-         len = 257 - len;
-         if (len > nleft) return 0; // corrupt data
-         val = stbi__get8(s);
-         count += len;
-         while (len) {
-            *p = val;
-            p += 4;
-            len--;
-         }
-      }
-   }
-
-   return 1;
-}
-
-static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
-{
-   int pixelCount;
-   int channelCount, compression;
-   int channel, i;
-   int bitdepth;
-   int w,h;
-   stbi_uc *out;
-   STBI_NOTUSED(ri);
-
-   // Check identifier
-   if (stbi__get32be(s) != 0x38425053)   // "8BPS"
-      return stbi__errpuc("not PSD", "Corrupt PSD image");
-
-   // Check file type version.
-   if (stbi__get16be(s) != 1)
-      return stbi__errpuc("wrong version", "Unsupported version of PSD image");
-
-   // Skip 6 reserved bytes.
-   stbi__skip(s, 6 );
-
-   // Read the number of channels (R, G, B, A, etc).
-   channelCount = stbi__get16be(s);
-   if (channelCount < 0 || channelCount > 16)
-      return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image");
-
-   // Read the rows and columns of the image.
-   h = stbi__get32be(s);
-   w = stbi__get32be(s);
-
-   // Make sure the depth is 8 bits.
-   bitdepth = stbi__get16be(s);
-   if (bitdepth != 8 && bitdepth != 16)
-      return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit");
-
-   // Make sure the color mode is RGB.
-   // Valid options are:
-   //   0: Bitmap
-   //   1: Grayscale
-   //   2: Indexed color
-   //   3: RGB color
-   //   4: CMYK color
-   //   7: Multichannel
-   //   8: Duotone
-   //   9: Lab color
-   if (stbi__get16be(s) != 3)
-      return stbi__errpuc("wrong color format", "PSD is not in RGB color format");
-
-   // Skip the Mode Data.  (It's the palette for indexed color; other info for other modes.)
-   stbi__skip(s,stbi__get32be(s) );
-
-   // Skip the image resources.  (resolution, pen tool paths, etc)
-   stbi__skip(s, stbi__get32be(s) );
-
-   // Skip the reserved data.
-   stbi__skip(s, stbi__get32be(s) );
-
-   // Find out if the data is compressed.
-   // Known values:
-   //   0: no compression
-   //   1: RLE compressed
-   compression = stbi__get16be(s);
-   if (compression > 1)
-      return stbi__errpuc("bad compression", "PSD has an unknown compression format");
-
-   // Check size
-   if (!stbi__mad3sizes_valid(4, w, h, 0))
-      return stbi__errpuc("too large", "Corrupt PSD");
-
-   // Create the destination image.
-
-   if (!compression && bitdepth == 16 && bpc == 16) {
-      out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0);
-      ri->bits_per_channel = 16;
-   } else
-      out = (stbi_uc *) stbi__malloc(4 * w*h);
-
-   if (!out) return stbi__errpuc("outofmem", "Out of memory");
-   pixelCount = w*h;
-
-   // Initialize the data to zero.
-   //memset( out, 0, pixelCount * 4 );
-
-   // Finally, the image data.
-   if (compression) {
-      // RLE as used by .PSD and .TIFF
-      // Loop until you get the number of unpacked bytes you are expecting:
-      //     Read the next source byte into n.
-      //     If n is between 0 and 127 inclusive, copy the next n+1 bytes literally.
-      //     Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times.
-      //     Else if n is 128, noop.
-      // Endloop
-
-      // The RLE-compressed data is preceeded by a 2-byte data count for each row in the data,
-      // which we're going to just skip.
-      stbi__skip(s, h * channelCount * 2 );
-
-      // Read the RLE data by channel.
-      for (channel = 0; channel < 4; channel++) {
-         stbi_uc *p;
-
-         p = out+channel;
-         if (channel >= channelCount) {
-            // Fill this channel with default data.
-            for (i = 0; i < pixelCount; i++, p += 4)
-               *p = (channel == 3 ? 255 : 0);
-         } else {
-            // Read the RLE data.
-            if (!stbi__psd_decode_rle(s, p, pixelCount)) {
-               STBI_FREE(out);
-               return stbi__errpuc("corrupt", "bad RLE data");
-            }
-         }
-      }
-
-   } else {
-      // We're at the raw image data.  It's each channel in order (Red, Green, Blue, Alpha, ...)
-      // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image.
-
-      // Read the data by channel.
-      for (channel = 0; channel < 4; channel++) {
-         if (channel >= channelCount) {
-            // Fill this channel with default data.
-            if (bitdepth == 16 && bpc == 16) {
-               stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
-               stbi__uint16 val = channel == 3 ? 65535 : 0;
-               for (i = 0; i < pixelCount; i++, q += 4)
-                  *q = val;
-            } else {
-               stbi_uc *p = out+channel;
-               stbi_uc val = channel == 3 ? 255 : 0;
-               for (i = 0; i < pixelCount; i++, p += 4)
-                  *p = val;
-            }
-         } else {
-            if (ri->bits_per_channel == 16) {    // output bpc
-               stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
-               for (i = 0; i < pixelCount; i++, q += 4)
-                  *q = (stbi__uint16) stbi__get16be(s);
-            } else {
-               stbi_uc *p = out+channel;
-               if (bitdepth == 16) {  // input bpc
-                  for (i = 0; i < pixelCount; i++, p += 4)
-                     *p = (stbi_uc) (stbi__get16be(s) >> 8);
-               } else {
-                  for (i = 0; i < pixelCount; i++, p += 4)
-                     *p = stbi__get8(s);
-               }
-            }
-         }
-      }
-   }
-
-   // remove weird white matte from PSD
-   if (channelCount >= 4) {
-      if (ri->bits_per_channel == 16) {
-         for (i=0; i < w*h; ++i) {
-            stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i;
-            if (pixel[3] != 0 && pixel[3] != 65535) {
-               float a = pixel[3] / 65535.0f;
-               float ra = 1.0f / a;
-               float inv_a = 65535.0f * (1 - ra);
-               pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a);
-               pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a);
-               pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a);
-            }
-         }
-      } else {
-         for (i=0; i < w*h; ++i) {
-            unsigned char *pixel = out + 4*i;
-            if (pixel[3] != 0 && pixel[3] != 255) {
-               float a = pixel[3] / 255.0f;
-               float ra = 1.0f / a;
-               float inv_a = 255.0f * (1 - ra);
-               pixel[0] = (unsigned char) (pixel[0]*ra + inv_a);
-               pixel[1] = (unsigned char) (pixel[1]*ra + inv_a);
-               pixel[2] = (unsigned char) (pixel[2]*ra + inv_a);
-            }
-         }
-      }
-   }
-
-   // convert to desired output format
-   if (req_comp && req_comp != 4) {
-      if (ri->bits_per_channel == 16)
-         out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h);
-      else
-         out = stbi__convert_format(out, 4, req_comp, w, h);
-      if (out == NULL) return out; // stbi__convert_format frees input on failure
-   }
-
-   if (comp) *comp = 4;
-   *y = h;
-   *x = w;
-
-   return out;
-}
-#endif
-
-// *************************************************************************************************
-// Softimage PIC loader
-// by Tom Seddon
-//
-// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format
-// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/
-
-#ifndef STBI_NO_PIC
-static int stbi__pic_is4(stbi__context *s,const char *str)
-{
-   int i;
-   for (i=0; i<4; ++i)
-      if (stbi__get8(s) != (stbi_uc)str[i])
-         return 0;
-
-   return 1;
-}
-
-static int stbi__pic_test_core(stbi__context *s)
-{
-   int i;
-
-   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34"))
-      return 0;
-
-   for(i=0;i<84;++i)
-      stbi__get8(s);
-
-   if (!stbi__pic_is4(s,"PICT"))
-      return 0;
-
-   return 1;
-}
-
-typedef struct
-{
-   stbi_uc size,type,channel;
-} stbi__pic_packet;
-
-static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest)
-{
-   int mask=0x80, i;
-
-   for (i=0; i<4; ++i, mask>>=1) {
-      if (channel & mask) {
-         if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short");
-         dest[i]=stbi__get8(s);
-      }
-   }
-
-   return dest;
-}
-
-static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src)
-{
-   int mask=0x80,i;
-
-   for (i=0;i<4; ++i, mask>>=1)
-      if (channel&mask)
-         dest[i]=src[i];
-}
-
-static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result)
-{
-   int act_comp=0,num_packets=0,y,chained;
-   stbi__pic_packet packets[10];
-
-   // this will (should...) cater for even some bizarre stuff like having data
-    // for the same channel in multiple packets.
-   do {
-      stbi__pic_packet *packet;
-
-      if (num_packets==sizeof(packets)/sizeof(packets[0]))
-         return stbi__errpuc("bad format","too many packets");
-
-      packet = &packets[num_packets++];
-
-      chained = stbi__get8(s);
-      packet->size    = stbi__get8(s);
-      packet->type    = stbi__get8(s);
-      packet->channel = stbi__get8(s);
-
-      act_comp |= packet->channel;
-
-      if (stbi__at_eof(s))          return stbi__errpuc("bad file","file too short (reading packets)");
-      if (packet->size != 8)  return stbi__errpuc("bad format","packet isn't 8bpp");
-   } while (chained);
-
-   *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel?
-
-   for(y=0; y<height; ++y) {
-      int packet_idx;
-
-      for(packet_idx=0; packet_idx < num_packets; ++packet_idx) {
-         stbi__pic_packet *packet = &packets[packet_idx];
-         stbi_uc *dest = result+y*width*4;
-
-         switch (packet->type) {
-            default:
-               return stbi__errpuc("bad format","packet has bad compression type");
-
-            case 0: {//uncompressed
-               int x;
-
-               for(x=0;x<width;++x, dest+=4)
-                  if (!stbi__readval(s,packet->channel,dest))
-                     return 0;
-               break;
-            }
-
-            case 1://Pure RLE
-               {
-                  int left=width, i;
-
-                  while (left>0) {
-                     stbi_uc count,value[4];
-
-                     count=stbi__get8(s);
-                     if (stbi__at_eof(s))   return stbi__errpuc("bad file","file too short (pure read count)");
-
-                     if (count > left)
-                        count = (stbi_uc) left;
-
-                     if (!stbi__readval(s,packet->channel,value))  return 0;
-
-                     for(i=0; i<count; ++i,dest+=4)
-                        stbi__copyval(packet->channel,dest,value);
-                     left -= count;
-                  }
-               }
-               break;
-
-            case 2: {//Mixed RLE
-               int left=width;
-               while (left>0) {
-                  int count = stbi__get8(s), i;
-                  if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (mixed read count)");
-
-                  if (count >= 128) { // Repeated
-                     stbi_uc value[4];
-
-                     if (count==128)
-                        count = stbi__get16be(s);
-                     else
-                        count -= 127;
-                     if (count > left)
-                        return stbi__errpuc("bad file","scanline overrun");
-
-                     if (!stbi__readval(s,packet->channel,value))
-                        return 0;
-
-                     for(i=0;i<count;++i, dest += 4)
-                        stbi__copyval(packet->channel,dest,value);
-                  } else { // Raw
-                     ++count;
-                     if (count>left) return stbi__errpuc("bad file","scanline overrun");
-
-                     for(i=0;i<count;++i, dest+=4)
-                        if (!stbi__readval(s,packet->channel,dest))
-                           return 0;
-                  }
-                  left-=count;
-               }
-               break;
-            }
-         }
-      }
-   }
-
-   return result;
-}
-
-static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri)
-{
-   stbi_uc *result;
-   int i, x,y, internal_comp;
-   STBI_NOTUSED(ri);
-
-   if (!comp) comp = &internal_comp;
-
-   for (i=0; i<92; ++i)
-      stbi__get8(s);
-
-   x = stbi__get16be(s);
-   y = stbi__get16be(s);
-   if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (pic header)");
-   if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode");
-
-   stbi__get32be(s); //skip `ratio'
-   stbi__get16be(s); //skip `fields'
-   stbi__get16be(s); //skip `pad'
-
-   // intermediate buffer is RGBA
-   result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0);
-   memset(result, 0xff, x*y*4);
-
-   if (!stbi__pic_load_core(s,x,y,comp, result)) {
-      STBI_FREE(result);
-      result=0;
-   }
-   *px = x;
-   *py = y;
-   if (req_comp == 0) req_comp = *comp;
-   result=stbi__convert_format(result,4,req_comp,x,y);
-
-   return result;
-}
-
-static int stbi__pic_test(stbi__context *s)
-{
-   int r = stbi__pic_test_core(s);
-   stbi__rewind(s);
-   return r;
-}
-#endif
-
-// *************************************************************************************************
-// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb
-
-#ifndef STBI_NO_GIF
-typedef struct
-{
-   stbi__int16 prefix;
-   stbi_uc first;
-   stbi_uc suffix;
-} stbi__gif_lzw;
-
-typedef struct
-{
-   int w,h;
-   stbi_uc *out;                 // output buffer (always 4 components)
-   stbi_uc *background;          // The current "background" as far as a gif is concerned
-   stbi_uc *history; 
-   int flags, bgindex, ratio, transparent, eflags;
-   stbi_uc  pal[256][4];
-   stbi_uc lpal[256][4];
-   stbi__gif_lzw codes[8192];
-   stbi_uc *color_table;
-   int parse, step;
-   int lflags;
-   int start_x, start_y;
-   int max_x, max_y;
-   int cur_x, cur_y;
-   int line_size;
-   int delay;
-} stbi__gif;
-
-static int stbi__gif_test_raw(stbi__context *s)
-{
-   int sz;
-   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0;
-   sz = stbi__get8(s);
-   if (sz != '9' && sz != '7') return 0;
-   if (stbi__get8(s) != 'a') return 0;
-   return 1;
-}
-
-static int stbi__gif_test(stbi__context *s)
-{
-   int r = stbi__gif_test_raw(s);
-   stbi__rewind(s);
-   return r;
-}
-
-static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp)
-{
-   int i;
-   for (i=0; i < num_entries; ++i) {
-      pal[i][2] = stbi__get8(s);
-      pal[i][1] = stbi__get8(s);
-      pal[i][0] = stbi__get8(s);
-      pal[i][3] = transp == i ? 0 : 255;
-   }
-}
-
-static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info)
-{
-   stbi_uc version;
-   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8')
-      return stbi__err("not GIF", "Corrupt GIF");
-
-   version = stbi__get8(s);
-   if (version != '7' && version != '9')    return stbi__err("not GIF", "Corrupt GIF");
-   if (stbi__get8(s) != 'a')                return stbi__err("not GIF", "Corrupt GIF");
-
-   stbi__g_failure_reason = "";
-   g->w = stbi__get16le(s);
-   g->h = stbi__get16le(s);
-   g->flags = stbi__get8(s);
-   g->bgindex = stbi__get8(s);
-   g->ratio = stbi__get8(s);
-   g->transparent = -1;
-
-   if (comp != 0) *comp = 4;  // can't actually tell whether it's 3 or 4 until we parse the comments
-
-   if (is_info) return 1;
-
-   if (g->flags & 0x80)
-      stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1);
-
-   return 1;
-}
-
-static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp)
-{
-   stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif));
-   if (!stbi__gif_header(s, g, comp, 1)) {
-      STBI_FREE(g);
-      stbi__rewind( s );
-      return 0;
-   }
-   if (x) *x = g->w;
-   if (y) *y = g->h;
-   STBI_FREE(g);
-   return 1;
-}
-
-static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code)
-{
-   stbi_uc *p, *c;
-   int idx; 
-
-   // recurse to decode the prefixes, since the linked-list is backwards,
-   // and working backwards through an interleaved image would be nasty
-   if (g->codes[code].prefix >= 0)
-      stbi__out_gif_code(g, g->codes[code].prefix);
-
-   if (g->cur_y >= g->max_y) return;
-
-   idx = g->cur_x + g->cur_y; 
-   p = &g->out[idx];
-   g->history[idx / 4] = 1;  
-
-   c = &g->color_table[g->codes[code].suffix * 4];
-   if (c[3] > 128) { // don't render transparent pixels; 
-      p[0] = c[2];
-      p[1] = c[1];
-      p[2] = c[0];
-      p[3] = c[3];
-   }
-   g->cur_x += 4;
-
-   if (g->cur_x >= g->max_x) {
-      g->cur_x = g->start_x;
-      g->cur_y += g->step;
-
-      while (g->cur_y >= g->max_y && g->parse > 0) {
-         g->step = (1 << g->parse) * g->line_size;
-         g->cur_y = g->start_y + (g->step >> 1);
-         --g->parse;
-      }
-   }
-}
-
-static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
-{
-   stbi_uc lzw_cs;
-   stbi__int32 len, init_code;
-   stbi__uint32 first;
-   stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear;
-   stbi__gif_lzw *p;
-
-   lzw_cs = stbi__get8(s);
-   if (lzw_cs > 12) return NULL;
-   clear = 1 << lzw_cs;
-   first = 1;
-   codesize = lzw_cs + 1;
-   codemask = (1 << codesize) - 1;
-   bits = 0;
-   valid_bits = 0;
-   for (init_code = 0; init_code < clear; init_code++) {
-      g->codes[init_code].prefix = -1;
-      g->codes[init_code].first = (stbi_uc) init_code;
-      g->codes[init_code].suffix = (stbi_uc) init_code;
-   }
-
-   // support no starting clear code
-   avail = clear+2;
-   oldcode = -1;
-
-   len = 0;
-   for(;;) {
-      if (valid_bits < codesize) {
-         if (len == 0) {
-            len = stbi__get8(s); // start new block
-            if (len == 0)
-               return g->out;
-         }
-         --len;
-         bits |= (stbi__int32) stbi__get8(s) << valid_bits;
-         valid_bits += 8;
-      } else {
-         stbi__int32 code = bits & codemask;
-         bits >>= codesize;
-         valid_bits -= codesize;
-         // @OPTIMIZE: is there some way we can accelerate the non-clear path?
-         if (code == clear) {  // clear code
-            codesize = lzw_cs + 1;
-            codemask = (1 << codesize) - 1;
-            avail = clear + 2;
-            oldcode = -1;
-            first = 0;
-         } else if (code == clear + 1) { // end of stream code
-            stbi__skip(s, len);
-            while ((len = stbi__get8(s)) > 0)
-               stbi__skip(s,len);
-            return g->out;
-         } else if (code <= avail) {
-            if (first) {
-               return stbi__errpuc("no clear code", "Corrupt GIF");
-            }
-
-            if (oldcode >= 0) {
-               p = &g->codes[avail++];
-               if (avail > 8192) {
-                  return stbi__errpuc("too many codes", "Corrupt GIF");
-               }
-
-               p->prefix = (stbi__int16) oldcode;
-               p->first = g->codes[oldcode].first;
-               p->suffix = (code == avail) ? p->first : g->codes[code].first;
-            } else if (code == avail)
-               return stbi__errpuc("illegal code in raster", "Corrupt GIF");
-
-            stbi__out_gif_code(g, (stbi__uint16) code);
-
-            if ((avail & codemask) == 0 && avail <= 0x0FFF) {
-               codesize++;
-               codemask = (1 << codesize) - 1;
-            }
-
-            oldcode = code;
-         } else {
-            return stbi__errpuc("illegal code in raster", "Corrupt GIF");
-         }
-      }
-   }
-}
-
-// this function is designed to support animated gifs, although stb_image doesn't support it
-// two back is the image from two frames ago, used for a very specific disposal format
-static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back)
-{
-   int dispose; 
-   int first_frame; 
-   int pi; 
-   int pcount; 
-
-   // on first frame, any non-written pixels get the background colour (non-transparent)
-   first_frame = 0; 
-   if (g->out == 0) {
-      if (!stbi__gif_header(s, g, comp,0))     return 0; // stbi__g_failure_reason set by stbi__gif_header
-      g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h);
-      g->background = (stbi_uc *) stbi__malloc(4 * g->w * g->h); 
-      g->history = (stbi_uc *) stbi__malloc(g->w * g->h); 
-      if (g->out == 0)                      return stbi__errpuc("outofmem", "Out of memory");
-
-      // image is treated as "tranparent" at the start - ie, nothing overwrites the current background; 
-      // background colour is only used for pixels that are not rendered first frame, after that "background"
-      // color refers to teh color that was there the previous frame. 
-      memset( g->out, 0x00, 4 * g->w * g->h ); 
-      memset( g->background, 0x00, 4 * g->w * g->h ); // state of the background (starts transparent)
-      memset( g->history, 0x00, g->w * g->h );        // pixels that were affected previous frame
-      first_frame = 1; 
-   } else {
-      // second frame - how do we dispoase of the previous one?
-      dispose = (g->eflags & 0x1C) >> 2; 
-      pcount = g->w * g->h; 
-
-      if ((dispose == 3) && (two_back == 0)) {
-         dispose = 2; // if I don't have an image to revert back to, default to the old background
-      }
-
-      if (dispose == 3) { // use previous graphic
-         for (pi = 0; pi < pcount; ++pi) {
-            if (g->history[pi]) {
-               memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); 
-            }
-         }
-      } else if (dispose == 2) { 
-         // restore what was changed last frame to background before that frame; 
-         for (pi = 0; pi < pcount; ++pi) {
-            if (g->history[pi]) {
-               memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); 
-            }
-         }
-      } else {
-         // This is a non-disposal case eithe way, so just 
-         // leave the pixels as is, and they will become the new background
-         // 1: do not dispose
-         // 0:  not specified.
-      }
-
-      // background is what out is after the undoing of the previou frame; 
-      memcpy( g->background, g->out, 4 * g->w * g->h ); 
-   }
-
-   // clear my history; 
-   memset( g->history, 0x00, g->w * g->h );        // pixels that were affected previous frame
-
-   for (;;) {
-      int tag = stbi__get8(s); 
-      switch (tag) {
-         case 0x2C: /* Image Descriptor */
-         {
-            stbi__int32 x, y, w, h;
-            stbi_uc *o;
-
-            x = stbi__get16le(s);
-            y = stbi__get16le(s);
-            w = stbi__get16le(s);
-            h = stbi__get16le(s);
-            if (((x + w) > (g->w)) || ((y + h) > (g->h)))
-               return stbi__errpuc("bad Image Descriptor", "Corrupt GIF");
-
-            g->line_size = g->w * 4;
-            g->start_x = x * 4;
-            g->start_y = y * g->line_size;
-            g->max_x   = g->start_x + w * 4;
-            g->max_y   = g->start_y + h * g->line_size;
-            g->cur_x   = g->start_x;
-            g->cur_y   = g->start_y;
-
-            g->lflags = stbi__get8(s);
-
-            if (g->lflags & 0x40) {
-               g->step = 8 * g->line_size; // first interlaced spacing
-               g->parse = 3;
-            } else {
-               g->step = g->line_size;
-               g->parse = 0;
-            }
-
-            if (g->lflags & 0x80) {
-               stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1);
-               g->color_table = (stbi_uc *) g->lpal;
-            } else if (g->flags & 0x80) {
-               g->color_table = (stbi_uc *) g->pal;
-            } else
-               return stbi__errpuc("missing color table", "Corrupt GIF");            
-            
-            o = stbi__process_gif_raster(s, g);
-            if (o == NULL) return NULL;
-
-            // if this was the first frame, 
-            pcount = g->w * g->h; 
-            if (first_frame && (g->bgindex > 0)) {
-               // if first frame, any pixel not drawn to gets the background color
-               for (pi = 0; pi < pcount; ++pi) {
-                  if (g->history[pi] == 0) {
-                     g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; 
-                     memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); 
-                  }
-               }
-            }
-
-            return o;
-         }
-
-         case 0x21: // Comment Extension.
-         {
-            int len;
-            int ext = stbi__get8(s); 
-            if (ext == 0xF9) { // Graphic Control Extension.
-               len = stbi__get8(s);
-               if (len == 4) {
-                  g->eflags = stbi__get8(s);
-                  g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths.
-
-                  // unset old transparent
-                  if (g->transparent >= 0) {
-                     g->pal[g->transparent][3] = 255; 
-                  } 
-                  if (g->eflags & 0x01) {
-                     g->transparent = stbi__get8(s);
-                     if (g->transparent >= 0) {
-                        g->pal[g->transparent][3] = 0; 
-                     }
-                  } else {
-                     // don't need transparent
-                     stbi__skip(s, 1); 
-                     g->transparent = -1; 
-                  }
-               } else {
-                  stbi__skip(s, len);
-                  break;
-               }
-            } 
-            while ((len = stbi__get8(s)) != 0) {
-               stbi__skip(s, len);
-            }
-            break;
-         }
-
-         case 0x3B: // gif stream termination code
-            return (stbi_uc *) s; // using '1' causes warning on some compilers
-
-         default:
-            return stbi__errpuc("unknown code", "Corrupt GIF");
-      }
-   }
-}
-
-static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
-{
-   if (stbi__gif_test(s)) {
-      int layers = 0; 
-      stbi_uc *u = 0;
-      stbi_uc *out = 0;
-      stbi_uc *two_back = 0; 
-      stbi__gif g;
-      int stride; 
-      memset(&g, 0, sizeof(g));
-      if (delays) {
-         *delays = 0; 
-      }
-
-      do {
-         u = stbi__gif_load_next(s, &g, comp, req_comp, two_back);
-         if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
-
-         if (u) {
-            *x = g.w;
-            *y = g.h;
-            ++layers; 
-            stride = g.w * g.h * 4; 
-         
-            if (out) {
-               out = (stbi_uc*) STBI_REALLOC( out, layers * stride ); 
-               if (delays) {
-                  *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers ); 
-               }
-            } else {
-               out = (stbi_uc*)stbi__malloc( layers * stride ); 
-               if (delays) {
-                  *delays = (int*) stbi__malloc( layers * sizeof(int) ); 
-               }
-            }
-            memcpy( out + ((layers - 1) * stride), u, stride ); 
-            if (layers >= 2) {
-               two_back = out - 2 * stride; 
-            }
-
-            if (delays) {
-               (*delays)[layers - 1U] = g.delay; 
-            }
-         }
-      } while (u != 0); 
-
-      // free temp buffer; 
-      STBI_FREE(g.out); 
-      STBI_FREE(g.history); 
-      STBI_FREE(g.background); 
-
-      // do the final conversion after loading everything; 
-      if (req_comp && req_comp != 4)
-         out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h);
-
-      *z = layers; 
-      return out;
-   } else {
-      return stbi__errpuc("not GIF", "Image was not as a gif type."); 
-   }
-}
-
-static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   stbi_uc *u = 0;
-   stbi__gif g;
-   memset(&g, 0, sizeof(g));
-
-   u = stbi__gif_load_next(s, &g, comp, req_comp, 0);
-   if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
-   if (u) {
-      *x = g.w;
-      *y = g.h;
-
-      // moved conversion to after successful load so that the same
-      // can be done for multiple frames. 
-      if (req_comp && req_comp != 4)
-         u = stbi__convert_format(u, 4, req_comp, g.w, g.h);
-   }
-
-   // free buffers needed for multiple frame loading; 
-   STBI_FREE(g.history);
-   STBI_FREE(g.background); 
-
-   return u;
-}
-
-static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   return stbi__gif_info_raw(s,x,y,comp);
-}
-#endif
-
-// *************************************************************************************************
-// Radiance RGBE HDR loader
-// originally by Nicolas Schulz
-#ifndef STBI_NO_HDR
-static int stbi__hdr_test_core(stbi__context *s, const char *signature)
-{
-   int i;
-   for (i=0; signature[i]; ++i)
-      if (stbi__get8(s) != signature[i])
-          return 0;
-   stbi__rewind(s);
-   return 1;
-}
-
-static int stbi__hdr_test(stbi__context* s)
-{
-   int r = stbi__hdr_test_core(s, "#?RADIANCE\n");
-   stbi__rewind(s);
-   if(!r) {
-       r = stbi__hdr_test_core(s, "#?RGBE\n");
-       stbi__rewind(s);
-   }
-   return r;
-}
-
-#define STBI__HDR_BUFLEN  1024
-static char *stbi__hdr_gettoken(stbi__context *z, char *buffer)
-{
-   int len=0;
-   char c = '\0';
-
-   c = (char) stbi__get8(z);
-
-   while (!stbi__at_eof(z) && c != '\n') {
-      buffer[len++] = c;
-      if (len == STBI__HDR_BUFLEN-1) {
-         // flush to end of line
-         while (!stbi__at_eof(z) && stbi__get8(z) != '\n')
-            ;
-         break;
-      }
-      c = (char) stbi__get8(z);
-   }
-
-   buffer[len] = 0;
-   return buffer;
-}
-
-static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp)
-{
-   if ( input[3] != 0 ) {
-      float f1;
-      // Exponent
-      f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8));
-      if (req_comp <= 2)
-         output[0] = (input[0] + input[1] + input[2]) * f1 / 3;
-      else {
-         output[0] = input[0] * f1;
-         output[1] = input[1] * f1;
-         output[2] = input[2] * f1;
-      }
-      if (req_comp == 2) output[1] = 1;
-      if (req_comp == 4) output[3] = 1;
-   } else {
-      switch (req_comp) {
-         case 4: output[3] = 1; /* fallthrough */
-         case 3: output[0] = output[1] = output[2] = 0;
-                 break;
-         case 2: output[1] = 1; /* fallthrough */
-         case 1: output[0] = 0;
-                 break;
-      }
-   }
-}
-
-static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   char buffer[STBI__HDR_BUFLEN];
-   char *token;
-   int valid = 0;
-   int width, height;
-   stbi_uc *scanline;
-   float *hdr_data;
-   int len;
-   unsigned char count, value;
-   int i, j, k, c1,c2, z;
-   const char *headerToken;
-   STBI_NOTUSED(ri);
-
-   // Check identifier
-   headerToken = stbi__hdr_gettoken(s,buffer);
-   if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0)
-      return stbi__errpf("not HDR", "Corrupt HDR image");
-
-   // Parse header
-   for(;;) {
-      token = stbi__hdr_gettoken(s,buffer);
-      if (token[0] == 0) break;
-      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
-   }
-
-   if (!valid)    return stbi__errpf("unsupported format", "Unsupported HDR format");
-
-   // Parse width and height
-   // can't use sscanf() if we're not using stdio!
-   token = stbi__hdr_gettoken(s,buffer);
-   if (strncmp(token, "-Y ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
-   token += 3;
-   height = (int) strtol(token, &token, 10);
-   while (*token == ' ') ++token;
-   if (strncmp(token, "+X ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
-   token += 3;
-   width = (int) strtol(token, NULL, 10);
-
-   *x = width;
-   *y = height;
-
-   if (comp) *comp = 3;
-   if (req_comp == 0) req_comp = 3;
-
-   if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0))
-      return stbi__errpf("too large", "HDR image is too large");
-
-   // Read data
-   hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0);
-   if (!hdr_data)
-      return stbi__errpf("outofmem", "Out of memory");
-
-   // Load image data
-   // image data is stored as some number of sca
-   if ( width < 8 || width >= 32768) {
-      // Read flat data
-      for (j=0; j < height; ++j) {
-         for (i=0; i < width; ++i) {
-            stbi_uc rgbe[4];
-           main_decode_loop:
-            stbi__getn(s, rgbe, 4);
-            stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp);
-         }
-      }
-   } else {
-      // Read RLE-encoded data
-      scanline = NULL;
-
-      for (j = 0; j < height; ++j) {
-         c1 = stbi__get8(s);
-         c2 = stbi__get8(s);
-         len = stbi__get8(s);
-         if (c1 != 2 || c2 != 2 || (len & 0x80)) {
-            // not run-length encoded, so we have to actually use THIS data as a decoded
-            // pixel (note this can't be a valid pixel--one of RGB must be >= 128)
-            stbi_uc rgbe[4];
-            rgbe[0] = (stbi_uc) c1;
-            rgbe[1] = (stbi_uc) c2;
-            rgbe[2] = (stbi_uc) len;
-            rgbe[3] = (stbi_uc) stbi__get8(s);
-            stbi__hdr_convert(hdr_data, rgbe, req_comp);
-            i = 1;
-            j = 0;
-            STBI_FREE(scanline);
-            goto main_decode_loop; // yes, this makes no sense
-         }
-         len <<= 8;
-         len |= stbi__get8(s);
-         if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); }
-         if (scanline == NULL) {
-            scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0);
-            if (!scanline) {
-               STBI_FREE(hdr_data);
-               return stbi__errpf("outofmem", "Out of memory");
-            }
-         }
-
-         for (k = 0; k < 4; ++k) {
-            int nleft;
-            i = 0;
-            while ((nleft = width - i) > 0) {
-               count = stbi__get8(s);
-               if (count > 128) {
-                  // Run
-                  value = stbi__get8(s);
-                  count -= 128;
-                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
-                  for (z = 0; z < count; ++z)
-                     scanline[i++ * 4 + k] = value;
-               } else {
-                  // Dump
-                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
-                  for (z = 0; z < count; ++z)
-                     scanline[i++ * 4 + k] = stbi__get8(s);
-               }
-            }
-         }
-         for (i=0; i < width; ++i)
-            stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp);
-      }
-      if (scanline)
-         STBI_FREE(scanline);
-   }
-
-   return hdr_data;
-}
-
-static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   char buffer[STBI__HDR_BUFLEN];
-   char *token;
-   int valid = 0;
-   int dummy;
-
-   if (!x) x = &dummy;
-   if (!y) y = &dummy;
-   if (!comp) comp = &dummy;
-
-   if (stbi__hdr_test(s) == 0) {
-       stbi__rewind( s );
-       return 0;
-   }
-
-   for(;;) {
-      token = stbi__hdr_gettoken(s,buffer);
-      if (token[0] == 0) break;
-      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
-   }
-
-   if (!valid) {
-       stbi__rewind( s );
-       return 0;
-   }
-   token = stbi__hdr_gettoken(s,buffer);
-   if (strncmp(token, "-Y ", 3)) {
-       stbi__rewind( s );
-       return 0;
-   }
-   token += 3;
-   *y = (int) strtol(token, &token, 10);
-   while (*token == ' ') ++token;
-   if (strncmp(token, "+X ", 3)) {
-       stbi__rewind( s );
-       return 0;
-   }
-   token += 3;
-   *x = (int) strtol(token, NULL, 10);
-   *comp = 3;
-   return 1;
-}
-#endif // STBI_NO_HDR
-
-#ifndef STBI_NO_BMP
-static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   void *p;
-   stbi__bmp_data info;
-
-   info.all_a = 255;
-   p = stbi__bmp_parse_header(s, &info);
-   stbi__rewind( s );
-   if (p == NULL)
-      return 0;
-   if (x) *x = s->img_x;
-   if (y) *y = s->img_y;
-   if (comp) *comp = info.ma ? 4 : 3;
-   return 1;
-}
-#endif
-
-#ifndef STBI_NO_PSD
-static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   int channelCount, dummy, depth;
-   if (!x) x = &dummy;
-   if (!y) y = &dummy;
-   if (!comp) comp = &dummy;
-   if (stbi__get32be(s) != 0x38425053) {
-       stbi__rewind( s );
-       return 0;
-   }
-   if (stbi__get16be(s) != 1) {
-       stbi__rewind( s );
-       return 0;
-   }
-   stbi__skip(s, 6);
-   channelCount = stbi__get16be(s);
-   if (channelCount < 0 || channelCount > 16) {
-       stbi__rewind( s );
-       return 0;
-   }
-   *y = stbi__get32be(s);
-   *x = stbi__get32be(s);
-   depth = stbi__get16be(s);
-   if (depth != 8 && depth != 16) {
-       stbi__rewind( s );
-       return 0;
-   }
-   if (stbi__get16be(s) != 3) {
-       stbi__rewind( s );
-       return 0;
-   }
-   *comp = 4;
-   return 1;
-}
-
-static int stbi__psd_is16(stbi__context *s)
-{
-   int channelCount, depth;
-   if (stbi__get32be(s) != 0x38425053) {
-       stbi__rewind( s );
-       return 0;
-   }
-   if (stbi__get16be(s) != 1) {
-       stbi__rewind( s );
-       return 0;
-   }
-   stbi__skip(s, 6);
-   channelCount = stbi__get16be(s);
-   if (channelCount < 0 || channelCount > 16) {
-       stbi__rewind( s );
-       return 0;
-   }
-   (void) stbi__get32be(s);
-   (void) stbi__get32be(s);
-   depth = stbi__get16be(s);
-   if (depth != 16) {
-       stbi__rewind( s );
-       return 0;
-   }
-   return 1;
-}
-#endif
-
-#ifndef STBI_NO_PIC
-static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   int act_comp=0,num_packets=0,chained,dummy;
-   stbi__pic_packet packets[10];
-
-   if (!x) x = &dummy;
-   if (!y) y = &dummy;
-   if (!comp) comp = &dummy;
-
-   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) {
-      stbi__rewind(s);
-      return 0;
-   }
-
-   stbi__skip(s, 88);
-
-   *x = stbi__get16be(s);
-   *y = stbi__get16be(s);
-   if (stbi__at_eof(s)) {
-      stbi__rewind( s);
-      return 0;
-   }
-   if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) {
-      stbi__rewind( s );
-      return 0;
-   }
-
-   stbi__skip(s, 8);
-
-   do {
-      stbi__pic_packet *packet;
-
-      if (num_packets==sizeof(packets)/sizeof(packets[0]))
-         return 0;
-
-      packet = &packets[num_packets++];
-      chained = stbi__get8(s);
-      packet->size    = stbi__get8(s);
-      packet->type    = stbi__get8(s);
-      packet->channel = stbi__get8(s);
-      act_comp |= packet->channel;
-
-      if (stbi__at_eof(s)) {
-          stbi__rewind( s );
-          return 0;
-      }
-      if (packet->size != 8) {
-          stbi__rewind( s );
-          return 0;
-      }
-   } while (chained);
-
-   *comp = (act_comp & 0x10 ? 4 : 3);
-
-   return 1;
-}
-#endif
-
-// *************************************************************************************************
-// Portable Gray Map and Portable Pixel Map loader
-// by Ken Miller
-//
-// PGM: http://netpbm.sourceforge.net/doc/pgm.html
-// PPM: http://netpbm.sourceforge.net/doc/ppm.html
-//
-// Known limitations:
-//    Does not support comments in the header section
-//    Does not support ASCII image data (formats P2 and P3)
-//    Does not support 16-bit-per-channel
-
-#ifndef STBI_NO_PNM
-
-static int      stbi__pnm_test(stbi__context *s)
-{
-   char p, t;
-   p = (char) stbi__get8(s);
-   t = (char) stbi__get8(s);
-   if (p != 'P' || (t != '5' && t != '6')) {
-       stbi__rewind( s );
-       return 0;
-   }
-   return 1;
-}
-
-static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
-{
-   stbi_uc *out;
-   STBI_NOTUSED(ri);
-
-   if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n))
-      return 0;
-
-   *x = s->img_x;
-   *y = s->img_y;
-   if (comp) *comp = s->img_n;
-
-   if (!stbi__mad3sizes_valid(s->img_n, s->img_x, s->img_y, 0))
-      return stbi__errpuc("too large", "PNM too large");
-
-   out = (stbi_uc *) stbi__malloc_mad3(s->img_n, s->img_x, s->img_y, 0);
-   if (!out) return stbi__errpuc("outofmem", "Out of memory");
-   stbi__getn(s, out, s->img_n * s->img_x * s->img_y);
-
-   if (req_comp && req_comp != s->img_n) {
-      out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
-      if (out == NULL) return out; // stbi__convert_format frees input on failure
-   }
-   return out;
-}
-
-static int      stbi__pnm_isspace(char c)
-{
-   return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
-}
-
-static void     stbi__pnm_skip_whitespace(stbi__context *s, char *c)
-{
-   for (;;) {
-      while (!stbi__at_eof(s) && stbi__pnm_isspace(*c))
-         *c = (char) stbi__get8(s);
-
-      if (stbi__at_eof(s) || *c != '#')
-         break;
-
-      while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' )
-         *c = (char) stbi__get8(s);
-   }
-}
-
-static int      stbi__pnm_isdigit(char c)
-{
-   return c >= '0' && c <= '9';
-}
-
-static int      stbi__pnm_getinteger(stbi__context *s, char *c)
-{
-   int value = 0;
-
-   while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) {
-      value = value*10 + (*c - '0');
-      *c = (char) stbi__get8(s);
-   }
-
-   return value;
-}
-
-static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp)
-{
-   int maxv, dummy;
-   char c, p, t;
-
-   if (!x) x = &dummy;
-   if (!y) y = &dummy;
-   if (!comp) comp = &dummy;
-
-   stbi__rewind(s);
-
-   // Get identifier
-   p = (char) stbi__get8(s);
-   t = (char) stbi__get8(s);
-   if (p != 'P' || (t != '5' && t != '6')) {
-       stbi__rewind(s);
-       return 0;
-   }
-
-   *comp = (t == '6') ? 3 : 1;  // '5' is 1-component .pgm; '6' is 3-component .ppm
-
-   c = (char) stbi__get8(s);
-   stbi__pnm_skip_whitespace(s, &c);
-
-   *x = stbi__pnm_getinteger(s, &c); // read width
-   stbi__pnm_skip_whitespace(s, &c);
-
-   *y = stbi__pnm_getinteger(s, &c); // read height
-   stbi__pnm_skip_whitespace(s, &c);
-
-   maxv = stbi__pnm_getinteger(s, &c);  // read max value
-
-   if (maxv > 255)
-      return stbi__err("max value > 255", "PPM image not 8-bit");
-   else
-      return 1;
-}
-#endif
-
-static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp)
-{
-   #ifndef STBI_NO_JPEG
-   if (stbi__jpeg_info(s, x, y, comp)) return 1;
-   #endif
-
-   #ifndef STBI_NO_PNG
-   if (stbi__png_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_GIF
-   if (stbi__gif_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_BMP
-   if (stbi__bmp_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_PSD
-   if (stbi__psd_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_PIC
-   if (stbi__pic_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_PNM
-   if (stbi__pnm_info(s, x, y, comp))  return 1;
-   #endif
-
-   #ifndef STBI_NO_HDR
-   if (stbi__hdr_info(s, x, y, comp))  return 1;
-   #endif
-
-   // test tga last because it's a crappy test!
-   #ifndef STBI_NO_TGA
-   if (stbi__tga_info(s, x, y, comp))
-       return 1;
-   #endif
-   return stbi__err("unknown image type", "Image not of any known type, or corrupt");
-}
-
-static int stbi__is_16_main(stbi__context *s)
-{
-   #ifndef STBI_NO_PNG
-   if (stbi__png_is16(s))  return 1;
-   #endif
-
-   #ifndef STBI_NO_PSD
-   if (stbi__psd_is16(s))  return 1;
-   #endif
-
-   return 0;
-}
-
-#ifndef STBI_NO_STDIO
-STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp)
-{
-    FILE *f = stbi__fopen(filename, "rb");
-    int result;
-    if (!f) return stbi__err("can't fopen", "Unable to open file");
-    result = stbi_info_from_file(f, x, y, comp);
-    fclose(f);
-    return result;
-}
-
-STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp)
-{
-   int r;
-   stbi__context s;
-   long pos = ftell(f);
-   stbi__start_file(&s, f);
-   r = stbi__info_main(&s,x,y,comp);
-   fseek(f,pos,SEEK_SET);
-   return r;
-}
-
-STBIDEF int stbi_is_16_bit(char const *filename)
-{
-    FILE *f = stbi__fopen(filename, "rb");
-    int result;
-    if (!f) return stbi__err("can't fopen", "Unable to open file");
-    result = stbi_is_16_bit_from_file(f);
-    fclose(f);
-    return result;
-}
-
-STBIDEF int stbi_is_16_bit_from_file(FILE *f)
-{
-   int r;
-   stbi__context s;
-   long pos = ftell(f);
-   stbi__start_file(&s, f);
-   r = stbi__is_16_main(&s);
-   fseek(f,pos,SEEK_SET);
-   return r;
-}
-#endif // !STBI_NO_STDIO
-
-STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__info_main(&s,x,y,comp);
-}
-
-STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
-   return stbi__info_main(&s,x,y,comp);
-}
-
-STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len)
-{
-   stbi__context s;
-   stbi__start_mem(&s,buffer,len);
-   return stbi__is_16_main(&s);
-}
-
-STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user)
-{
-   stbi__context s;
-   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
-   return stbi__is_16_main(&s);
-}
-
-#endif // STB_IMAGE_IMPLEMENTATION
-
-/*
-   revision history:
-      2.19  (2018-02-11) fix warning
-      2.18  (2018-01-30) fix warnings
-      2.17  (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug
-                         1-bit BMP
-                         *_is_16_bit api
-                         avoid warnings
-      2.16  (2017-07-23) all functions have 16-bit variants;
-                         STBI_NO_STDIO works again;
-                         compilation fixes;
-                         fix rounding in unpremultiply;
-                         optimize vertical flip;
-                         disable raw_len validation;
-                         documentation fixes
-      2.15  (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode;
-                         warning fixes; disable run-time SSE detection on gcc;
-                         uniform handling of optional "return" values;
-                         thread-safe initialization of zlib tables
-      2.14  (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
-      2.13  (2016-11-29) add 16-bit API, only supported for PNG right now
-      2.12  (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
-      2.11  (2016-04-02) allocate large structures on the stack
-                         remove white matting for transparent PSD
-                         fix reported channel count for PNG & BMP
-                         re-enable SSE2 in non-gcc 64-bit
-                         support RGB-formatted JPEG
-                         read 16-bit PNGs (only as 8-bit)
-      2.10  (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED
-      2.09  (2016-01-16) allow comments in PNM files
-                         16-bit-per-pixel TGA (not bit-per-component)
-                         info() for TGA could break due to .hdr handling
-                         info() for BMP to shares code instead of sloppy parse
-                         can use STBI_REALLOC_SIZED if allocator doesn't support realloc
-                         code cleanup
-      2.08  (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA
-      2.07  (2015-09-13) fix compiler warnings
-                         partial animated GIF support
-                         limited 16-bpc PSD support
-                         #ifdef unused functions
-                         bug with < 92 byte PIC,PNM,HDR,TGA
-      2.06  (2015-04-19) fix bug where PSD returns wrong '*comp' value
-      2.05  (2015-04-19) fix bug in progressive JPEG handling, fix warning
-      2.04  (2015-04-15) try to re-enable SIMD on MinGW 64-bit
-      2.03  (2015-04-12) extra corruption checking (mmozeiko)
-                         stbi_set_flip_vertically_on_load (nguillemot)
-                         fix NEON support; fix mingw support
-      2.02  (2015-01-19) fix incorrect assert, fix warning
-      2.01  (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2
-      2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG
-      2.00  (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg)
-                         progressive JPEG (stb)
-                         PGM/PPM support (Ken Miller)
-                         STBI_MALLOC,STBI_REALLOC,STBI_FREE
-                         GIF bugfix -- seemingly never worked
-                         STBI_NO_*, STBI_ONLY_*
-      1.48  (2014-12-14) fix incorrectly-named assert()
-      1.47  (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb)
-                         optimize PNG (ryg)
-                         fix bug in interlaced PNG with user-specified channel count (stb)
-      1.46  (2014-08-26)
-              fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG
-      1.45  (2014-08-16)
-              fix MSVC-ARM internal compiler error by wrapping malloc
-      1.44  (2014-08-07)
-              various warning fixes from Ronny Chevalier
-      1.43  (2014-07-15)
-              fix MSVC-only compiler problem in code changed in 1.42
-      1.42  (2014-07-09)
-              don't define _CRT_SECURE_NO_WARNINGS (affects user code)
-              fixes to stbi__cleanup_jpeg path
-              added STBI_ASSERT to avoid requiring assert.h
-      1.41  (2014-06-25)
-              fix search&replace from 1.36 that messed up comments/error messages
-      1.40  (2014-06-22)
-              fix gcc struct-initialization warning
-      1.39  (2014-06-15)
-              fix to TGA optimization when req_comp != number of components in TGA;
-              fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite)
-              add support for BMP version 5 (more ignored fields)
-      1.38  (2014-06-06)
-              suppress MSVC warnings on integer casts truncating values
-              fix accidental rename of 'skip' field of I/O
-      1.37  (2014-06-04)
-              remove duplicate typedef
-      1.36  (2014-06-03)
-              convert to header file single-file library
-              if de-iphone isn't set, load iphone images color-swapped instead of returning NULL
-      1.35  (2014-05-27)
-              various warnings
-              fix broken STBI_SIMD path
-              fix bug where stbi_load_from_file no longer left file pointer in correct place
-              fix broken non-easy path for 32-bit BMP (possibly never used)
-              TGA optimization by Arseny Kapoulkine
-      1.34  (unknown)
-              use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case
-      1.33  (2011-07-14)
-              make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements
-      1.32  (2011-07-13)
-              support for "info" function for all supported filetypes (SpartanJ)
-      1.31  (2011-06-20)
-              a few more leak fixes, bug in PNG handling (SpartanJ)
-      1.30  (2011-06-11)
-              added ability to load files via callbacks to accomidate custom input streams (Ben Wenger)
-              removed deprecated format-specific test/load functions
-              removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway
-              error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha)
-              fix inefficiency in decoding 32-bit BMP (David Woo)
-      1.29  (2010-08-16)
-              various warning fixes from Aurelien Pocheville
-      1.28  (2010-08-01)
-              fix bug in GIF palette transparency (SpartanJ)
-      1.27  (2010-08-01)
-              cast-to-stbi_uc to fix warnings
-      1.26  (2010-07-24)
-              fix bug in file buffering for PNG reported by SpartanJ
-      1.25  (2010-07-17)
-              refix trans_data warning (Won Chun)
-      1.24  (2010-07-12)
-              perf improvements reading from files on platforms with lock-heavy fgetc()
-              minor perf improvements for jpeg
-              deprecated type-specific functions so we'll get feedback if they're needed
-              attempt to fix trans_data warning (Won Chun)
-      1.23    fixed bug in iPhone support
-      1.22  (2010-07-10)
-              removed image *writing* support
-              stbi_info support from Jetro Lauha
-              GIF support from Jean-Marc Lienher
-              iPhone PNG-extensions from James Brown
-              warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva)
-      1.21    fix use of 'stbi_uc' in header (reported by jon blow)
-      1.20    added support for Softimage PIC, by Tom Seddon
-      1.19    bug in interlaced PNG corruption check (found by ryg)
-      1.18  (2008-08-02)
-              fix a threading bug (local mutable static)
-      1.17    support interlaced PNG
-      1.16    major bugfix - stbi__convert_format converted one too many pixels
-      1.15    initialize some fields for thread safety
-      1.14    fix threadsafe conversion bug
-              header-file-only version (#define STBI_HEADER_FILE_ONLY before including)
-      1.13    threadsafe
-      1.12    const qualifiers in the API
-      1.11    Support installable IDCT, colorspace conversion routines
-      1.10    Fixes for 64-bit (don't use "unsigned long")
-              optimized upsampling by Fabian "ryg" Giesen
-      1.09    Fix format-conversion for PSD code (bad global variables!)
-      1.08    Thatcher Ulrich's PSD code integrated by Nicolas Schulz
-      1.07    attempt to fix C++ warning/errors again
-      1.06    attempt to fix C++ warning/errors again
-      1.05    fix TGA loading to return correct *comp and use good luminance calc
-      1.04    default float alpha is 1, not 255; use 'void *' for stbi_image_free
-      1.03    bugfixes to STBI_NO_STDIO, STBI_NO_HDR
-      1.02    support for (subset of) HDR files, float interface for preferred access to them
-      1.01    fix bug: possible bug in handling right-side up bmps... not sure
-              fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all
-      1.00    interface to zlib that skips zlib header
-      0.99    correct handling of alpha in palette
-      0.98    TGA loader by lonesock; dynamically add loaders (untested)
-      0.97    jpeg errors on too large a file; also catch another malloc failure
-      0.96    fix detection of invalid v value - particleman@mollyrocket forum
-      0.95    during header scan, seek to markers in case of padding
-      0.94    STBI_NO_STDIO to disable stdio usage; rename all #defines the same
-      0.93    handle jpegtran output; verbose errors
-      0.92    read 4,8,16,24,32-bit BMP files of several formats
-      0.91    output 24-bit Windows 3.0 BMP files
-      0.90    fix a few more warnings; bump version number to approach 1.0
-      0.61    bugfixes due to Marc LeBlanc, Christopher Lloyd
-      0.60    fix compiling as c++
-      0.59    fix warnings: merge Dave Moore's -Wall fixes
-      0.58    fix bug: zlib uncompressed mode len/nlen was wrong endian
-      0.57    fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available
-      0.56    fix bug: zlib uncompressed mode len vs. nlen
-      0.55    fix bug: restart_interval not initialized to 0
-      0.54    allow NULL for 'int *comp'
-      0.53    fix bug in png 3->4; speedup png decoding
-      0.52    png handles req_comp=3,4 directly; minor cleanup; jpeg comments
-      0.51    obey req_comp requests, 1-component jpegs return as 1-component,
-              on 'test' only check type, not whether we support this variant
-      0.50  (2006-11-19)
-              first released version
-*/
-
-
-/*
-------------------------------------------------------------------------------
-This software is available under 2 licenses -- choose whichever you prefer.
-------------------------------------------------------------------------------
-ALTERNATIVE A - MIT License
-Copyright (c) 2017 Sean Barrett
-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.
-------------------------------------------------------------------------------
-ALTERNATIVE B - Public Domain (www.unlicense.org)
-This is free and unencumbered software released into the public domain.
-Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
-software, either in source code form or as a compiled binary, for any purpose,
-commercial or non-commercial, and by any means.
-In jurisdictions that recognize copyright laws, the author or authors of this
-software dedicate any and all copyright interest in the software to the public
-domain. We make this dedication for the benefit of the public at large and to
-the detriment of our heirs and successors. We intend this dedication to be an
-overt act of relinquishment in perpetuity of all present and future rights to
-this software under copyright law.
-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 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.
-------------------------------------------------------------------------------
+/* stb_image - v2.19 - public domain image loader - http://nothings.org/stb
+                                  no warranty implied; use at your own risk
+
+   Do this:
+      #define STB_IMAGE_IMPLEMENTATION
+   before you include this file in *one* C or C++ file to create the implementation.
+
+   // i.e. it should look like this:
+   #include ...
+   #include ...
+   #include ...
+   #define STB_IMAGE_IMPLEMENTATION
+   #include "stb_image.h"
+
+   You can #define STBI_ASSERT(x) before the #include to avoid using assert.h.
+   And #define STBI_MALLOC, STBI_REALLOC, and STBI_FREE to avoid using malloc,realloc,free
+
+
+   QUICK NOTES:
+      Primarily of interest to game developers and other people who can
+          avoid problematic images and only need the trivial interface
+
+      JPEG baseline & progressive (12 bpc/arithmetic not supported, same as stock IJG lib)
+      PNG 1/2/4/8/16-bit-per-channel
+
+      TGA (not sure what subset, if a subset)
+      BMP non-1bpp, non-RLE
+      PSD (composited view only, no extra channels, 8/16 bit-per-channel)
+
+      GIF (*comp always reports as 4-channel)
+      HDR (radiance rgbE format)
+      PIC (Softimage PIC)
+      PNM (PPM and PGM binary only)
+
+      Animated GIF still needs a proper API, but here's one way to do it:
+          http://gist.github.com/urraka/685d9a6340b26b830d49
+
+      - decode from memory or through FILE (define STBI_NO_STDIO to remove code)
+      - decode from arbitrary I/O callbacks
+      - SIMD acceleration on x86/x64 (SSE2) and ARM (NEON)
+
+   Full documentation under "DOCUMENTATION" below.
+
+
+LICENSE
+
+  See end of file for license information.
+
+RECENT REVISION HISTORY:
+
+      2.19  (2018-02-11) fix warning
+      2.18  (2018-01-30) fix warnings
+      2.17  (2018-01-29) bugfix, 1-bit BMP, 16-bitness query, fix warnings
+      2.16  (2017-07-23) all functions have 16-bit variants; optimizations; bugfixes
+      2.15  (2017-03-18) fix png-1,2,4; all Imagenet JPGs; no runtime SSE detection on GCC
+      2.14  (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
+      2.13  (2016-12-04) experimental 16-bit API, only for PNG so far; fixes
+      2.12  (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
+      2.11  (2016-04-02) 16-bit PNGS; enable SSE2 in non-gcc x64
+                         RGB-format JPEG; remove white matting in PSD;
+                         allocate large structures on the stack;
+                         correct channel count for PNG & BMP
+      2.10  (2016-01-22) avoid warning introduced in 2.09
+      2.09  (2016-01-16) 16-bit TGA; comments in PNM files; STBI_REALLOC_SIZED
+
+   See end of file for full revision history.
+
+
+ ============================    Contributors    =========================
+
+ Image formats                          Extensions, features
+    Sean Barrett (jpeg, png, bmp)          Jetro Lauha (stbi_info)
+    Nicolas Schulz (hdr, psd)              Martin "SpartanJ" Golini (stbi_info)
+    Jonathan Dummer (tga)                  James "moose2000" Brown (iPhone PNG)
+    Jean-Marc Lienher (gif)                Ben "Disch" Wenger (io callbacks)
+    Tom Seddon (pic)                       Omar Cornut (1/2/4-bit PNG)
+    Thatcher Ulrich (psd)                  Nicolas Guillemot (vertical flip)
+    Ken Miller (pgm, ppm)                  Richard Mitton (16-bit PSD)
+    github:urraka (animated gif)           Junggon Kim (PNM comments)
+    Christopher Forseth (animated gif)     Daniel Gibson (16-bit TGA)
+                                           socks-the-fox (16-bit PNG)
+                                           Jeremy Sawicki (handle all ImageNet JPGs)
+ Optimizations & bugfixes                  Mikhail Morozov (1-bit BMP)
+    Fabian "ryg" Giesen                    Anael Seghezzi (is-16-bit query)
+    Arseny Kapoulkine
+    John-Mark Allen
+
+ Bug & warning fixes
+    Marc LeBlanc            David Woo          Guillaume George   Martins Mozeiko
+    Christpher Lloyd        Jerry Jansson      Joseph Thomson     Phil Jordan
+    Dave Moore              Roy Eltham         Hayaki Saito       Nathan Reed
+    Won Chun                Luke Graham        Johan Duparc       Nick Verigakis
+    the Horde3D community   Thomas Ruf         Ronny Chevalier    github:rlyeh
+    Janez Zemva             John Bartholomew   Michal Cichon      github:romigrou
+    Jonathan Blow           Ken Hamada         Tero Hanninen      github:svdijk
+    Laurent Gomila          Cort Stratton      Sergio Gonzalez    github:snagar
+    Aruelien Pocheville     Thibault Reuille   Cass Everitt       github:Zelex
+    Ryamond Barbiero        Paul Du Bois       Engin Manap        github:grim210
+    Aldo Culquicondor       Philipp Wiesemann  Dale Weiler        github:sammyhw
+    Oriol Ferrer Mesia      Josh Tobin         Matthew Gregan     github:phprus
+    Julian Raschke          Gregory Mullen     Baldur Karlsson    github:poppolopoppo
+    Christian Floisand      Kevin Schmidt                         github:darealshinji
+    Blazej Dariusz Roszkowski                                     github:Michaelangel007
+*/
+
+#ifndef STBI_INCLUDE_STB_IMAGE_H
+#define STBI_INCLUDE_STB_IMAGE_H
+
+// DOCUMENTATION
+//
+// Limitations:
+//    - no 12-bit-per-channel JPEG
+//    - no JPEGs with arithmetic coding
+//    - GIF always returns *comp=4
+//
+// Basic usage (see HDR discussion below for HDR usage):
+//    int x,y,n;
+//    unsigned char *data = stbi_load(filename, &x, &y, &n, 0);
+//    // ... process data if not NULL ...
+//    // ... x = width, y = height, n = # 8-bit components per pixel ...
+//    // ... replace '0' with '1'..'4' to force that many components per pixel
+//    // ... but 'n' will always be the number that it would have been if you said 0
+//    stbi_image_free(data)
+//
+// Standard parameters:
+//    int *x                 -- outputs image width in pixels
+//    int *y                 -- outputs image height in pixels
+//    int *channels_in_file  -- outputs # of image components in image file
+//    int desired_channels   -- if non-zero, # of image components requested in result
+//
+// The return value from an image loader is an 'unsigned char *' which points
+// to the pixel data, or NULL on an allocation failure or if the image is
+// corrupt or invalid. The pixel data consists of *y scanlines of *x pixels,
+// with each pixel consisting of N interleaved 8-bit components; the first
+// pixel pointed to is top-left-most in the image. There is no padding between
+// image scanlines or between pixels, regardless of format. The number of
+// components N is 'desired_channels' if desired_channels is non-zero, or
+// *channels_in_file otherwise. If desired_channels is non-zero,
+// *channels_in_file has the number of components that _would_ have been
+// output otherwise. E.g. if you set desired_channels to 4, you will always
+// get RGBA output, but you can check *channels_in_file to see if it's trivially
+// opaque because e.g. there were only 3 channels in the source image.
+//
+// An output image with N components has the following components interleaved
+// in this order in each pixel:
+//
+//     N=#comp     components
+//       1           grey
+//       2           grey, alpha
+//       3           red, green, blue
+//       4           red, green, blue, alpha
+//
+// If image loading fails for any reason, the return value will be NULL,
+// and *x, *y, *channels_in_file will be unchanged. The function
+// stbi_failure_reason() can be queried for an extremely brief, end-user
+// unfriendly explanation of why the load failed. Define STBI_NO_FAILURE_STRINGS
+// to avoid compiling these strings at all, and STBI_FAILURE_USERMSG to get slightly
+// more user-friendly ones.
+//
+// Paletted PNG, BMP, GIF, and PIC images are automatically depalettized.
+//
+// ===========================================================================
+//
+// Philosophy
+//
+// stb libraries are designed with the following priorities:
+//
+//    1. easy to use
+//    2. easy to maintain
+//    3. good performance
+//
+// Sometimes I let "good performance" creep up in priority over "easy to maintain",
+// and for best performance I may provide less-easy-to-use APIs that give higher
+// performance, in addition to the easy to use ones. Nevertheless, it's important
+// to keep in mind that from the standpoint of you, a client of this library,
+// all you care about is #1 and #3, and stb libraries DO NOT emphasize #3 above all.
+//
+// Some secondary priorities arise directly from the first two, some of which
+// make more explicit reasons why performance can't be emphasized.
+//
+//    - Portable ("ease of use")
+//    - Small source code footprint ("easy to maintain")
+//    - No dependencies ("ease of use")
+//
+// ===========================================================================
+//
+// I/O callbacks
+//
+// I/O callbacks allow you to read from arbitrary sources, like packaged
+// files or some other source. Data read from callbacks are processed
+// through a small internal buffer (currently 128 bytes) to try to reduce
+// overhead.
+//
+// The three functions you must define are "read" (reads some bytes of data),
+// "skip" (skips some bytes of data), "eof" (reports if the stream is at the end).
+//
+// ===========================================================================
+//
+// SIMD support
+//
+// The JPEG decoder will try to automatically use SIMD kernels on x86 when
+// supported by the compiler. For ARM Neon support, you must explicitly
+// request it.
+//
+// (The old do-it-yourself SIMD API is no longer supported in the current
+// code.)
+//
+// On x86, SSE2 will automatically be used when available based on a run-time
+// test; if not, the generic C versions are used as a fall-back. On ARM targets,
+// the typical path is to have separate builds for NEON and non-NEON devices
+// (at least this is true for iOS and Android). Therefore, the NEON support is
+// toggled by a build flag: define STBI_NEON to get NEON loops.
+//
+// If for some reason you do not want to use any of SIMD code, or if
+// you have issues compiling it, you can disable it entirely by
+// defining STBI_NO_SIMD.
+//
+// ===========================================================================
+//
+// HDR image support   (disable by defining STBI_NO_HDR)
+//
+// stb_image now supports loading HDR images in general, and currently
+// the Radiance .HDR file format, although the support is provided
+// generically. You can still load any file through the existing interface;
+// if you attempt to load an HDR file, it will be automatically remapped to
+// LDR, assuming gamma 2.2 and an arbitrary scale factor defaulting to 1;
+// both of these constants can be reconfigured through this interface:
+//
+//     stbi_hdr_to_ldr_gamma(2.2f);
+//     stbi_hdr_to_ldr_scale(1.0f);
+//
+// (note, do not use _inverse_ constants; stbi_image will invert them
+// appropriately).
+//
+// Additionally, there is a new, parallel interface for loading files as
+// (linear) floats to preserve the full dynamic range:
+//
+//    float *data = stbi_loadf(filename, &x, &y, &n, 0);
+//
+// If you load LDR images through this interface, those images will
+// be promoted to floating point values, run through the inverse of
+// constants corresponding to the above:
+//
+//     stbi_ldr_to_hdr_scale(1.0f);
+//     stbi_ldr_to_hdr_gamma(2.2f);
+//
+// Finally, given a filename (or an open file or memory block--see header
+// file for details) containing image data, you can query for the "most
+// appropriate" interface to use (that is, whether the image is HDR or
+// not), using:
+//
+//     stbi_is_hdr(char *filename);
+//
+// ===========================================================================
+//
+// iPhone PNG support:
+//
+// By default we convert iphone-formatted PNGs back to RGB, even though
+// they are internally encoded differently. You can disable this conversion
+// by by calling stbi_convert_iphone_png_to_rgb(0), in which case
+// you will always just get the native iphone "format" through (which
+// is BGR stored in RGB).
+//
+// Call stbi_set_unpremultiply_on_load(1) as well to force a divide per
+// pixel to remove any premultiplied alpha *only* if the image file explicitly
+// says there's premultiplied data (currently only happens in iPhone images,
+// and only if iPhone convert-to-rgb processing is on).
+//
+// ===========================================================================
+//
+// ADDITIONAL CONFIGURATION
+//
+//  - You can suppress implementation of any of the decoders to reduce
+//    your code footprint by #defining one or more of the following
+//    symbols before creating the implementation.
+//
+//        STBI_NO_JPEG
+//        STBI_NO_PNG
+//        STBI_NO_BMP
+//        STBI_NO_PSD
+//        STBI_NO_TGA
+//        STBI_NO_GIF
+//        STBI_NO_HDR
+//        STBI_NO_PIC
+//        STBI_NO_PNM   (.ppm and .pgm)
+//
+//  - You can request *only* certain decoders and suppress all other ones
+//    (this will be more forward-compatible, as addition of new decoders
+//    doesn't require you to disable them explicitly):
+//
+//        STBI_ONLY_JPEG
+//        STBI_ONLY_PNG
+//        STBI_ONLY_BMP
+//        STBI_ONLY_PSD
+//        STBI_ONLY_TGA
+//        STBI_ONLY_GIF
+//        STBI_ONLY_HDR
+//        STBI_ONLY_PIC
+//        STBI_ONLY_PNM   (.ppm and .pgm)
+//
+//   - If you use STBI_NO_PNG (or _ONLY_ without PNG), and you still
+//     want the zlib decoder to be available, #define STBI_SUPPORT_ZLIB
+//
+
+
+#ifndef STBI_NO_STDIO
+#include <stdio.h>
+#endif // STBI_NO_STDIO
+
+#define STBI_VERSION 1
+
+enum
+{
+   STBI_default = 0, // only used for desired_channels
+
+   STBI_grey       = 1,
+   STBI_grey_alpha = 2,
+   STBI_rgb        = 3,
+   STBI_rgb_alpha  = 4
+};
+
+typedef unsigned char stbi_uc;
+typedef unsigned short stbi_us;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef STB_IMAGE_STATIC
+#define STBIDEF static
+#else
+#define STBIDEF extern
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// PRIMARY API - works on images of any type
+//
+
+//
+// load image by filename, open file, or memory buffer
+//
+
+typedef struct
+{
+   int      (*read)  (void *user,char *data,int size);   // fill 'data' with 'size' bytes.  return number of bytes actually read
+   void     (*skip)  (void *user,int n);                 // skip the next 'n' bytes, or 'unget' the last -n bytes if negative
+   int      (*eof)   (void *user);                       // returns nonzero if we are at end of file/data
+} stbi_io_callbacks;
+
+////////////////////////////////////
+//
+// 8-bits-per-channel interface
+//
+
+STBIDEF stbi_uc *stbi_load_from_memory   (stbi_uc           const *buffer, int len   , int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk  , void *user, int *x, int *y, int *channels_in_file, int desired_channels);
+#ifndef STBI_NO_GIF
+STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
+#endif
+
+
+#ifndef STBI_NO_STDIO
+STBIDEF stbi_uc *stbi_load            (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_uc *stbi_load_from_file  (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
+// for stbi_load_from_file, file pointer is left pointing immediately after image
+#endif
+
+////////////////////////////////////
+//
+// 16-bits-per-channel interface
+//
+
+STBIDEF stbi_us *stbi_load_16_from_memory   (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels);
+
+#ifndef STBI_NO_STDIO
+STBIDEF stbi_us *stbi_load_16          (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+STBIDEF stbi_us *stbi_load_from_file_16(FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
+#endif
+
+////////////////////////////////////
+//
+// float-per-channel interface
+//
+#ifndef STBI_NO_LINEAR
+   STBIDEF float *stbi_loadf_from_memory     (stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels);
+   STBIDEF float *stbi_loadf_from_callbacks  (stbi_io_callbacks const *clbk, void *user, int *x, int *y,  int *channels_in_file, int desired_channels);
+
+   #ifndef STBI_NO_STDIO
+   STBIDEF float *stbi_loadf            (char const *filename, int *x, int *y, int *channels_in_file, int desired_channels);
+   STBIDEF float *stbi_loadf_from_file  (FILE *f, int *x, int *y, int *channels_in_file, int desired_channels);
+   #endif
+#endif
+
+#ifndef STBI_NO_HDR
+   STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma);
+   STBIDEF void   stbi_hdr_to_ldr_scale(float scale);
+#endif // STBI_NO_HDR
+
+#ifndef STBI_NO_LINEAR
+   STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma);
+   STBIDEF void   stbi_ldr_to_hdr_scale(float scale);
+#endif // STBI_NO_LINEAR
+
+// stbi_is_hdr is always defined, but always returns false if STBI_NO_HDR
+STBIDEF int    stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user);
+STBIDEF int    stbi_is_hdr_from_memory(stbi_uc const *buffer, int len);
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_is_hdr          (char const *filename);
+STBIDEF int      stbi_is_hdr_from_file(FILE *f);
+#endif // STBI_NO_STDIO
+
+
+// get a VERY brief reason for failure
+// NOT THREADSAFE
+STBIDEF const char *stbi_failure_reason  (void);
+
+// free the loaded image -- this is just free()
+STBIDEF void     stbi_image_free      (void *retval_from_stbi_load);
+
+// get image dimensions & components without fully decoding
+STBIDEF int      stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp);
+STBIDEF int      stbi_info_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp);
+STBIDEF int      stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len);
+STBIDEF int      stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *clbk, void *user);
+
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_info               (char const *filename,     int *x, int *y, int *comp);
+STBIDEF int      stbi_info_from_file     (FILE *f,                  int *x, int *y, int *comp);
+STBIDEF int      stbi_is_16_bit          (char const *filename);
+STBIDEF int      stbi_is_16_bit_from_file(FILE *f);
+#endif
+
+
+
+// for image formats that explicitly notate that they have premultiplied alpha,
+// we just return the colors as stored in the file. set this flag to force
+// unpremultiplication. results are undefined if the unpremultiply overflow.
+STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply);
+
+// indicate whether we should process iphone images back to canonical format,
+// or just pass them through "as-is"
+STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert);
+
+// flip the image vertically, so the first pixel in the output array is the bottom left
+STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip);
+
+// ZLIB client - used by PNG, available for other purposes
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen);
+STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header);
+STBIDEF char *stbi_zlib_decode_malloc(const char *buffer, int len, int *outlen);
+STBIDEF int   stbi_zlib_decode_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
+
+STBIDEF char *stbi_zlib_decode_noheader_malloc(const char *buffer, int len, int *outlen);
+STBIDEF int   stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen);
+
+
+#ifdef __cplusplus
+}
+#endif
+
+//
+//
+////   end header file   /////////////////////////////////////////////////////
+#endif // STBI_INCLUDE_STB_IMAGE_H
+
+#ifdef STB_IMAGE_IMPLEMENTATION
+
+#if defined(STBI_ONLY_JPEG) || defined(STBI_ONLY_PNG) || defined(STBI_ONLY_BMP) \
+  || defined(STBI_ONLY_TGA) || defined(STBI_ONLY_GIF) || defined(STBI_ONLY_PSD) \
+  || defined(STBI_ONLY_HDR) || defined(STBI_ONLY_PIC) || defined(STBI_ONLY_PNM) \
+  || defined(STBI_ONLY_ZLIB)
+   #ifndef STBI_ONLY_JPEG
+   #define STBI_NO_JPEG
+   #endif
+   #ifndef STBI_ONLY_PNG
+   #define STBI_NO_PNG
+   #endif
+   #ifndef STBI_ONLY_BMP
+   #define STBI_NO_BMP
+   #endif
+   #ifndef STBI_ONLY_PSD
+   #define STBI_NO_PSD
+   #endif
+   #ifndef STBI_ONLY_TGA
+   #define STBI_NO_TGA
+   #endif
+   #ifndef STBI_ONLY_GIF
+   #define STBI_NO_GIF
+   #endif
+   #ifndef STBI_ONLY_HDR
+   #define STBI_NO_HDR
+   #endif
+   #ifndef STBI_ONLY_PIC
+   #define STBI_NO_PIC
+   #endif
+   #ifndef STBI_ONLY_PNM
+   #define STBI_NO_PNM
+   #endif
+#endif
+
+#if defined(STBI_NO_PNG) && !defined(STBI_SUPPORT_ZLIB) && !defined(STBI_NO_ZLIB)
+#define STBI_NO_ZLIB
+#endif
+
+
+#include <stdarg.h>
+#include <stddef.h> // ptrdiff_t on osx
+#include <stdlib.h>
+#include <string.h>
+#include <limits.h>
+
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
+#include <math.h>  // ldexp, pow
+#endif
+
+#ifndef STBI_NO_STDIO
+#include <stdio.h>
+#endif
+
+#ifndef STBI_ASSERT
+#include <assert.h>
+#define STBI_ASSERT(x) assert(x)
+#endif
+
+
+#ifndef _MSC_VER
+   #ifdef __cplusplus
+   #define stbi_inline inline
+   #else
+   #define stbi_inline
+   #endif
+#else
+   #define stbi_inline __forceinline
+#endif
+
+
+#ifdef _MSC_VER
+typedef unsigned short stbi__uint16;
+typedef   signed short stbi__int16;
+typedef unsigned int   stbi__uint32;
+typedef   signed int   stbi__int32;
+#else
+#include <stdint.h>
+typedef uint16_t stbi__uint16;
+typedef int16_t  stbi__int16;
+typedef uint32_t stbi__uint32;
+typedef int32_t  stbi__int32;
+#endif
+
+// should produce compiler error if size is wrong
+typedef unsigned char validate_uint32[sizeof(stbi__uint32)==4 ? 1 : -1];
+
+#ifdef _MSC_VER
+#define STBI_NOTUSED(v)  (void)(v)
+#else
+#define STBI_NOTUSED(v)  (void)sizeof(v)
+#endif
+
+#ifdef _MSC_VER
+#define STBI_HAS_LROTL
+#endif
+
+#ifdef STBI_HAS_LROTL
+   #define stbi_lrot(x,y)  _lrotl(x,y)
+#else
+   #define stbi_lrot(x,y)  (((x) << (y)) | ((x) >> (32 - (y))))
+#endif
+
+#if defined(STBI_MALLOC) && defined(STBI_FREE) && (defined(STBI_REALLOC) || defined(STBI_REALLOC_SIZED))
+// ok
+#elif !defined(STBI_MALLOC) && !defined(STBI_FREE) && !defined(STBI_REALLOC) && !defined(STBI_REALLOC_SIZED)
+// ok
+#else
+#error "Must define all or none of STBI_MALLOC, STBI_FREE, and STBI_REALLOC (or STBI_REALLOC_SIZED)."
+#endif
+
+#ifndef STBI_MALLOC
+#define STBI_MALLOC(sz)           malloc(sz)
+#define STBI_REALLOC(p,newsz)     realloc(p,newsz)
+#define STBI_FREE(p)              free(p)
+#endif
+
+#ifndef STBI_REALLOC_SIZED
+#define STBI_REALLOC_SIZED(p,oldsz,newsz) STBI_REALLOC(p,newsz)
+#endif
+
+// x86/x64 detection
+#if defined(__x86_64__) || defined(_M_X64)
+#define STBI__X64_TARGET
+#elif defined(__i386) || defined(_M_IX86)
+#define STBI__X86_TARGET
+#endif
+
+#if defined(__GNUC__) && defined(STBI__X86_TARGET) && !defined(__SSE2__) && !defined(STBI_NO_SIMD)
+// gcc doesn't support sse2 intrinsics unless you compile with -msse2,
+// which in turn means it gets to use SSE2 everywhere. This is unfortunate,
+// but previous attempts to provide the SSE2 functions with runtime
+// detection caused numerous issues. The way architecture extensions are
+// exposed in GCC/Clang is, sadly, not really suited for one-file libs.
+// New behavior: if compiled with -msse2, we use SSE2 without any
+// detection; if not, we don't use it at all.
+#define STBI_NO_SIMD
+#endif
+
+#if defined(__MINGW32__) && defined(STBI__X86_TARGET) && !defined(STBI_MINGW_ENABLE_SSE2) && !defined(STBI_NO_SIMD)
+// Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid STBI__X64_TARGET
+//
+// 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the
+// Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant.
+// As a result, enabling SSE2 on 32-bit MinGW is dangerous when not
+// simultaneously enabling "-mstackrealign".
+//
+// See https://github.com/nothings/stb/issues/81 for more information.
+//
+// So default to no SSE2 on 32-bit MinGW. If you've read this far and added
+// -mstackrealign to your build settings, feel free to #define STBI_MINGW_ENABLE_SSE2.
+#define STBI_NO_SIMD
+#endif
+
+#if !defined(STBI_NO_SIMD) && (defined(STBI__X86_TARGET) || defined(STBI__X64_TARGET))
+#define STBI_SSE2
+#include <emmintrin.h>
+
+#ifdef _MSC_VER
+
+#if _MSC_VER >= 1400  // not VC6
+#include <intrin.h> // __cpuid
+static int stbi__cpuid3(void)
+{
+   int info[4];
+   __cpuid(info,1);
+   return info[3];
+}
+#else
+static int stbi__cpuid3(void)
+{
+   int res;
+   __asm {
+      mov  eax,1
+      cpuid
+      mov  res,edx
+   }
+   return res;
+}
+#endif
+
+#define STBI_SIMD_ALIGN(type, name) __declspec(align(16)) type name
+
+static int stbi__sse2_available(void)
+{
+   int info3 = stbi__cpuid3();
+   return ((info3 >> 26) & 1) != 0;
+}
+#else // assume GCC-style if not VC++
+#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
+
+static int stbi__sse2_available(void)
+{
+   // If we're even attempting to compile this on GCC/Clang, that means
+   // -msse2 is on, which means the compiler is allowed to use SSE2
+   // instructions at will, and so are we.
+   return 1;
+}
+#endif
+#endif
+
+// ARM NEON
+#if defined(STBI_NO_SIMD) && defined(STBI_NEON)
+#undef STBI_NEON
+#endif
+
+#ifdef STBI_NEON
+#include <arm_neon.h>
+// assume GCC or Clang on ARM targets
+#define STBI_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
+#endif
+
+#ifndef STBI_SIMD_ALIGN
+#define STBI_SIMD_ALIGN(type, name) type name
+#endif
+
+///////////////////////////////////////////////
+//
+//  stbi__context struct and start_xxx functions
+
+// stbi__context structure is our basic context used by all images, so it
+// contains all the IO context, plus some basic image information
+typedef struct
+{
+   stbi__uint32 img_x, img_y;
+   int img_n, img_out_n;
+
+   stbi_io_callbacks io;
+   void *io_user_data;
+
+   int read_from_callbacks;
+   int buflen;
+   stbi_uc buffer_start[128];
+
+   stbi_uc *img_buffer, *img_buffer_end;
+   stbi_uc *img_buffer_original, *img_buffer_original_end;
+} stbi__context;
+
+
+static void stbi__refill_buffer(stbi__context *s);
+
+// initialize a memory-decode context
+static void stbi__start_mem(stbi__context *s, stbi_uc const *buffer, int len)
+{
+   s->io.read = NULL;
+   s->read_from_callbacks = 0;
+   s->img_buffer = s->img_buffer_original = (stbi_uc *) buffer;
+   s->img_buffer_end = s->img_buffer_original_end = (stbi_uc *) buffer+len;
+}
+
+// initialize a callback-based context
+static void stbi__start_callbacks(stbi__context *s, stbi_io_callbacks *c, void *user)
+{
+   s->io = *c;
+   s->io_user_data = user;
+   s->buflen = sizeof(s->buffer_start);
+   s->read_from_callbacks = 1;
+   s->img_buffer_original = s->buffer_start;
+   stbi__refill_buffer(s);
+   s->img_buffer_original_end = s->img_buffer_end;
+}
+
+#ifndef STBI_NO_STDIO
+
+static int stbi__stdio_read(void *user, char *data, int size)
+{
+   return (int) fread(data,1,size,(FILE*) user);
+}
+
+static void stbi__stdio_skip(void *user, int n)
+{
+   fseek((FILE*) user, n, SEEK_CUR);
+}
+
+static int stbi__stdio_eof(void *user)
+{
+   return feof((FILE*) user);
+}
+
+static stbi_io_callbacks stbi__stdio_callbacks =
+{
+   stbi__stdio_read,
+   stbi__stdio_skip,
+   stbi__stdio_eof,
+};
+
+static void stbi__start_file(stbi__context *s, FILE *f)
+{
+   stbi__start_callbacks(s, &stbi__stdio_callbacks, (void *) f);
+}
+
+//static void stop_file(stbi__context *s) { }
+
+#endif // !STBI_NO_STDIO
+
+static void stbi__rewind(stbi__context *s)
+{
+   // conceptually rewind SHOULD rewind to the beginning of the stream,
+   // but we just rewind to the beginning of the initial buffer, because
+   // we only use it after doing 'test', which only ever looks at at most 92 bytes
+   s->img_buffer = s->img_buffer_original;
+   s->img_buffer_end = s->img_buffer_original_end;
+}
+
+enum
+{
+   STBI_ORDER_RGB,
+   STBI_ORDER_BGR
+};
+
+typedef struct
+{
+   int bits_per_channel;
+   int num_channels;
+   int channel_order;
+} stbi__result_info;
+
+#ifndef STBI_NO_JPEG
+static int      stbi__jpeg_test(stbi__context *s);
+static void    *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PNG
+static int      stbi__png_test(stbi__context *s);
+static void    *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__png_info(stbi__context *s, int *x, int *y, int *comp);
+static int      stbi__png_is16(stbi__context *s);
+#endif
+
+#ifndef STBI_NO_BMP
+static int      stbi__bmp_test(stbi__context *s);
+static void    *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_TGA
+static int      stbi__tga_test(stbi__context *s);
+static void    *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__tga_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PSD
+static int      stbi__psd_test(stbi__context *s);
+static void    *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc);
+static int      stbi__psd_info(stbi__context *s, int *x, int *y, int *comp);
+static int      stbi__psd_is16(stbi__context *s);
+#endif
+
+#ifndef STBI_NO_HDR
+static int      stbi__hdr_test(stbi__context *s);
+static float   *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PIC
+static int      stbi__pic_test(stbi__context *s);
+static void    *stbi__pic_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__pic_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_GIF
+static int      stbi__gif_test(stbi__context *s);
+static void    *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static void    *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp);
+static int      stbi__gif_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+#ifndef STBI_NO_PNM
+static int      stbi__pnm_test(stbi__context *s);
+static void    *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri);
+static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp);
+#endif
+
+// this is not threadsafe
+static const char *stbi__g_failure_reason;
+
+STBIDEF const char *stbi_failure_reason(void)
+{
+   return stbi__g_failure_reason;
+}
+
+static int stbi__err(const char *str)
+{
+   stbi__g_failure_reason = str;
+   return 0;
+}
+
+static void *stbi__malloc(size_t size)
+{
+    return STBI_MALLOC(size);
+}
+
+// stb_image uses ints pervasively, including for offset calculations.
+// therefore the largest decoded image size we can support with the
+// current code, even on 64-bit targets, is INT_MAX. this is not a
+// significant limitation for the intended use case.
+//
+// we do, however, need to make sure our size calculations don't
+// overflow. hence a few helper functions for size calculations that
+// multiply integers together, making sure that they're non-negative
+// and no overflow occurs.
+
+// return 1 if the sum is valid, 0 on overflow.
+// negative terms are considered invalid.
+static int stbi__addsizes_valid(int a, int b)
+{
+   if (b < 0) return 0;
+   // now 0 <= b <= INT_MAX, hence also
+   // 0 <= INT_MAX - b <= INTMAX.
+   // And "a + b <= INT_MAX" (which might overflow) is the
+   // same as a <= INT_MAX - b (no overflow)
+   return a <= INT_MAX - b;
+}
+
+// returns 1 if the product is valid, 0 on overflow.
+// negative factors are considered invalid.
+static int stbi__mul2sizes_valid(int a, int b)
+{
+   if (a < 0 || b < 0) return 0;
+   if (b == 0) return 1; // mul-by-0 is always safe
+   // portable way to check for no overflows in a*b
+   return a <= INT_MAX/b;
+}
+
+// returns 1 if "a*b + add" has no negative terms/factors and doesn't overflow
+static int stbi__mad2sizes_valid(int a, int b, int add)
+{
+   return stbi__mul2sizes_valid(a, b) && stbi__addsizes_valid(a*b, add);
+}
+
+// returns 1 if "a*b*c + add" has no negative terms/factors and doesn't overflow
+static int stbi__mad3sizes_valid(int a, int b, int c, int add)
+{
+   return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
+      stbi__addsizes_valid(a*b*c, add);
+}
+
+// returns 1 if "a*b*c*d + add" has no negative terms/factors and doesn't overflow
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
+static int stbi__mad4sizes_valid(int a, int b, int c, int d, int add)
+{
+   return stbi__mul2sizes_valid(a, b) && stbi__mul2sizes_valid(a*b, c) &&
+      stbi__mul2sizes_valid(a*b*c, d) && stbi__addsizes_valid(a*b*c*d, add);
+}
+#endif
+
+// mallocs with size overflow checking
+static void *stbi__malloc_mad2(int a, int b, int add)
+{
+   if (!stbi__mad2sizes_valid(a, b, add)) return NULL;
+   return stbi__malloc(a*b + add);
+}
+
+static void *stbi__malloc_mad3(int a, int b, int c, int add)
+{
+   if (!stbi__mad3sizes_valid(a, b, c, add)) return NULL;
+   return stbi__malloc(a*b*c + add);
+}
+
+#if !defined(STBI_NO_LINEAR) || !defined(STBI_NO_HDR)
+static void *stbi__malloc_mad4(int a, int b, int c, int d, int add)
+{
+   if (!stbi__mad4sizes_valid(a, b, c, d, add)) return NULL;
+   return stbi__malloc(a*b*c*d + add);
+}
+#endif
+
+// stbi__err - error
+// stbi__errpf - error returning pointer to float
+// stbi__errpuc - error returning pointer to unsigned char
+
+#ifdef STBI_NO_FAILURE_STRINGS
+   #define stbi__err(x,y)  0
+#elif defined(STBI_FAILURE_USERMSG)
+   #define stbi__err(x,y)  stbi__err(y)
+#else
+   #define stbi__err(x,y)  stbi__err(x)
+#endif
+
+#define stbi__errpf(x,y)   ((float *)(size_t) (stbi__err(x,y)?NULL:NULL))
+#define stbi__errpuc(x,y)  ((unsigned char *)(size_t) (stbi__err(x,y)?NULL:NULL))
+
+STBIDEF void stbi_image_free(void *retval_from_stbi_load)
+{
+   STBI_FREE(retval_from_stbi_load);
+}
+
+#ifndef STBI_NO_LINEAR
+static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp);
+#endif
+
+#ifndef STBI_NO_HDR
+static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp);
+#endif
+
+static int stbi__vertically_flip_on_load = 0;
+
+STBIDEF void stbi_set_flip_vertically_on_load(int flag_true_if_should_flip)
+{
+    stbi__vertically_flip_on_load = flag_true_if_should_flip;
+}
+
+static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
+{
+   memset(ri, 0, sizeof(*ri)); // make sure it's initialized if we add new fields
+   ri->bits_per_channel = 8; // default is 8 so most paths don't have to be changed
+   ri->channel_order = STBI_ORDER_RGB; // all current input & output are this, but this is here so we can add BGR order
+   ri->num_channels = 0;
+
+   #ifndef STBI_NO_JPEG
+   if (stbi__jpeg_test(s)) return stbi__jpeg_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_PNG
+   if (stbi__png_test(s))  return stbi__png_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_BMP
+   if (stbi__bmp_test(s))  return stbi__bmp_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_GIF
+   if (stbi__gif_test(s))  return stbi__gif_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_PSD
+   if (stbi__psd_test(s))  return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
+   #endif
+   #ifndef STBI_NO_PIC
+   if (stbi__pic_test(s))  return stbi__pic_load(s,x,y,comp,req_comp, ri);
+   #endif
+   #ifndef STBI_NO_PNM
+   if (stbi__pnm_test(s))  return stbi__pnm_load(s,x,y,comp,req_comp, ri);
+   #endif
+
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_test(s)) {
+      float *hdr = stbi__hdr_load(s, x,y,comp,req_comp, ri);
+      return stbi__hdr_to_ldr(hdr, *x, *y, req_comp ? req_comp : *comp);
+   }
+   #endif
+
+   #ifndef STBI_NO_TGA
+   // test tga last because it's a crappy test!
+   if (stbi__tga_test(s))
+      return stbi__tga_load(s,x,y,comp,req_comp, ri);
+   #endif
+
+   return stbi__errpuc("unknown image type", "Image not of any known type, or corrupt");
+}
+
+static stbi_uc *stbi__convert_16_to_8(stbi__uint16 *orig, int w, int h, int channels)
+{
+   int i;
+   int img_len = w * h * channels;
+   stbi_uc *reduced;
+
+   reduced = (stbi_uc *) stbi__malloc(img_len);
+   if (reduced == NULL) return stbi__errpuc("outofmem", "Out of memory");
+
+   for (i = 0; i < img_len; ++i)
+      reduced[i] = (stbi_uc)((orig[i] >> 8) & 0xFF); // top half of each byte is sufficient approx of 16->8 bit scaling
+
+   STBI_FREE(orig);
+   return reduced;
+}
+
+static stbi__uint16 *stbi__convert_8_to_16(stbi_uc *orig, int w, int h, int channels)
+{
+   int i;
+   int img_len = w * h * channels;
+   stbi__uint16 *enlarged;
+
+   enlarged = (stbi__uint16 *) stbi__malloc(img_len*2);
+   if (enlarged == NULL) return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
+
+   for (i = 0; i < img_len; ++i)
+      enlarged[i] = (stbi__uint16)((orig[i] << 8) + orig[i]); // replicate to high and low byte, maps 0->0, 255->0xffff
+
+   STBI_FREE(orig);
+   return enlarged;
+}
+
+static void stbi__vertical_flip(void *image, int w, int h, int bytes_per_pixel)
+{
+   int row;
+   size_t bytes_per_row = (size_t)w * bytes_per_pixel;
+   stbi_uc temp[2048];
+   stbi_uc *bytes = (stbi_uc *)image;
+
+   for (row = 0; row < (h>>1); row++) {
+      stbi_uc *row0 = bytes + row*bytes_per_row;
+      stbi_uc *row1 = bytes + (h - row - 1)*bytes_per_row;
+      // swap row0 with row1
+      size_t bytes_left = bytes_per_row;
+      while (bytes_left) {
+         size_t bytes_copy = (bytes_left < sizeof(temp)) ? bytes_left : sizeof(temp);
+         memcpy(temp, row0, bytes_copy);
+         memcpy(row0, row1, bytes_copy);
+         memcpy(row1, temp, bytes_copy);
+         row0 += bytes_copy;
+         row1 += bytes_copy;
+         bytes_left -= bytes_copy;
+      }
+   }
+}
+
+static void stbi__vertical_flip_slices(void *image, int w, int h, int z, int bytes_per_pixel)
+{
+   int slice;
+   int slice_size = w * h * bytes_per_pixel;
+
+   stbi_uc *bytes = (stbi_uc *)image;
+   for (slice = 0; slice < z; ++slice) {
+      stbi__vertical_flip(bytes, w, h, bytes_per_pixel); 
+      bytes += slice_size; 
+   }
+}
+
+static unsigned char *stbi__load_and_postprocess_8bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__result_info ri;
+   void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 8);
+
+   if (result == NULL)
+      return NULL;
+
+   if (ri.bits_per_channel != 8) {
+      STBI_ASSERT(ri.bits_per_channel == 16);
+      result = stbi__convert_16_to_8((stbi__uint16 *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
+      ri.bits_per_channel = 8;
+   }
+
+   // @TODO: move stbi__convert_format to here
+
+   if (stbi__vertically_flip_on_load) {
+      int channels = req_comp ? req_comp : *comp;
+      stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi_uc));
+   }
+
+   return (unsigned char *) result;
+}
+
+static stbi__uint16 *stbi__load_and_postprocess_16bit(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__result_info ri;
+   void *result = stbi__load_main(s, x, y, comp, req_comp, &ri, 16);
+
+   if (result == NULL)
+      return NULL;
+
+   if (ri.bits_per_channel != 16) {
+      STBI_ASSERT(ri.bits_per_channel == 8);
+      result = stbi__convert_8_to_16((stbi_uc *) result, *x, *y, req_comp == 0 ? *comp : req_comp);
+      ri.bits_per_channel = 16;
+   }
+
+   // @TODO: move stbi__convert_format16 to here
+   // @TODO: special case RGB-to-Y (and RGBA-to-YA) for 8-bit-to-16-bit case to keep more precision
+
+   if (stbi__vertically_flip_on_load) {
+      int channels = req_comp ? req_comp : *comp;
+      stbi__vertical_flip(result, *x, *y, channels * sizeof(stbi__uint16));
+   }
+
+   return (stbi__uint16 *) result;
+}
+
+#if !defined(STBI_NO_HDR) || !defined(STBI_NO_LINEAR)
+static void stbi__float_postprocess(float *result, int *x, int *y, int *comp, int req_comp)
+{
+   if (stbi__vertically_flip_on_load && result != NULL) {
+      int channels = req_comp ? req_comp : *comp;
+      stbi__vertical_flip(result, *x, *y, channels * sizeof(float));
+   }
+}
+#endif
+
+#ifndef STBI_NO_STDIO
+
+static FILE *stbi__fopen(char const *filename, char const *mode)
+{
+   FILE *f;
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+   if (0 != fopen_s(&f, filename, mode))
+      f=0;
+#else
+   f = fopen(filename, mode);
+#endif
+   return f;
+}
+
+
+STBIDEF stbi_uc *stbi_load(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+   FILE *f = stbi__fopen(filename, "rb");
+   unsigned char *result;
+   if (!f) return stbi__errpuc("can't fopen", "Unable to open file");
+   result = stbi_load_from_file(f,x,y,comp,req_comp);
+   fclose(f);
+   return result;
+}
+
+STBIDEF stbi_uc *stbi_load_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+   unsigned char *result;
+   stbi__context s;
+   stbi__start_file(&s,f);
+   result = stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
+   if (result) {
+      // need to 'unget' all the characters in the IO buffer
+      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
+   }
+   return result;
+}
+
+STBIDEF stbi__uint16 *stbi_load_from_file_16(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__uint16 *result;
+   stbi__context s;
+   stbi__start_file(&s,f);
+   result = stbi__load_and_postprocess_16bit(&s,x,y,comp,req_comp);
+   if (result) {
+      // need to 'unget' all the characters in the IO buffer
+      fseek(f, - (int) (s.img_buffer_end - s.img_buffer), SEEK_CUR);
+   }
+   return result;
+}
+
+STBIDEF stbi_us *stbi_load_16(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+   FILE *f = stbi__fopen(filename, "rb");
+   stbi__uint16 *result;
+   if (!f) return (stbi_us *) stbi__errpuc("can't fopen", "Unable to open file");
+   result = stbi_load_from_file_16(f,x,y,comp,req_comp);
+   fclose(f);
+   return result;
+}
+
+
+#endif //!STBI_NO_STDIO
+
+STBIDEF stbi_us *stbi_load_16_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *channels_in_file, int desired_channels)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
+}
+
+STBIDEF stbi_us *stbi_load_16_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *channels_in_file, int desired_channels)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *)clbk, user);
+   return stbi__load_and_postprocess_16bit(&s,x,y,channels_in_file,desired_channels);
+}
+
+STBIDEF stbi_uc *stbi_load_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
+}
+
+STBIDEF stbi_uc *stbi_load_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__load_and_postprocess_8bit(&s,x,y,comp,req_comp);
+}
+
+#ifndef STBI_NO_GIF
+STBIDEF stbi_uc *stbi_load_gif_from_memory(stbi_uc const *buffer, int len, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
+{
+   unsigned char *result;
+   stbi__context s; 
+   stbi__start_mem(&s,buffer,len); 
+   
+   result = (unsigned char*) stbi__load_gif_main(&s, delays, x, y, z, comp, req_comp);
+   if (stbi__vertically_flip_on_load) {
+      stbi__vertical_flip_slices( result, *x, *y, *z, *comp ); 
+   }
+
+   return result; 
+}
+#endif
+
+#ifndef STBI_NO_LINEAR
+static float *stbi__loadf_main(stbi__context *s, int *x, int *y, int *comp, int req_comp)
+{
+   unsigned char *data;
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_test(s)) {
+      stbi__result_info ri;
+      float *hdr_data = stbi__hdr_load(s,x,y,comp,req_comp, &ri);
+      if (hdr_data)
+         stbi__float_postprocess(hdr_data,x,y,comp,req_comp);
+      return hdr_data;
+   }
+   #endif
+   data = stbi__load_and_postprocess_8bit(s, x, y, comp, req_comp);
+   if (data)
+      return stbi__ldr_to_hdr(data, *x, *y, req_comp ? req_comp : *comp);
+   return stbi__errpf("unknown image type", "Image not of any known type, or corrupt");
+}
+
+STBIDEF float *stbi_loadf_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+
+STBIDEF float *stbi_loadf_from_callbacks(stbi_io_callbacks const *clbk, void *user, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF float *stbi_loadf(char const *filename, int *x, int *y, int *comp, int req_comp)
+{
+   float *result;
+   FILE *f = stbi__fopen(filename, "rb");
+   if (!f) return stbi__errpf("can't fopen", "Unable to open file");
+   result = stbi_loadf_from_file(f,x,y,comp,req_comp);
+   fclose(f);
+   return result;
+}
+
+STBIDEF float *stbi_loadf_from_file(FILE *f, int *x, int *y, int *comp, int req_comp)
+{
+   stbi__context s;
+   stbi__start_file(&s,f);
+   return stbi__loadf_main(&s,x,y,comp,req_comp);
+}
+#endif // !STBI_NO_STDIO
+
+#endif // !STBI_NO_LINEAR
+
+// these is-hdr-or-not is defined independent of whether STBI_NO_LINEAR is
+// defined, for API simplicity; if STBI_NO_LINEAR is defined, it always
+// reports false!
+
+STBIDEF int stbi_is_hdr_from_memory(stbi_uc const *buffer, int len)
+{
+   #ifndef STBI_NO_HDR
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__hdr_test(&s);
+   #else
+   STBI_NOTUSED(buffer);
+   STBI_NOTUSED(len);
+   return 0;
+   #endif
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF int      stbi_is_hdr          (char const *filename)
+{
+   FILE *f = stbi__fopen(filename, "rb");
+   int result=0;
+   if (f) {
+      result = stbi_is_hdr_from_file(f);
+      fclose(f);
+   }
+   return result;
+}
+
+STBIDEF int stbi_is_hdr_from_file(FILE *f)
+{
+   #ifndef STBI_NO_HDR
+   long pos = ftell(f);
+   int res;
+   stbi__context s;
+   stbi__start_file(&s,f);
+   res = stbi__hdr_test(&s);
+   fseek(f, pos, SEEK_SET);
+   return res;
+   #else
+   STBI_NOTUSED(f);
+   return 0;
+   #endif
+}
+#endif // !STBI_NO_STDIO
+
+STBIDEF int      stbi_is_hdr_from_callbacks(stbi_io_callbacks const *clbk, void *user)
+{
+   #ifndef STBI_NO_HDR
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) clbk, user);
+   return stbi__hdr_test(&s);
+   #else
+   STBI_NOTUSED(clbk);
+   STBI_NOTUSED(user);
+   return 0;
+   #endif
+}
+
+#ifndef STBI_NO_LINEAR
+static float stbi__l2h_gamma=2.2f, stbi__l2h_scale=1.0f;
+
+STBIDEF void   stbi_ldr_to_hdr_gamma(float gamma) { stbi__l2h_gamma = gamma; }
+STBIDEF void   stbi_ldr_to_hdr_scale(float scale) { stbi__l2h_scale = scale; }
+#endif
+
+static float stbi__h2l_gamma_i=1.0f/2.2f, stbi__h2l_scale_i=1.0f;
+
+STBIDEF void   stbi_hdr_to_ldr_gamma(float gamma) { stbi__h2l_gamma_i = 1/gamma; }
+STBIDEF void   stbi_hdr_to_ldr_scale(float scale) { stbi__h2l_scale_i = 1/scale; }
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+// Common code used by all image loaders
+//
+
+enum
+{
+   STBI__SCAN_load=0,
+   STBI__SCAN_type,
+   STBI__SCAN_header
+};
+
+static void stbi__refill_buffer(stbi__context *s)
+{
+   int n = (s->io.read)(s->io_user_data,(char*)s->buffer_start,s->buflen);
+   if (n == 0) {
+      // at end of file, treat same as if from memory, but need to handle case
+      // where s->img_buffer isn't pointing to safe memory, e.g. 0-byte file
+      s->read_from_callbacks = 0;
+      s->img_buffer = s->buffer_start;
+      s->img_buffer_end = s->buffer_start+1;
+      *s->img_buffer = 0;
+   } else {
+      s->img_buffer = s->buffer_start;
+      s->img_buffer_end = s->buffer_start + n;
+   }
+}
+
+stbi_inline static stbi_uc stbi__get8(stbi__context *s)
+{
+   if (s->img_buffer < s->img_buffer_end)
+      return *s->img_buffer++;
+   if (s->read_from_callbacks) {
+      stbi__refill_buffer(s);
+      return *s->img_buffer++;
+   }
+   return 0;
+}
+
+stbi_inline static int stbi__at_eof(stbi__context *s)
+{
+   if (s->io.read) {
+      if (!(s->io.eof)(s->io_user_data)) return 0;
+      // if feof() is true, check if buffer = end
+      // special case: we've only got the special 0 character at the end
+      if (s->read_from_callbacks == 0) return 1;
+   }
+
+   return s->img_buffer >= s->img_buffer_end;
+}
+
+static void stbi__skip(stbi__context *s, int n)
+{
+   if (n < 0) {
+      s->img_buffer = s->img_buffer_end;
+      return;
+   }
+   if (s->io.read) {
+      int blen = (int) (s->img_buffer_end - s->img_buffer);
+      if (blen < n) {
+         s->img_buffer = s->img_buffer_end;
+         (s->io.skip)(s->io_user_data, n - blen);
+         return;
+      }
+   }
+   s->img_buffer += n;
+}
+
+static int stbi__getn(stbi__context *s, stbi_uc *buffer, int n)
+{
+   if (s->io.read) {
+      int blen = (int) (s->img_buffer_end - s->img_buffer);
+      if (blen < n) {
+         int res, count;
+
+         memcpy(buffer, s->img_buffer, blen);
+
+         count = (s->io.read)(s->io_user_data, (char*) buffer + blen, n - blen);
+         res = (count == (n-blen));
+         s->img_buffer = s->img_buffer_end;
+         return res;
+      }
+   }
+
+   if (s->img_buffer+n <= s->img_buffer_end) {
+      memcpy(buffer, s->img_buffer, n);
+      s->img_buffer += n;
+      return 1;
+   } else
+      return 0;
+}
+
+static int stbi__get16be(stbi__context *s)
+{
+   int z = stbi__get8(s);
+   return (z << 8) + stbi__get8(s);
+}
+
+static stbi__uint32 stbi__get32be(stbi__context *s)
+{
+   stbi__uint32 z = stbi__get16be(s);
+   return (z << 16) + stbi__get16be(s);
+}
+
+#if defined(STBI_NO_BMP) && defined(STBI_NO_TGA) && defined(STBI_NO_GIF)
+// nothing
+#else
+static int stbi__get16le(stbi__context *s)
+{
+   int z = stbi__get8(s);
+   return z + (stbi__get8(s) << 8);
+}
+#endif
+
+#ifndef STBI_NO_BMP
+static stbi__uint32 stbi__get32le(stbi__context *s)
+{
+   stbi__uint32 z = stbi__get16le(s);
+   return z + (stbi__get16le(s) << 16);
+}
+#endif
+
+#define STBI__BYTECAST(x)  ((stbi_uc) ((x) & 255))  // truncate int to byte without warnings
+
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  generic converter from built-in img_n to req_comp
+//    individual types do this automatically as much as possible (e.g. jpeg
+//    does all cases internally since it needs to colorspace convert anyway,
+//    and it never has alpha, so very few cases ). png can automatically
+//    interleave an alpha=255 channel, but falls back to this for other cases
+//
+//  assume data buffer is malloced, so malloc a new one and free that one
+//  only failure mode is malloc failing
+
+static stbi_uc stbi__compute_y(int r, int g, int b)
+{
+   return (stbi_uc) (((r*77) + (g*150) +  (29*b)) >> 8);
+}
+
+static unsigned char *stbi__convert_format(unsigned char *data, int img_n, int req_comp, unsigned int x, unsigned int y)
+{
+   int i,j;
+   unsigned char *good;
+
+   if (req_comp == img_n) return data;
+   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
+
+   good = (unsigned char *) stbi__malloc_mad3(req_comp, x, y, 0);
+   if (good == NULL) {
+      STBI_FREE(data);
+      return stbi__errpuc("outofmem", "Out of memory");
+   }
+
+   for (j=0; j < (int) y; ++j) {
+      unsigned char *src  = data + j * x * img_n   ;
+      unsigned char *dest = good + j * x * req_comp;
+
+      #define STBI__COMBO(a,b)  ((a)*8+(b))
+      #define STBI__CASE(a,b)   case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
+      // convert source image with img_n components to one with req_comp components;
+      // avoid switch per pixel, so use switch per scanline and massive macros
+      switch (STBI__COMBO(img_n, req_comp)) {
+         STBI__CASE(1,2) { dest[0]=src[0], dest[1]=255;                                     } break;
+         STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0];                                  } break;
+         STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=255;                     } break;
+         STBI__CASE(2,1) { dest[0]=src[0];                                                  } break;
+         STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0];                                  } break;
+         STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1];                  } break;
+         STBI__CASE(3,4) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255;        } break;
+         STBI__CASE(3,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
+         STBI__CASE(3,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = 255;    } break;
+         STBI__CASE(4,1) { dest[0]=stbi__compute_y(src[0],src[1],src[2]);                   } break;
+         STBI__CASE(4,2) { dest[0]=stbi__compute_y(src[0],src[1],src[2]), dest[1] = src[3]; } break;
+         STBI__CASE(4,3) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];                    } break;
+         default: STBI_ASSERT(0);
+      }
+      #undef STBI__CASE
+   }
+
+   STBI_FREE(data);
+   return good;
+}
+
+static stbi__uint16 stbi__compute_y_16(int r, int g, int b)
+{
+   return (stbi__uint16) (((r*77) + (g*150) +  (29*b)) >> 8);
+}
+
+static stbi__uint16 *stbi__convert_format16(stbi__uint16 *data, int img_n, int req_comp, unsigned int x, unsigned int y)
+{
+   int i,j;
+   stbi__uint16 *good;
+
+   if (req_comp == img_n) return data;
+   STBI_ASSERT(req_comp >= 1 && req_comp <= 4);
+
+   good = (stbi__uint16 *) stbi__malloc(req_comp * x * y * 2);
+   if (good == NULL) {
+      STBI_FREE(data);
+      return (stbi__uint16 *) stbi__errpuc("outofmem", "Out of memory");
+   }
+
+   for (j=0; j < (int) y; ++j) {
+      stbi__uint16 *src  = data + j * x * img_n   ;
+      stbi__uint16 *dest = good + j * x * req_comp;
+
+      #define STBI__COMBO(a,b)  ((a)*8+(b))
+      #define STBI__CASE(a,b)   case STBI__COMBO(a,b): for(i=x-1; i >= 0; --i, src += a, dest += b)
+      // convert source image with img_n components to one with req_comp components;
+      // avoid switch per pixel, so use switch per scanline and massive macros
+      switch (STBI__COMBO(img_n, req_comp)) {
+         STBI__CASE(1,2) { dest[0]=src[0], dest[1]=0xffff;                                     } break;
+         STBI__CASE(1,3) { dest[0]=dest[1]=dest[2]=src[0];                                     } break;
+         STBI__CASE(1,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=0xffff;                     } break;
+         STBI__CASE(2,1) { dest[0]=src[0];                                                     } break;
+         STBI__CASE(2,3) { dest[0]=dest[1]=dest[2]=src[0];                                     } break;
+         STBI__CASE(2,4) { dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1];                     } break;
+         STBI__CASE(3,4) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=0xffff;        } break;
+         STBI__CASE(3,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
+         STBI__CASE(3,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]), dest[1] = 0xffff; } break;
+         STBI__CASE(4,1) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]);                   } break;
+         STBI__CASE(4,2) { dest[0]=stbi__compute_y_16(src[0],src[1],src[2]), dest[1] = src[3]; } break;
+         STBI__CASE(4,3) { dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];                       } break;
+         default: STBI_ASSERT(0);
+      }
+      #undef STBI__CASE
+   }
+
+   STBI_FREE(data);
+   return good;
+}
+
+#ifndef STBI_NO_LINEAR
+static float   *stbi__ldr_to_hdr(stbi_uc *data, int x, int y, int comp)
+{
+   int i,k,n;
+   float *output;
+   if (!data) return NULL;
+   output = (float *) stbi__malloc_mad4(x, y, comp, sizeof(float), 0);
+   if (output == NULL) { STBI_FREE(data); return stbi__errpf("outofmem", "Out of memory"); }
+   // compute number of non-alpha components
+   if (comp & 1) n = comp; else n = comp-1;
+   for (i=0; i < x*y; ++i) {
+      for (k=0; k < n; ++k) {
+         output[i*comp + k] = (float) (pow(data[i*comp+k]/255.0f, stbi__l2h_gamma) * stbi__l2h_scale);
+      }
+      if (k < comp) output[i*comp + k] = data[i*comp+k]/255.0f;
+   }
+   STBI_FREE(data);
+   return output;
+}
+#endif
+
+#ifndef STBI_NO_HDR
+#define stbi__float2int(x)   ((int) (x))
+static stbi_uc *stbi__hdr_to_ldr(float   *data, int x, int y, int comp)
+{
+   int i,k,n;
+   stbi_uc *output;
+   if (!data) return NULL;
+   output = (stbi_uc *) stbi__malloc_mad3(x, y, comp, 0);
+   if (output == NULL) { STBI_FREE(data); return stbi__errpuc("outofmem", "Out of memory"); }
+   // compute number of non-alpha components
+   if (comp & 1) n = comp; else n = comp-1;
+   for (i=0; i < x*y; ++i) {
+      for (k=0; k < n; ++k) {
+         float z = (float) pow(data[i*comp+k]*stbi__h2l_scale_i, stbi__h2l_gamma_i) * 255 + 0.5f;
+         if (z < 0) z = 0;
+         if (z > 255) z = 255;
+         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
+      }
+      if (k < comp) {
+         float z = data[i*comp+k] * 255 + 0.5f;
+         if (z < 0) z = 0;
+         if (z > 255) z = 255;
+         output[i*comp + k] = (stbi_uc) stbi__float2int(z);
+      }
+   }
+   STBI_FREE(data);
+   return output;
+}
+#endif
+
+//////////////////////////////////////////////////////////////////////////////
+//
+//  "baseline" JPEG/JFIF decoder
+//
+//    simple implementation
+//      - doesn't support delayed output of y-dimension
+//      - simple interface (only one output format: 8-bit interleaved RGB)
+//      - doesn't try to recover corrupt jpegs
+//      - doesn't allow partial loading, loading multiple at once
+//      - still fast on x86 (copying globals into locals doesn't help x86)
+//      - allocates lots of intermediate memory (full size of all components)
+//        - non-interleaved case requires this anyway
+//        - allows good upsampling (see next)
+//    high-quality
+//      - upsampled channels are bilinearly interpolated, even across blocks
+//      - quality integer IDCT derived from IJG's 'slow'
+//    performance
+//      - fast huffman; reasonable integer IDCT
+//      - some SIMD kernels for common paths on targets with SSE2/NEON
+//      - uses a lot of intermediate memory, could cache poorly
+
+#ifndef STBI_NO_JPEG
+
+// huffman decoding acceleration
+#define FAST_BITS   9  // larger handles more cases; smaller stomps less cache
+
+typedef struct
+{
+   stbi_uc  fast[1 << FAST_BITS];
+   // weirdly, repacking this into AoS is a 10% speed loss, instead of a win
+   stbi__uint16 code[256];
+   stbi_uc  values[256];
+   stbi_uc  size[257];
+   unsigned int maxcode[18];
+   int    delta[17];   // old 'firstsymbol' - old 'firstcode'
+} stbi__huffman;
+
+typedef struct
+{
+   stbi__context *s;
+   stbi__huffman huff_dc[4];
+   stbi__huffman huff_ac[4];
+   stbi__uint16 dequant[4][64];
+   stbi__int16 fast_ac[4][1 << FAST_BITS];
+
+// sizes for components, interleaved MCUs
+   int img_h_max, img_v_max;
+   int img_mcu_x, img_mcu_y;
+   int img_mcu_w, img_mcu_h;
+
+// definition of jpeg image component
+   struct
+   {
+      int id;
+      int h,v;
+      int tq;
+      int hd,ha;
+      int dc_pred;
+
+      int x,y,w2,h2;
+      stbi_uc *data;
+      void *raw_data, *raw_coeff;
+      stbi_uc *linebuf;
+      short   *coeff;   // progressive only
+      int      coeff_w, coeff_h; // number of 8x8 coefficient blocks
+   } img_comp[4];
+
+   stbi__uint32   code_buffer; // jpeg entropy-coded buffer
+   int            code_bits;   // number of valid bits
+   unsigned char  marker;      // marker seen while filling entropy buffer
+   int            nomore;      // flag if we saw a marker so must stop
+
+   int            progressive;
+   int            spec_start;
+   int            spec_end;
+   int            succ_high;
+   int            succ_low;
+   int            eob_run;
+   int            jfif;
+   int            app14_color_transform; // Adobe APP14 tag
+   int            rgb;
+
+   int scan_n, order[4];
+   int restart_interval, todo;
+
+// kernels
+   void (*idct_block_kernel)(stbi_uc *out, int out_stride, short data[64]);
+   void (*YCbCr_to_RGB_kernel)(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step);
+   stbi_uc *(*resample_row_hv_2_kernel)(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs);
+} stbi__jpeg;
+
+static int stbi__build_huffman(stbi__huffman *h, int *count)
+{
+   int i,j,k=0;
+   unsigned int code;
+   // build size list for each symbol (from JPEG spec)
+   for (i=0; i < 16; ++i)
+      for (j=0; j < count[i]; ++j)
+         h->size[k++] = (stbi_uc) (i+1);
+   h->size[k] = 0;
+
+   // compute actual symbols (from jpeg spec)
+   code = 0;
+   k = 0;
+   for(j=1; j <= 16; ++j) {
+      // compute delta to add to code to compute symbol id
+      h->delta[j] = k - code;
+      if (h->size[k] == j) {
+         while (h->size[k] == j)
+            h->code[k++] = (stbi__uint16) (code++);
+         if (code-1 >= (1u << j)) return stbi__err("bad code lengths","Corrupt JPEG");
+      }
+      // compute largest code + 1 for this size, preshifted as needed later
+      h->maxcode[j] = code << (16-j);
+      code <<= 1;
+   }
+   h->maxcode[j] = 0xffffffff;
+
+   // build non-spec acceleration table; 255 is flag for not-accelerated
+   memset(h->fast, 255, 1 << FAST_BITS);
+   for (i=0; i < k; ++i) {
+      int s = h->size[i];
+      if (s <= FAST_BITS) {
+         int c = h->code[i] << (FAST_BITS-s);
+         int m = 1 << (FAST_BITS-s);
+         for (j=0; j < m; ++j) {
+            h->fast[c+j] = (stbi_uc) i;
+         }
+      }
+   }
+   return 1;
+}
+
+// build a table that decodes both magnitude and value of small ACs in
+// one go.
+static void stbi__build_fast_ac(stbi__int16 *fast_ac, stbi__huffman *h)
+{
+   int i;
+   for (i=0; i < (1 << FAST_BITS); ++i) {
+      stbi_uc fast = h->fast[i];
+      fast_ac[i] = 0;
+      if (fast < 255) {
+         int rs = h->values[fast];
+         int run = (rs >> 4) & 15;
+         int magbits = rs & 15;
+         int len = h->size[fast];
+
+         if (magbits && len + magbits <= FAST_BITS) {
+            // magnitude code followed by receive_extend code
+            int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
+            int m = 1 << (magbits - 1);
+            if (k < m) k += (~0U << magbits) + 1;
+            // if the result is small enough, we can fit it in fast_ac table
+            if (k >= -128 && k <= 127)
+               fast_ac[i] = (stbi__int16) ((k * 256) + (run * 16) + (len + magbits));
+         }
+      }
+   }
+}
+
+static void stbi__grow_buffer_unsafe(stbi__jpeg *j)
+{
+   do {
+      unsigned int b = j->nomore ? 0 : stbi__get8(j->s);
+      if (b == 0xff) {
+         int c = stbi__get8(j->s);
+         while (c == 0xff) c = stbi__get8(j->s); // consume fill bytes
+         if (c != 0) {
+            j->marker = (unsigned char) c;
+            j->nomore = 1;
+            return;
+         }
+      }
+      j->code_buffer |= b << (24 - j->code_bits);
+      j->code_bits += 8;
+   } while (j->code_bits <= 24);
+}
+
+// (1 << n) - 1
+static const stbi__uint32 stbi__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
+
+// decode a jpeg huffman value from the bitstream
+stbi_inline static int stbi__jpeg_huff_decode(stbi__jpeg *j, stbi__huffman *h)
+{
+   unsigned int temp;
+   int c,k;
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+
+   // look at the top FAST_BITS and determine what symbol ID it is,
+   // if the code is <= FAST_BITS
+   c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+   k = h->fast[c];
+   if (k < 255) {
+      int s = h->size[k];
+      if (s > j->code_bits)
+         return -1;
+      j->code_buffer <<= s;
+      j->code_bits -= s;
+      return h->values[k];
+   }
+
+   // naive test is to shift the code_buffer down so k bits are
+   // valid, then test against maxcode. To speed this up, we've
+   // preshifted maxcode left so that it has (16-k) 0s at the
+   // end; in other words, regardless of the number of bits, it
+   // wants to be compared against something shifted to have 16;
+   // that way we don't need to shift inside the loop.
+   temp = j->code_buffer >> 16;
+   for (k=FAST_BITS+1 ; ; ++k)
+      if (temp < h->maxcode[k])
+         break;
+   if (k == 17) {
+      // error! code not found
+      j->code_bits -= 16;
+      return -1;
+   }
+
+   if (k > j->code_bits)
+      return -1;
+
+   // convert the huffman code to the symbol id
+   c = ((j->code_buffer >> (32 - k)) & stbi__bmask[k]) + h->delta[k];
+   STBI_ASSERT((((j->code_buffer) >> (32 - h->size[c])) & stbi__bmask[h->size[c]]) == h->code[c]);
+
+   // convert the id to a symbol
+   j->code_bits -= k;
+   j->code_buffer <<= k;
+   return h->values[c];
+}
+
+// bias[n] = (-1<<n) + 1
+static const int stbi__jbias[16] = {0,-1,-3,-7,-15,-31,-63,-127,-255,-511,-1023,-2047,-4095,-8191,-16383,-32767};
+
+// combined JPEG 'receive' and JPEG 'extend', since baseline
+// always extends everything it receives.
+stbi_inline static int stbi__extend_receive(stbi__jpeg *j, int n)
+{
+   unsigned int k;
+   int sgn;
+   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+
+   sgn = (stbi__int32)j->code_buffer >> 31; // sign bit is always in MSB
+   k = stbi_lrot(j->code_buffer, n);
+   STBI_ASSERT(n >= 0 && n < (int) (sizeof(stbi__bmask)/sizeof(*stbi__bmask)));
+   j->code_buffer = k & ~stbi__bmask[n];
+   k &= stbi__bmask[n];
+   j->code_bits -= n;
+   return k + (stbi__jbias[n] & ~sgn);
+}
+
+// get some unsigned bits
+stbi_inline static int stbi__jpeg_get_bits(stbi__jpeg *j, int n)
+{
+   unsigned int k;
+   if (j->code_bits < n) stbi__grow_buffer_unsafe(j);
+   k = stbi_lrot(j->code_buffer, n);
+   j->code_buffer = k & ~stbi__bmask[n];
+   k &= stbi__bmask[n];
+   j->code_bits -= n;
+   return k;
+}
+
+stbi_inline static int stbi__jpeg_get_bit(stbi__jpeg *j)
+{
+   unsigned int k;
+   if (j->code_bits < 1) stbi__grow_buffer_unsafe(j);
+   k = j->code_buffer;
+   j->code_buffer <<= 1;
+   --j->code_bits;
+   return k & 0x80000000;
+}
+
+// given a value that's at position X in the zigzag stream,
+// where does it appear in the 8x8 matrix coded as row-major?
+static const stbi_uc stbi__jpeg_dezigzag[64+15] =
+{
+    0,  1,  8, 16,  9,  2,  3, 10,
+   17, 24, 32, 25, 18, 11,  4,  5,
+   12, 19, 26, 33, 40, 48, 41, 34,
+   27, 20, 13,  6,  7, 14, 21, 28,
+   35, 42, 49, 56, 57, 50, 43, 36,
+   29, 22, 15, 23, 30, 37, 44, 51,
+   58, 59, 52, 45, 38, 31, 39, 46,
+   53, 60, 61, 54, 47, 55, 62, 63,
+   // let corrupt input sample past end
+   63, 63, 63, 63, 63, 63, 63, 63,
+   63, 63, 63, 63, 63, 63, 63
+};
+
+// decode one 64-entry block--
+static int stbi__jpeg_decode_block(stbi__jpeg *j, short data[64], stbi__huffman *hdc, stbi__huffman *hac, stbi__int16 *fac, int b, stbi__uint16 *dequant)
+{
+   int diff,dc,k;
+   int t;
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+   t = stbi__jpeg_huff_decode(j, hdc);
+   if (t < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+
+   // 0 all the ac values now so we can do it 32-bits at a time
+   memset(data,0,64*sizeof(data[0]));
+
+   diff = t ? stbi__extend_receive(j, t) : 0;
+   dc = j->img_comp[b].dc_pred + diff;
+   j->img_comp[b].dc_pred = dc;
+   data[0] = (short) (dc * dequant[0]);
+
+   // decode AC components, see JPEG spec
+   k = 1;
+   do {
+      unsigned int zig;
+      int c,r,s;
+      if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+      c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+      r = fac[c];
+      if (r) { // fast-AC path
+         k += (r >> 4) & 15; // run
+         s = r & 15; // combined length
+         j->code_buffer <<= s;
+         j->code_bits -= s;
+         // decode into unzigzag'd location
+         zig = stbi__jpeg_dezigzag[k++];
+         data[zig] = (short) ((r >> 8) * dequant[zig]);
+      } else {
+         int rs = stbi__jpeg_huff_decode(j, hac);
+         if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+         s = rs & 15;
+         r = rs >> 4;
+         if (s == 0) {
+            if (rs != 0xf0) break; // end block
+            k += 16;
+         } else {
+            k += r;
+            // decode into unzigzag'd location
+            zig = stbi__jpeg_dezigzag[k++];
+            data[zig] = (short) (stbi__extend_receive(j,s) * dequant[zig]);
+         }
+      }
+   } while (k < 64);
+   return 1;
+}
+
+static int stbi__jpeg_decode_block_prog_dc(stbi__jpeg *j, short data[64], stbi__huffman *hdc, int b)
+{
+   int diff,dc;
+   int t;
+   if (j->spec_end != 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
+
+   if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+
+   if (j->succ_high == 0) {
+      // first scan for DC coefficient, must be first
+      memset(data,0,64*sizeof(data[0])); // 0 all the ac values now
+      t = stbi__jpeg_huff_decode(j, hdc);
+      diff = t ? stbi__extend_receive(j, t) : 0;
+
+      dc = j->img_comp[b].dc_pred + diff;
+      j->img_comp[b].dc_pred = dc;
+      data[0] = (short) (dc << j->succ_low);
+   } else {
+      // refinement scan for DC coefficient
+      if (stbi__jpeg_get_bit(j))
+         data[0] += (short) (1 << j->succ_low);
+   }
+   return 1;
+}
+
+// @OPTIMIZE: store non-zigzagged during the decode passes,
+// and only de-zigzag when dequantizing
+static int stbi__jpeg_decode_block_prog_ac(stbi__jpeg *j, short data[64], stbi__huffman *hac, stbi__int16 *fac)
+{
+   int k;
+   if (j->spec_start == 0) return stbi__err("can't merge dc and ac", "Corrupt JPEG");
+
+   if (j->succ_high == 0) {
+      int shift = j->succ_low;
+
+      if (j->eob_run) {
+         --j->eob_run;
+         return 1;
+      }
+
+      k = j->spec_start;
+      do {
+         unsigned int zig;
+         int c,r,s;
+         if (j->code_bits < 16) stbi__grow_buffer_unsafe(j);
+         c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
+         r = fac[c];
+         if (r) { // fast-AC path
+            k += (r >> 4) & 15; // run
+            s = r & 15; // combined length
+            j->code_buffer <<= s;
+            j->code_bits -= s;
+            zig = stbi__jpeg_dezigzag[k++];
+            data[zig] = (short) ((r >> 8) << shift);
+         } else {
+            int rs = stbi__jpeg_huff_decode(j, hac);
+            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+            s = rs & 15;
+            r = rs >> 4;
+            if (s == 0) {
+               if (r < 15) {
+                  j->eob_run = (1 << r);
+                  if (r)
+                     j->eob_run += stbi__jpeg_get_bits(j, r);
+                  --j->eob_run;
+                  break;
+               }
+               k += 16;
+            } else {
+               k += r;
+               zig = stbi__jpeg_dezigzag[k++];
+               data[zig] = (short) (stbi__extend_receive(j,s) << shift);
+            }
+         }
+      } while (k <= j->spec_end);
+   } else {
+      // refinement scan for these AC coefficients
+
+      short bit = (short) (1 << j->succ_low);
+
+      if (j->eob_run) {
+         --j->eob_run;
+         for (k = j->spec_start; k <= j->spec_end; ++k) {
+            short *p = &data[stbi__jpeg_dezigzag[k]];
+            if (*p != 0)
+               if (stbi__jpeg_get_bit(j))
+                  if ((*p & bit)==0) {
+                     if (*p > 0)
+                        *p += bit;
+                     else
+                        *p -= bit;
+                  }
+         }
+      } else {
+         k = j->spec_start;
+         do {
+            int r,s;
+            int rs = stbi__jpeg_huff_decode(j, hac); // @OPTIMIZE see if we can use the fast path here, advance-by-r is so slow, eh
+            if (rs < 0) return stbi__err("bad huffman code","Corrupt JPEG");
+            s = rs & 15;
+            r = rs >> 4;
+            if (s == 0) {
+               if (r < 15) {
+                  j->eob_run = (1 << r) - 1;
+                  if (r)
+                     j->eob_run += stbi__jpeg_get_bits(j, r);
+                  r = 64; // force end of block
+               } else {
+                  // r=15 s=0 should write 16 0s, so we just do
+                  // a run of 15 0s and then write s (which is 0),
+                  // so we don't have to do anything special here
+               }
+            } else {
+               if (s != 1) return stbi__err("bad huffman code", "Corrupt JPEG");
+               // sign bit
+               if (stbi__jpeg_get_bit(j))
+                  s = bit;
+               else
+                  s = -bit;
+            }
+
+            // advance by r
+            while (k <= j->spec_end) {
+               short *p = &data[stbi__jpeg_dezigzag[k++]];
+               if (*p != 0) {
+                  if (stbi__jpeg_get_bit(j))
+                     if ((*p & bit)==0) {
+                        if (*p > 0)
+                           *p += bit;
+                        else
+                           *p -= bit;
+                     }
+               } else {
+                  if (r == 0) {
+                     *p = (short) s;
+                     break;
+                  }
+                  --r;
+               }
+            }
+         } while (k <= j->spec_end);
+      }
+   }
+   return 1;
+}
+
+// take a -128..127 value and stbi__clamp it and convert to 0..255
+stbi_inline static stbi_uc stbi__clamp(int x)
+{
+   // trick to use a single test to catch both cases
+   if ((unsigned int) x > 255) {
+      if (x < 0) return 0;
+      if (x > 255) return 255;
+   }
+   return (stbi_uc) x;
+}
+
+#define stbi__f2f(x)  ((int) (((x) * 4096 + 0.5)))
+#define stbi__fsh(x)  ((x) * 4096)
+
+// derived from jidctint -- DCT_ISLOW
+#define STBI__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \
+   int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \
+   p2 = s2;                                    \
+   p3 = s6;                                    \
+   p1 = (p2+p3) * stbi__f2f(0.5411961f);       \
+   t2 = p1 + p3*stbi__f2f(-1.847759065f);      \
+   t3 = p1 + p2*stbi__f2f( 0.765366865f);      \
+   p2 = s0;                                    \
+   p3 = s4;                                    \
+   t0 = stbi__fsh(p2+p3);                      \
+   t1 = stbi__fsh(p2-p3);                      \
+   x0 = t0+t3;                                 \
+   x3 = t0-t3;                                 \
+   x1 = t1+t2;                                 \
+   x2 = t1-t2;                                 \
+   t0 = s7;                                    \
+   t1 = s5;                                    \
+   t2 = s3;                                    \
+   t3 = s1;                                    \
+   p3 = t0+t2;                                 \
+   p4 = t1+t3;                                 \
+   p1 = t0+t3;                                 \
+   p2 = t1+t2;                                 \
+   p5 = (p3+p4)*stbi__f2f( 1.175875602f);      \
+   t0 = t0*stbi__f2f( 0.298631336f);           \
+   t1 = t1*stbi__f2f( 2.053119869f);           \
+   t2 = t2*stbi__f2f( 3.072711026f);           \
+   t3 = t3*stbi__f2f( 1.501321110f);           \
+   p1 = p5 + p1*stbi__f2f(-0.899976223f);      \
+   p2 = p5 + p2*stbi__f2f(-2.562915447f);      \
+   p3 = p3*stbi__f2f(-1.961570560f);           \
+   p4 = p4*stbi__f2f(-0.390180644f);           \
+   t3 += p1+p4;                                \
+   t2 += p2+p3;                                \
+   t1 += p2+p4;                                \
+   t0 += p1+p3;
+
+static void stbi__idct_block(stbi_uc *out, int out_stride, short data[64])
+{
+   int i,val[64],*v=val;
+   stbi_uc *o;
+   short *d = data;
+
+   // columns
+   for (i=0; i < 8; ++i,++d, ++v) {
+      // if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing
+      if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0
+           && d[40]==0 && d[48]==0 && d[56]==0) {
+         //    no shortcut                 0     seconds
+         //    (1|2|3|4|5|6|7)==0          0     seconds
+         //    all separate               -0.047 seconds
+         //    1 && 2|3 && 4|5 && 6|7:    -0.047 seconds
+         int dcterm = d[0]*4;
+         v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
+      } else {
+         STBI__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56])
+         // constants scaled things up by 1<<12; let's bring them back
+         // down, but keep 2 extra bits of precision
+         x0 += 512; x1 += 512; x2 += 512; x3 += 512;
+         v[ 0] = (x0+t3) >> 10;
+         v[56] = (x0-t3) >> 10;
+         v[ 8] = (x1+t2) >> 10;
+         v[48] = (x1-t2) >> 10;
+         v[16] = (x2+t1) >> 10;
+         v[40] = (x2-t1) >> 10;
+         v[24] = (x3+t0) >> 10;
+         v[32] = (x3-t0) >> 10;
+      }
+   }
+
+   for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride) {
+      // no fast case since the first 1D IDCT spread components out
+      STBI__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7])
+      // constants scaled things up by 1<<12, plus we had 1<<2 from first
+      // loop, plus horizontal and vertical each scale by sqrt(8) so together
+      // we've got an extra 1<<3, so 1<<17 total we need to remove.
+      // so we want to round that, which means adding 0.5 * 1<<17,
+      // aka 65536. Also, we'll end up with -128 to 127 that we want
+      // to encode as 0..255 by adding 128, so we'll add that before the shift
+      x0 += 65536 + (128<<17);
+      x1 += 65536 + (128<<17);
+      x2 += 65536 + (128<<17);
+      x3 += 65536 + (128<<17);
+      // tried computing the shifts into temps, or'ing the temps to see
+      // if any were out of range, but that was slower
+      o[0] = stbi__clamp((x0+t3) >> 17);
+      o[7] = stbi__clamp((x0-t3) >> 17);
+      o[1] = stbi__clamp((x1+t2) >> 17);
+      o[6] = stbi__clamp((x1-t2) >> 17);
+      o[2] = stbi__clamp((x2+t1) >> 17);
+      o[5] = stbi__clamp((x2-t1) >> 17);
+      o[3] = stbi__clamp((x3+t0) >> 17);
+      o[4] = stbi__clamp((x3-t0) >> 17);
+   }
+}
+
+#ifdef STBI_SSE2
+// sse2 integer IDCT. not the fastest possible implementation but it
+// produces bit-identical results to the generic C version so it's
+// fully "transparent".
+static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
+{
+   // This is constructed to match our regular (generic) integer IDCT exactly.
+   __m128i row0, row1, row2, row3, row4, row5, row6, row7;
+   __m128i tmp;
+
+   // dot product constant: even elems=x, odd elems=y
+   #define dct_const(x,y)  _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y))
+
+   // out(0) = c0[even]*x + c0[odd]*y   (c0, x, y 16-bit, out 32-bit)
+   // out(1) = c1[even]*x + c1[odd]*y
+   #define dct_rot(out0,out1, x,y,c0,c1) \
+      __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \
+      __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \
+      __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \
+      __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \
+      __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \
+      __m128i out1##_h = _mm_madd_epi16(c0##hi, c1)
+
+   // out = in << 12  (in 16-bit, out 32-bit)
+   #define dct_widen(out, in) \
+      __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \
+      __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4)
+
+   // wide add
+   #define dct_wadd(out, a, b) \
+      __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \
+      __m128i out##_h = _mm_add_epi32(a##_h, b##_h)
+
+   // wide sub
+   #define dct_wsub(out, a, b) \
+      __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \
+      __m128i out##_h = _mm_sub_epi32(a##_h, b##_h)
+
+   // butterfly a/b, add bias, then shift by "s" and pack
+   #define dct_bfly32o(out0, out1, a,b,bias,s) \
+      { \
+         __m128i abiased_l = _mm_add_epi32(a##_l, bias); \
+         __m128i abiased_h = _mm_add_epi32(a##_h, bias); \
+         dct_wadd(sum, abiased, b); \
+         dct_wsub(dif, abiased, b); \
+         out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \
+         out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \
+      }
+
+   // 8-bit interleave step (for transposes)
+   #define dct_interleave8(a, b) \
+      tmp = a; \
+      a = _mm_unpacklo_epi8(a, b); \
+      b = _mm_unpackhi_epi8(tmp, b)
+
+   // 16-bit interleave step (for transposes)
+   #define dct_interleave16(a, b) \
+      tmp = a; \
+      a = _mm_unpacklo_epi16(a, b); \
+      b = _mm_unpackhi_epi16(tmp, b)
+
+   #define dct_pass(bias,shift) \
+      { \
+         /* even part */ \
+         dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \
+         __m128i sum04 = _mm_add_epi16(row0, row4); \
+         __m128i dif04 = _mm_sub_epi16(row0, row4); \
+         dct_widen(t0e, sum04); \
+         dct_widen(t1e, dif04); \
+         dct_wadd(x0, t0e, t3e); \
+         dct_wsub(x3, t0e, t3e); \
+         dct_wadd(x1, t1e, t2e); \
+         dct_wsub(x2, t1e, t2e); \
+         /* odd part */ \
+         dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \
+         dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \
+         __m128i sum17 = _mm_add_epi16(row1, row7); \
+         __m128i sum35 = _mm_add_epi16(row3, row5); \
+         dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \
+         dct_wadd(x4, y0o, y4o); \
+         dct_wadd(x5, y1o, y5o); \
+         dct_wadd(x6, y2o, y5o); \
+         dct_wadd(x7, y3o, y4o); \
+         dct_bfly32o(row0,row7, x0,x7,bias,shift); \
+         dct_bfly32o(row1,row6, x1,x6,bias,shift); \
+         dct_bfly32o(row2,row5, x2,x5,bias,shift); \
+         dct_bfly32o(row3,row4, x3,x4,bias,shift); \
+      }
+
+   __m128i rot0_0 = dct_const(stbi__f2f(0.5411961f), stbi__f2f(0.5411961f) + stbi__f2f(-1.847759065f));
+   __m128i rot0_1 = dct_const(stbi__f2f(0.5411961f) + stbi__f2f( 0.765366865f), stbi__f2f(0.5411961f));
+   __m128i rot1_0 = dct_const(stbi__f2f(1.175875602f) + stbi__f2f(-0.899976223f), stbi__f2f(1.175875602f));
+   __m128i rot1_1 = dct_const(stbi__f2f(1.175875602f), stbi__f2f(1.175875602f) + stbi__f2f(-2.562915447f));
+   __m128i rot2_0 = dct_const(stbi__f2f(-1.961570560f) + stbi__f2f( 0.298631336f), stbi__f2f(-1.961570560f));
+   __m128i rot2_1 = dct_const(stbi__f2f(-1.961570560f), stbi__f2f(-1.961570560f) + stbi__f2f( 3.072711026f));
+   __m128i rot3_0 = dct_const(stbi__f2f(-0.390180644f) + stbi__f2f( 2.053119869f), stbi__f2f(-0.390180644f));
+   __m128i rot3_1 = dct_const(stbi__f2f(-0.390180644f), stbi__f2f(-0.390180644f) + stbi__f2f( 1.501321110f));
+
+   // rounding biases in column/row passes, see stbi__idct_block for explanation.
+   __m128i bias_0 = _mm_set1_epi32(512);
+   __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17));
+
+   // load
+   row0 = _mm_load_si128((const __m128i *) (data + 0*8));
+   row1 = _mm_load_si128((const __m128i *) (data + 1*8));
+   row2 = _mm_load_si128((const __m128i *) (data + 2*8));
+   row3 = _mm_load_si128((const __m128i *) (data + 3*8));
+   row4 = _mm_load_si128((const __m128i *) (data + 4*8));
+   row5 = _mm_load_si128((const __m128i *) (data + 5*8));
+   row6 = _mm_load_si128((const __m128i *) (data + 6*8));
+   row7 = _mm_load_si128((const __m128i *) (data + 7*8));
+
+   // column pass
+   dct_pass(bias_0, 10);
+
+   {
+      // 16bit 8x8 transpose pass 1
+      dct_interleave16(row0, row4);
+      dct_interleave16(row1, row5);
+      dct_interleave16(row2, row6);
+      dct_interleave16(row3, row7);
+
+      // transpose pass 2
+      dct_interleave16(row0, row2);
+      dct_interleave16(row1, row3);
+      dct_interleave16(row4, row6);
+      dct_interleave16(row5, row7);
+
+      // transpose pass 3
+      dct_interleave16(row0, row1);
+      dct_interleave16(row2, row3);
+      dct_interleave16(row4, row5);
+      dct_interleave16(row6, row7);
+   }
+
+   // row pass
+   dct_pass(bias_1, 17);
+
+   {
+      // pack
+      __m128i p0 = _mm_packus_epi16(row0, row1); // a0a1a2a3...a7b0b1b2b3...b7
+      __m128i p1 = _mm_packus_epi16(row2, row3);
+      __m128i p2 = _mm_packus_epi16(row4, row5);
+      __m128i p3 = _mm_packus_epi16(row6, row7);
+
+      // 8bit 8x8 transpose pass 1
+      dct_interleave8(p0, p2); // a0e0a1e1...
+      dct_interleave8(p1, p3); // c0g0c1g1...
+
+      // transpose pass 2
+      dct_interleave8(p0, p1); // a0c0e0g0...
+      dct_interleave8(p2, p3); // b0d0f0h0...
+
+      // transpose pass 3
+      dct_interleave8(p0, p2); // a0b0c0d0...
+      dct_interleave8(p1, p3); // a4b4c4d4...
+
+      // store
+      _mm_storel_epi64((__m128i *) out, p0); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p2); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p1); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, p3); out += out_stride;
+      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e));
+   }
+
+#undef dct_const
+#undef dct_rot
+#undef dct_widen
+#undef dct_wadd
+#undef dct_wsub
+#undef dct_bfly32o
+#undef dct_interleave8
+#undef dct_interleave16
+#undef dct_pass
+}
+
+#endif // STBI_SSE2
+
+#ifdef STBI_NEON
+
+// NEON integer IDCT. should produce bit-identical
+// results to the generic C version.
+static void stbi__idct_simd(stbi_uc *out, int out_stride, short data[64])
+{
+   int16x8_t row0, row1, row2, row3, row4, row5, row6, row7;
+
+   int16x4_t rot0_0 = vdup_n_s16(stbi__f2f(0.5411961f));
+   int16x4_t rot0_1 = vdup_n_s16(stbi__f2f(-1.847759065f));
+   int16x4_t rot0_2 = vdup_n_s16(stbi__f2f( 0.765366865f));
+   int16x4_t rot1_0 = vdup_n_s16(stbi__f2f( 1.175875602f));
+   int16x4_t rot1_1 = vdup_n_s16(stbi__f2f(-0.899976223f));
+   int16x4_t rot1_2 = vdup_n_s16(stbi__f2f(-2.562915447f));
+   int16x4_t rot2_0 = vdup_n_s16(stbi__f2f(-1.961570560f));
+   int16x4_t rot2_1 = vdup_n_s16(stbi__f2f(-0.390180644f));
+   int16x4_t rot3_0 = vdup_n_s16(stbi__f2f( 0.298631336f));
+   int16x4_t rot3_1 = vdup_n_s16(stbi__f2f( 2.053119869f));
+   int16x4_t rot3_2 = vdup_n_s16(stbi__f2f( 3.072711026f));
+   int16x4_t rot3_3 = vdup_n_s16(stbi__f2f( 1.501321110f));
+
+#define dct_long_mul(out, inq, coeff) \
+   int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \
+   int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff)
+
+#define dct_long_mac(out, acc, inq, coeff) \
+   int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \
+   int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff)
+
+#define dct_widen(out, inq) \
+   int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \
+   int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12)
+
+// wide add
+#define dct_wadd(out, a, b) \
+   int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \
+   int32x4_t out##_h = vaddq_s32(a##_h, b##_h)
+
+// wide sub
+#define dct_wsub(out, a, b) \
+   int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \
+   int32x4_t out##_h = vsubq_s32(a##_h, b##_h)
+
+// butterfly a/b, then shift using "shiftop" by "s" and pack
+#define dct_bfly32o(out0,out1, a,b,shiftop,s) \
+   { \
+      dct_wadd(sum, a, b); \
+      dct_wsub(dif, a, b); \
+      out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \
+      out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \
+   }
+
+#define dct_pass(shiftop, shift) \
+   { \
+      /* even part */ \
+      int16x8_t sum26 = vaddq_s16(row2, row6); \
+      dct_long_mul(p1e, sum26, rot0_0); \
+      dct_long_mac(t2e, p1e, row6, rot0_1); \
+      dct_long_mac(t3e, p1e, row2, rot0_2); \
+      int16x8_t sum04 = vaddq_s16(row0, row4); \
+      int16x8_t dif04 = vsubq_s16(row0, row4); \
+      dct_widen(t0e, sum04); \
+      dct_widen(t1e, dif04); \
+      dct_wadd(x0, t0e, t3e); \
+      dct_wsub(x3, t0e, t3e); \
+      dct_wadd(x1, t1e, t2e); \
+      dct_wsub(x2, t1e, t2e); \
+      /* odd part */ \
+      int16x8_t sum15 = vaddq_s16(row1, row5); \
+      int16x8_t sum17 = vaddq_s16(row1, row7); \
+      int16x8_t sum35 = vaddq_s16(row3, row5); \
+      int16x8_t sum37 = vaddq_s16(row3, row7); \
+      int16x8_t sumodd = vaddq_s16(sum17, sum35); \
+      dct_long_mul(p5o, sumodd, rot1_0); \
+      dct_long_mac(p1o, p5o, sum17, rot1_1); \
+      dct_long_mac(p2o, p5o, sum35, rot1_2); \
+      dct_long_mul(p3o, sum37, rot2_0); \
+      dct_long_mul(p4o, sum15, rot2_1); \
+      dct_wadd(sump13o, p1o, p3o); \
+      dct_wadd(sump24o, p2o, p4o); \
+      dct_wadd(sump23o, p2o, p3o); \
+      dct_wadd(sump14o, p1o, p4o); \
+      dct_long_mac(x4, sump13o, row7, rot3_0); \
+      dct_long_mac(x5, sump24o, row5, rot3_1); \
+      dct_long_mac(x6, sump23o, row3, rot3_2); \
+      dct_long_mac(x7, sump14o, row1, rot3_3); \
+      dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \
+      dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \
+      dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \
+      dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \
+   }
+
+   // load
+   row0 = vld1q_s16(data + 0*8);
+   row1 = vld1q_s16(data + 1*8);
+   row2 = vld1q_s16(data + 2*8);
+   row3 = vld1q_s16(data + 3*8);
+   row4 = vld1q_s16(data + 4*8);
+   row5 = vld1q_s16(data + 5*8);
+   row6 = vld1q_s16(data + 6*8);
+   row7 = vld1q_s16(data + 7*8);
+
+   // add DC bias
+   row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0));
+
+   // column pass
+   dct_pass(vrshrn_n_s32, 10);
+
+   // 16bit 8x8 transpose
+   {
+// these three map to a single VTRN.16, VTRN.32, and VSWP, respectively.
+// whether compilers actually get this is another story, sadly.
+#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; }
+#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); }
+#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); }
+
+      // pass 1
+      dct_trn16(row0, row1); // a0b0a2b2a4b4a6b6
+      dct_trn16(row2, row3);
+      dct_trn16(row4, row5);
+      dct_trn16(row6, row7);
+
+      // pass 2
+      dct_trn32(row0, row2); // a0b0c0d0a4b4c4d4
+      dct_trn32(row1, row3);
+      dct_trn32(row4, row6);
+      dct_trn32(row5, row7);
+
+      // pass 3
+      dct_trn64(row0, row4); // a0b0c0d0e0f0g0h0
+      dct_trn64(row1, row5);
+      dct_trn64(row2, row6);
+      dct_trn64(row3, row7);
+
+#undef dct_trn16
+#undef dct_trn32
+#undef dct_trn64
+   }
+
+   // row pass
+   // vrshrn_n_s32 only supports shifts up to 16, we need
+   // 17. so do a non-rounding shift of 16 first then follow
+   // up with a rounding shift by 1.
+   dct_pass(vshrn_n_s32, 16);
+
+   {
+      // pack and round
+      uint8x8_t p0 = vqrshrun_n_s16(row0, 1);
+      uint8x8_t p1 = vqrshrun_n_s16(row1, 1);
+      uint8x8_t p2 = vqrshrun_n_s16(row2, 1);
+      uint8x8_t p3 = vqrshrun_n_s16(row3, 1);
+      uint8x8_t p4 = vqrshrun_n_s16(row4, 1);
+      uint8x8_t p5 = vqrshrun_n_s16(row5, 1);
+      uint8x8_t p6 = vqrshrun_n_s16(row6, 1);
+      uint8x8_t p7 = vqrshrun_n_s16(row7, 1);
+
+      // again, these can translate into one instruction, but often don't.
+#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; }
+#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); }
+#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); }
+
+      // sadly can't use interleaved stores here since we only write
+      // 8 bytes to each scan line!
+
+      // 8x8 8-bit transpose pass 1
+      dct_trn8_8(p0, p1);
+      dct_trn8_8(p2, p3);
+      dct_trn8_8(p4, p5);
+      dct_trn8_8(p6, p7);
+
+      // pass 2
+      dct_trn8_16(p0, p2);
+      dct_trn8_16(p1, p3);
+      dct_trn8_16(p4, p6);
+      dct_trn8_16(p5, p7);
+
+      // pass 3
+      dct_trn8_32(p0, p4);
+      dct_trn8_32(p1, p5);
+      dct_trn8_32(p2, p6);
+      dct_trn8_32(p3, p7);
+
+      // store
+      vst1_u8(out, p0); out += out_stride;
+      vst1_u8(out, p1); out += out_stride;
+      vst1_u8(out, p2); out += out_stride;
+      vst1_u8(out, p3); out += out_stride;
+      vst1_u8(out, p4); out += out_stride;
+      vst1_u8(out, p5); out += out_stride;
+      vst1_u8(out, p6); out += out_stride;
+      vst1_u8(out, p7);
+
+#undef dct_trn8_8
+#undef dct_trn8_16
+#undef dct_trn8_32
+   }
+
+#undef dct_long_mul
+#undef dct_long_mac
+#undef dct_widen
+#undef dct_wadd
+#undef dct_wsub
+#undef dct_bfly32o
+#undef dct_pass
+}
+
+#endif // STBI_NEON
+
+#define STBI__MARKER_none  0xff
+// if there's a pending marker from the entropy stream, return that
+// otherwise, fetch from the stream and get a marker. if there's no
+// marker, return 0xff, which is never a valid marker value
+static stbi_uc stbi__get_marker(stbi__jpeg *j)
+{
+   stbi_uc x;
+   if (j->marker != STBI__MARKER_none) { x = j->marker; j->marker = STBI__MARKER_none; return x; }
+   x = stbi__get8(j->s);
+   if (x != 0xff) return STBI__MARKER_none;
+   while (x == 0xff)
+      x = stbi__get8(j->s); // consume repeated 0xff fill bytes
+   return x;
+}
+
+// in each scan, we'll have scan_n components, and the order
+// of the components is specified by order[]
+#define STBI__RESTART(x)     ((x) >= 0xd0 && (x) <= 0xd7)
+
+// after a restart interval, stbi__jpeg_reset the entropy decoder and
+// the dc prediction
+static void stbi__jpeg_reset(stbi__jpeg *j)
+{
+   j->code_bits = 0;
+   j->code_buffer = 0;
+   j->nomore = 0;
+   j->img_comp[0].dc_pred = j->img_comp[1].dc_pred = j->img_comp[2].dc_pred = j->img_comp[3].dc_pred = 0;
+   j->marker = STBI__MARKER_none;
+   j->todo = j->restart_interval ? j->restart_interval : 0x7fffffff;
+   j->eob_run = 0;
+   // no more than 1<<31 MCUs if no restart_interal? that's plenty safe,
+   // since we don't even allow 1<<30 pixels
+}
+
+static int stbi__parse_entropy_coded_data(stbi__jpeg *z)
+{
+   stbi__jpeg_reset(z);
+   if (!z->progressive) {
+      if (z->scan_n == 1) {
+         int i,j;
+         STBI_SIMD_ALIGN(short, data[64]);
+         int n = z->order[0];
+         // non-interleaved data, we just need to process one block at a time,
+         // in trivial scanline order
+         // number of blocks to do just depends on how many actual "pixels" this
+         // component has, independent of interleaved MCU blocking and such
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               int ha = z->img_comp[n].ha;
+               if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
+               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
+               // every data block is an MCU, so countdown the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  // if it's NOT a restart, then just bail, so we get corrupt data
+                  // rather than no data
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      } else { // interleaved
+         int i,j,k,x,y;
+         STBI_SIMD_ALIGN(short, data[64]);
+         for (j=0; j < z->img_mcu_y; ++j) {
+            for (i=0; i < z->img_mcu_x; ++i) {
+               // scan an interleaved mcu... process scan_n components in order
+               for (k=0; k < z->scan_n; ++k) {
+                  int n = z->order[k];
+                  // scan out an mcu's worth of this component; that's just determined
+                  // by the basic H and V specified for the component
+                  for (y=0; y < z->img_comp[n].v; ++y) {
+                     for (x=0; x < z->img_comp[n].h; ++x) {
+                        int x2 = (i*z->img_comp[n].h + x)*8;
+                        int y2 = (j*z->img_comp[n].v + y)*8;
+                        int ha = z->img_comp[n].ha;
+                        if (!stbi__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd, z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq])) return 0;
+                        z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2, z->img_comp[n].w2, data);
+                     }
+                  }
+               }
+               // after all interleaved components, that's an interleaved MCU,
+               // so now count down the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      }
+   } else {
+      if (z->scan_n == 1) {
+         int i,j;
+         int n = z->order[0];
+         // non-interleaved data, we just need to process one block at a time,
+         // in trivial scanline order
+         // number of blocks to do just depends on how many actual "pixels" this
+         // component has, independent of interleaved MCU blocking and such
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
+               if (z->spec_start == 0) {
+                  if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
+                     return 0;
+               } else {
+                  int ha = z->img_comp[n].ha;
+                  if (!stbi__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha]))
+                     return 0;
+               }
+               // every data block is an MCU, so countdown the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      } else { // interleaved
+         int i,j,k,x,y;
+         for (j=0; j < z->img_mcu_y; ++j) {
+            for (i=0; i < z->img_mcu_x; ++i) {
+               // scan an interleaved mcu... process scan_n components in order
+               for (k=0; k < z->scan_n; ++k) {
+                  int n = z->order[k];
+                  // scan out an mcu's worth of this component; that's just determined
+                  // by the basic H and V specified for the component
+                  for (y=0; y < z->img_comp[n].v; ++y) {
+                     for (x=0; x < z->img_comp[n].h; ++x) {
+                        int x2 = (i*z->img_comp[n].h + x);
+                        int y2 = (j*z->img_comp[n].v + y);
+                        short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w);
+                        if (!stbi__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
+                           return 0;
+                     }
+                  }
+               }
+               // after all interleaved components, that's an interleaved MCU,
+               // so now count down the restart interval
+               if (--z->todo <= 0) {
+                  if (z->code_bits < 24) stbi__grow_buffer_unsafe(z);
+                  if (!STBI__RESTART(z->marker)) return 1;
+                  stbi__jpeg_reset(z);
+               }
+            }
+         }
+         return 1;
+      }
+   }
+}
+
+static void stbi__jpeg_dequantize(short *data, stbi__uint16 *dequant)
+{
+   int i;
+   for (i=0; i < 64; ++i)
+      data[i] *= dequant[i];
+}
+
+static void stbi__jpeg_finish(stbi__jpeg *z)
+{
+   if (z->progressive) {
+      // dequantize and idct the data
+      int i,j,n;
+      for (n=0; n < z->s->img_n; ++n) {
+         int w = (z->img_comp[n].x+7) >> 3;
+         int h = (z->img_comp[n].y+7) >> 3;
+         for (j=0; j < h; ++j) {
+            for (i=0; i < w; ++i) {
+               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
+               stbi__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]);
+               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8, z->img_comp[n].w2, data);
+            }
+         }
+      }
+   }
+}
+
+static int stbi__process_marker(stbi__jpeg *z, int m)
+{
+   int L;
+   switch (m) {
+      case STBI__MARKER_none: // no marker found
+         return stbi__err("expected marker","Corrupt JPEG");
+
+      case 0xDD: // DRI - specify restart interval
+         if (stbi__get16be(z->s) != 4) return stbi__err("bad DRI len","Corrupt JPEG");
+         z->restart_interval = stbi__get16be(z->s);
+         return 1;
+
+      case 0xDB: // DQT - define quantization table
+         L = stbi__get16be(z->s)-2;
+         while (L > 0) {
+            int q = stbi__get8(z->s);
+            int p = q >> 4, sixteen = (p != 0);
+            int t = q & 15,i;
+            if (p != 0 && p != 1) return stbi__err("bad DQT type","Corrupt JPEG");
+            if (t > 3) return stbi__err("bad DQT table","Corrupt JPEG");
+
+            for (i=0; i < 64; ++i)
+               z->dequant[t][stbi__jpeg_dezigzag[i]] = (stbi__uint16)(sixteen ? stbi__get16be(z->s) : stbi__get8(z->s));
+            L -= (sixteen ? 129 : 65);
+         }
+         return L==0;
+
+      case 0xC4: // DHT - define huffman table
+         L = stbi__get16be(z->s)-2;
+         while (L > 0) {
+            stbi_uc *v;
+            int sizes[16],i,n=0;
+            int q = stbi__get8(z->s);
+            int tc = q >> 4;
+            int th = q & 15;
+            if (tc > 1 || th > 3) return stbi__err("bad DHT header","Corrupt JPEG");
+            for (i=0; i < 16; ++i) {
+               sizes[i] = stbi__get8(z->s);
+               n += sizes[i];
+            }
+            L -= 17;
+            if (tc == 0) {
+               if (!stbi__build_huffman(z->huff_dc+th, sizes)) return 0;
+               v = z->huff_dc[th].values;
+            } else {
+               if (!stbi__build_huffman(z->huff_ac+th, sizes)) return 0;
+               v = z->huff_ac[th].values;
+            }
+            for (i=0; i < n; ++i)
+               v[i] = stbi__get8(z->s);
+            if (tc != 0)
+               stbi__build_fast_ac(z->fast_ac[th], z->huff_ac + th);
+            L -= n;
+         }
+         return L==0;
+   }
+
+   // check for comment block or APP blocks
+   if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE) {
+      L = stbi__get16be(z->s);
+      if (L < 2) {
+         if (m == 0xFE)
+            return stbi__err("bad COM len","Corrupt JPEG");
+         else
+            return stbi__err("bad APP len","Corrupt JPEG");
+      }
+      L -= 2;
+
+      if (m == 0xE0 && L >= 5) { // JFIF APP0 segment
+         static const unsigned char tag[5] = {'J','F','I','F','\0'};
+         int ok = 1;
+         int i;
+         for (i=0; i < 5; ++i)
+            if (stbi__get8(z->s) != tag[i])
+               ok = 0;
+         L -= 5;
+         if (ok)
+            z->jfif = 1;
+      } else if (m == 0xEE && L >= 12) { // Adobe APP14 segment
+         static const unsigned char tag[6] = {'A','d','o','b','e','\0'};
+         int ok = 1;
+         int i;
+         for (i=0; i < 6; ++i)
+            if (stbi__get8(z->s) != tag[i])
+               ok = 0;
+         L -= 6;
+         if (ok) {
+            stbi__get8(z->s); // version
+            stbi__get16be(z->s); // flags0
+            stbi__get16be(z->s); // flags1
+            z->app14_color_transform = stbi__get8(z->s); // color transform
+            L -= 6;
+         }
+      }
+
+      stbi__skip(z->s, L);
+      return 1;
+   }
+
+   return stbi__err("unknown marker","Corrupt JPEG");
+}
+
+// after we see SOS
+static int stbi__process_scan_header(stbi__jpeg *z)
+{
+   int i;
+   int Ls = stbi__get16be(z->s);
+   z->scan_n = stbi__get8(z->s);
+   if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n) return stbi__err("bad SOS component count","Corrupt JPEG");
+   if (Ls != 6+2*z->scan_n) return stbi__err("bad SOS len","Corrupt JPEG");
+   for (i=0; i < z->scan_n; ++i) {
+      int id = stbi__get8(z->s), which;
+      int q = stbi__get8(z->s);
+      for (which = 0; which < z->s->img_n; ++which)
+         if (z->img_comp[which].id == id)
+            break;
+      if (which == z->s->img_n) return 0; // no match
+      z->img_comp[which].hd = q >> 4;   if (z->img_comp[which].hd > 3) return stbi__err("bad DC huff","Corrupt JPEG");
+      z->img_comp[which].ha = q & 15;   if (z->img_comp[which].ha > 3) return stbi__err("bad AC huff","Corrupt JPEG");
+      z->order[i] = which;
+   }
+
+   {
+      int aa;
+      z->spec_start = stbi__get8(z->s);
+      z->spec_end   = stbi__get8(z->s); // should be 63, but might be 0
+      aa = stbi__get8(z->s);
+      z->succ_high = (aa >> 4);
+      z->succ_low  = (aa & 15);
+      if (z->progressive) {
+         if (z->spec_start > 63 || z->spec_end > 63  || z->spec_start > z->spec_end || z->succ_high > 13 || z->succ_low > 13)
+            return stbi__err("bad SOS", "Corrupt JPEG");
+      } else {
+         if (z->spec_start != 0) return stbi__err("bad SOS","Corrupt JPEG");
+         if (z->succ_high != 0 || z->succ_low != 0) return stbi__err("bad SOS","Corrupt JPEG");
+         z->spec_end = 63;
+      }
+   }
+
+   return 1;
+}
+
+static int stbi__free_jpeg_components(stbi__jpeg *z, int ncomp, int why)
+{
+   int i;
+   for (i=0; i < ncomp; ++i) {
+      if (z->img_comp[i].raw_data) {
+         STBI_FREE(z->img_comp[i].raw_data);
+         z->img_comp[i].raw_data = NULL;
+         z->img_comp[i].data = NULL;
+      }
+      if (z->img_comp[i].raw_coeff) {
+         STBI_FREE(z->img_comp[i].raw_coeff);
+         z->img_comp[i].raw_coeff = 0;
+         z->img_comp[i].coeff = 0;
+      }
+      if (z->img_comp[i].linebuf) {
+         STBI_FREE(z->img_comp[i].linebuf);
+         z->img_comp[i].linebuf = NULL;
+      }
+   }
+   return why;
+}
+
+static int stbi__process_frame_header(stbi__jpeg *z, int scan)
+{
+   stbi__context *s = z->s;
+   int Lf,p,i,q, h_max=1,v_max=1,c;
+   Lf = stbi__get16be(s);         if (Lf < 11) return stbi__err("bad SOF len","Corrupt JPEG"); // JPEG
+   p  = stbi__get8(s);            if (p != 8) return stbi__err("only 8-bit","JPEG format not supported: 8-bit only"); // JPEG baseline
+   s->img_y = stbi__get16be(s);   if (s->img_y == 0) return stbi__err("no header height", "JPEG format not supported: delayed height"); // Legal, but we don't handle it--but neither does IJG
+   s->img_x = stbi__get16be(s);   if (s->img_x == 0) return stbi__err("0 width","Corrupt JPEG"); // JPEG requires
+   c = stbi__get8(s);
+   if (c != 3 && c != 1 && c != 4) return stbi__err("bad component count","Corrupt JPEG");
+   s->img_n = c;
+   for (i=0; i < c; ++i) {
+      z->img_comp[i].data = NULL;
+      z->img_comp[i].linebuf = NULL;
+   }
+
+   if (Lf != 8+3*s->img_n) return stbi__err("bad SOF len","Corrupt JPEG");
+
+   z->rgb = 0;
+   for (i=0; i < s->img_n; ++i) {
+      static const unsigned char rgb[3] = { 'R', 'G', 'B' };
+      z->img_comp[i].id = stbi__get8(s);
+      if (s->img_n == 3 && z->img_comp[i].id == rgb[i])
+         ++z->rgb;
+      q = stbi__get8(s);
+      z->img_comp[i].h = (q >> 4);  if (!z->img_comp[i].h || z->img_comp[i].h > 4) return stbi__err("bad H","Corrupt JPEG");
+      z->img_comp[i].v = q & 15;    if (!z->img_comp[i].v || z->img_comp[i].v > 4) return stbi__err("bad V","Corrupt JPEG");
+      z->img_comp[i].tq = stbi__get8(s);  if (z->img_comp[i].tq > 3) return stbi__err("bad TQ","Corrupt JPEG");
+   }
+
+   if (scan != STBI__SCAN_load) return 1;
+
+   if (!stbi__mad3sizes_valid(s->img_x, s->img_y, s->img_n, 0)) return stbi__err("too large", "Image too large to decode");
+
+   for (i=0; i < s->img_n; ++i) {
+      if (z->img_comp[i].h > h_max) h_max = z->img_comp[i].h;
+      if (z->img_comp[i].v > v_max) v_max = z->img_comp[i].v;
+   }
+
+   // compute interleaved mcu info
+   z->img_h_max = h_max;
+   z->img_v_max = v_max;
+   z->img_mcu_w = h_max * 8;
+   z->img_mcu_h = v_max * 8;
+   // these sizes can't be more than 17 bits
+   z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w;
+   z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h;
+
+   for (i=0; i < s->img_n; ++i) {
+      // number of effective pixels (e.g. for non-interleaved MCU)
+      z->img_comp[i].x = (s->img_x * z->img_comp[i].h + h_max-1) / h_max;
+      z->img_comp[i].y = (s->img_y * z->img_comp[i].v + v_max-1) / v_max;
+      // to simplify generation, we'll allocate enough memory to decode
+      // the bogus oversized data from using interleaved MCUs and their
+      // big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
+      // discard the extra data until colorspace conversion
+      //
+      // img_mcu_x, img_mcu_y: <=17 bits; comp[i].h and .v are <=4 (checked earlier)
+      // so these muls can't overflow with 32-bit ints (which we require)
+      z->img_comp[i].w2 = z->img_mcu_x * z->img_comp[i].h * 8;
+      z->img_comp[i].h2 = z->img_mcu_y * z->img_comp[i].v * 8;
+      z->img_comp[i].coeff = 0;
+      z->img_comp[i].raw_coeff = 0;
+      z->img_comp[i].linebuf = NULL;
+      z->img_comp[i].raw_data = stbi__malloc_mad2(z->img_comp[i].w2, z->img_comp[i].h2, 15);
+      if (z->img_comp[i].raw_data == NULL)
+         return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
+      // align blocks for idct using mmx/sse
+      z->img_comp[i].data = (stbi_uc*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
+      if (z->progressive) {
+         // w2, h2 are multiples of 8 (see above)
+         z->img_comp[i].coeff_w = z->img_comp[i].w2 / 8;
+         z->img_comp[i].coeff_h = z->img_comp[i].h2 / 8;
+         z->img_comp[i].raw_coeff = stbi__malloc_mad3(z->img_comp[i].w2, z->img_comp[i].h2, sizeof(short), 15);
+         if (z->img_comp[i].raw_coeff == NULL)
+            return stbi__free_jpeg_components(z, i+1, stbi__err("outofmem", "Out of memory"));
+         z->img_comp[i].coeff = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15);
+      }
+   }
+
+   return 1;
+}
+
+// use comparisons since in some cases we handle more than one case (e.g. SOF)
+#define stbi__DNL(x)         ((x) == 0xdc)
+#define stbi__SOI(x)         ((x) == 0xd8)
+#define stbi__EOI(x)         ((x) == 0xd9)
+#define stbi__SOF(x)         ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2)
+#define stbi__SOS(x)         ((x) == 0xda)
+
+#define stbi__SOF_progressive(x)   ((x) == 0xc2)
+
+static int stbi__decode_jpeg_header(stbi__jpeg *z, int scan)
+{
+   int m;
+   z->jfif = 0;
+   z->app14_color_transform = -1; // valid values are 0,1,2
+   z->marker = STBI__MARKER_none; // initialize cached marker to empty
+   m = stbi__get_marker(z);
+   if (!stbi__SOI(m)) return stbi__err("no SOI","Corrupt JPEG");
+   if (scan == STBI__SCAN_type) return 1;
+   m = stbi__get_marker(z);
+   while (!stbi__SOF(m)) {
+      if (!stbi__process_marker(z,m)) return 0;
+      m = stbi__get_marker(z);
+      while (m == STBI__MARKER_none) {
+         // some files have extra padding after their blocks, so ok, we'll scan
+         if (stbi__at_eof(z->s)) return stbi__err("no SOF", "Corrupt JPEG");
+         m = stbi__get_marker(z);
+      }
+   }
+   z->progressive = stbi__SOF_progressive(m);
+   if (!stbi__process_frame_header(z, scan)) return 0;
+   return 1;
+}
+
+// decode image to YCbCr format
+static int stbi__decode_jpeg_image(stbi__jpeg *j)
+{
+   int m;
+   for (m = 0; m < 4; m++) {
+      j->img_comp[m].raw_data = NULL;
+      j->img_comp[m].raw_coeff = NULL;
+   }
+   j->restart_interval = 0;
+   if (!stbi__decode_jpeg_header(j, STBI__SCAN_load)) return 0;
+   m = stbi__get_marker(j);
+   while (!stbi__EOI(m)) {
+      if (stbi__SOS(m)) {
+         if (!stbi__process_scan_header(j)) return 0;
+         if (!stbi__parse_entropy_coded_data(j)) return 0;
+         if (j->marker == STBI__MARKER_none ) {
+            // handle 0s at the end of image data from IP Kamera 9060
+            while (!stbi__at_eof(j->s)) {
+               int x = stbi__get8(j->s);
+               if (x == 255) {
+                  j->marker = stbi__get8(j->s);
+                  break;
+               }
+            }
+            // if we reach eof without hitting a marker, stbi__get_marker() below will fail and we'll eventually return 0
+         }
+      } else if (stbi__DNL(m)) {
+         int Ld = stbi__get16be(j->s);
+         stbi__uint32 NL = stbi__get16be(j->s);
+         if (Ld != 4) return stbi__err("bad DNL len", "Corrupt JPEG");
+         if (NL != j->s->img_y) return stbi__err("bad DNL height", "Corrupt JPEG");
+      } else {
+         if (!stbi__process_marker(j, m)) return 0;
+      }
+      m = stbi__get_marker(j);
+   }
+   if (j->progressive)
+      stbi__jpeg_finish(j);
+   return 1;
+}
+
+// static jfif-centered resampling (across block boundaries)
+
+typedef stbi_uc *(*resample_row_func)(stbi_uc *out, stbi_uc *in0, stbi_uc *in1,
+                                    int w, int hs);
+
+#define stbi__div4(x) ((stbi_uc) ((x) >> 2))
+
+static stbi_uc *resample_row_1(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   STBI_NOTUSED(out);
+   STBI_NOTUSED(in_far);
+   STBI_NOTUSED(w);
+   STBI_NOTUSED(hs);
+   return in_near;
+}
+
+static stbi_uc* stbi__resample_row_v_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate two samples vertically for every one in input
+   int i;
+   STBI_NOTUSED(hs);
+   for (i=0; i < w; ++i)
+      out[i] = stbi__div4(3*in_near[i] + in_far[i] + 2);
+   return out;
+}
+
+static stbi_uc*  stbi__resample_row_h_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate two samples horizontally for every one in input
+   int i;
+   stbi_uc *input = in_near;
+
+   if (w == 1) {
+      // if only one sample, can't do any interpolation
+      out[0] = out[1] = input[0];
+      return out;
+   }
+
+   out[0] = input[0];
+   out[1] = stbi__div4(input[0]*3 + input[1] + 2);
+   for (i=1; i < w-1; ++i) {
+      int n = 3*input[i]+2;
+      out[i*2+0] = stbi__div4(n+input[i-1]);
+      out[i*2+1] = stbi__div4(n+input[i+1]);
+   }
+   out[i*2+0] = stbi__div4(input[w-2]*3 + input[w-1] + 2);
+   out[i*2+1] = input[w-1];
+
+   STBI_NOTUSED(in_far);
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+
+#define stbi__div16(x) ((stbi_uc) ((x) >> 4))
+
+static stbi_uc *stbi__resample_row_hv_2(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate 2x2 samples for every one in input
+   int i,t0,t1;
+   if (w == 1) {
+      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
+      return out;
+   }
+
+   t1 = 3*in_near[0] + in_far[0];
+   out[0] = stbi__div4(t1+2);
+   for (i=1; i < w; ++i) {
+      t0 = t1;
+      t1 = 3*in_near[i]+in_far[i];
+      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
+      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
+   }
+   out[w*2-1] = stbi__div4(t1+2);
+
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+
+#if defined(STBI_SSE2) || defined(STBI_NEON)
+static stbi_uc *stbi__resample_row_hv_2_simd(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // need to generate 2x2 samples for every one in input
+   int i=0,t0,t1;
+
+   if (w == 1) {
+      out[0] = out[1] = stbi__div4(3*in_near[0] + in_far[0] + 2);
+      return out;
+   }
+
+   t1 = 3*in_near[0] + in_far[0];
+   // process groups of 8 pixels for as long as we can.
+   // note we can't handle the last pixel in a row in this loop
+   // because we need to handle the filter boundary conditions.
+   for (; i < ((w-1) & ~7); i += 8) {
+#if defined(STBI_SSE2)
+      // load and perform the vertical filtering pass
+      // this uses 3*x + y = 4*x + (y - x)
+      __m128i zero  = _mm_setzero_si128();
+      __m128i farb  = _mm_loadl_epi64((__m128i *) (in_far + i));
+      __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i));
+      __m128i farw  = _mm_unpacklo_epi8(farb, zero);
+      __m128i nearw = _mm_unpacklo_epi8(nearb, zero);
+      __m128i diff  = _mm_sub_epi16(farw, nearw);
+      __m128i nears = _mm_slli_epi16(nearw, 2);
+      __m128i curr  = _mm_add_epi16(nears, diff); // current row
+
+      // horizontal filter works the same based on shifted vers of current
+      // row. "prev" is current row shifted right by 1 pixel; we need to
+      // insert the previous pixel value (from t1).
+      // "next" is current row shifted left by 1 pixel, with first pixel
+      // of next block of 8 pixels added in.
+      __m128i prv0 = _mm_slli_si128(curr, 2);
+      __m128i nxt0 = _mm_srli_si128(curr, 2);
+      __m128i prev = _mm_insert_epi16(prv0, t1, 0);
+      __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7);
+
+      // horizontal filter, polyphase implementation since it's convenient:
+      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
+      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
+      // note the shared term.
+      __m128i bias  = _mm_set1_epi16(8);
+      __m128i curs = _mm_slli_epi16(curr, 2);
+      __m128i prvd = _mm_sub_epi16(prev, curr);
+      __m128i nxtd = _mm_sub_epi16(next, curr);
+      __m128i curb = _mm_add_epi16(curs, bias);
+      __m128i even = _mm_add_epi16(prvd, curb);
+      __m128i odd  = _mm_add_epi16(nxtd, curb);
+
+      // interleave even and odd pixels, then undo scaling.
+      __m128i int0 = _mm_unpacklo_epi16(even, odd);
+      __m128i int1 = _mm_unpackhi_epi16(even, odd);
+      __m128i de0  = _mm_srli_epi16(int0, 4);
+      __m128i de1  = _mm_srli_epi16(int1, 4);
+
+      // pack and write output
+      __m128i outv = _mm_packus_epi16(de0, de1);
+      _mm_storeu_si128((__m128i *) (out + i*2), outv);
+#elif defined(STBI_NEON)
+      // load and perform the vertical filtering pass
+      // this uses 3*x + y = 4*x + (y - x)
+      uint8x8_t farb  = vld1_u8(in_far + i);
+      uint8x8_t nearb = vld1_u8(in_near + i);
+      int16x8_t diff  = vreinterpretq_s16_u16(vsubl_u8(farb, nearb));
+      int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2));
+      int16x8_t curr  = vaddq_s16(nears, diff); // current row
+
+      // horizontal filter works the same based on shifted vers of current
+      // row. "prev" is current row shifted right by 1 pixel; we need to
+      // insert the previous pixel value (from t1).
+      // "next" is current row shifted left by 1 pixel, with first pixel
+      // of next block of 8 pixels added in.
+      int16x8_t prv0 = vextq_s16(curr, curr, 7);
+      int16x8_t nxt0 = vextq_s16(curr, curr, 1);
+      int16x8_t prev = vsetq_lane_s16(t1, prv0, 0);
+      int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7);
+
+      // horizontal filter, polyphase implementation since it's convenient:
+      // even pixels = 3*cur + prev = cur*4 + (prev - cur)
+      // odd  pixels = 3*cur + next = cur*4 + (next - cur)
+      // note the shared term.
+      int16x8_t curs = vshlq_n_s16(curr, 2);
+      int16x8_t prvd = vsubq_s16(prev, curr);
+      int16x8_t nxtd = vsubq_s16(next, curr);
+      int16x8_t even = vaddq_s16(curs, prvd);
+      int16x8_t odd  = vaddq_s16(curs, nxtd);
+
+      // undo scaling and round, then store with even/odd phases interleaved
+      uint8x8x2_t o;
+      o.val[0] = vqrshrun_n_s16(even, 4);
+      o.val[1] = vqrshrun_n_s16(odd,  4);
+      vst2_u8(out + i*2, o);
+#endif
+
+      // "previous" value for next iter
+      t1 = 3*in_near[i+7] + in_far[i+7];
+   }
+
+   t0 = t1;
+   t1 = 3*in_near[i] + in_far[i];
+   out[i*2] = stbi__div16(3*t1 + t0 + 8);
+
+   for (++i; i < w; ++i) {
+      t0 = t1;
+      t1 = 3*in_near[i]+in_far[i];
+      out[i*2-1] = stbi__div16(3*t0 + t1 + 8);
+      out[i*2  ] = stbi__div16(3*t1 + t0 + 8);
+   }
+   out[w*2-1] = stbi__div4(t1+2);
+
+   STBI_NOTUSED(hs);
+
+   return out;
+}
+#endif
+
+static stbi_uc *stbi__resample_row_generic(stbi_uc *out, stbi_uc *in_near, stbi_uc *in_far, int w, int hs)
+{
+   // resample with nearest-neighbor
+   int i,j;
+   STBI_NOTUSED(in_far);
+   for (i=0; i < w; ++i)
+      for (j=0; j < hs; ++j)
+         out[i*hs+j] = in_near[i];
+   return out;
+}
+
+// this is a reduced-precision calculation of YCbCr-to-RGB introduced
+// to make sure the code produces the same results in both SIMD and scalar
+#define stbi__float2fixed(x)  (((int) ((x) * 4096.0f + 0.5f)) << 8)
+static void stbi__YCbCr_to_RGB_row(stbi_uc *out, const stbi_uc *y, const stbi_uc *pcb, const stbi_uc *pcr, int count, int step)
+{
+   int i;
+   for (i=0; i < count; ++i) {
+      int y_fixed = (y[i] << 20) + (1<<19); // rounding
+      int r,g,b;
+      int cr = pcr[i] - 128;
+      int cb = pcb[i] - 128;
+      r = y_fixed +  cr* stbi__float2fixed(1.40200f);
+      g = y_fixed + (cr*-stbi__float2fixed(0.71414f)) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
+      b = y_fixed                                     +   cb* stbi__float2fixed(1.77200f);
+      r >>= 20;
+      g >>= 20;
+      b >>= 20;
+      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
+      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
+      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
+      out[0] = (stbi_uc)r;
+      out[1] = (stbi_uc)g;
+      out[2] = (stbi_uc)b;
+      out[3] = 255;
+      out += step;
+   }
+}
+
+#if defined(STBI_SSE2) || defined(STBI_NEON)
+static void stbi__YCbCr_to_RGB_simd(stbi_uc *out, stbi_uc const *y, stbi_uc const *pcb, stbi_uc const *pcr, int count, int step)
+{
+   int i = 0;
+
+#ifdef STBI_SSE2
+   // step == 3 is pretty ugly on the final interleave, and i'm not convinced
+   // it's useful in practice (you wouldn't use it for textures, for example).
+   // so just accelerate step == 4 case.
+   if (step == 4) {
+      // this is a fairly straightforward implementation and not super-optimized.
+      __m128i signflip  = _mm_set1_epi8(-0x80);
+      __m128i cr_const0 = _mm_set1_epi16(   (short) ( 1.40200f*4096.0f+0.5f));
+      __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f));
+      __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f));
+      __m128i cb_const1 = _mm_set1_epi16(   (short) ( 1.77200f*4096.0f+0.5f));
+      __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128);
+      __m128i xw = _mm_set1_epi16(255); // alpha channel
+
+      for (; i+7 < count; i += 8) {
+         // load
+         __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i));
+         __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i));
+         __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i));
+         __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); // -128
+         __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); // -128
+
+         // unpack to short (and left-shift cr, cb by 8)
+         __m128i yw  = _mm_unpacklo_epi8(y_bias, y_bytes);
+         __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased);
+         __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased);
+
+         // color transform
+         __m128i yws = _mm_srli_epi16(yw, 4);
+         __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw);
+         __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw);
+         __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1);
+         __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1);
+         __m128i rws = _mm_add_epi16(cr0, yws);
+         __m128i gwt = _mm_add_epi16(cb0, yws);
+         __m128i bws = _mm_add_epi16(yws, cb1);
+         __m128i gws = _mm_add_epi16(gwt, cr1);
+
+         // descale
+         __m128i rw = _mm_srai_epi16(rws, 4);
+         __m128i bw = _mm_srai_epi16(bws, 4);
+         __m128i gw = _mm_srai_epi16(gws, 4);
+
+         // back to byte, set up for transpose
+         __m128i brb = _mm_packus_epi16(rw, bw);
+         __m128i gxb = _mm_packus_epi16(gw, xw);
+
+         // transpose to interleave channels
+         __m128i t0 = _mm_unpacklo_epi8(brb, gxb);
+         __m128i t1 = _mm_unpackhi_epi8(brb, gxb);
+         __m128i o0 = _mm_unpacklo_epi16(t0, t1);
+         __m128i o1 = _mm_unpackhi_epi16(t0, t1);
+
+         // store
+         _mm_storeu_si128((__m128i *) (out + 0), o0);
+         _mm_storeu_si128((__m128i *) (out + 16), o1);
+         out += 32;
+      }
+   }
+#endif
+
+#ifdef STBI_NEON
+   // in this version, step=3 support would be easy to add. but is there demand?
+   if (step == 4) {
+      // this is a fairly straightforward implementation and not super-optimized.
+      uint8x8_t signflip = vdup_n_u8(0x80);
+      int16x8_t cr_const0 = vdupq_n_s16(   (short) ( 1.40200f*4096.0f+0.5f));
+      int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f));
+      int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f));
+      int16x8_t cb_const1 = vdupq_n_s16(   (short) ( 1.77200f*4096.0f+0.5f));
+
+      for (; i+7 < count; i += 8) {
+         // load
+         uint8x8_t y_bytes  = vld1_u8(y + i);
+         uint8x8_t cr_bytes = vld1_u8(pcr + i);
+         uint8x8_t cb_bytes = vld1_u8(pcb + i);
+         int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip));
+         int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip));
+
+         // expand to s16
+         int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4));
+         int16x8_t crw = vshll_n_s8(cr_biased, 7);
+         int16x8_t cbw = vshll_n_s8(cb_biased, 7);
+
+         // color transform
+         int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0);
+         int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0);
+         int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1);
+         int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1);
+         int16x8_t rws = vaddq_s16(yws, cr0);
+         int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1);
+         int16x8_t bws = vaddq_s16(yws, cb1);
+
+         // undo scaling, round, convert to byte
+         uint8x8x4_t o;
+         o.val[0] = vqrshrun_n_s16(rws, 4);
+         o.val[1] = vqrshrun_n_s16(gws, 4);
+         o.val[2] = vqrshrun_n_s16(bws, 4);
+         o.val[3] = vdup_n_u8(255);
+
+         // store, interleaving r/g/b/a
+         vst4_u8(out, o);
+         out += 8*4;
+      }
+   }
+#endif
+
+   for (; i < count; ++i) {
+      int y_fixed = (y[i] << 20) + (1<<19); // rounding
+      int r,g,b;
+      int cr = pcr[i] - 128;
+      int cb = pcb[i] - 128;
+      r = y_fixed + cr* stbi__float2fixed(1.40200f);
+      g = y_fixed + cr*-stbi__float2fixed(0.71414f) + ((cb*-stbi__float2fixed(0.34414f)) & 0xffff0000);
+      b = y_fixed                                   +   cb* stbi__float2fixed(1.77200f);
+      r >>= 20;
+      g >>= 20;
+      b >>= 20;
+      if ((unsigned) r > 255) { if (r < 0) r = 0; else r = 255; }
+      if ((unsigned) g > 255) { if (g < 0) g = 0; else g = 255; }
+      if ((unsigned) b > 255) { if (b < 0) b = 0; else b = 255; }
+      out[0] = (stbi_uc)r;
+      out[1] = (stbi_uc)g;
+      out[2] = (stbi_uc)b;
+      out[3] = 255;
+      out += step;
+   }
+}
+#endif
+
+// set up the kernels
+static void stbi__setup_jpeg(stbi__jpeg *j)
+{
+   j->idct_block_kernel = stbi__idct_block;
+   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_row;
+   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2;
+
+#ifdef STBI_SSE2
+   if (stbi__sse2_available()) {
+      j->idct_block_kernel = stbi__idct_simd;
+      j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
+      j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
+   }
+#endif
+
+#ifdef STBI_NEON
+   j->idct_block_kernel = stbi__idct_simd;
+   j->YCbCr_to_RGB_kernel = stbi__YCbCr_to_RGB_simd;
+   j->resample_row_hv_2_kernel = stbi__resample_row_hv_2_simd;
+#endif
+}
+
+// clean up the temporary component buffers
+static void stbi__cleanup_jpeg(stbi__jpeg *j)
+{
+   stbi__free_jpeg_components(j, j->s->img_n, 0);
+}
+
+typedef struct
+{
+   resample_row_func resample;
+   stbi_uc *line0,*line1;
+   int hs,vs;   // expansion factor in each axis
+   int w_lores; // horizontal pixels pre-expansion
+   int ystep;   // how far through vertical expansion we are
+   int ypos;    // which pre-expansion row we're on
+} stbi__resample;
+
+// fast 0..255 * 0..255 => 0..255 rounded multiplication
+static stbi_uc stbi__blinn_8x8(stbi_uc x, stbi_uc y)
+{
+   unsigned int t = x*y + 128;
+   return (stbi_uc) ((t + (t >>8)) >> 8);
+}
+
+static stbi_uc *load_jpeg_image(stbi__jpeg *z, int *out_x, int *out_y, int *comp, int req_comp)
+{
+   int n, decode_n, is_rgb;
+   z->s->img_n = 0; // make stbi__cleanup_jpeg safe
+
+   // validate req_comp
+   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
+
+   // load a jpeg image from whichever source, but leave in YCbCr format
+   if (!stbi__decode_jpeg_image(z)) { stbi__cleanup_jpeg(z); return NULL; }
+
+   // determine actual number of components to generate
+   n = req_comp ? req_comp : z->s->img_n >= 3 ? 3 : 1;
+
+   is_rgb = z->s->img_n == 3 && (z->rgb == 3 || (z->app14_color_transform == 0 && !z->jfif));
+
+   if (z->s->img_n == 3 && n < 3 && !is_rgb)
+      decode_n = 1;
+   else
+      decode_n = z->s->img_n;
+
+   // resample and color-convert
+   {
+      int k;
+      unsigned int i,j;
+      stbi_uc *output;
+      stbi_uc *coutput[4];
+
+      stbi__resample res_comp[4];
+
+      for (k=0; k < decode_n; ++k) {
+         stbi__resample *r = &res_comp[k];
+
+         // allocate line buffer big enough for upsampling off the edges
+         // with upsample factor of 4
+         z->img_comp[k].linebuf = (stbi_uc *) stbi__malloc(z->s->img_x + 3);
+         if (!z->img_comp[k].linebuf) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
+
+         r->hs      = z->img_h_max / z->img_comp[k].h;
+         r->vs      = z->img_v_max / z->img_comp[k].v;
+         r->ystep   = r->vs >> 1;
+         r->w_lores = (z->s->img_x + r->hs-1) / r->hs;
+         r->ypos    = 0;
+         r->line0   = r->line1 = z->img_comp[k].data;
+
+         if      (r->hs == 1 && r->vs == 1) r->resample = resample_row_1;
+         else if (r->hs == 1 && r->vs == 2) r->resample = stbi__resample_row_v_2;
+         else if (r->hs == 2 && r->vs == 1) r->resample = stbi__resample_row_h_2;
+         else if (r->hs == 2 && r->vs == 2) r->resample = z->resample_row_hv_2_kernel;
+         else                               r->resample = stbi__resample_row_generic;
+      }
+
+      // can't error after this so, this is safe
+      output = (stbi_uc *) stbi__malloc_mad3(n, z->s->img_x, z->s->img_y, 1);
+      if (!output) { stbi__cleanup_jpeg(z); return stbi__errpuc("outofmem", "Out of memory"); }
+
+      // now go ahead and resample
+      for (j=0; j < z->s->img_y; ++j) {
+         stbi_uc *out = output + n * z->s->img_x * j;
+         for (k=0; k < decode_n; ++k) {
+            stbi__resample *r = &res_comp[k];
+            int y_bot = r->ystep >= (r->vs >> 1);
+            coutput[k] = r->resample(z->img_comp[k].linebuf,
+                                     y_bot ? r->line1 : r->line0,
+                                     y_bot ? r->line0 : r->line1,
+                                     r->w_lores, r->hs);
+            if (++r->ystep >= r->vs) {
+               r->ystep = 0;
+               r->line0 = r->line1;
+               if (++r->ypos < z->img_comp[k].y)
+                  r->line1 += z->img_comp[k].w2;
+            }
+         }
+         if (n >= 3) {
+            stbi_uc *y = coutput[0];
+            if (z->s->img_n == 3) {
+               if (is_rgb) {
+                  for (i=0; i < z->s->img_x; ++i) {
+                     out[0] = y[i];
+                     out[1] = coutput[1][i];
+                     out[2] = coutput[2][i];
+                     out[3] = 255;
+                     out += n;
+                  }
+               } else {
+                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+               }
+            } else if (z->s->img_n == 4) {
+               if (z->app14_color_transform == 0) { // CMYK
+                  for (i=0; i < z->s->img_x; ++i) {
+                     stbi_uc m = coutput[3][i];
+                     out[0] = stbi__blinn_8x8(coutput[0][i], m);
+                     out[1] = stbi__blinn_8x8(coutput[1][i], m);
+                     out[2] = stbi__blinn_8x8(coutput[2][i], m);
+                     out[3] = 255;
+                     out += n;
+                  }
+               } else if (z->app14_color_transform == 2) { // YCCK
+                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+                  for (i=0; i < z->s->img_x; ++i) {
+                     stbi_uc m = coutput[3][i];
+                     out[0] = stbi__blinn_8x8(255 - out[0], m);
+                     out[1] = stbi__blinn_8x8(255 - out[1], m);
+                     out[2] = stbi__blinn_8x8(255 - out[2], m);
+                     out += n;
+                  }
+               } else { // YCbCr + alpha?  Ignore the fourth channel for now
+                  z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
+               }
+            } else
+               for (i=0; i < z->s->img_x; ++i) {
+                  out[0] = out[1] = out[2] = y[i];
+                  out[3] = 255; // not used if n==3
+                  out += n;
+               }
+         } else {
+            if (is_rgb) {
+               if (n == 1)
+                  for (i=0; i < z->s->img_x; ++i)
+                     *out++ = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
+               else {
+                  for (i=0; i < z->s->img_x; ++i, out += 2) {
+                     out[0] = stbi__compute_y(coutput[0][i], coutput[1][i], coutput[2][i]);
+                     out[1] = 255;
+                  }
+               }
+            } else if (z->s->img_n == 4 && z->app14_color_transform == 0) {
+               for (i=0; i < z->s->img_x; ++i) {
+                  stbi_uc m = coutput[3][i];
+                  stbi_uc r = stbi__blinn_8x8(coutput[0][i], m);
+                  stbi_uc g = stbi__blinn_8x8(coutput[1][i], m);
+                  stbi_uc b = stbi__blinn_8x8(coutput[2][i], m);
+                  out[0] = stbi__compute_y(r, g, b);
+                  out[1] = 255;
+                  out += n;
+               }
+            } else if (z->s->img_n == 4 && z->app14_color_transform == 2) {
+               for (i=0; i < z->s->img_x; ++i) {
+                  out[0] = stbi__blinn_8x8(255 - coutput[0][i], coutput[3][i]);
+                  out[1] = 255;
+                  out += n;
+               }
+            } else {
+               stbi_uc *y = coutput[0];
+               if (n == 1)
+                  for (i=0; i < z->s->img_x; ++i) out[i] = y[i];
+               else
+                  for (i=0; i < z->s->img_x; ++i) *out++ = y[i], *out++ = 255;
+            }
+         }
+      }
+      stbi__cleanup_jpeg(z);
+      *out_x = z->s->img_x;
+      *out_y = z->s->img_y;
+      if (comp) *comp = z->s->img_n >= 3 ? 3 : 1; // report original components, not output
+      return output;
+   }
+}
+
+static void *stbi__jpeg_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   unsigned char* result;
+   stbi__jpeg* j = (stbi__jpeg*) stbi__malloc(sizeof(stbi__jpeg));
+   STBI_NOTUSED(ri);
+   j->s = s;
+   stbi__setup_jpeg(j);
+   result = load_jpeg_image(j, x,y,comp,req_comp);
+   STBI_FREE(j);
+   return result;
+}
+
+static int stbi__jpeg_test(stbi__context *s)
+{
+   int r;
+   stbi__jpeg* j = (stbi__jpeg*)stbi__malloc(sizeof(stbi__jpeg));
+   j->s = s;
+   stbi__setup_jpeg(j);
+   r = stbi__decode_jpeg_header(j, STBI__SCAN_type);
+   stbi__rewind(s);
+   STBI_FREE(j);
+   return r;
+}
+
+static int stbi__jpeg_info_raw(stbi__jpeg *j, int *x, int *y, int *comp)
+{
+   if (!stbi__decode_jpeg_header(j, STBI__SCAN_header)) {
+      stbi__rewind( j->s );
+      return 0;
+   }
+   if (x) *x = j->s->img_x;
+   if (y) *y = j->s->img_y;
+   if (comp) *comp = j->s->img_n >= 3 ? 3 : 1;
+   return 1;
+}
+
+static int stbi__jpeg_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int result;
+   stbi__jpeg* j = (stbi__jpeg*) (stbi__malloc(sizeof(stbi__jpeg)));
+   j->s = s;
+   result = stbi__jpeg_info_raw(j, x, y, comp);
+   STBI_FREE(j);
+   return result;
+}
+#endif
+
+// public domain zlib decode    v0.2  Sean Barrett 2006-11-18
+//    simple implementation
+//      - all input must be provided in an upfront buffer
+//      - all output is written to a single output buffer (can malloc/realloc)
+//    performance
+//      - fast huffman
+
+#ifndef STBI_NO_ZLIB
+
+// fast-way is faster to check than jpeg huffman, but slow way is slower
+#define STBI__ZFAST_BITS  9 // accelerate all cases in default tables
+#define STBI__ZFAST_MASK  ((1 << STBI__ZFAST_BITS) - 1)
+
+// zlib-style huffman encoding
+// (jpegs packs from left, zlib from right, so can't share code)
+typedef struct
+{
+   stbi__uint16 fast[1 << STBI__ZFAST_BITS];
+   stbi__uint16 firstcode[16];
+   int maxcode[17];
+   stbi__uint16 firstsymbol[16];
+   stbi_uc  size[288];
+   stbi__uint16 value[288];
+} stbi__zhuffman;
+
+stbi_inline static int stbi__bitreverse16(int n)
+{
+  n = ((n & 0xAAAA) >>  1) | ((n & 0x5555) << 1);
+  n = ((n & 0xCCCC) >>  2) | ((n & 0x3333) << 2);
+  n = ((n & 0xF0F0) >>  4) | ((n & 0x0F0F) << 4);
+  n = ((n & 0xFF00) >>  8) | ((n & 0x00FF) << 8);
+  return n;
+}
+
+stbi_inline static int stbi__bit_reverse(int v, int bits)
+{
+   STBI_ASSERT(bits <= 16);
+   // to bit reverse n bits, reverse 16 and shift
+   // e.g. 11 bits, bit reverse and shift away 5
+   return stbi__bitreverse16(v) >> (16-bits);
+}
+
+static int stbi__zbuild_huffman(stbi__zhuffman *z, const stbi_uc *sizelist, int num)
+{
+   int i,k=0;
+   int code, next_code[16], sizes[17];
+
+   // DEFLATE spec for generating codes
+   memset(sizes, 0, sizeof(sizes));
+   memset(z->fast, 0, sizeof(z->fast));
+   for (i=0; i < num; ++i)
+      ++sizes[sizelist[i]];
+   sizes[0] = 0;
+   for (i=1; i < 16; ++i)
+      if (sizes[i] > (1 << i))
+         return stbi__err("bad sizes", "Corrupt PNG");
+   code = 0;
+   for (i=1; i < 16; ++i) {
+      next_code[i] = code;
+      z->firstcode[i] = (stbi__uint16) code;
+      z->firstsymbol[i] = (stbi__uint16) k;
+      code = (code + sizes[i]);
+      if (sizes[i])
+         if (code-1 >= (1 << i)) return stbi__err("bad codelengths","Corrupt PNG");
+      z->maxcode[i] = code << (16-i); // preshift for inner loop
+      code <<= 1;
+      k += sizes[i];
+   }
+   z->maxcode[16] = 0x10000; // sentinel
+   for (i=0; i < num; ++i) {
+      int s = sizelist[i];
+      if (s) {
+         int c = next_code[s] - z->firstcode[s] + z->firstsymbol[s];
+         stbi__uint16 fastv = (stbi__uint16) ((s << 9) | i);
+         z->size [c] = (stbi_uc     ) s;
+         z->value[c] = (stbi__uint16) i;
+         if (s <= STBI__ZFAST_BITS) {
+            int j = stbi__bit_reverse(next_code[s],s);
+            while (j < (1 << STBI__ZFAST_BITS)) {
+               z->fast[j] = fastv;
+               j += (1 << s);
+            }
+         }
+         ++next_code[s];
+      }
+   }
+   return 1;
+}
+
+// zlib-from-memory implementation for PNG reading
+//    because PNG allows splitting the zlib stream arbitrarily,
+//    and it's annoying structurally to have PNG call ZLIB call PNG,
+//    we require PNG read all the IDATs and combine them into a single
+//    memory buffer
+
+typedef struct
+{
+   stbi_uc *zbuffer, *zbuffer_end;
+   int num_bits;
+   stbi__uint32 code_buffer;
+
+   char *zout;
+   char *zout_start;
+   char *zout_end;
+   int   z_expandable;
+
+   stbi__zhuffman z_length, z_distance;
+} stbi__zbuf;
+
+stbi_inline static stbi_uc stbi__zget8(stbi__zbuf *z)
+{
+   if (z->zbuffer >= z->zbuffer_end) return 0;
+   return *z->zbuffer++;
+}
+
+static void stbi__fill_bits(stbi__zbuf *z)
+{
+   do {
+      STBI_ASSERT(z->code_buffer < (1U << z->num_bits));
+      z->code_buffer |= (unsigned int) stbi__zget8(z) << z->num_bits;
+      z->num_bits += 8;
+   } while (z->num_bits <= 24);
+}
+
+stbi_inline static unsigned int stbi__zreceive(stbi__zbuf *z, int n)
+{
+   unsigned int k;
+   if (z->num_bits < n) stbi__fill_bits(z);
+   k = z->code_buffer & ((1 << n) - 1);
+   z->code_buffer >>= n;
+   z->num_bits -= n;
+   return k;
+}
+
+static int stbi__zhuffman_decode_slowpath(stbi__zbuf *a, stbi__zhuffman *z)
+{
+   int b,s,k;
+   // not resolved by fast table, so compute it the slow way
+   // use jpeg approach, which requires MSbits at top
+   k = stbi__bit_reverse(a->code_buffer, 16);
+   for (s=STBI__ZFAST_BITS+1; ; ++s)
+      if (k < z->maxcode[s])
+         break;
+   if (s == 16) return -1; // invalid code!
+   // code size is s, so:
+   b = (k >> (16-s)) - z->firstcode[s] + z->firstsymbol[s];
+   STBI_ASSERT(z->size[b] == s);
+   a->code_buffer >>= s;
+   a->num_bits -= s;
+   return z->value[b];
+}
+
+stbi_inline static int stbi__zhuffman_decode(stbi__zbuf *a, stbi__zhuffman *z)
+{
+   int b,s;
+   if (a->num_bits < 16) stbi__fill_bits(a);
+   b = z->fast[a->code_buffer & STBI__ZFAST_MASK];
+   if (b) {
+      s = b >> 9;
+      a->code_buffer >>= s;
+      a->num_bits -= s;
+      return b & 511;
+   }
+   return stbi__zhuffman_decode_slowpath(a, z);
+}
+
+static int stbi__zexpand(stbi__zbuf *z, char *zout, int n)  // need to make room for n bytes
+{
+   char *q;
+   int cur, limit, old_limit;
+   z->zout = zout;
+   if (!z->z_expandable) return stbi__err("output buffer limit","Corrupt PNG");
+   cur   = (int) (z->zout     - z->zout_start);
+   limit = old_limit = (int) (z->zout_end - z->zout_start);
+   while (cur + n > limit)
+      limit *= 2;
+   q = (char *) STBI_REALLOC_SIZED(z->zout_start, old_limit, limit);
+   STBI_NOTUSED(old_limit);
+   if (q == NULL) return stbi__err("outofmem", "Out of memory");
+   z->zout_start = q;
+   z->zout       = q + cur;
+   z->zout_end   = q + limit;
+   return 1;
+}
+
+static const int stbi__zlength_base[31] = {
+   3,4,5,6,7,8,9,10,11,13,
+   15,17,19,23,27,31,35,43,51,59,
+   67,83,99,115,131,163,195,227,258,0,0 };
+
+static const int stbi__zlength_extra[31]=
+{ 0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,0,0 };
+
+static const int stbi__zdist_base[32] = { 1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,
+257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577,0,0};
+
+static const int stbi__zdist_extra[32] =
+{ 0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13};
+
+static int stbi__parse_huffman_block(stbi__zbuf *a)
+{
+   char *zout = a->zout;
+   for(;;) {
+      int z = stbi__zhuffman_decode(a, &a->z_length);
+      if (z < 256) {
+         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG"); // error in huffman codes
+         if (zout >= a->zout_end) {
+            if (!stbi__zexpand(a, zout, 1)) return 0;
+            zout = a->zout;
+         }
+         *zout++ = (char) z;
+      } else {
+         stbi_uc *p;
+         int len,dist;
+         if (z == 256) {
+            a->zout = zout;
+            return 1;
+         }
+         z -= 257;
+         len = stbi__zlength_base[z];
+         if (stbi__zlength_extra[z]) len += stbi__zreceive(a, stbi__zlength_extra[z]);
+         z = stbi__zhuffman_decode(a, &a->z_distance);
+         if (z < 0) return stbi__err("bad huffman code","Corrupt PNG");
+         dist = stbi__zdist_base[z];
+         if (stbi__zdist_extra[z]) dist += stbi__zreceive(a, stbi__zdist_extra[z]);
+         if (zout - a->zout_start < dist) return stbi__err("bad dist","Corrupt PNG");
+         if (zout + len > a->zout_end) {
+            if (!stbi__zexpand(a, zout, len)) return 0;
+            zout = a->zout;
+         }
+         p = (stbi_uc *) (zout - dist);
+         if (dist == 1) { // run of one byte; common in images.
+            stbi_uc v = *p;
+            if (len) { do *zout++ = v; while (--len); }
+         } else {
+            if (len) { do *zout++ = *p++; while (--len); }
+         }
+      }
+   }
+}
+
+static int stbi__compute_huffman_codes(stbi__zbuf *a)
+{
+   static const stbi_uc length_dezigzag[19] = { 16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15 };
+   stbi__zhuffman z_codelength;
+   stbi_uc lencodes[286+32+137];//padding for maximum single op
+   stbi_uc codelength_sizes[19];
+   int i,n;
+
+   int hlit  = stbi__zreceive(a,5) + 257;
+   int hdist = stbi__zreceive(a,5) + 1;
+   int hclen = stbi__zreceive(a,4) + 4;
+   int ntot  = hlit + hdist;
+
+   memset(codelength_sizes, 0, sizeof(codelength_sizes));
+   for (i=0; i < hclen; ++i) {
+      int s = stbi__zreceive(a,3);
+      codelength_sizes[length_dezigzag[i]] = (stbi_uc) s;
+   }
+   if (!stbi__zbuild_huffman(&z_codelength, codelength_sizes, 19)) return 0;
+
+   n = 0;
+   while (n < ntot) {
+      int c = stbi__zhuffman_decode(a, &z_codelength);
+      if (c < 0 || c >= 19) return stbi__err("bad codelengths", "Corrupt PNG");
+      if (c < 16)
+         lencodes[n++] = (stbi_uc) c;
+      else {
+         stbi_uc fill = 0;
+         if (c == 16) {
+            c = stbi__zreceive(a,2)+3;
+            if (n == 0) return stbi__err("bad codelengths", "Corrupt PNG");
+            fill = lencodes[n-1];
+         } else if (c == 17)
+            c = stbi__zreceive(a,3)+3;
+         else {
+            STBI_ASSERT(c == 18);
+            c = stbi__zreceive(a,7)+11;
+         }
+         if (ntot - n < c) return stbi__err("bad codelengths", "Corrupt PNG");
+         memset(lencodes+n, fill, c);
+         n += c;
+      }
+   }
+   if (n != ntot) return stbi__err("bad codelengths","Corrupt PNG");
+   if (!stbi__zbuild_huffman(&a->z_length, lencodes, hlit)) return 0;
+   if (!stbi__zbuild_huffman(&a->z_distance, lencodes+hlit, hdist)) return 0;
+   return 1;
+}
+
+static int stbi__parse_uncompressed_block(stbi__zbuf *a)
+{
+   stbi_uc header[4];
+   int len,nlen,k;
+   if (a->num_bits & 7)
+      stbi__zreceive(a, a->num_bits & 7); // discard
+   // drain the bit-packed data into header
+   k = 0;
+   while (a->num_bits > 0) {
+      header[k++] = (stbi_uc) (a->code_buffer & 255); // suppress MSVC run-time check
+      a->code_buffer >>= 8;
+      a->num_bits -= 8;
+   }
+   STBI_ASSERT(a->num_bits == 0);
+   // now fill header the normal way
+   while (k < 4)
+      header[k++] = stbi__zget8(a);
+   len  = header[1] * 256 + header[0];
+   nlen = header[3] * 256 + header[2];
+   if (nlen != (len ^ 0xffff)) return stbi__err("zlib corrupt","Corrupt PNG");
+   if (a->zbuffer + len > a->zbuffer_end) return stbi__err("read past buffer","Corrupt PNG");
+   if (a->zout + len > a->zout_end)
+      if (!stbi__zexpand(a, a->zout, len)) return 0;
+   memcpy(a->zout, a->zbuffer, len);
+   a->zbuffer += len;
+   a->zout += len;
+   return 1;
+}
+
+static int stbi__parse_zlib_header(stbi__zbuf *a)
+{
+   int cmf   = stbi__zget8(a);
+   int cm    = cmf & 15;
+   /* int cinfo = cmf >> 4; */
+   int flg   = stbi__zget8(a);
+   if ((cmf*256+flg) % 31 != 0) return stbi__err("bad zlib header","Corrupt PNG"); // zlib spec
+   if (flg & 32) return stbi__err("no preset dict","Corrupt PNG"); // preset dictionary not allowed in png
+   if (cm != 8) return stbi__err("bad compression","Corrupt PNG"); // DEFLATE required for png
+   // window = 1 << (8 + cinfo)... but who cares, we fully buffer output
+   return 1;
+}
+
+static const stbi_uc stbi__zdefault_length[288] =
+{
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
+   8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9, 9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
+   7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7, 7,7,7,7,7,7,7,7,8,8,8,8,8,8,8,8
+};
+static const stbi_uc stbi__zdefault_distance[32] =
+{
+   5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5
+};
+/*
+Init algorithm:
+{
+   int i;   // use <= to match clearly with spec
+   for (i=0; i <= 143; ++i)     stbi__zdefault_length[i]   = 8;
+   for (   ; i <= 255; ++i)     stbi__zdefault_length[i]   = 9;
+   for (   ; i <= 279; ++i)     stbi__zdefault_length[i]   = 7;
+   for (   ; i <= 287; ++i)     stbi__zdefault_length[i]   = 8;
+
+   for (i=0; i <=  31; ++i)     stbi__zdefault_distance[i] = 5;
+}
+*/
+
+static int stbi__parse_zlib(stbi__zbuf *a, int parse_header)
+{
+   int final, type;
+   if (parse_header)
+      if (!stbi__parse_zlib_header(a)) return 0;
+   a->num_bits = 0;
+   a->code_buffer = 0;
+   do {
+      final = stbi__zreceive(a,1);
+      type = stbi__zreceive(a,2);
+      if (type == 0) {
+         if (!stbi__parse_uncompressed_block(a)) return 0;
+      } else if (type == 3) {
+         return 0;
+      } else {
+         if (type == 1) {
+            // use fixed code lengths
+            if (!stbi__zbuild_huffman(&a->z_length  , stbi__zdefault_length  , 288)) return 0;
+            if (!stbi__zbuild_huffman(&a->z_distance, stbi__zdefault_distance,  32)) return 0;
+         } else {
+            if (!stbi__compute_huffman_codes(a)) return 0;
+         }
+         if (!stbi__parse_huffman_block(a)) return 0;
+      }
+   } while (!final);
+   return 1;
+}
+
+static int stbi__do_zlib(stbi__zbuf *a, char *obuf, int olen, int exp, int parse_header)
+{
+   a->zout_start = obuf;
+   a->zout       = obuf;
+   a->zout_end   = obuf + olen;
+   a->z_expandable = exp;
+
+   return stbi__parse_zlib(a, parse_header);
+}
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize(const char *buffer, int len, int initial_size, int *outlen)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(initial_size);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer + len;
+   if (stbi__do_zlib(&a, p, initial_size, 1, 1)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF char *stbi_zlib_decode_malloc(char const *buffer, int len, int *outlen)
+{
+   return stbi_zlib_decode_malloc_guesssize(buffer, len, 16384, outlen);
+}
+
+STBIDEF char *stbi_zlib_decode_malloc_guesssize_headerflag(const char *buffer, int len, int initial_size, int *outlen, int parse_header)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(initial_size);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer + len;
+   if (stbi__do_zlib(&a, p, initial_size, 1, parse_header)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF int stbi_zlib_decode_buffer(char *obuffer, int olen, char const *ibuffer, int ilen)
+{
+   stbi__zbuf a;
+   a.zbuffer = (stbi_uc *) ibuffer;
+   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
+   if (stbi__do_zlib(&a, obuffer, olen, 0, 1))
+      return (int) (a.zout - a.zout_start);
+   else
+      return -1;
+}
+
+STBIDEF char *stbi_zlib_decode_noheader_malloc(char const *buffer, int len, int *outlen)
+{
+   stbi__zbuf a;
+   char *p = (char *) stbi__malloc(16384);
+   if (p == NULL) return NULL;
+   a.zbuffer = (stbi_uc *) buffer;
+   a.zbuffer_end = (stbi_uc *) buffer+len;
+   if (stbi__do_zlib(&a, p, 16384, 1, 0)) {
+      if (outlen) *outlen = (int) (a.zout - a.zout_start);
+      return a.zout_start;
+   } else {
+      STBI_FREE(a.zout_start);
+      return NULL;
+   }
+}
+
+STBIDEF int stbi_zlib_decode_noheader_buffer(char *obuffer, int olen, const char *ibuffer, int ilen)
+{
+   stbi__zbuf a;
+   a.zbuffer = (stbi_uc *) ibuffer;
+   a.zbuffer_end = (stbi_uc *) ibuffer + ilen;
+   if (stbi__do_zlib(&a, obuffer, olen, 0, 0))
+      return (int) (a.zout - a.zout_start);
+   else
+      return -1;
+}
+#endif
+
+// public domain "baseline" PNG decoder   v0.10  Sean Barrett 2006-11-18
+//    simple implementation
+//      - only 8-bit samples
+//      - no CRC checking
+//      - allocates lots of intermediate memory
+//        - avoids problem of streaming data between subsystems
+//        - avoids explicit window management
+//    performance
+//      - uses stb_zlib, a PD zlib implementation with fast huffman decoding
+
+#ifndef STBI_NO_PNG
+typedef struct
+{
+   stbi__uint32 length;
+   stbi__uint32 type;
+} stbi__pngchunk;
+
+static stbi__pngchunk stbi__get_chunk_header(stbi__context *s)
+{
+   stbi__pngchunk c;
+   c.length = stbi__get32be(s);
+   c.type   = stbi__get32be(s);
+   return c;
+}
+
+static int stbi__check_png_header(stbi__context *s)
+{
+   static const stbi_uc png_sig[8] = { 137,80,78,71,13,10,26,10 };
+   int i;
+   for (i=0; i < 8; ++i)
+      if (stbi__get8(s) != png_sig[i]) return stbi__err("bad png sig","Not a PNG");
+   return 1;
+}
+
+typedef struct
+{
+   stbi__context *s;
+   stbi_uc *idata, *expanded, *out;
+   int depth;
+} stbi__png;
+
+
+enum {
+   STBI__F_none=0,
+   STBI__F_sub=1,
+   STBI__F_up=2,
+   STBI__F_avg=3,
+   STBI__F_paeth=4,
+   // synthetic filters used for first scanline to avoid needing a dummy row of 0s
+   STBI__F_avg_first,
+   STBI__F_paeth_first
+};
+
+static stbi_uc first_row_filter[5] =
+{
+   STBI__F_none,
+   STBI__F_sub,
+   STBI__F_none,
+   STBI__F_avg_first,
+   STBI__F_paeth_first
+};
+
+static int stbi__paeth(int a, int b, int c)
+{
+   int p = a + b - c;
+   int pa = abs(p-a);
+   int pb = abs(p-b);
+   int pc = abs(p-c);
+   if (pa <= pb && pa <= pc) return a;
+   if (pb <= pc) return b;
+   return c;
+}
+
+static const stbi_uc stbi__depth_scale_table[9] = { 0, 0xff, 0x55, 0, 0x11, 0,0,0, 0x01 };
+
+// create the png data from post-deflated data
+static int stbi__create_png_image_raw(stbi__png *a, stbi_uc *raw, stbi__uint32 raw_len, int out_n, stbi__uint32 x, stbi__uint32 y, int depth, int color)
+{
+   int bytes = (depth == 16? 2 : 1);
+   stbi__context *s = a->s;
+   stbi__uint32 i,j,stride = x*out_n*bytes;
+   stbi__uint32 img_len, img_width_bytes;
+   int k;
+   int img_n = s->img_n; // copy it into a local for later
+
+   int output_bytes = out_n*bytes;
+   int filter_bytes = img_n*bytes;
+   int width = x;
+
+   STBI_ASSERT(out_n == s->img_n || out_n == s->img_n+1);
+   a->out = (stbi_uc *) stbi__malloc_mad3(x, y, output_bytes, 0); // extra bytes to write off the end into
+   if (!a->out) return stbi__err("outofmem", "Out of memory");
+
+   if (!stbi__mad3sizes_valid(img_n, x, depth, 7)) return stbi__err("too large", "Corrupt PNG");
+   img_width_bytes = (((img_n * x * depth) + 7) >> 3);
+   img_len = (img_width_bytes + 1) * y;
+
+   // we used to check for exact match between raw_len and img_len on non-interlaced PNGs,
+   // but issue #276 reported a PNG in the wild that had extra data at the end (all zeros),
+   // so just check for raw_len < img_len always.
+   if (raw_len < img_len) return stbi__err("not enough pixels","Corrupt PNG");
+
+   for (j=0; j < y; ++j) {
+      stbi_uc *cur = a->out + stride*j;
+      stbi_uc *prior;
+      int filter = *raw++;
+
+      if (filter > 4)
+         return stbi__err("invalid filter","Corrupt PNG");
+
+      if (depth < 8) {
+         STBI_ASSERT(img_width_bytes <= x);
+         cur += x*out_n - img_width_bytes; // store output to the rightmost img_len bytes, so we can decode in place
+         filter_bytes = 1;
+         width = img_width_bytes;
+      }
+      prior = cur - stride; // bugfix: need to compute this after 'cur +=' computation above
+
+      // if first row, use special filter that doesn't sample previous row
+      if (j == 0) filter = first_row_filter[filter];
+
+      // handle first byte explicitly
+      for (k=0; k < filter_bytes; ++k) {
+         switch (filter) {
+            case STBI__F_none       : cur[k] = raw[k]; break;
+            case STBI__F_sub        : cur[k] = raw[k]; break;
+            case STBI__F_up         : cur[k] = STBI__BYTECAST(raw[k] + prior[k]); break;
+            case STBI__F_avg        : cur[k] = STBI__BYTECAST(raw[k] + (prior[k]>>1)); break;
+            case STBI__F_paeth      : cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(0,prior[k],0)); break;
+            case STBI__F_avg_first  : cur[k] = raw[k]; break;
+            case STBI__F_paeth_first: cur[k] = raw[k]; break;
+         }
+      }
+
+      if (depth == 8) {
+         if (img_n != out_n)
+            cur[img_n] = 255; // first pixel
+         raw += img_n;
+         cur += out_n;
+         prior += out_n;
+      } else if (depth == 16) {
+         if (img_n != out_n) {
+            cur[filter_bytes]   = 255; // first pixel top byte
+            cur[filter_bytes+1] = 255; // first pixel bottom byte
+         }
+         raw += filter_bytes;
+         cur += output_bytes;
+         prior += output_bytes;
+      } else {
+         raw += 1;
+         cur += 1;
+         prior += 1;
+      }
+
+      // this is a little gross, so that we don't switch per-pixel or per-component
+      if (depth < 8 || img_n == out_n) {
+         int nk = (width - 1)*filter_bytes;
+         #define STBI__CASE(f) \
+             case f:     \
+                for (k=0; k < nk; ++k)
+         switch (filter) {
+            // "none" filter turns into a memcpy here; make that explicit.
+            case STBI__F_none:         memcpy(cur, raw, nk); break;
+            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k-filter_bytes]); } break;
+            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
+            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k-filter_bytes])>>1)); } break;
+            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],prior[k],prior[k-filter_bytes])); } break;
+            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k-filter_bytes] >> 1)); } break;
+            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k-filter_bytes],0,0)); } break;
+         }
+         #undef STBI__CASE
+         raw += nk;
+      } else {
+         STBI_ASSERT(img_n+1 == out_n);
+         #define STBI__CASE(f) \
+             case f:     \
+                for (i=x-1; i >= 1; --i, cur[filter_bytes]=255,raw+=filter_bytes,cur+=output_bytes,prior+=output_bytes) \
+                   for (k=0; k < filter_bytes; ++k)
+         switch (filter) {
+            STBI__CASE(STBI__F_none)         { cur[k] = raw[k]; } break;
+            STBI__CASE(STBI__F_sub)          { cur[k] = STBI__BYTECAST(raw[k] + cur[k- output_bytes]); } break;
+            STBI__CASE(STBI__F_up)           { cur[k] = STBI__BYTECAST(raw[k] + prior[k]); } break;
+            STBI__CASE(STBI__F_avg)          { cur[k] = STBI__BYTECAST(raw[k] + ((prior[k] + cur[k- output_bytes])>>1)); } break;
+            STBI__CASE(STBI__F_paeth)        { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],prior[k],prior[k- output_bytes])); } break;
+            STBI__CASE(STBI__F_avg_first)    { cur[k] = STBI__BYTECAST(raw[k] + (cur[k- output_bytes] >> 1)); } break;
+            STBI__CASE(STBI__F_paeth_first)  { cur[k] = STBI__BYTECAST(raw[k] + stbi__paeth(cur[k- output_bytes],0,0)); } break;
+         }
+         #undef STBI__CASE
+
+         // the loop above sets the high byte of the pixels' alpha, but for
+         // 16 bit png files we also need the low byte set. we'll do that here.
+         if (depth == 16) {
+            cur = a->out + stride*j; // start at the beginning of the row again
+            for (i=0; i < x; ++i,cur+=output_bytes) {
+               cur[filter_bytes+1] = 255;
+            }
+         }
+      }
+   }
+
+   // we make a separate pass to expand bits to pixels; for performance,
+   // this could run two scanlines behind the above code, so it won't
+   // intefere with filtering but will still be in the cache.
+   if (depth < 8) {
+      for (j=0; j < y; ++j) {
+         stbi_uc *cur = a->out + stride*j;
+         stbi_uc *in  = a->out + stride*j + x*out_n - img_width_bytes;
+         // unpack 1/2/4-bit into a 8-bit buffer. allows us to keep the common 8-bit path optimal at minimal cost for 1/2/4-bit
+         // png guarante byte alignment, if width is not multiple of 8/4/2 we'll decode dummy trailing data that will be skipped in the later loop
+         stbi_uc scale = (color == 0) ? stbi__depth_scale_table[depth] : 1; // scale grayscale values to 0..255 range
+
+         // note that the final byte might overshoot and write more data than desired.
+         // we can allocate enough data that this never writes out of memory, but it
+         // could also overwrite the next scanline. can it overwrite non-empty data
+         // on the next scanline? yes, consider 1-pixel-wide scanlines with 1-bit-per-pixel.
+         // so we need to explicitly clamp the final ones
+
+         if (depth == 4) {
+            for (k=x*img_n; k >= 2; k-=2, ++in) {
+               *cur++ = scale * ((*in >> 4)       );
+               *cur++ = scale * ((*in     ) & 0x0f);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 4)       );
+         } else if (depth == 2) {
+            for (k=x*img_n; k >= 4; k-=4, ++in) {
+               *cur++ = scale * ((*in >> 6)       );
+               *cur++ = scale * ((*in >> 4) & 0x03);
+               *cur++ = scale * ((*in >> 2) & 0x03);
+               *cur++ = scale * ((*in     ) & 0x03);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 6)       );
+            if (k > 1) *cur++ = scale * ((*in >> 4) & 0x03);
+            if (k > 2) *cur++ = scale * ((*in >> 2) & 0x03);
+         } else if (depth == 1) {
+            for (k=x*img_n; k >= 8; k-=8, ++in) {
+               *cur++ = scale * ((*in >> 7)       );
+               *cur++ = scale * ((*in >> 6) & 0x01);
+               *cur++ = scale * ((*in >> 5) & 0x01);
+               *cur++ = scale * ((*in >> 4) & 0x01);
+               *cur++ = scale * ((*in >> 3) & 0x01);
+               *cur++ = scale * ((*in >> 2) & 0x01);
+               *cur++ = scale * ((*in >> 1) & 0x01);
+               *cur++ = scale * ((*in     ) & 0x01);
+            }
+            if (k > 0) *cur++ = scale * ((*in >> 7)       );
+            if (k > 1) *cur++ = scale * ((*in >> 6) & 0x01);
+            if (k > 2) *cur++ = scale * ((*in >> 5) & 0x01);
+            if (k > 3) *cur++ = scale * ((*in >> 4) & 0x01);
+            if (k > 4) *cur++ = scale * ((*in >> 3) & 0x01);
+            if (k > 5) *cur++ = scale * ((*in >> 2) & 0x01);
+            if (k > 6) *cur++ = scale * ((*in >> 1) & 0x01);
+         }
+         if (img_n != out_n) {
+            int q;
+            // insert alpha = 255
+            cur = a->out + stride*j;
+            if (img_n == 1) {
+               for (q=x-1; q >= 0; --q) {
+                  cur[q*2+1] = 255;
+                  cur[q*2+0] = cur[q];
+               }
+            } else {
+               STBI_ASSERT(img_n == 3);
+               for (q=x-1; q >= 0; --q) {
+                  cur[q*4+3] = 255;
+                  cur[q*4+2] = cur[q*3+2];
+                  cur[q*4+1] = cur[q*3+1];
+                  cur[q*4+0] = cur[q*3+0];
+               }
+            }
+         }
+      }
+   } else if (depth == 16) {
+      // force the image data from big-endian to platform-native.
+      // this is done in a separate pass due to the decoding relying
+      // on the data being untouched, but could probably be done
+      // per-line during decode if care is taken.
+      stbi_uc *cur = a->out;
+      stbi__uint16 *cur16 = (stbi__uint16*)cur;
+
+      for(i=0; i < x*y*out_n; ++i,cur16++,cur+=2) {
+         *cur16 = (cur[0] << 8) | cur[1];
+      }
+   }
+
+   return 1;
+}
+
+static int stbi__create_png_image(stbi__png *a, stbi_uc *image_data, stbi__uint32 image_data_len, int out_n, int depth, int color, int interlaced)
+{
+   int bytes = (depth == 16 ? 2 : 1);
+   int out_bytes = out_n * bytes;
+   stbi_uc *final;
+   int p;
+   if (!interlaced)
+      return stbi__create_png_image_raw(a, image_data, image_data_len, out_n, a->s->img_x, a->s->img_y, depth, color);
+
+   // de-interlacing
+   final = (stbi_uc *) stbi__malloc_mad3(a->s->img_x, a->s->img_y, out_bytes, 0);
+   for (p=0; p < 7; ++p) {
+      int xorig[] = { 0,4,0,2,0,1,0 };
+      int yorig[] = { 0,0,4,0,2,0,1 };
+      int xspc[]  = { 8,8,4,4,2,2,1 };
+      int yspc[]  = { 8,8,8,4,4,2,2 };
+      int i,j,x,y;
+      // pass1_x[4] = 0, pass1_x[5] = 1, pass1_x[12] = 1
+      x = (a->s->img_x - xorig[p] + xspc[p]-1) / xspc[p];
+      y = (a->s->img_y - yorig[p] + yspc[p]-1) / yspc[p];
+      if (x && y) {
+         stbi__uint32 img_len = ((((a->s->img_n * x * depth) + 7) >> 3) + 1) * y;
+         if (!stbi__create_png_image_raw(a, image_data, image_data_len, out_n, x, y, depth, color)) {
+            STBI_FREE(final);
+            return 0;
+         }
+         for (j=0; j < y; ++j) {
+            for (i=0; i < x; ++i) {
+               int out_y = j*yspc[p]+yorig[p];
+               int out_x = i*xspc[p]+xorig[p];
+               memcpy(final + out_y*a->s->img_x*out_bytes + out_x*out_bytes,
+                      a->out + (j*x+i)*out_bytes, out_bytes);
+            }
+         }
+         STBI_FREE(a->out);
+         image_data += img_len;
+         image_data_len -= img_len;
+      }
+   }
+   a->out = final;
+
+   return 1;
+}
+
+static int stbi__compute_transparency(stbi__png *z, stbi_uc tc[3], int out_n)
+{
+   stbi__context *s = z->s;
+   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+   stbi_uc *p = z->out;
+
+   // compute color-based transparency, assuming we've
+   // already got 255 as the alpha value in the output
+   STBI_ASSERT(out_n == 2 || out_n == 4);
+
+   if (out_n == 2) {
+      for (i=0; i < pixel_count; ++i) {
+         p[1] = (p[0] == tc[0] ? 0 : 255);
+         p += 2;
+      }
+   } else {
+      for (i=0; i < pixel_count; ++i) {
+         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
+            p[3] = 0;
+         p += 4;
+      }
+   }
+   return 1;
+}
+
+static int stbi__compute_transparency16(stbi__png *z, stbi__uint16 tc[3], int out_n)
+{
+   stbi__context *s = z->s;
+   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+   stbi__uint16 *p = (stbi__uint16*) z->out;
+
+   // compute color-based transparency, assuming we've
+   // already got 65535 as the alpha value in the output
+   STBI_ASSERT(out_n == 2 || out_n == 4);
+
+   if (out_n == 2) {
+      for (i = 0; i < pixel_count; ++i) {
+         p[1] = (p[0] == tc[0] ? 0 : 65535);
+         p += 2;
+      }
+   } else {
+      for (i = 0; i < pixel_count; ++i) {
+         if (p[0] == tc[0] && p[1] == tc[1] && p[2] == tc[2])
+            p[3] = 0;
+         p += 4;
+      }
+   }
+   return 1;
+}
+
+static int stbi__expand_png_palette(stbi__png *a, stbi_uc *palette, int len, int pal_img_n)
+{
+   stbi__uint32 i, pixel_count = a->s->img_x * a->s->img_y;
+   stbi_uc *p, *temp_out, *orig = a->out;
+
+   p = (stbi_uc *) stbi__malloc_mad2(pixel_count, pal_img_n, 0);
+   if (p == NULL) return stbi__err("outofmem", "Out of memory");
+
+   // between here and free(out) below, exitting would leak
+   temp_out = p;
+
+   if (pal_img_n == 3) {
+      for (i=0; i < pixel_count; ++i) {
+         int n = orig[i]*4;
+         p[0] = palette[n  ];
+         p[1] = palette[n+1];
+         p[2] = palette[n+2];
+         p += 3;
+      }
+   } else {
+      for (i=0; i < pixel_count; ++i) {
+         int n = orig[i]*4;
+         p[0] = palette[n  ];
+         p[1] = palette[n+1];
+         p[2] = palette[n+2];
+         p[3] = palette[n+3];
+         p += 4;
+      }
+   }
+   STBI_FREE(a->out);
+   a->out = temp_out;
+
+   STBI_NOTUSED(len);
+
+   return 1;
+}
+
+static int stbi__unpremultiply_on_load = 0;
+static int stbi__de_iphone_flag = 0;
+
+STBIDEF void stbi_set_unpremultiply_on_load(int flag_true_if_should_unpremultiply)
+{
+   stbi__unpremultiply_on_load = flag_true_if_should_unpremultiply;
+}
+
+STBIDEF void stbi_convert_iphone_png_to_rgb(int flag_true_if_should_convert)
+{
+   stbi__de_iphone_flag = flag_true_if_should_convert;
+}
+
+static void stbi__de_iphone(stbi__png *z)
+{
+   stbi__context *s = z->s;
+   stbi__uint32 i, pixel_count = s->img_x * s->img_y;
+   stbi_uc *p = z->out;
+
+   if (s->img_out_n == 3) {  // convert bgr to rgb
+      for (i=0; i < pixel_count; ++i) {
+         stbi_uc t = p[0];
+         p[0] = p[2];
+         p[2] = t;
+         p += 3;
+      }
+   } else {
+      STBI_ASSERT(s->img_out_n == 4);
+      if (stbi__unpremultiply_on_load) {
+         // convert bgr to rgb and unpremultiply
+         for (i=0; i < pixel_count; ++i) {
+            stbi_uc a = p[3];
+            stbi_uc t = p[0];
+            if (a) {
+               stbi_uc half = a / 2;
+               p[0] = (p[2] * 255 + half) / a;
+               p[1] = (p[1] * 255 + half) / a;
+               p[2] = ( t   * 255 + half) / a;
+            } else {
+               p[0] = p[2];
+               p[2] = t;
+            }
+            p += 4;
+         }
+      } else {
+         // convert bgr to rgb
+         for (i=0; i < pixel_count; ++i) {
+            stbi_uc t = p[0];
+            p[0] = p[2];
+            p[2] = t;
+            p += 4;
+         }
+      }
+   }
+}
+
+#define STBI__PNG_TYPE(a,b,c,d)  (((unsigned) (a) << 24) + ((unsigned) (b) << 16) + ((unsigned) (c) << 8) + (unsigned) (d))
+
+static int stbi__parse_png_file(stbi__png *z, int scan, int req_comp)
+{
+   stbi_uc palette[1024], pal_img_n=0;
+   stbi_uc has_trans=0, tc[3];
+   stbi__uint16 tc16[3];
+   stbi__uint32 ioff=0, idata_limit=0, i, pal_len=0;
+   int first=1,k,interlace=0, color=0, is_iphone=0;
+   stbi__context *s = z->s;
+
+   z->expanded = NULL;
+   z->idata = NULL;
+   z->out = NULL;
+
+   if (!stbi__check_png_header(s)) return 0;
+
+   if (scan == STBI__SCAN_type) return 1;
+
+   for (;;) {
+      stbi__pngchunk c = stbi__get_chunk_header(s);
+      switch (c.type) {
+         case STBI__PNG_TYPE('C','g','B','I'):
+            is_iphone = 1;
+            stbi__skip(s, c.length);
+            break;
+         case STBI__PNG_TYPE('I','H','D','R'): {
+            int comp,filter;
+            if (!first) return stbi__err("multiple IHDR","Corrupt PNG");
+            first = 0;
+            if (c.length != 13) return stbi__err("bad IHDR len","Corrupt PNG");
+            s->img_x = stbi__get32be(s); if (s->img_x > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
+            s->img_y = stbi__get32be(s); if (s->img_y > (1 << 24)) return stbi__err("too large","Very large image (corrupt?)");
+            z->depth = stbi__get8(s);  if (z->depth != 1 && z->depth != 2 && z->depth != 4 && z->depth != 8 && z->depth != 16)  return stbi__err("1/2/4/8/16-bit only","PNG not supported: 1/2/4/8/16-bit only");
+            color = stbi__get8(s);  if (color > 6)         return stbi__err("bad ctype","Corrupt PNG");
+            if (color == 3 && z->depth == 16)                  return stbi__err("bad ctype","Corrupt PNG");
+            if (color == 3) pal_img_n = 3; else if (color & 1) return stbi__err("bad ctype","Corrupt PNG");
+            comp  = stbi__get8(s);  if (comp) return stbi__err("bad comp method","Corrupt PNG");
+            filter= stbi__get8(s);  if (filter) return stbi__err("bad filter method","Corrupt PNG");
+            interlace = stbi__get8(s); if (interlace>1) return stbi__err("bad interlace method","Corrupt PNG");
+            if (!s->img_x || !s->img_y) return stbi__err("0-pixel image","Corrupt PNG");
+            if (!pal_img_n) {
+               s->img_n = (color & 2 ? 3 : 1) + (color & 4 ? 1 : 0);
+               if ((1 << 30) / s->img_x / s->img_n < s->img_y) return stbi__err("too large", "Image too large to decode");
+               if (scan == STBI__SCAN_header) return 1;
+            } else {
+               // if paletted, then pal_n is our final components, and
+               // img_n is # components to decompress/filter.
+               s->img_n = 1;
+               if ((1 << 30) / s->img_x / 4 < s->img_y) return stbi__err("too large","Corrupt PNG");
+               // if SCAN_header, have to scan to see if we have a tRNS
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('P','L','T','E'):  {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (c.length > 256*3) return stbi__err("invalid PLTE","Corrupt PNG");
+            pal_len = c.length / 3;
+            if (pal_len * 3 != c.length) return stbi__err("invalid PLTE","Corrupt PNG");
+            for (i=0; i < pal_len; ++i) {
+               palette[i*4+0] = stbi__get8(s);
+               palette[i*4+1] = stbi__get8(s);
+               palette[i*4+2] = stbi__get8(s);
+               palette[i*4+3] = 255;
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('t','R','N','S'): {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (z->idata) return stbi__err("tRNS after IDAT","Corrupt PNG");
+            if (pal_img_n) {
+               if (scan == STBI__SCAN_header) { s->img_n = 4; return 1; }
+               if (pal_len == 0) return stbi__err("tRNS before PLTE","Corrupt PNG");
+               if (c.length > pal_len) return stbi__err("bad tRNS len","Corrupt PNG");
+               pal_img_n = 4;
+               for (i=0; i < c.length; ++i)
+                  palette[i*4+3] = stbi__get8(s);
+            } else {
+               if (!(s->img_n & 1)) return stbi__err("tRNS with alpha","Corrupt PNG");
+               if (c.length != (stbi__uint32) s->img_n*2) return stbi__err("bad tRNS len","Corrupt PNG");
+               has_trans = 1;
+               if (z->depth == 16) {
+                  for (k = 0; k < s->img_n; ++k) tc16[k] = (stbi__uint16)stbi__get16be(s); // copy the values as-is
+               } else {
+                  for (k = 0; k < s->img_n; ++k) tc[k] = (stbi_uc)(stbi__get16be(s) & 255) * stbi__depth_scale_table[z->depth]; // non 8-bit images will be larger
+               }
+            }
+            break;
+         }
+
+         case STBI__PNG_TYPE('I','D','A','T'): {
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (pal_img_n && !pal_len) return stbi__err("no PLTE","Corrupt PNG");
+            if (scan == STBI__SCAN_header) { s->img_n = pal_img_n; return 1; }
+            if ((int)(ioff + c.length) < (int)ioff) return 0;
+            if (ioff + c.length > idata_limit) {
+               stbi__uint32 idata_limit_old = idata_limit;
+               stbi_uc *p;
+               if (idata_limit == 0) idata_limit = c.length > 4096 ? c.length : 4096;
+               while (ioff + c.length > idata_limit)
+                  idata_limit *= 2;
+               STBI_NOTUSED(idata_limit_old);
+               p = (stbi_uc *) STBI_REALLOC_SIZED(z->idata, idata_limit_old, idata_limit); if (p == NULL) return stbi__err("outofmem", "Out of memory");
+               z->idata = p;
+            }
+            if (!stbi__getn(s, z->idata+ioff,c.length)) return stbi__err("outofdata","Corrupt PNG");
+            ioff += c.length;
+            break;
+         }
+
+         case STBI__PNG_TYPE('I','E','N','D'): {
+            stbi__uint32 raw_len, bpl;
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if (scan != STBI__SCAN_load) return 1;
+            if (z->idata == NULL) return stbi__err("no IDAT","Corrupt PNG");
+            // initial guess for decoded data size to avoid unnecessary reallocs
+            bpl = (s->img_x * z->depth + 7) / 8; // bytes per line, per component
+            raw_len = bpl * s->img_y * s->img_n /* pixels */ + s->img_y /* filter mode per row */;
+            z->expanded = (stbi_uc *) stbi_zlib_decode_malloc_guesssize_headerflag((char *) z->idata, ioff, raw_len, (int *) &raw_len, !is_iphone);
+            if (z->expanded == NULL) return 0; // zlib should set error
+            STBI_FREE(z->idata); z->idata = NULL;
+            if ((req_comp == s->img_n+1 && req_comp != 3 && !pal_img_n) || has_trans)
+               s->img_out_n = s->img_n+1;
+            else
+               s->img_out_n = s->img_n;
+            if (!stbi__create_png_image(z, z->expanded, raw_len, s->img_out_n, z->depth, color, interlace)) return 0;
+            if (has_trans) {
+               if (z->depth == 16) {
+                  if (!stbi__compute_transparency16(z, tc16, s->img_out_n)) return 0;
+               } else {
+                  if (!stbi__compute_transparency(z, tc, s->img_out_n)) return 0;
+               }
+            }
+            if (is_iphone && stbi__de_iphone_flag && s->img_out_n > 2)
+               stbi__de_iphone(z);
+            if (pal_img_n) {
+               // pal_img_n == 3 or 4
+               s->img_n = pal_img_n; // record the actual colors we had
+               s->img_out_n = pal_img_n;
+               if (req_comp >= 3) s->img_out_n = req_comp;
+               if (!stbi__expand_png_palette(z, palette, pal_len, s->img_out_n))
+                  return 0;
+            } else if (has_trans) {
+               // non-paletted image with tRNS -> source image has (constant) alpha
+               ++s->img_n;
+            }
+            STBI_FREE(z->expanded); z->expanded = NULL;
+            return 1;
+         }
+
+         default:
+            // if critical, fail
+            if (first) return stbi__err("first not IHDR", "Corrupt PNG");
+            if ((c.type & (1 << 29)) == 0) {
+               #ifndef STBI_NO_FAILURE_STRINGS
+               // not threadsafe
+               static char invalid_chunk[] = "XXXX PNG chunk not known";
+               invalid_chunk[0] = STBI__BYTECAST(c.type >> 24);
+               invalid_chunk[1] = STBI__BYTECAST(c.type >> 16);
+               invalid_chunk[2] = STBI__BYTECAST(c.type >>  8);
+               invalid_chunk[3] = STBI__BYTECAST(c.type >>  0);
+               #endif
+               return stbi__err(invalid_chunk, "PNG not supported: unknown PNG chunk type");
+            }
+            stbi__skip(s, c.length);
+            break;
+      }
+      // end of PNG chunk, read and skip CRC
+      stbi__get32be(s);
+   }
+}
+
+static void *stbi__do_png(stbi__png *p, int *x, int *y, int *n, int req_comp, stbi__result_info *ri)
+{
+   void *result=NULL;
+   if (req_comp < 0 || req_comp > 4) return stbi__errpuc("bad req_comp", "Internal error");
+   if (stbi__parse_png_file(p, STBI__SCAN_load, req_comp)) {
+      if (p->depth < 8)
+         ri->bits_per_channel = 8;
+      else
+         ri->bits_per_channel = p->depth;
+      result = p->out;
+      p->out = NULL;
+      if (req_comp && req_comp != p->s->img_out_n) {
+         if (ri->bits_per_channel == 8)
+            result = stbi__convert_format((unsigned char *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
+         else
+            result = stbi__convert_format16((stbi__uint16 *) result, p->s->img_out_n, req_comp, p->s->img_x, p->s->img_y);
+         p->s->img_out_n = req_comp;
+         if (result == NULL) return result;
+      }
+      *x = p->s->img_x;
+      *y = p->s->img_y;
+      if (n) *n = p->s->img_n;
+   }
+   STBI_FREE(p->out);      p->out      = NULL;
+   STBI_FREE(p->expanded); p->expanded = NULL;
+   STBI_FREE(p->idata);    p->idata    = NULL;
+
+   return result;
+}
+
+static void *stbi__png_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   stbi__png p;
+   p.s = s;
+   return stbi__do_png(&p, x,y,comp,req_comp, ri);
+}
+
+static int stbi__png_test(stbi__context *s)
+{
+   int r;
+   r = stbi__check_png_header(s);
+   stbi__rewind(s);
+   return r;
+}
+
+static int stbi__png_info_raw(stbi__png *p, int *x, int *y, int *comp)
+{
+   if (!stbi__parse_png_file(p, STBI__SCAN_header, 0)) {
+      stbi__rewind( p->s );
+      return 0;
+   }
+   if (x) *x = p->s->img_x;
+   if (y) *y = p->s->img_y;
+   if (comp) *comp = p->s->img_n;
+   return 1;
+}
+
+static int stbi__png_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   stbi__png p;
+   p.s = s;
+   return stbi__png_info_raw(&p, x, y, comp);
+}
+
+static int stbi__png_is16(stbi__context *s)
+{
+   stbi__png p;
+   p.s = s;
+   if (!stbi__png_info_raw(&p, NULL, NULL, NULL))
+	   return 0;
+   if (p.depth != 16) {
+      stbi__rewind(p.s);
+      return 0;
+   }
+   return 1;
+}
+#endif
+
+// Microsoft/Windows BMP image
+
+#ifndef STBI_NO_BMP
+static int stbi__bmp_test_raw(stbi__context *s)
+{
+   int r;
+   int sz;
+   if (stbi__get8(s) != 'B') return 0;
+   if (stbi__get8(s) != 'M') return 0;
+   stbi__get32le(s); // discard filesize
+   stbi__get16le(s); // discard reserved
+   stbi__get16le(s); // discard reserved
+   stbi__get32le(s); // discard data offset
+   sz = stbi__get32le(s);
+   r = (sz == 12 || sz == 40 || sz == 56 || sz == 108 || sz == 124);
+   return r;
+}
+
+static int stbi__bmp_test(stbi__context *s)
+{
+   int r = stbi__bmp_test_raw(s);
+   stbi__rewind(s);
+   return r;
+}
+
+
+// returns 0..31 for the highest set bit
+static int stbi__high_bit(unsigned int z)
+{
+   int n=0;
+   if (z == 0) return -1;
+   if (z >= 0x10000) n += 16, z >>= 16;
+   if (z >= 0x00100) n +=  8, z >>=  8;
+   if (z >= 0x00010) n +=  4, z >>=  4;
+   if (z >= 0x00004) n +=  2, z >>=  2;
+   if (z >= 0x00002) n +=  1, z >>=  1;
+   return n;
+}
+
+static int stbi__bitcount(unsigned int a)
+{
+   a = (a & 0x55555555) + ((a >>  1) & 0x55555555); // max 2
+   a = (a & 0x33333333) + ((a >>  2) & 0x33333333); // max 4
+   a = (a + (a >> 4)) & 0x0f0f0f0f; // max 8 per 4, now 8 bits
+   a = (a + (a >> 8)); // max 16 per 8 bits
+   a = (a + (a >> 16)); // max 32 per 8 bits
+   return a & 0xff;
+}
+
+// extract an arbitrarily-aligned N-bit value (N=bits)
+// from v, and then make it 8-bits long and fractionally
+// extend it to full full range.
+static int stbi__shiftsigned(int v, int shift, int bits)
+{
+   static unsigned int mul_table[9] = {
+      0,
+      0xff/*0b11111111*/, 0x55/*0b01010101*/, 0x49/*0b01001001*/, 0x11/*0b00010001*/,
+      0x21/*0b00100001*/, 0x41/*0b01000001*/, 0x81/*0b10000001*/, 0x01/*0b00000001*/,
+   };
+   static unsigned int shift_table[9] = {
+      0, 0,0,1,0,2,4,6,0,
+   };
+   if (shift < 0)
+      v <<= -shift;
+   else
+      v >>= shift;
+   STBI_ASSERT(v >= 0 && v < 256);
+   v >>= (8-bits);
+   STBI_ASSERT(bits >= 0 && bits <= 8);
+   return (int) ((unsigned) v * mul_table[bits]) >> shift_table[bits];
+}
+
+typedef struct
+{
+   int bpp, offset, hsz;
+   unsigned int mr,mg,mb,ma, all_a;
+} stbi__bmp_data;
+
+static void *stbi__bmp_parse_header(stbi__context *s, stbi__bmp_data *info)
+{
+   int hsz;
+   if (stbi__get8(s) != 'B' || stbi__get8(s) != 'M') return stbi__errpuc("not BMP", "Corrupt BMP");
+   stbi__get32le(s); // discard filesize
+   stbi__get16le(s); // discard reserved
+   stbi__get16le(s); // discard reserved
+   info->offset = stbi__get32le(s);
+   info->hsz = hsz = stbi__get32le(s);
+   info->mr = info->mg = info->mb = info->ma = 0;
+
+   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124) return stbi__errpuc("unknown BMP", "BMP type not supported: unknown");
+   if (hsz == 12) {
+      s->img_x = stbi__get16le(s);
+      s->img_y = stbi__get16le(s);
+   } else {
+      s->img_x = stbi__get32le(s);
+      s->img_y = stbi__get32le(s);
+   }
+   if (stbi__get16le(s) != 1) return stbi__errpuc("bad BMP", "bad BMP");
+   info->bpp = stbi__get16le(s);
+   if (hsz != 12) {
+      int compress = stbi__get32le(s);
+      if (compress == 1 || compress == 2) return stbi__errpuc("BMP RLE", "BMP type not supported: RLE");
+      stbi__get32le(s); // discard sizeof
+      stbi__get32le(s); // discard hres
+      stbi__get32le(s); // discard vres
+      stbi__get32le(s); // discard colorsused
+      stbi__get32le(s); // discard max important
+      if (hsz == 40 || hsz == 56) {
+         if (hsz == 56) {
+            stbi__get32le(s);
+            stbi__get32le(s);
+            stbi__get32le(s);
+            stbi__get32le(s);
+         }
+         if (info->bpp == 16 || info->bpp == 32) {
+            if (compress == 0) {
+               if (info->bpp == 32) {
+                  info->mr = 0xffu << 16;
+                  info->mg = 0xffu <<  8;
+                  info->mb = 0xffu <<  0;
+                  info->ma = 0xffu << 24;
+                  info->all_a = 0; // if all_a is 0 at end, then we loaded alpha channel but it was all 0
+               } else {
+                  info->mr = 31u << 10;
+                  info->mg = 31u <<  5;
+                  info->mb = 31u <<  0;
+               }
+            } else if (compress == 3) {
+               info->mr = stbi__get32le(s);
+               info->mg = stbi__get32le(s);
+               info->mb = stbi__get32le(s);
+               // not documented, but generated by photoshop and handled by mspaint
+               if (info->mr == info->mg && info->mg == info->mb) {
+                  // ?!?!?
+                  return stbi__errpuc("bad BMP", "bad BMP");
+               }
+            } else
+               return stbi__errpuc("bad BMP", "bad BMP");
+         }
+      } else {
+         int i;
+         if (hsz != 108 && hsz != 124)
+            return stbi__errpuc("bad BMP", "bad BMP");
+         info->mr = stbi__get32le(s);
+         info->mg = stbi__get32le(s);
+         info->mb = stbi__get32le(s);
+         info->ma = stbi__get32le(s);
+         stbi__get32le(s); // discard color space
+         for (i=0; i < 12; ++i)
+            stbi__get32le(s); // discard color space parameters
+         if (hsz == 124) {
+            stbi__get32le(s); // discard rendering intent
+            stbi__get32le(s); // discard offset of profile data
+            stbi__get32le(s); // discard size of profile data
+            stbi__get32le(s); // discard reserved
+         }
+      }
+   }
+   return (void *) 1;
+}
+
+
+static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   stbi_uc *out;
+   unsigned int mr=0,mg=0,mb=0,ma=0, all_a;
+   stbi_uc pal[256][4];
+   int psize=0,i,j,width;
+   int flip_vertically, pad, target;
+   stbi__bmp_data info;
+   STBI_NOTUSED(ri);
+
+   info.all_a = 255;
+   if (stbi__bmp_parse_header(s, &info) == NULL)
+      return NULL; // error code already set
+
+   flip_vertically = ((int) s->img_y) > 0;
+   s->img_y = abs((int) s->img_y);
+
+   mr = info.mr;
+   mg = info.mg;
+   mb = info.mb;
+   ma = info.ma;
+   all_a = info.all_a;
+
+   if (info.hsz == 12) {
+      if (info.bpp < 24)
+         psize = (info.offset - 14 - 24) / 3;
+   } else {
+      if (info.bpp < 16)
+         psize = (info.offset - 14 - info.hsz) >> 2;
+   }
+
+   s->img_n = ma ? 4 : 3;
+   if (req_comp && req_comp >= 3) // we can directly decode 3 or 4
+      target = req_comp;
+   else
+      target = s->img_n; // if they want monochrome, we'll post-convert
+
+   // sanity-check size
+   if (!stbi__mad3sizes_valid(target, s->img_x, s->img_y, 0))
+      return stbi__errpuc("too large", "Corrupt BMP");
+
+   out = (stbi_uc *) stbi__malloc_mad3(target, s->img_x, s->img_y, 0);
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   if (info.bpp < 16) {
+      int z=0;
+      if (psize == 0 || psize > 256) { STBI_FREE(out); return stbi__errpuc("invalid", "Corrupt BMP"); }
+      for (i=0; i < psize; ++i) {
+         pal[i][2] = stbi__get8(s);
+         pal[i][1] = stbi__get8(s);
+         pal[i][0] = stbi__get8(s);
+         if (info.hsz != 12) stbi__get8(s);
+         pal[i][3] = 255;
+      }
+      stbi__skip(s, info.offset - 14 - info.hsz - psize * (info.hsz == 12 ? 3 : 4));
+      if (info.bpp == 1) width = (s->img_x + 7) >> 3;
+      else if (info.bpp == 4) width = (s->img_x + 1) >> 1;
+      else if (info.bpp == 8) width = s->img_x;
+      else { STBI_FREE(out); return stbi__errpuc("bad bpp", "Corrupt BMP"); }
+      pad = (-width)&3;
+      if (info.bpp == 1) {
+         for (j=0; j < (int) s->img_y; ++j) {
+            int bit_offset = 7, v = stbi__get8(s);
+            for (i=0; i < (int) s->img_x; ++i) {
+               int color = (v>>bit_offset)&0x1;
+               out[z++] = pal[color][0];
+               out[z++] = pal[color][1];
+               out[z++] = pal[color][2];
+               if((--bit_offset) < 0) {
+                  bit_offset = 7;
+                  v = stbi__get8(s);
+               }
+            }
+            stbi__skip(s, pad);
+         }
+      } else {
+         for (j=0; j < (int) s->img_y; ++j) {
+            for (i=0; i < (int) s->img_x; i += 2) {
+               int v=stbi__get8(s),v2=0;
+               if (info.bpp == 4) {
+                  v2 = v & 15;
+                  v >>= 4;
+               }
+               out[z++] = pal[v][0];
+               out[z++] = pal[v][1];
+               out[z++] = pal[v][2];
+               if (target == 4) out[z++] = 255;
+               if (i+1 == (int) s->img_x) break;
+               v = (info.bpp == 8) ? stbi__get8(s) : v2;
+               out[z++] = pal[v][0];
+               out[z++] = pal[v][1];
+               out[z++] = pal[v][2];
+               if (target == 4) out[z++] = 255;
+            }
+            stbi__skip(s, pad);
+         }
+      }
+   } else {
+      int rshift=0,gshift=0,bshift=0,ashift=0,rcount=0,gcount=0,bcount=0,acount=0;
+      int z = 0;
+      int easy=0;
+      stbi__skip(s, info.offset - 14 - info.hsz);
+      if (info.bpp == 24) width = 3 * s->img_x;
+      else if (info.bpp == 16) width = 2*s->img_x;
+      else /* bpp = 32 and pad = 0 */ width=0;
+      pad = (-width) & 3;
+      if (info.bpp == 24) {
+         easy = 1;
+      } else if (info.bpp == 32) {
+         if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000)
+            easy = 2;
+      }
+      if (!easy) {
+         if (!mr || !mg || !mb) { STBI_FREE(out); return stbi__errpuc("bad masks", "Corrupt BMP"); }
+         // right shift amt to put high bit in position #7
+         rshift = stbi__high_bit(mr)-7; rcount = stbi__bitcount(mr);
+         gshift = stbi__high_bit(mg)-7; gcount = stbi__bitcount(mg);
+         bshift = stbi__high_bit(mb)-7; bcount = stbi__bitcount(mb);
+         ashift = stbi__high_bit(ma)-7; acount = stbi__bitcount(ma);
+      }
+      for (j=0; j < (int) s->img_y; ++j) {
+         if (easy) {
+            for (i=0; i < (int) s->img_x; ++i) {
+               unsigned char a;
+               out[z+2] = stbi__get8(s);
+               out[z+1] = stbi__get8(s);
+               out[z+0] = stbi__get8(s);
+               z += 3;
+               a = (easy == 2 ? stbi__get8(s) : 255);
+               all_a |= a;
+               if (target == 4) out[z++] = a;
+            }
+         } else {
+            int bpp = info.bpp;
+            for (i=0; i < (int) s->img_x; ++i) {
+               stbi__uint32 v = (bpp == 16 ? (stbi__uint32) stbi__get16le(s) : stbi__get32le(s));
+               unsigned int a;
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mr, rshift, rcount));
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mg, gshift, gcount));
+               out[z++] = STBI__BYTECAST(stbi__shiftsigned(v & mb, bshift, bcount));
+               a = (ma ? stbi__shiftsigned(v & ma, ashift, acount) : 255);
+               all_a |= a;
+               if (target == 4) out[z++] = STBI__BYTECAST(a);
+            }
+         }
+         stbi__skip(s, pad);
+      }
+   }
+
+   // if alpha channel is all 0s, replace with all 255s
+   if (target == 4 && all_a == 0)
+      for (i=4*s->img_x*s->img_y-1; i >= 0; i -= 4)
+         out[i] = 255;
+
+   if (flip_vertically) {
+      stbi_uc t;
+      for (j=0; j < (int) s->img_y>>1; ++j) {
+         stbi_uc *p1 = out +      j     *s->img_x*target;
+         stbi_uc *p2 = out + (s->img_y-1-j)*s->img_x*target;
+         for (i=0; i < (int) s->img_x*target; ++i) {
+            t = p1[i], p1[i] = p2[i], p2[i] = t;
+         }
+      }
+   }
+
+   if (req_comp && req_comp != target) {
+      out = stbi__convert_format(out, target, req_comp, s->img_x, s->img_y);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+
+   *x = s->img_x;
+   *y = s->img_y;
+   if (comp) *comp = s->img_n;
+   return out;
+}
+#endif
+
+// Targa Truevision - TGA
+// by Jonathan Dummer
+#ifndef STBI_NO_TGA
+// returns STBI_rgb or whatever, 0 on error
+static int stbi__tga_get_comp(int bits_per_pixel, int is_grey, int* is_rgb16)
+{
+   // only RGB or RGBA (incl. 16bit) or grey allowed
+   if (is_rgb16) *is_rgb16 = 0;
+   switch(bits_per_pixel) {
+      case 8:  return STBI_grey;
+      case 16: if(is_grey) return STBI_grey_alpha;
+               // fallthrough
+      case 15: if(is_rgb16) *is_rgb16 = 1;
+               return STBI_rgb;
+      case 24: // fallthrough
+      case 32: return bits_per_pixel/8;
+      default: return 0;
+   }
+}
+
+static int stbi__tga_info(stbi__context *s, int *x, int *y, int *comp)
+{
+    int tga_w, tga_h, tga_comp, tga_image_type, tga_bits_per_pixel, tga_colormap_bpp;
+    int sz, tga_colormap_type;
+    stbi__get8(s);                   // discard Offset
+    tga_colormap_type = stbi__get8(s); // colormap type
+    if( tga_colormap_type > 1 ) {
+        stbi__rewind(s);
+        return 0;      // only RGB or indexed allowed
+    }
+    tga_image_type = stbi__get8(s); // image type
+    if ( tga_colormap_type == 1 ) { // colormapped (paletted) image
+        if (tga_image_type != 1 && tga_image_type != 9) {
+            stbi__rewind(s);
+            return 0;
+        }
+        stbi__skip(s,4);       // skip index of first colormap entry and number of entries
+        sz = stbi__get8(s);    //   check bits per palette color entry
+        if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) {
+            stbi__rewind(s);
+            return 0;
+        }
+        stbi__skip(s,4);       // skip image x and y origin
+        tga_colormap_bpp = sz;
+    } else { // "normal" image w/o colormap - only RGB or grey allowed, +/- RLE
+        if ( (tga_image_type != 2) && (tga_image_type != 3) && (tga_image_type != 10) && (tga_image_type != 11) ) {
+            stbi__rewind(s);
+            return 0; // only RGB or grey allowed, +/- RLE
+        }
+        stbi__skip(s,9); // skip colormap specification and image x/y origin
+        tga_colormap_bpp = 0;
+    }
+    tga_w = stbi__get16le(s);
+    if( tga_w < 1 ) {
+        stbi__rewind(s);
+        return 0;   // test width
+    }
+    tga_h = stbi__get16le(s);
+    if( tga_h < 1 ) {
+        stbi__rewind(s);
+        return 0;   // test height
+    }
+    tga_bits_per_pixel = stbi__get8(s); // bits per pixel
+    stbi__get8(s); // ignore alpha bits
+    if (tga_colormap_bpp != 0) {
+        if((tga_bits_per_pixel != 8) && (tga_bits_per_pixel != 16)) {
+            // when using a colormap, tga_bits_per_pixel is the size of the indexes
+            // I don't think anything but 8 or 16bit indexes makes sense
+            stbi__rewind(s);
+            return 0;
+        }
+        tga_comp = stbi__tga_get_comp(tga_colormap_bpp, 0, NULL);
+    } else {
+        tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3) || (tga_image_type == 11), NULL);
+    }
+    if(!tga_comp) {
+      stbi__rewind(s);
+      return 0;
+    }
+    if (x) *x = tga_w;
+    if (y) *y = tga_h;
+    if (comp) *comp = tga_comp;
+    return 1;                   // seems to have passed everything
+}
+
+static int stbi__tga_test(stbi__context *s)
+{
+   int res = 0;
+   int sz, tga_color_type;
+   stbi__get8(s);      //   discard Offset
+   tga_color_type = stbi__get8(s);   //   color type
+   if ( tga_color_type > 1 ) goto errorEnd;   //   only RGB or indexed allowed
+   sz = stbi__get8(s);   //   image type
+   if ( tga_color_type == 1 ) { // colormapped (paletted) image
+      if (sz != 1 && sz != 9) goto errorEnd; // colortype 1 demands image type 1 or 9
+      stbi__skip(s,4);       // skip index of first colormap entry and number of entries
+      sz = stbi__get8(s);    //   check bits per palette color entry
+      if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
+      stbi__skip(s,4);       // skip image x and y origin
+   } else { // "normal" image w/o colormap
+      if ( (sz != 2) && (sz != 3) && (sz != 10) && (sz != 11) ) goto errorEnd; // only RGB or grey allowed, +/- RLE
+      stbi__skip(s,9); // skip colormap specification and image x/y origin
+   }
+   if ( stbi__get16le(s) < 1 ) goto errorEnd;      //   test width
+   if ( stbi__get16le(s) < 1 ) goto errorEnd;      //   test height
+   sz = stbi__get8(s);   //   bits per pixel
+   if ( (tga_color_type == 1) && (sz != 8) && (sz != 16) ) goto errorEnd; // for colormapped images, bpp is size of an index
+   if ( (sz != 8) && (sz != 15) && (sz != 16) && (sz != 24) && (sz != 32) ) goto errorEnd;
+
+   res = 1; // if we got this far, everything's good and we can return 1 instead of 0
+
+errorEnd:
+   stbi__rewind(s);
+   return res;
+}
+
+// read 16bit value and convert to 24bit RGB
+static void stbi__tga_read_rgb16(stbi__context *s, stbi_uc* out)
+{
+   stbi__uint16 px = (stbi__uint16)stbi__get16le(s);
+   stbi__uint16 fiveBitMask = 31;
+   // we have 3 channels with 5bits each
+   int r = (px >> 10) & fiveBitMask;
+   int g = (px >> 5) & fiveBitMask;
+   int b = px & fiveBitMask;
+   // Note that this saves the data in RGB(A) order, so it doesn't need to be swapped later
+   out[0] = (stbi_uc)((r * 255)/31);
+   out[1] = (stbi_uc)((g * 255)/31);
+   out[2] = (stbi_uc)((b * 255)/31);
+
+   // some people claim that the most significant bit might be used for alpha
+   // (possibly if an alpha-bit is set in the "image descriptor byte")
+   // but that only made 16bit test images completely translucent..
+   // so let's treat all 15 and 16bit TGAs as RGB with no alpha.
+}
+
+static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   //   read in the TGA header stuff
+   int tga_offset = stbi__get8(s);
+   int tga_indexed = stbi__get8(s);
+   int tga_image_type = stbi__get8(s);
+   int tga_is_RLE = 0;
+   int tga_palette_start = stbi__get16le(s);
+   int tga_palette_len = stbi__get16le(s);
+   int tga_palette_bits = stbi__get8(s);
+   int tga_x_origin = stbi__get16le(s);
+   int tga_y_origin = stbi__get16le(s);
+   int tga_width = stbi__get16le(s);
+   int tga_height = stbi__get16le(s);
+   int tga_bits_per_pixel = stbi__get8(s);
+   int tga_comp, tga_rgb16=0;
+   int tga_inverted = stbi__get8(s);
+   // int tga_alpha_bits = tga_inverted & 15; // the 4 lowest bits - unused (useless?)
+   //   image data
+   unsigned char *tga_data;
+   unsigned char *tga_palette = NULL;
+   int i, j;
+   unsigned char raw_data[4] = {0};
+   int RLE_count = 0;
+   int RLE_repeating = 0;
+   int read_next_pixel = 1;
+   STBI_NOTUSED(ri);
+
+   //   do a tiny bit of precessing
+   if ( tga_image_type >= 8 )
+   {
+      tga_image_type -= 8;
+      tga_is_RLE = 1;
+   }
+   tga_inverted = 1 - ((tga_inverted >> 5) & 1);
+
+   //   If I'm paletted, then I'll use the number of bits from the palette
+   if ( tga_indexed ) tga_comp = stbi__tga_get_comp(tga_palette_bits, 0, &tga_rgb16);
+   else tga_comp = stbi__tga_get_comp(tga_bits_per_pixel, (tga_image_type == 3), &tga_rgb16);
+
+   if(!tga_comp) // shouldn't really happen, stbi__tga_test() should have ensured basic consistency
+      return stbi__errpuc("bad format", "Can't find out TGA pixelformat");
+
+   //   tga info
+   *x = tga_width;
+   *y = tga_height;
+   if (comp) *comp = tga_comp;
+
+   if (!stbi__mad3sizes_valid(tga_width, tga_height, tga_comp, 0))
+      return stbi__errpuc("too large", "Corrupt TGA");
+
+   tga_data = (unsigned char*)stbi__malloc_mad3(tga_width, tga_height, tga_comp, 0);
+   if (!tga_data) return stbi__errpuc("outofmem", "Out of memory");
+
+   // skip to the data's starting position (offset usually = 0)
+   stbi__skip(s, tga_offset );
+
+   if ( !tga_indexed && !tga_is_RLE && !tga_rgb16 ) {
+      for (i=0; i < tga_height; ++i) {
+         int row = tga_inverted ? tga_height -i - 1 : i;
+         stbi_uc *tga_row = tga_data + row*tga_width*tga_comp;
+         stbi__getn(s, tga_row, tga_width * tga_comp);
+      }
+   } else  {
+      //   do I need to load a palette?
+      if ( tga_indexed)
+      {
+         //   any data to skip? (offset usually = 0)
+         stbi__skip(s, tga_palette_start );
+         //   load the palette
+         tga_palette = (unsigned char*)stbi__malloc_mad2(tga_palette_len, tga_comp, 0);
+         if (!tga_palette) {
+            STBI_FREE(tga_data);
+            return stbi__errpuc("outofmem", "Out of memory");
+         }
+         if (tga_rgb16) {
+            stbi_uc *pal_entry = tga_palette;
+            STBI_ASSERT(tga_comp == STBI_rgb);
+            for (i=0; i < tga_palette_len; ++i) {
+               stbi__tga_read_rgb16(s, pal_entry);
+               pal_entry += tga_comp;
+            }
+         } else if (!stbi__getn(s, tga_palette, tga_palette_len * tga_comp)) {
+               STBI_FREE(tga_data);
+               STBI_FREE(tga_palette);
+               return stbi__errpuc("bad palette", "Corrupt TGA");
+         }
+      }
+      //   load the data
+      for (i=0; i < tga_width * tga_height; ++i)
+      {
+         //   if I'm in RLE mode, do I need to get a RLE stbi__pngchunk?
+         if ( tga_is_RLE )
+         {
+            if ( RLE_count == 0 )
+            {
+               //   yep, get the next byte as a RLE command
+               int RLE_cmd = stbi__get8(s);
+               RLE_count = 1 + (RLE_cmd & 127);
+               RLE_repeating = RLE_cmd >> 7;
+               read_next_pixel = 1;
+            } else if ( !RLE_repeating )
+            {
+               read_next_pixel = 1;
+            }
+         } else
+         {
+            read_next_pixel = 1;
+         }
+         //   OK, if I need to read a pixel, do it now
+         if ( read_next_pixel )
+         {
+            //   load however much data we did have
+            if ( tga_indexed )
+            {
+               // read in index, then perform the lookup
+               int pal_idx = (tga_bits_per_pixel == 8) ? stbi__get8(s) : stbi__get16le(s);
+               if ( pal_idx >= tga_palette_len ) {
+                  // invalid index
+                  pal_idx = 0;
+               }
+               pal_idx *= tga_comp;
+               for (j = 0; j < tga_comp; ++j) {
+                  raw_data[j] = tga_palette[pal_idx+j];
+               }
+            } else if(tga_rgb16) {
+               STBI_ASSERT(tga_comp == STBI_rgb);
+               stbi__tga_read_rgb16(s, raw_data);
+            } else {
+               //   read in the data raw
+               for (j = 0; j < tga_comp; ++j) {
+                  raw_data[j] = stbi__get8(s);
+               }
+            }
+            //   clear the reading flag for the next pixel
+            read_next_pixel = 0;
+         } // end of reading a pixel
+
+         // copy data
+         for (j = 0; j < tga_comp; ++j)
+           tga_data[i*tga_comp+j] = raw_data[j];
+
+         //   in case we're in RLE mode, keep counting down
+         --RLE_count;
+      }
+      //   do I need to invert the image?
+      if ( tga_inverted )
+      {
+         for (j = 0; j*2 < tga_height; ++j)
+         {
+            int index1 = j * tga_width * tga_comp;
+            int index2 = (tga_height - 1 - j) * tga_width * tga_comp;
+            for (i = tga_width * tga_comp; i > 0; --i)
+            {
+               unsigned char temp = tga_data[index1];
+               tga_data[index1] = tga_data[index2];
+               tga_data[index2] = temp;
+               ++index1;
+               ++index2;
+            }
+         }
+      }
+      //   clear my palette, if I had one
+      if ( tga_palette != NULL )
+      {
+         STBI_FREE( tga_palette );
+      }
+   }
+
+   // swap RGB - if the source data was RGB16, it already is in the right order
+   if (tga_comp >= 3 && !tga_rgb16)
+   {
+      unsigned char* tga_pixel = tga_data;
+      for (i=0; i < tga_width * tga_height; ++i)
+      {
+         unsigned char temp = tga_pixel[0];
+         tga_pixel[0] = tga_pixel[2];
+         tga_pixel[2] = temp;
+         tga_pixel += tga_comp;
+      }
+   }
+
+   // convert to target component count
+   if (req_comp && req_comp != tga_comp)
+      tga_data = stbi__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height);
+
+   //   the things I do to get rid of an error message, and yet keep
+   //   Microsoft's C compilers happy... [8^(
+   tga_palette_start = tga_palette_len = tga_palette_bits =
+         tga_x_origin = tga_y_origin = 0;
+   //   OK, done
+   return tga_data;
+}
+#endif
+
+// *************************************************************************************************
+// Photoshop PSD loader -- PD by Thatcher Ulrich, integration by Nicolas Schulz, tweaked by STB
+
+#ifndef STBI_NO_PSD
+static int stbi__psd_test(stbi__context *s)
+{
+   int r = (stbi__get32be(s) == 0x38425053);
+   stbi__rewind(s);
+   return r;
+}
+
+static int stbi__psd_decode_rle(stbi__context *s, stbi_uc *p, int pixelCount)
+{
+   int count, nleft, len;
+
+   count = 0;
+   while ((nleft = pixelCount - count) > 0) {
+      len = stbi__get8(s);
+      if (len == 128) {
+         // No-op.
+      } else if (len < 128) {
+         // Copy next len+1 bytes literally.
+         len++;
+         if (len > nleft) return 0; // corrupt data
+         count += len;
+         while (len) {
+            *p = stbi__get8(s);
+            p += 4;
+            len--;
+         }
+      } else if (len > 128) {
+         stbi_uc   val;
+         // Next -len+1 bytes in the dest are replicated from next source byte.
+         // (Interpret len as a negative 8-bit int.)
+         len = 257 - len;
+         if (len > nleft) return 0; // corrupt data
+         val = stbi__get8(s);
+         count += len;
+         while (len) {
+            *p = val;
+            p += 4;
+            len--;
+         }
+      }
+   }
+
+   return 1;
+}
+
+static void *stbi__psd_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri, int bpc)
+{
+   int pixelCount;
+   int channelCount, compression;
+   int channel, i;
+   int bitdepth;
+   int w,h;
+   stbi_uc *out;
+   STBI_NOTUSED(ri);
+
+   // Check identifier
+   if (stbi__get32be(s) != 0x38425053)   // "8BPS"
+      return stbi__errpuc("not PSD", "Corrupt PSD image");
+
+   // Check file type version.
+   if (stbi__get16be(s) != 1)
+      return stbi__errpuc("wrong version", "Unsupported version of PSD image");
+
+   // Skip 6 reserved bytes.
+   stbi__skip(s, 6 );
+
+   // Read the number of channels (R, G, B, A, etc).
+   channelCount = stbi__get16be(s);
+   if (channelCount < 0 || channelCount > 16)
+      return stbi__errpuc("wrong channel count", "Unsupported number of channels in PSD image");
+
+   // Read the rows and columns of the image.
+   h = stbi__get32be(s);
+   w = stbi__get32be(s);
+
+   // Make sure the depth is 8 bits.
+   bitdepth = stbi__get16be(s);
+   if (bitdepth != 8 && bitdepth != 16)
+      return stbi__errpuc("unsupported bit depth", "PSD bit depth is not 8 or 16 bit");
+
+   // Make sure the color mode is RGB.
+   // Valid options are:
+   //   0: Bitmap
+   //   1: Grayscale
+   //   2: Indexed color
+   //   3: RGB color
+   //   4: CMYK color
+   //   7: Multichannel
+   //   8: Duotone
+   //   9: Lab color
+   if (stbi__get16be(s) != 3)
+      return stbi__errpuc("wrong color format", "PSD is not in RGB color format");
+
+   // Skip the Mode Data.  (It's the palette for indexed color; other info for other modes.)
+   stbi__skip(s,stbi__get32be(s) );
+
+   // Skip the image resources.  (resolution, pen tool paths, etc)
+   stbi__skip(s, stbi__get32be(s) );
+
+   // Skip the reserved data.
+   stbi__skip(s, stbi__get32be(s) );
+
+   // Find out if the data is compressed.
+   // Known values:
+   //   0: no compression
+   //   1: RLE compressed
+   compression = stbi__get16be(s);
+   if (compression > 1)
+      return stbi__errpuc("bad compression", "PSD has an unknown compression format");
+
+   // Check size
+   if (!stbi__mad3sizes_valid(4, w, h, 0))
+      return stbi__errpuc("too large", "Corrupt PSD");
+
+   // Create the destination image.
+
+   if (!compression && bitdepth == 16 && bpc == 16) {
+      out = (stbi_uc *) stbi__malloc_mad3(8, w, h, 0);
+      ri->bits_per_channel = 16;
+   } else
+      out = (stbi_uc *) stbi__malloc(4 * w*h);
+
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   pixelCount = w*h;
+
+   // Initialize the data to zero.
+   //memset( out, 0, pixelCount * 4 );
+
+   // Finally, the image data.
+   if (compression) {
+      // RLE as used by .PSD and .TIFF
+      // Loop until you get the number of unpacked bytes you are expecting:
+      //     Read the next source byte into n.
+      //     If n is between 0 and 127 inclusive, copy the next n+1 bytes literally.
+      //     Else if n is between -127 and -1 inclusive, copy the next byte -n+1 times.
+      //     Else if n is 128, noop.
+      // Endloop
+
+      // The RLE-compressed data is preceeded by a 2-byte data count for each row in the data,
+      // which we're going to just skip.
+      stbi__skip(s, h * channelCount * 2 );
+
+      // Read the RLE data by channel.
+      for (channel = 0; channel < 4; channel++) {
+         stbi_uc *p;
+
+         p = out+channel;
+         if (channel >= channelCount) {
+            // Fill this channel with default data.
+            for (i = 0; i < pixelCount; i++, p += 4)
+               *p = (channel == 3 ? 255 : 0);
+         } else {
+            // Read the RLE data.
+            if (!stbi__psd_decode_rle(s, p, pixelCount)) {
+               STBI_FREE(out);
+               return stbi__errpuc("corrupt", "bad RLE data");
+            }
+         }
+      }
+
+   } else {
+      // We're at the raw image data.  It's each channel in order (Red, Green, Blue, Alpha, ...)
+      // where each channel consists of an 8-bit (or 16-bit) value for each pixel in the image.
+
+      // Read the data by channel.
+      for (channel = 0; channel < 4; channel++) {
+         if (channel >= channelCount) {
+            // Fill this channel with default data.
+            if (bitdepth == 16 && bpc == 16) {
+               stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
+               stbi__uint16 val = channel == 3 ? 65535 : 0;
+               for (i = 0; i < pixelCount; i++, q += 4)
+                  *q = val;
+            } else {
+               stbi_uc *p = out+channel;
+               stbi_uc val = channel == 3 ? 255 : 0;
+               for (i = 0; i < pixelCount; i++, p += 4)
+                  *p = val;
+            }
+         } else {
+            if (ri->bits_per_channel == 16) {    // output bpc
+               stbi__uint16 *q = ((stbi__uint16 *) out) + channel;
+               for (i = 0; i < pixelCount; i++, q += 4)
+                  *q = (stbi__uint16) stbi__get16be(s);
+            } else {
+               stbi_uc *p = out+channel;
+               if (bitdepth == 16) {  // input bpc
+                  for (i = 0; i < pixelCount; i++, p += 4)
+                     *p = (stbi_uc) (stbi__get16be(s) >> 8);
+               } else {
+                  for (i = 0; i < pixelCount; i++, p += 4)
+                     *p = stbi__get8(s);
+               }
+            }
+         }
+      }
+   }
+
+   // remove weird white matte from PSD
+   if (channelCount >= 4) {
+      if (ri->bits_per_channel == 16) {
+         for (i=0; i < w*h; ++i) {
+            stbi__uint16 *pixel = (stbi__uint16 *) out + 4*i;
+            if (pixel[3] != 0 && pixel[3] != 65535) {
+               float a = pixel[3] / 65535.0f;
+               float ra = 1.0f / a;
+               float inv_a = 65535.0f * (1 - ra);
+               pixel[0] = (stbi__uint16) (pixel[0]*ra + inv_a);
+               pixel[1] = (stbi__uint16) (pixel[1]*ra + inv_a);
+               pixel[2] = (stbi__uint16) (pixel[2]*ra + inv_a);
+            }
+         }
+      } else {
+         for (i=0; i < w*h; ++i) {
+            unsigned char *pixel = out + 4*i;
+            if (pixel[3] != 0 && pixel[3] != 255) {
+               float a = pixel[3] / 255.0f;
+               float ra = 1.0f / a;
+               float inv_a = 255.0f * (1 - ra);
+               pixel[0] = (unsigned char) (pixel[0]*ra + inv_a);
+               pixel[1] = (unsigned char) (pixel[1]*ra + inv_a);
+               pixel[2] = (unsigned char) (pixel[2]*ra + inv_a);
+            }
+         }
+      }
+   }
+
+   // convert to desired output format
+   if (req_comp && req_comp != 4) {
+      if (ri->bits_per_channel == 16)
+         out = (stbi_uc *) stbi__convert_format16((stbi__uint16 *) out, 4, req_comp, w, h);
+      else
+         out = stbi__convert_format(out, 4, req_comp, w, h);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+
+   if (comp) *comp = 4;
+   *y = h;
+   *x = w;
+
+   return out;
+}
+#endif
+
+// *************************************************************************************************
+// Softimage PIC loader
+// by Tom Seddon
+//
+// See http://softimage.wiki.softimage.com/index.php/INFO:_PIC_file_format
+// See http://ozviz.wasp.uwa.edu.au/~pbourke/dataformats/softimagepic/
+
+#ifndef STBI_NO_PIC
+static int stbi__pic_is4(stbi__context *s,const char *str)
+{
+   int i;
+   for (i=0; i<4; ++i)
+      if (stbi__get8(s) != (stbi_uc)str[i])
+         return 0;
+
+   return 1;
+}
+
+static int stbi__pic_test_core(stbi__context *s)
+{
+   int i;
+
+   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34"))
+      return 0;
+
+   for(i=0;i<84;++i)
+      stbi__get8(s);
+
+   if (!stbi__pic_is4(s,"PICT"))
+      return 0;
+
+   return 1;
+}
+
+typedef struct
+{
+   stbi_uc size,type,channel;
+} stbi__pic_packet;
+
+static stbi_uc *stbi__readval(stbi__context *s, int channel, stbi_uc *dest)
+{
+   int mask=0x80, i;
+
+   for (i=0; i<4; ++i, mask>>=1) {
+      if (channel & mask) {
+         if (stbi__at_eof(s)) return stbi__errpuc("bad file","PIC file too short");
+         dest[i]=stbi__get8(s);
+      }
+   }
+
+   return dest;
+}
+
+static void stbi__copyval(int channel,stbi_uc *dest,const stbi_uc *src)
+{
+   int mask=0x80,i;
+
+   for (i=0;i<4; ++i, mask>>=1)
+      if (channel&mask)
+         dest[i]=src[i];
+}
+
+static stbi_uc *stbi__pic_load_core(stbi__context *s,int width,int height,int *comp, stbi_uc *result)
+{
+   int act_comp=0,num_packets=0,y,chained;
+   stbi__pic_packet packets[10];
+
+   // this will (should...) cater for even some bizarre stuff like having data
+    // for the same channel in multiple packets.
+   do {
+      stbi__pic_packet *packet;
+
+      if (num_packets==sizeof(packets)/sizeof(packets[0]))
+         return stbi__errpuc("bad format","too many packets");
+
+      packet = &packets[num_packets++];
+
+      chained = stbi__get8(s);
+      packet->size    = stbi__get8(s);
+      packet->type    = stbi__get8(s);
+      packet->channel = stbi__get8(s);
+
+      act_comp |= packet->channel;
+
+      if (stbi__at_eof(s))          return stbi__errpuc("bad file","file too short (reading packets)");
+      if (packet->size != 8)  return stbi__errpuc("bad format","packet isn't 8bpp");
+   } while (chained);
+
+   *comp = (act_comp & 0x10 ? 4 : 3); // has alpha channel?
+
+   for(y=0; y<height; ++y) {
+      int packet_idx;
+
+      for(packet_idx=0; packet_idx < num_packets; ++packet_idx) {
+         stbi__pic_packet *packet = &packets[packet_idx];
+         stbi_uc *dest = result+y*width*4;
+
+         switch (packet->type) {
+            default:
+               return stbi__errpuc("bad format","packet has bad compression type");
+
+            case 0: {//uncompressed
+               int x;
+
+               for(x=0;x<width;++x, dest+=4)
+                  if (!stbi__readval(s,packet->channel,dest))
+                     return 0;
+               break;
+            }
+
+            case 1://Pure RLE
+               {
+                  int left=width, i;
+
+                  while (left>0) {
+                     stbi_uc count,value[4];
+
+                     count=stbi__get8(s);
+                     if (stbi__at_eof(s))   return stbi__errpuc("bad file","file too short (pure read count)");
+
+                     if (count > left)
+                        count = (stbi_uc) left;
+
+                     if (!stbi__readval(s,packet->channel,value))  return 0;
+
+                     for(i=0; i<count; ++i,dest+=4)
+                        stbi__copyval(packet->channel,dest,value);
+                     left -= count;
+                  }
+               }
+               break;
+
+            case 2: {//Mixed RLE
+               int left=width;
+               while (left>0) {
+                  int count = stbi__get8(s), i;
+                  if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (mixed read count)");
+
+                  if (count >= 128) { // Repeated
+                     stbi_uc value[4];
+
+                     if (count==128)
+                        count = stbi__get16be(s);
+                     else
+                        count -= 127;
+                     if (count > left)
+                        return stbi__errpuc("bad file","scanline overrun");
+
+                     if (!stbi__readval(s,packet->channel,value))
+                        return 0;
+
+                     for(i=0;i<count;++i, dest += 4)
+                        stbi__copyval(packet->channel,dest,value);
+                  } else { // Raw
+                     ++count;
+                     if (count>left) return stbi__errpuc("bad file","scanline overrun");
+
+                     for(i=0;i<count;++i, dest+=4)
+                        if (!stbi__readval(s,packet->channel,dest))
+                           return 0;
+                  }
+                  left-=count;
+               }
+               break;
+            }
+         }
+      }
+   }
+
+   return result;
+}
+
+static void *stbi__pic_load(stbi__context *s,int *px,int *py,int *comp,int req_comp, stbi__result_info *ri)
+{
+   stbi_uc *result;
+   int i, x,y, internal_comp;
+   STBI_NOTUSED(ri);
+
+   if (!comp) comp = &internal_comp;
+
+   for (i=0; i<92; ++i)
+      stbi__get8(s);
+
+   x = stbi__get16be(s);
+   y = stbi__get16be(s);
+   if (stbi__at_eof(s))  return stbi__errpuc("bad file","file too short (pic header)");
+   if (!stbi__mad3sizes_valid(x, y, 4, 0)) return stbi__errpuc("too large", "PIC image too large to decode");
+
+   stbi__get32be(s); //skip `ratio'
+   stbi__get16be(s); //skip `fields'
+   stbi__get16be(s); //skip `pad'
+
+   // intermediate buffer is RGBA
+   result = (stbi_uc *) stbi__malloc_mad3(x, y, 4, 0);
+   memset(result, 0xff, x*y*4);
+
+   if (!stbi__pic_load_core(s,x,y,comp, result)) {
+      STBI_FREE(result);
+      result=0;
+   }
+   *px = x;
+   *py = y;
+   if (req_comp == 0) req_comp = *comp;
+   result=stbi__convert_format(result,4,req_comp,x,y);
+
+   return result;
+}
+
+static int stbi__pic_test(stbi__context *s)
+{
+   int r = stbi__pic_test_core(s);
+   stbi__rewind(s);
+   return r;
+}
+#endif
+
+// *************************************************************************************************
+// GIF loader -- public domain by Jean-Marc Lienher -- simplified/shrunk by stb
+
+#ifndef STBI_NO_GIF
+typedef struct
+{
+   stbi__int16 prefix;
+   stbi_uc first;
+   stbi_uc suffix;
+} stbi__gif_lzw;
+
+typedef struct
+{
+   int w,h;
+   stbi_uc *out;                 // output buffer (always 4 components)
+   stbi_uc *background;          // The current "background" as far as a gif is concerned
+   stbi_uc *history; 
+   int flags, bgindex, ratio, transparent, eflags;
+   stbi_uc  pal[256][4];
+   stbi_uc lpal[256][4];
+   stbi__gif_lzw codes[8192];
+   stbi_uc *color_table;
+   int parse, step;
+   int lflags;
+   int start_x, start_y;
+   int max_x, max_y;
+   int cur_x, cur_y;
+   int line_size;
+   int delay;
+} stbi__gif;
+
+static int stbi__gif_test_raw(stbi__context *s)
+{
+   int sz;
+   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8') return 0;
+   sz = stbi__get8(s);
+   if (sz != '9' && sz != '7') return 0;
+   if (stbi__get8(s) != 'a') return 0;
+   return 1;
+}
+
+static int stbi__gif_test(stbi__context *s)
+{
+   int r = stbi__gif_test_raw(s);
+   stbi__rewind(s);
+   return r;
+}
+
+static void stbi__gif_parse_colortable(stbi__context *s, stbi_uc pal[256][4], int num_entries, int transp)
+{
+   int i;
+   for (i=0; i < num_entries; ++i) {
+      pal[i][2] = stbi__get8(s);
+      pal[i][1] = stbi__get8(s);
+      pal[i][0] = stbi__get8(s);
+      pal[i][3] = transp == i ? 0 : 255;
+   }
+}
+
+static int stbi__gif_header(stbi__context *s, stbi__gif *g, int *comp, int is_info)
+{
+   stbi_uc version;
+   if (stbi__get8(s) != 'G' || stbi__get8(s) != 'I' || stbi__get8(s) != 'F' || stbi__get8(s) != '8')
+      return stbi__err("not GIF", "Corrupt GIF");
+
+   version = stbi__get8(s);
+   if (version != '7' && version != '9')    return stbi__err("not GIF", "Corrupt GIF");
+   if (stbi__get8(s) != 'a')                return stbi__err("not GIF", "Corrupt GIF");
+
+   stbi__g_failure_reason = "";
+   g->w = stbi__get16le(s);
+   g->h = stbi__get16le(s);
+   g->flags = stbi__get8(s);
+   g->bgindex = stbi__get8(s);
+   g->ratio = stbi__get8(s);
+   g->transparent = -1;
+
+   if (comp != 0) *comp = 4;  // can't actually tell whether it's 3 or 4 until we parse the comments
+
+   if (is_info) return 1;
+
+   if (g->flags & 0x80)
+      stbi__gif_parse_colortable(s,g->pal, 2 << (g->flags & 7), -1);
+
+   return 1;
+}
+
+static int stbi__gif_info_raw(stbi__context *s, int *x, int *y, int *comp)
+{
+   stbi__gif* g = (stbi__gif*) stbi__malloc(sizeof(stbi__gif));
+   if (!stbi__gif_header(s, g, comp, 1)) {
+      STBI_FREE(g);
+      stbi__rewind( s );
+      return 0;
+   }
+   if (x) *x = g->w;
+   if (y) *y = g->h;
+   STBI_FREE(g);
+   return 1;
+}
+
+static void stbi__out_gif_code(stbi__gif *g, stbi__uint16 code)
+{
+   stbi_uc *p, *c;
+   int idx; 
+
+   // recurse to decode the prefixes, since the linked-list is backwards,
+   // and working backwards through an interleaved image would be nasty
+   if (g->codes[code].prefix >= 0)
+      stbi__out_gif_code(g, g->codes[code].prefix);
+
+   if (g->cur_y >= g->max_y) return;
+
+   idx = g->cur_x + g->cur_y; 
+   p = &g->out[idx];
+   g->history[idx / 4] = 1;  
+
+   c = &g->color_table[g->codes[code].suffix * 4];
+   if (c[3] > 128) { // don't render transparent pixels; 
+      p[0] = c[2];
+      p[1] = c[1];
+      p[2] = c[0];
+      p[3] = c[3];
+   }
+   g->cur_x += 4;
+
+   if (g->cur_x >= g->max_x) {
+      g->cur_x = g->start_x;
+      g->cur_y += g->step;
+
+      while (g->cur_y >= g->max_y && g->parse > 0) {
+         g->step = (1 << g->parse) * g->line_size;
+         g->cur_y = g->start_y + (g->step >> 1);
+         --g->parse;
+      }
+   }
+}
+
+static stbi_uc *stbi__process_gif_raster(stbi__context *s, stbi__gif *g)
+{
+   stbi_uc lzw_cs;
+   stbi__int32 len, init_code;
+   stbi__uint32 first;
+   stbi__int32 codesize, codemask, avail, oldcode, bits, valid_bits, clear;
+   stbi__gif_lzw *p;
+
+   lzw_cs = stbi__get8(s);
+   if (lzw_cs > 12) return NULL;
+   clear = 1 << lzw_cs;
+   first = 1;
+   codesize = lzw_cs + 1;
+   codemask = (1 << codesize) - 1;
+   bits = 0;
+   valid_bits = 0;
+   for (init_code = 0; init_code < clear; init_code++) {
+      g->codes[init_code].prefix = -1;
+      g->codes[init_code].first = (stbi_uc) init_code;
+      g->codes[init_code].suffix = (stbi_uc) init_code;
+   }
+
+   // support no starting clear code
+   avail = clear+2;
+   oldcode = -1;
+
+   len = 0;
+   for(;;) {
+      if (valid_bits < codesize) {
+         if (len == 0) {
+            len = stbi__get8(s); // start new block
+            if (len == 0)
+               return g->out;
+         }
+         --len;
+         bits |= (stbi__int32) stbi__get8(s) << valid_bits;
+         valid_bits += 8;
+      } else {
+         stbi__int32 code = bits & codemask;
+         bits >>= codesize;
+         valid_bits -= codesize;
+         // @OPTIMIZE: is there some way we can accelerate the non-clear path?
+         if (code == clear) {  // clear code
+            codesize = lzw_cs + 1;
+            codemask = (1 << codesize) - 1;
+            avail = clear + 2;
+            oldcode = -1;
+            first = 0;
+         } else if (code == clear + 1) { // end of stream code
+            stbi__skip(s, len);
+            while ((len = stbi__get8(s)) > 0)
+               stbi__skip(s,len);
+            return g->out;
+         } else if (code <= avail) {
+            if (first) {
+               return stbi__errpuc("no clear code", "Corrupt GIF");
+            }
+
+            if (oldcode >= 0) {
+               p = &g->codes[avail++];
+               if (avail > 8192) {
+                  return stbi__errpuc("too many codes", "Corrupt GIF");
+               }
+
+               p->prefix = (stbi__int16) oldcode;
+               p->first = g->codes[oldcode].first;
+               p->suffix = (code == avail) ? p->first : g->codes[code].first;
+            } else if (code == avail)
+               return stbi__errpuc("illegal code in raster", "Corrupt GIF");
+
+            stbi__out_gif_code(g, (stbi__uint16) code);
+
+            if ((avail & codemask) == 0 && avail <= 0x0FFF) {
+               codesize++;
+               codemask = (1 << codesize) - 1;
+            }
+
+            oldcode = code;
+         } else {
+            return stbi__errpuc("illegal code in raster", "Corrupt GIF");
+         }
+      }
+   }
+}
+
+// this function is designed to support animated gifs, although stb_image doesn't support it
+// two back is the image from two frames ago, used for a very specific disposal format
+static stbi_uc *stbi__gif_load_next(stbi__context *s, stbi__gif *g, int *comp, int req_comp, stbi_uc *two_back)
+{
+   int dispose; 
+   int first_frame; 
+   int pi; 
+   int pcount; 
+
+   // on first frame, any non-written pixels get the background colour (non-transparent)
+   first_frame = 0; 
+   if (g->out == 0) {
+      if (!stbi__gif_header(s, g, comp,0))     return 0; // stbi__g_failure_reason set by stbi__gif_header
+      g->out = (stbi_uc *) stbi__malloc(4 * g->w * g->h);
+      g->background = (stbi_uc *) stbi__malloc(4 * g->w * g->h); 
+      g->history = (stbi_uc *) stbi__malloc(g->w * g->h); 
+      if (g->out == 0)                      return stbi__errpuc("outofmem", "Out of memory");
+
+      // image is treated as "tranparent" at the start - ie, nothing overwrites the current background; 
+      // background colour is only used for pixels that are not rendered first frame, after that "background"
+      // color refers to teh color that was there the previous frame. 
+      memset( g->out, 0x00, 4 * g->w * g->h ); 
+      memset( g->background, 0x00, 4 * g->w * g->h ); // state of the background (starts transparent)
+      memset( g->history, 0x00, g->w * g->h );        // pixels that were affected previous frame
+      first_frame = 1; 
+   } else {
+      // second frame - how do we dispoase of the previous one?
+      dispose = (g->eflags & 0x1C) >> 2; 
+      pcount = g->w * g->h; 
+
+      if ((dispose == 3) && (two_back == 0)) {
+         dispose = 2; // if I don't have an image to revert back to, default to the old background
+      }
+
+      if (dispose == 3) { // use previous graphic
+         for (pi = 0; pi < pcount; ++pi) {
+            if (g->history[pi]) {
+               memcpy( &g->out[pi * 4], &two_back[pi * 4], 4 ); 
+            }
+         }
+      } else if (dispose == 2) { 
+         // restore what was changed last frame to background before that frame; 
+         for (pi = 0; pi < pcount; ++pi) {
+            if (g->history[pi]) {
+               memcpy( &g->out[pi * 4], &g->background[pi * 4], 4 ); 
+            }
+         }
+      } else {
+         // This is a non-disposal case eithe way, so just 
+         // leave the pixels as is, and they will become the new background
+         // 1: do not dispose
+         // 0:  not specified.
+      }
+
+      // background is what out is after the undoing of the previou frame; 
+      memcpy( g->background, g->out, 4 * g->w * g->h ); 
+   }
+
+   // clear my history; 
+   memset( g->history, 0x00, g->w * g->h );        // pixels that were affected previous frame
+
+   for (;;) {
+      int tag = stbi__get8(s); 
+      switch (tag) {
+         case 0x2C: /* Image Descriptor */
+         {
+            stbi__int32 x, y, w, h;
+            stbi_uc *o;
+
+            x = stbi__get16le(s);
+            y = stbi__get16le(s);
+            w = stbi__get16le(s);
+            h = stbi__get16le(s);
+            if (((x + w) > (g->w)) || ((y + h) > (g->h)))
+               return stbi__errpuc("bad Image Descriptor", "Corrupt GIF");
+
+            g->line_size = g->w * 4;
+            g->start_x = x * 4;
+            g->start_y = y * g->line_size;
+            g->max_x   = g->start_x + w * 4;
+            g->max_y   = g->start_y + h * g->line_size;
+            g->cur_x   = g->start_x;
+            g->cur_y   = g->start_y;
+
+            g->lflags = stbi__get8(s);
+
+            if (g->lflags & 0x40) {
+               g->step = 8 * g->line_size; // first interlaced spacing
+               g->parse = 3;
+            } else {
+               g->step = g->line_size;
+               g->parse = 0;
+            }
+
+            if (g->lflags & 0x80) {
+               stbi__gif_parse_colortable(s,g->lpal, 2 << (g->lflags & 7), g->eflags & 0x01 ? g->transparent : -1);
+               g->color_table = (stbi_uc *) g->lpal;
+            } else if (g->flags & 0x80) {
+               g->color_table = (stbi_uc *) g->pal;
+            } else
+               return stbi__errpuc("missing color table", "Corrupt GIF");            
+            
+            o = stbi__process_gif_raster(s, g);
+            if (o == NULL) return NULL;
+
+            // if this was the first frame, 
+            pcount = g->w * g->h; 
+            if (first_frame && (g->bgindex > 0)) {
+               // if first frame, any pixel not drawn to gets the background color
+               for (pi = 0; pi < pcount; ++pi) {
+                  if (g->history[pi] == 0) {
+                     g->pal[g->bgindex][3] = 255; // just in case it was made transparent, undo that; It will be reset next frame if need be; 
+                     memcpy( &g->out[pi * 4], &g->pal[g->bgindex], 4 ); 
+                  }
+               }
+            }
+
+            return o;
+         }
+
+         case 0x21: // Comment Extension.
+         {
+            int len;
+            int ext = stbi__get8(s); 
+            if (ext == 0xF9) { // Graphic Control Extension.
+               len = stbi__get8(s);
+               if (len == 4) {
+                  g->eflags = stbi__get8(s);
+                  g->delay = 10 * stbi__get16le(s); // delay - 1/100th of a second, saving as 1/1000ths.
+
+                  // unset old transparent
+                  if (g->transparent >= 0) {
+                     g->pal[g->transparent][3] = 255; 
+                  } 
+                  if (g->eflags & 0x01) {
+                     g->transparent = stbi__get8(s);
+                     if (g->transparent >= 0) {
+                        g->pal[g->transparent][3] = 0; 
+                     }
+                  } else {
+                     // don't need transparent
+                     stbi__skip(s, 1); 
+                     g->transparent = -1; 
+                  }
+               } else {
+                  stbi__skip(s, len);
+                  break;
+               }
+            } 
+            while ((len = stbi__get8(s)) != 0) {
+               stbi__skip(s, len);
+            }
+            break;
+         }
+
+         case 0x3B: // gif stream termination code
+            return (stbi_uc *) s; // using '1' causes warning on some compilers
+
+         default:
+            return stbi__errpuc("unknown code", "Corrupt GIF");
+      }
+   }
+}
+
+static void *stbi__load_gif_main(stbi__context *s, int **delays, int *x, int *y, int *z, int *comp, int req_comp)
+{
+   if (stbi__gif_test(s)) {
+      int layers = 0; 
+      stbi_uc *u = 0;
+      stbi_uc *out = 0;
+      stbi_uc *two_back = 0; 
+      stbi__gif g;
+      int stride; 
+      memset(&g, 0, sizeof(g));
+      if (delays) {
+         *delays = 0; 
+      }
+
+      do {
+         u = stbi__gif_load_next(s, &g, comp, req_comp, two_back);
+         if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
+
+         if (u) {
+            *x = g.w;
+            *y = g.h;
+            ++layers; 
+            stride = g.w * g.h * 4; 
+         
+            if (out) {
+               out = (stbi_uc*) STBI_REALLOC( out, layers * stride ); 
+               if (delays) {
+                  *delays = (int*) STBI_REALLOC( *delays, sizeof(int) * layers ); 
+               }
+            } else {
+               out = (stbi_uc*)stbi__malloc( layers * stride ); 
+               if (delays) {
+                  *delays = (int*) stbi__malloc( layers * sizeof(int) ); 
+               }
+            }
+            memcpy( out + ((layers - 1) * stride), u, stride ); 
+            if (layers >= 2) {
+               two_back = out - 2 * stride; 
+            }
+
+            if (delays) {
+               (*delays)[layers - 1U] = g.delay; 
+            }
+         }
+      } while (u != 0); 
+
+      // free temp buffer; 
+      STBI_FREE(g.out); 
+      STBI_FREE(g.history); 
+      STBI_FREE(g.background); 
+
+      // do the final conversion after loading everything; 
+      if (req_comp && req_comp != 4)
+         out = stbi__convert_format(out, 4, req_comp, layers * g.w, g.h);
+
+      *z = layers; 
+      return out;
+   } else {
+      return stbi__errpuc("not GIF", "Image was not as a gif type."); 
+   }
+}
+
+static void *stbi__gif_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   stbi_uc *u = 0;
+   stbi__gif g;
+   memset(&g, 0, sizeof(g));
+
+   u = stbi__gif_load_next(s, &g, comp, req_comp, 0);
+   if (u == (stbi_uc *) s) u = 0;  // end of animated gif marker
+   if (u) {
+      *x = g.w;
+      *y = g.h;
+
+      // moved conversion to after successful load so that the same
+      // can be done for multiple frames. 
+      if (req_comp && req_comp != 4)
+         u = stbi__convert_format(u, 4, req_comp, g.w, g.h);
+   }
+
+   // free buffers needed for multiple frame loading; 
+   STBI_FREE(g.history);
+   STBI_FREE(g.background); 
+
+   return u;
+}
+
+static int stbi__gif_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   return stbi__gif_info_raw(s,x,y,comp);
+}
+#endif
+
+// *************************************************************************************************
+// Radiance RGBE HDR loader
+// originally by Nicolas Schulz
+#ifndef STBI_NO_HDR
+static int stbi__hdr_test_core(stbi__context *s, const char *signature)
+{
+   int i;
+   for (i=0; signature[i]; ++i)
+      if (stbi__get8(s) != signature[i])
+          return 0;
+   stbi__rewind(s);
+   return 1;
+}
+
+static int stbi__hdr_test(stbi__context* s)
+{
+   int r = stbi__hdr_test_core(s, "#?RADIANCE\n");
+   stbi__rewind(s);
+   if(!r) {
+       r = stbi__hdr_test_core(s, "#?RGBE\n");
+       stbi__rewind(s);
+   }
+   return r;
+}
+
+#define STBI__HDR_BUFLEN  1024
+static char *stbi__hdr_gettoken(stbi__context *z, char *buffer)
+{
+   int len=0;
+   char c = '\0';
+
+   c = (char) stbi__get8(z);
+
+   while (!stbi__at_eof(z) && c != '\n') {
+      buffer[len++] = c;
+      if (len == STBI__HDR_BUFLEN-1) {
+         // flush to end of line
+         while (!stbi__at_eof(z) && stbi__get8(z) != '\n')
+            ;
+         break;
+      }
+      c = (char) stbi__get8(z);
+   }
+
+   buffer[len] = 0;
+   return buffer;
+}
+
+static void stbi__hdr_convert(float *output, stbi_uc *input, int req_comp)
+{
+   if ( input[3] != 0 ) {
+      float f1;
+      // Exponent
+      f1 = (float) ldexp(1.0f, input[3] - (int)(128 + 8));
+      if (req_comp <= 2)
+         output[0] = (input[0] + input[1] + input[2]) * f1 / 3;
+      else {
+         output[0] = input[0] * f1;
+         output[1] = input[1] * f1;
+         output[2] = input[2] * f1;
+      }
+      if (req_comp == 2) output[1] = 1;
+      if (req_comp == 4) output[3] = 1;
+   } else {
+      switch (req_comp) {
+         case 4: output[3] = 1; /* fallthrough */
+         case 3: output[0] = output[1] = output[2] = 0;
+                 break;
+         case 2: output[1] = 1; /* fallthrough */
+         case 1: output[0] = 0;
+                 break;
+      }
+   }
+}
+
+static float *stbi__hdr_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   char buffer[STBI__HDR_BUFLEN];
+   char *token;
+   int valid = 0;
+   int width, height;
+   stbi_uc *scanline;
+   float *hdr_data;
+   int len;
+   unsigned char count, value;
+   int i, j, k, c1,c2, z;
+   const char *headerToken;
+   STBI_NOTUSED(ri);
+
+   // Check identifier
+   headerToken = stbi__hdr_gettoken(s,buffer);
+   if (strcmp(headerToken, "#?RADIANCE") != 0 && strcmp(headerToken, "#?RGBE") != 0)
+      return stbi__errpf("not HDR", "Corrupt HDR image");
+
+   // Parse header
+   for(;;) {
+      token = stbi__hdr_gettoken(s,buffer);
+      if (token[0] == 0) break;
+      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
+   }
+
+   if (!valid)    return stbi__errpf("unsupported format", "Unsupported HDR format");
+
+   // Parse width and height
+   // can't use sscanf() if we're not using stdio!
+   token = stbi__hdr_gettoken(s,buffer);
+   if (strncmp(token, "-Y ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
+   token += 3;
+   height = (int) strtol(token, &token, 10);
+   while (*token == ' ') ++token;
+   if (strncmp(token, "+X ", 3))  return stbi__errpf("unsupported data layout", "Unsupported HDR format");
+   token += 3;
+   width = (int) strtol(token, NULL, 10);
+
+   *x = width;
+   *y = height;
+
+   if (comp) *comp = 3;
+   if (req_comp == 0) req_comp = 3;
+
+   if (!stbi__mad4sizes_valid(width, height, req_comp, sizeof(float), 0))
+      return stbi__errpf("too large", "HDR image is too large");
+
+   // Read data
+   hdr_data = (float *) stbi__malloc_mad4(width, height, req_comp, sizeof(float), 0);
+   if (!hdr_data)
+      return stbi__errpf("outofmem", "Out of memory");
+
+   // Load image data
+   // image data is stored as some number of sca
+   if ( width < 8 || width >= 32768) {
+      // Read flat data
+      for (j=0; j < height; ++j) {
+         for (i=0; i < width; ++i) {
+            stbi_uc rgbe[4];
+           main_decode_loop:
+            stbi__getn(s, rgbe, 4);
+            stbi__hdr_convert(hdr_data + j * width * req_comp + i * req_comp, rgbe, req_comp);
+         }
+      }
+   } else {
+      // Read RLE-encoded data
+      scanline = NULL;
+
+      for (j = 0; j < height; ++j) {
+         c1 = stbi__get8(s);
+         c2 = stbi__get8(s);
+         len = stbi__get8(s);
+         if (c1 != 2 || c2 != 2 || (len & 0x80)) {
+            // not run-length encoded, so we have to actually use THIS data as a decoded
+            // pixel (note this can't be a valid pixel--one of RGB must be >= 128)
+            stbi_uc rgbe[4];
+            rgbe[0] = (stbi_uc) c1;
+            rgbe[1] = (stbi_uc) c2;
+            rgbe[2] = (stbi_uc) len;
+            rgbe[3] = (stbi_uc) stbi__get8(s);
+            stbi__hdr_convert(hdr_data, rgbe, req_comp);
+            i = 1;
+            j = 0;
+            STBI_FREE(scanline);
+            goto main_decode_loop; // yes, this makes no sense
+         }
+         len <<= 8;
+         len |= stbi__get8(s);
+         if (len != width) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("invalid decoded scanline length", "corrupt HDR"); }
+         if (scanline == NULL) {
+            scanline = (stbi_uc *) stbi__malloc_mad2(width, 4, 0);
+            if (!scanline) {
+               STBI_FREE(hdr_data);
+               return stbi__errpf("outofmem", "Out of memory");
+            }
+         }
+
+         for (k = 0; k < 4; ++k) {
+            int nleft;
+            i = 0;
+            while ((nleft = width - i) > 0) {
+               count = stbi__get8(s);
+               if (count > 128) {
+                  // Run
+                  value = stbi__get8(s);
+                  count -= 128;
+                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
+                  for (z = 0; z < count; ++z)
+                     scanline[i++ * 4 + k] = value;
+               } else {
+                  // Dump
+                  if (count > nleft) { STBI_FREE(hdr_data); STBI_FREE(scanline); return stbi__errpf("corrupt", "bad RLE data in HDR"); }
+                  for (z = 0; z < count; ++z)
+                     scanline[i++ * 4 + k] = stbi__get8(s);
+               }
+            }
+         }
+         for (i=0; i < width; ++i)
+            stbi__hdr_convert(hdr_data+(j*width + i)*req_comp, scanline + i*4, req_comp);
+      }
+      if (scanline)
+         STBI_FREE(scanline);
+   }
+
+   return hdr_data;
+}
+
+static int stbi__hdr_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   char buffer[STBI__HDR_BUFLEN];
+   char *token;
+   int valid = 0;
+   int dummy;
+
+   if (!x) x = &dummy;
+   if (!y) y = &dummy;
+   if (!comp) comp = &dummy;
+
+   if (stbi__hdr_test(s) == 0) {
+       stbi__rewind( s );
+       return 0;
+   }
+
+   for(;;) {
+      token = stbi__hdr_gettoken(s,buffer);
+      if (token[0] == 0) break;
+      if (strcmp(token, "FORMAT=32-bit_rle_rgbe") == 0) valid = 1;
+   }
+
+   if (!valid) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token = stbi__hdr_gettoken(s,buffer);
+   if (strncmp(token, "-Y ", 3)) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token += 3;
+   *y = (int) strtol(token, &token, 10);
+   while (*token == ' ') ++token;
+   if (strncmp(token, "+X ", 3)) {
+       stbi__rewind( s );
+       return 0;
+   }
+   token += 3;
+   *x = (int) strtol(token, NULL, 10);
+   *comp = 3;
+   return 1;
+}
+#endif // STBI_NO_HDR
+
+#ifndef STBI_NO_BMP
+static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   void *p;
+   stbi__bmp_data info;
+
+   info.all_a = 255;
+   p = stbi__bmp_parse_header(s, &info);
+   stbi__rewind( s );
+   if (p == NULL)
+      return 0;
+   if (x) *x = s->img_x;
+   if (y) *y = s->img_y;
+   if (comp) *comp = info.ma ? 4 : 3;
+   return 1;
+}
+#endif
+
+#ifndef STBI_NO_PSD
+static int stbi__psd_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int channelCount, dummy, depth;
+   if (!x) x = &dummy;
+   if (!y) y = &dummy;
+   if (!comp) comp = &dummy;
+   if (stbi__get32be(s) != 0x38425053) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (stbi__get16be(s) != 1) {
+       stbi__rewind( s );
+       return 0;
+   }
+   stbi__skip(s, 6);
+   channelCount = stbi__get16be(s);
+   if (channelCount < 0 || channelCount > 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   *y = stbi__get32be(s);
+   *x = stbi__get32be(s);
+   depth = stbi__get16be(s);
+   if (depth != 8 && depth != 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (stbi__get16be(s) != 3) {
+       stbi__rewind( s );
+       return 0;
+   }
+   *comp = 4;
+   return 1;
+}
+
+static int stbi__psd_is16(stbi__context *s)
+{
+   int channelCount, depth;
+   if (stbi__get32be(s) != 0x38425053) {
+       stbi__rewind( s );
+       return 0;
+   }
+   if (stbi__get16be(s) != 1) {
+       stbi__rewind( s );
+       return 0;
+   }
+   stbi__skip(s, 6);
+   channelCount = stbi__get16be(s);
+   if (channelCount < 0 || channelCount > 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   (void) stbi__get32be(s);
+   (void) stbi__get32be(s);
+   depth = stbi__get16be(s);
+   if (depth != 16) {
+       stbi__rewind( s );
+       return 0;
+   }
+   return 1;
+}
+#endif
+
+#ifndef STBI_NO_PIC
+static int stbi__pic_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int act_comp=0,num_packets=0,chained,dummy;
+   stbi__pic_packet packets[10];
+
+   if (!x) x = &dummy;
+   if (!y) y = &dummy;
+   if (!comp) comp = &dummy;
+
+   if (!stbi__pic_is4(s,"\x53\x80\xF6\x34")) {
+      stbi__rewind(s);
+      return 0;
+   }
+
+   stbi__skip(s, 88);
+
+   *x = stbi__get16be(s);
+   *y = stbi__get16be(s);
+   if (stbi__at_eof(s)) {
+      stbi__rewind( s);
+      return 0;
+   }
+   if ( (*x) != 0 && (1 << 28) / (*x) < (*y)) {
+      stbi__rewind( s );
+      return 0;
+   }
+
+   stbi__skip(s, 8);
+
+   do {
+      stbi__pic_packet *packet;
+
+      if (num_packets==sizeof(packets)/sizeof(packets[0]))
+         return 0;
+
+      packet = &packets[num_packets++];
+      chained = stbi__get8(s);
+      packet->size    = stbi__get8(s);
+      packet->type    = stbi__get8(s);
+      packet->channel = stbi__get8(s);
+      act_comp |= packet->channel;
+
+      if (stbi__at_eof(s)) {
+          stbi__rewind( s );
+          return 0;
+      }
+      if (packet->size != 8) {
+          stbi__rewind( s );
+          return 0;
+      }
+   } while (chained);
+
+   *comp = (act_comp & 0x10 ? 4 : 3);
+
+   return 1;
+}
+#endif
+
+// *************************************************************************************************
+// Portable Gray Map and Portable Pixel Map loader
+// by Ken Miller
+//
+// PGM: http://netpbm.sourceforge.net/doc/pgm.html
+// PPM: http://netpbm.sourceforge.net/doc/ppm.html
+//
+// Known limitations:
+//    Does not support comments in the header section
+//    Does not support ASCII image data (formats P2 and P3)
+//    Does not support 16-bit-per-channel
+
+#ifndef STBI_NO_PNM
+
+static int      stbi__pnm_test(stbi__context *s)
+{
+   char p, t;
+   p = (char) stbi__get8(s);
+   t = (char) stbi__get8(s);
+   if (p != 'P' || (t != '5' && t != '6')) {
+       stbi__rewind( s );
+       return 0;
+   }
+   return 1;
+}
+
+static void *stbi__pnm_load(stbi__context *s, int *x, int *y, int *comp, int req_comp, stbi__result_info *ri)
+{
+   stbi_uc *out;
+   STBI_NOTUSED(ri);
+
+   if (!stbi__pnm_info(s, (int *)&s->img_x, (int *)&s->img_y, (int *)&s->img_n))
+      return 0;
+
+   *x = s->img_x;
+   *y = s->img_y;
+   if (comp) *comp = s->img_n;
+
+   if (!stbi__mad3sizes_valid(s->img_n, s->img_x, s->img_y, 0))
+      return stbi__errpuc("too large", "PNM too large");
+
+   out = (stbi_uc *) stbi__malloc_mad3(s->img_n, s->img_x, s->img_y, 0);
+   if (!out) return stbi__errpuc("outofmem", "Out of memory");
+   stbi__getn(s, out, s->img_n * s->img_x * s->img_y);
+
+   if (req_comp && req_comp != s->img_n) {
+      out = stbi__convert_format(out, s->img_n, req_comp, s->img_x, s->img_y);
+      if (out == NULL) return out; // stbi__convert_format frees input on failure
+   }
+   return out;
+}
+
+static int      stbi__pnm_isspace(char c)
+{
+   return c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\f' || c == '\r';
+}
+
+static void     stbi__pnm_skip_whitespace(stbi__context *s, char *c)
+{
+   for (;;) {
+      while (!stbi__at_eof(s) && stbi__pnm_isspace(*c))
+         *c = (char) stbi__get8(s);
+
+      if (stbi__at_eof(s) || *c != '#')
+         break;
+
+      while (!stbi__at_eof(s) && *c != '\n' && *c != '\r' )
+         *c = (char) stbi__get8(s);
+   }
+}
+
+static int      stbi__pnm_isdigit(char c)
+{
+   return c >= '0' && c <= '9';
+}
+
+static int      stbi__pnm_getinteger(stbi__context *s, char *c)
+{
+   int value = 0;
+
+   while (!stbi__at_eof(s) && stbi__pnm_isdigit(*c)) {
+      value = value*10 + (*c - '0');
+      *c = (char) stbi__get8(s);
+   }
+
+   return value;
+}
+
+static int      stbi__pnm_info(stbi__context *s, int *x, int *y, int *comp)
+{
+   int maxv, dummy;
+   char c, p, t;
+
+   if (!x) x = &dummy;
+   if (!y) y = &dummy;
+   if (!comp) comp = &dummy;
+
+   stbi__rewind(s);
+
+   // Get identifier
+   p = (char) stbi__get8(s);
+   t = (char) stbi__get8(s);
+   if (p != 'P' || (t != '5' && t != '6')) {
+       stbi__rewind(s);
+       return 0;
+   }
+
+   *comp = (t == '6') ? 3 : 1;  // '5' is 1-component .pgm; '6' is 3-component .ppm
+
+   c = (char) stbi__get8(s);
+   stbi__pnm_skip_whitespace(s, &c);
+
+   *x = stbi__pnm_getinteger(s, &c); // read width
+   stbi__pnm_skip_whitespace(s, &c);
+
+   *y = stbi__pnm_getinteger(s, &c); // read height
+   stbi__pnm_skip_whitespace(s, &c);
+
+   maxv = stbi__pnm_getinteger(s, &c);  // read max value
+
+   if (maxv > 255)
+      return stbi__err("max value > 255", "PPM image not 8-bit");
+   else
+      return 1;
+}
+#endif
+
+static int stbi__info_main(stbi__context *s, int *x, int *y, int *comp)
+{
+   #ifndef STBI_NO_JPEG
+   if (stbi__jpeg_info(s, x, y, comp)) return 1;
+   #endif
+
+   #ifndef STBI_NO_PNG
+   if (stbi__png_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_GIF
+   if (stbi__gif_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_BMP
+   if (stbi__bmp_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PSD
+   if (stbi__psd_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PIC
+   if (stbi__pic_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PNM
+   if (stbi__pnm_info(s, x, y, comp))  return 1;
+   #endif
+
+   #ifndef STBI_NO_HDR
+   if (stbi__hdr_info(s, x, y, comp))  return 1;
+   #endif
+
+   // test tga last because it's a crappy test!
+   #ifndef STBI_NO_TGA
+   if (stbi__tga_info(s, x, y, comp))
+       return 1;
+   #endif
+   return stbi__err("unknown image type", "Image not of any known type, or corrupt");
+}
+
+static int stbi__is_16_main(stbi__context *s)
+{
+   #ifndef STBI_NO_PNG
+   if (stbi__png_is16(s))  return 1;
+   #endif
+
+   #ifndef STBI_NO_PSD
+   if (stbi__psd_is16(s))  return 1;
+   #endif
+
+   return 0;
+}
+
+#ifndef STBI_NO_STDIO
+STBIDEF int stbi_info(char const *filename, int *x, int *y, int *comp)
+{
+    FILE *f = stbi__fopen(filename, "rb");
+    int result;
+    if (!f) return stbi__err("can't fopen", "Unable to open file");
+    result = stbi_info_from_file(f, x, y, comp);
+    fclose(f);
+    return result;
+}
+
+STBIDEF int stbi_info_from_file(FILE *f, int *x, int *y, int *comp)
+{
+   int r;
+   stbi__context s;
+   long pos = ftell(f);
+   stbi__start_file(&s, f);
+   r = stbi__info_main(&s,x,y,comp);
+   fseek(f,pos,SEEK_SET);
+   return r;
+}
+
+STBIDEF int stbi_is_16_bit(char const *filename)
+{
+    FILE *f = stbi__fopen(filename, "rb");
+    int result;
+    if (!f) return stbi__err("can't fopen", "Unable to open file");
+    result = stbi_is_16_bit_from_file(f);
+    fclose(f);
+    return result;
+}
+
+STBIDEF int stbi_is_16_bit_from_file(FILE *f)
+{
+   int r;
+   stbi__context s;
+   long pos = ftell(f);
+   stbi__start_file(&s, f);
+   r = stbi__is_16_main(&s);
+   fseek(f,pos,SEEK_SET);
+   return r;
+}
+#endif // !STBI_NO_STDIO
+
+STBIDEF int stbi_info_from_memory(stbi_uc const *buffer, int len, int *x, int *y, int *comp)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__info_main(&s,x,y,comp);
+}
+
+STBIDEF int stbi_info_from_callbacks(stbi_io_callbacks const *c, void *user, int *x, int *y, int *comp)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
+   return stbi__info_main(&s,x,y,comp);
+}
+
+STBIDEF int stbi_is_16_bit_from_memory(stbi_uc const *buffer, int len)
+{
+   stbi__context s;
+   stbi__start_mem(&s,buffer,len);
+   return stbi__is_16_main(&s);
+}
+
+STBIDEF int stbi_is_16_bit_from_callbacks(stbi_io_callbacks const *c, void *user)
+{
+   stbi__context s;
+   stbi__start_callbacks(&s, (stbi_io_callbacks *) c, user);
+   return stbi__is_16_main(&s);
+}
+
+#endif // STB_IMAGE_IMPLEMENTATION
+
+/*
+   revision history:
+      2.19  (2018-02-11) fix warning
+      2.18  (2018-01-30) fix warnings
+      2.17  (2018-01-29) change sbti__shiftsigned to avoid clang -O2 bug
+                         1-bit BMP
+                         *_is_16_bit api
+                         avoid warnings
+      2.16  (2017-07-23) all functions have 16-bit variants;
+                         STBI_NO_STDIO works again;
+                         compilation fixes;
+                         fix rounding in unpremultiply;
+                         optimize vertical flip;
+                         disable raw_len validation;
+                         documentation fixes
+      2.15  (2017-03-18) fix png-1,2,4 bug; now all Imagenet JPGs decode;
+                         warning fixes; disable run-time SSE detection on gcc;
+                         uniform handling of optional "return" values;
+                         thread-safe initialization of zlib tables
+      2.14  (2017-03-03) remove deprecated STBI_JPEG_OLD; fixes for Imagenet JPGs
+      2.13  (2016-11-29) add 16-bit API, only supported for PNG right now
+      2.12  (2016-04-02) fix typo in 2.11 PSD fix that caused crashes
+      2.11  (2016-04-02) allocate large structures on the stack
+                         remove white matting for transparent PSD
+                         fix reported channel count for PNG & BMP
+                         re-enable SSE2 in non-gcc 64-bit
+                         support RGB-formatted JPEG
+                         read 16-bit PNGs (only as 8-bit)
+      2.10  (2016-01-22) avoid warning introduced in 2.09 by STBI_REALLOC_SIZED
+      2.09  (2016-01-16) allow comments in PNM files
+                         16-bit-per-pixel TGA (not bit-per-component)
+                         info() for TGA could break due to .hdr handling
+                         info() for BMP to shares code instead of sloppy parse
+                         can use STBI_REALLOC_SIZED if allocator doesn't support realloc
+                         code cleanup
+      2.08  (2015-09-13) fix to 2.07 cleanup, reading RGB PSD as RGBA
+      2.07  (2015-09-13) fix compiler warnings
+                         partial animated GIF support
+                         limited 16-bpc PSD support
+                         #ifdef unused functions
+                         bug with < 92 byte PIC,PNM,HDR,TGA
+      2.06  (2015-04-19) fix bug where PSD returns wrong '*comp' value
+      2.05  (2015-04-19) fix bug in progressive JPEG handling, fix warning
+      2.04  (2015-04-15) try to re-enable SIMD on MinGW 64-bit
+      2.03  (2015-04-12) extra corruption checking (mmozeiko)
+                         stbi_set_flip_vertically_on_load (nguillemot)
+                         fix NEON support; fix mingw support
+      2.02  (2015-01-19) fix incorrect assert, fix warning
+      2.01  (2015-01-17) fix various warnings; suppress SIMD on gcc 32-bit without -msse2
+      2.00b (2014-12-25) fix STBI_MALLOC in progressive JPEG
+      2.00  (2014-12-25) optimize JPG, including x86 SSE2 & NEON SIMD (ryg)
+                         progressive JPEG (stb)
+                         PGM/PPM support (Ken Miller)
+                         STBI_MALLOC,STBI_REALLOC,STBI_FREE
+                         GIF bugfix -- seemingly never worked
+                         STBI_NO_*, STBI_ONLY_*
+      1.48  (2014-12-14) fix incorrectly-named assert()
+      1.47  (2014-12-14) 1/2/4-bit PNG support, both direct and paletted (Omar Cornut & stb)
+                         optimize PNG (ryg)
+                         fix bug in interlaced PNG with user-specified channel count (stb)
+      1.46  (2014-08-26)
+              fix broken tRNS chunk (colorkey-style transparency) in non-paletted PNG
+      1.45  (2014-08-16)
+              fix MSVC-ARM internal compiler error by wrapping malloc
+      1.44  (2014-08-07)
+              various warning fixes from Ronny Chevalier
+      1.43  (2014-07-15)
+              fix MSVC-only compiler problem in code changed in 1.42
+      1.42  (2014-07-09)
+              don't define _CRT_SECURE_NO_WARNINGS (affects user code)
+              fixes to stbi__cleanup_jpeg path
+              added STBI_ASSERT to avoid requiring assert.h
+      1.41  (2014-06-25)
+              fix search&replace from 1.36 that messed up comments/error messages
+      1.40  (2014-06-22)
+              fix gcc struct-initialization warning
+      1.39  (2014-06-15)
+              fix to TGA optimization when req_comp != number of components in TGA;
+              fix to GIF loading because BMP wasn't rewinding (whoops, no GIFs in my test suite)
+              add support for BMP version 5 (more ignored fields)
+      1.38  (2014-06-06)
+              suppress MSVC warnings on integer casts truncating values
+              fix accidental rename of 'skip' field of I/O
+      1.37  (2014-06-04)
+              remove duplicate typedef
+      1.36  (2014-06-03)
+              convert to header file single-file library
+              if de-iphone isn't set, load iphone images color-swapped instead of returning NULL
+      1.35  (2014-05-27)
+              various warnings
+              fix broken STBI_SIMD path
+              fix bug where stbi_load_from_file no longer left file pointer in correct place
+              fix broken non-easy path for 32-bit BMP (possibly never used)
+              TGA optimization by Arseny Kapoulkine
+      1.34  (unknown)
+              use STBI_NOTUSED in stbi__resample_row_generic(), fix one more leak in tga failure case
+      1.33  (2011-07-14)
+              make stbi_is_hdr work in STBI_NO_HDR (as specified), minor compiler-friendly improvements
+      1.32  (2011-07-13)
+              support for "info" function for all supported filetypes (SpartanJ)
+      1.31  (2011-06-20)
+              a few more leak fixes, bug in PNG handling (SpartanJ)
+      1.30  (2011-06-11)
+              added ability to load files via callbacks to accomidate custom input streams (Ben Wenger)
+              removed deprecated format-specific test/load functions
+              removed support for installable file formats (stbi_loader) -- would have been broken for IO callbacks anyway
+              error cases in bmp and tga give messages and don't leak (Raymond Barbiero, grisha)
+              fix inefficiency in decoding 32-bit BMP (David Woo)
+      1.29  (2010-08-16)
+              various warning fixes from Aurelien Pocheville
+      1.28  (2010-08-01)
+              fix bug in GIF palette transparency (SpartanJ)
+      1.27  (2010-08-01)
+              cast-to-stbi_uc to fix warnings
+      1.26  (2010-07-24)
+              fix bug in file buffering for PNG reported by SpartanJ
+      1.25  (2010-07-17)
+              refix trans_data warning (Won Chun)
+      1.24  (2010-07-12)
+              perf improvements reading from files on platforms with lock-heavy fgetc()
+              minor perf improvements for jpeg
+              deprecated type-specific functions so we'll get feedback if they're needed
+              attempt to fix trans_data warning (Won Chun)
+      1.23    fixed bug in iPhone support
+      1.22  (2010-07-10)
+              removed image *writing* support
+              stbi_info support from Jetro Lauha
+              GIF support from Jean-Marc Lienher
+              iPhone PNG-extensions from James Brown
+              warning-fixes from Nicolas Schulz and Janez Zemva (i.stbi__err. Janez (U+017D)emva)
+      1.21    fix use of 'stbi_uc' in header (reported by jon blow)
+      1.20    added support for Softimage PIC, by Tom Seddon
+      1.19    bug in interlaced PNG corruption check (found by ryg)
+      1.18  (2008-08-02)
+              fix a threading bug (local mutable static)
+      1.17    support interlaced PNG
+      1.16    major bugfix - stbi__convert_format converted one too many pixels
+      1.15    initialize some fields for thread safety
+      1.14    fix threadsafe conversion bug
+              header-file-only version (#define STBI_HEADER_FILE_ONLY before including)
+      1.13    threadsafe
+      1.12    const qualifiers in the API
+      1.11    Support installable IDCT, colorspace conversion routines
+      1.10    Fixes for 64-bit (don't use "unsigned long")
+              optimized upsampling by Fabian "ryg" Giesen
+      1.09    Fix format-conversion for PSD code (bad global variables!)
+      1.08    Thatcher Ulrich's PSD code integrated by Nicolas Schulz
+      1.07    attempt to fix C++ warning/errors again
+      1.06    attempt to fix C++ warning/errors again
+      1.05    fix TGA loading to return correct *comp and use good luminance calc
+      1.04    default float alpha is 1, not 255; use 'void *' for stbi_image_free
+      1.03    bugfixes to STBI_NO_STDIO, STBI_NO_HDR
+      1.02    support for (subset of) HDR files, float interface for preferred access to them
+      1.01    fix bug: possible bug in handling right-side up bmps... not sure
+              fix bug: the stbi__bmp_load() and stbi__tga_load() functions didn't work at all
+      1.00    interface to zlib that skips zlib header
+      0.99    correct handling of alpha in palette
+      0.98    TGA loader by lonesock; dynamically add loaders (untested)
+      0.97    jpeg errors on too large a file; also catch another malloc failure
+      0.96    fix detection of invalid v value - particleman@mollyrocket forum
+      0.95    during header scan, seek to markers in case of padding
+      0.94    STBI_NO_STDIO to disable stdio usage; rename all #defines the same
+      0.93    handle jpegtran output; verbose errors
+      0.92    read 4,8,16,24,32-bit BMP files of several formats
+      0.91    output 24-bit Windows 3.0 BMP files
+      0.90    fix a few more warnings; bump version number to approach 1.0
+      0.61    bugfixes due to Marc LeBlanc, Christopher Lloyd
+      0.60    fix compiling as c++
+      0.59    fix warnings: merge Dave Moore's -Wall fixes
+      0.58    fix bug: zlib uncompressed mode len/nlen was wrong endian
+      0.57    fix bug: jpg last huffman symbol before marker was >9 bits but less than 16 available
+      0.56    fix bug: zlib uncompressed mode len vs. nlen
+      0.55    fix bug: restart_interval not initialized to 0
+      0.54    allow NULL for 'int *comp'
+      0.53    fix bug in png 3->4; speedup png decoding
+      0.52    png handles req_comp=3,4 directly; minor cleanup; jpeg comments
+      0.51    obey req_comp requests, 1-component jpegs return as 1-component,
+              on 'test' only check type, not whether we support this variant
+      0.50  (2006-11-19)
+              first released version
+*/
+
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+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.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+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 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.
+------------------------------------------------------------------------------
 */
\ No newline at end of file
diff --git a/installdeps b/installdeps
index 68ca78b5..54542d26 100755
--- a/installdeps
+++ b/installdeps
@@ -155,6 +155,8 @@ linux_installdeps() {
         debian_installdeps
     elif [ -f /etc/fedora-release ]; then
         fedora_installdeps
+    elif [ -f /etc/redhat-release ] || [ -f /etc/centos-release ]; then
+        rhel_installdeps
     elif [ -f /etc/arch-release ]; then
         archlinux_installdeps
     elif [ -f /etc/solus-release ]; then
@@ -280,7 +282,7 @@ debian_installdeps() {
     installing
 
     if [ -z "$target" ]; then
-        sudo apt-get -qq update
+        sudo apt-get -qq -y update
 
         sfml_libs=$(apt-cache search libsfml | grep -E 'graphics|window|network' | sed 's/ - .*//')
 
@@ -302,13 +304,44 @@ debian_installdeps() {
                 ;;
         esac
 
-        mxe_apt_sources='/etc/apt/sources.list.d/mxeapt.list'
+        # if on the travis ubuntu trusty, add xenial sources for newer gnutls
+        # otherwise the mxe pkg server does not work
+        if [ -n "$TRAVIS" ]; then
+            if grep -q trusty /etc/apt/sources.list 2>/dev/null; then
+                sudo sh -c "sed 's/trusty/xenial/g' /etc/apt/sources.list > /etc/apt/sources.list.d/xenial.list"
+            fi
+        fi
+
+        sudo apt-get -qq -y update
+
+        curl_gnutls_lib=$(apt-cache search libcurl | grep -E '^libcurl[0-9]+-gnutls - ' | sed 's/ - .*//' | sort | tail -1)
+
+        sudo apt-get -qy install apt apt-transport-https ca-certificates $curl_gnutls_lib curl
+
+        # this is necessary to upgrade libcurl from trusty to xenial on travis
+        sudo apt-get -qy -f install
+
+        debian_rel=trusty
+
+        apt_ssl_exceptions=/etc/apt/apt.conf.d/80ssl-exceptions
+
+        if ! grep -Eq '(pkg|mirror)\.mxe\.cc' $apt_ssl_exceptions 2>/dev/null; then
+            sudo sh -c "cat >> $apt_ssl_exceptions" <<EOF
+Acquire::https::pkg.mxe.cc::Verify-Peer "false";
+Acquire::https::pkg.mxe.cc::Verify-Host "false";
+Acquire::https::mirror.mxe.cc::Verify-Peer "false";
+Acquire::https::mirror.mxe.cc::Verify-Host "false";
+EOF
+        fi
+
+        mxe_apt_sources=/etc/apt/sources.list.d/mxeapt.list
+
+        sudo apt-get -qq -y update
 
-        sudo apt-get -qq update
         if [ -z "$(apt-cache search '^mxe-source$')" ]; then
             if [ ! -f "$mxe_apt_sources" ]; then
-                echo "deb http://pkg.mxe.cc/repos/apt/debian wheezy main" | sudo -- sh -c "cat > $mxe_apt_sources"
-                check sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB
+                echo "deb https://pkg.mxe.cc/repos/apt $debian_rel main" | sudo -- sh -c "cat > $mxe_apt_sources"
+                sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C6BF758A33A3A276 || :
             else
                 error "$mxe_apt_sources exists but mxe packages are not found in apt, either delete it or fix it"
             fi
@@ -318,9 +351,9 @@ debian_installdeps() {
         for dep in gcc zlib ffmpeg gettext sdl2 sfml openal wxwidgets; do
             set -- "$@" "mxe-${target}-$dep"
         done
-        check sudo apt-get -qq update
+        check sudo apt-get --allow-unauthenticated -qq -y update
         # native wx-common needed for wxrc executable
-        check sudo apt-get -qy install build-essential cmake ccache wx-common "$@"
+        check sudo apt-get --allow-unauthenticated -qy install build-essential cmake ccache wx-common "$@"
     fi
 
     build_instructions
@@ -376,7 +409,7 @@ fedora_installdeps() {
     fi
 
     # non-multiarch packages first
-    check sudo dnf -y --nogpgcheck --best --allowerasing install gcc gcc-c++ make cmake ccache git nasm redhat-rpm-config pkgconfig ccache
+    check sudo dnf -y --nogpgcheck --best --allowerasing install gcc gcc-c++ make cmake ccache git nasm redhat-rpm-config pkgconfig ccache ninja-build
 
     # try to install multiarch libgcc, glibc-devel and pkgconfig if available
     if [ -n "$amd64" ]; then
@@ -396,7 +429,7 @@ fedora_installdeps() {
             # this is sometimes necessary for rawhide
             set -- --exclude='glibc32*'
         fi
-        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel libpng-devel SDL2-devel SFML-devel openal-soft-devel wxGTK3-devel gtk2-devel gtk3-devel; do
+        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel libpng-devel SDL2-devel SFML-devel openal-soft-devel wxGTK3-devel gtk3-devel; do
             case $pkg in
                 *ffmpeg*)
                     [ -n "$no_ffmpeg" ] && continue
@@ -504,6 +537,190 @@ fedora_installdeps() {
     build_instructions
 }
 
+rhel_installdeps() {
+    rhel=1
+    ffmpeg=ffmpeg-devel
+    no_ffmpeg=
+    rpms_installed=
+
+    check_cross
+    installing
+
+    warning=
+
+    rhel_release=$(rpm -E %rhel)
+    tries=3
+    curdir=$(pwd)
+
+    # this source is necessary for mingw packages on rhel, and may be for other things in the future
+    check sudo yum -y install epel-release
+
+    # make sure rpmfusion is installed for ffmpeg
+    while [ $tries -gt 0 ]; do
+        mkdir -p "${tmp}/fusion"
+        cd "${tmp}/fusion"
+        if ! curl -fLO https://download1.rpmfusion.org/free/el/rpmfusion-free-release-${rhel_release}.noarch.rpm; then
+            rhel_release=$((rhel_release - 1))
+            tries=$((tries - 1))
+            continue
+        fi
+        if ! curl -fLO https://download1.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-${rhel_release}.noarch.rpm; then
+            tries=0
+            break
+        fi
+        # check if already installed
+        if rpm -q rpmfusion-free-release-${rhel_release} >/dev/null 2>&1 && rpm -q rpmfusion-nonfree-release-${rhel_release} >/dev/null 2>&1; then
+            info_msg 'rpmfusion already installed, good'
+            break
+        fi
+        # otherwise try to install
+        if ! sudo rpm --nodeps -Uvh ./rpmfusion-*.rpm; then
+            tries=0
+            break
+        fi
+        break
+    done
+    cd "$curdir"
+    if [ $tries -eq 0 ]; then
+        warning 'installing rpmfusion repos failed, continuing without ffmpeg'
+        no_ffmpeg=1
+        cmake_flags="$cmake_flags -DENABLE_FFMPEG=NO"
+    fi
+
+    # non-multiarch packages first
+    CMAKE=cmake3
+    check sudo yum -y install gcc gcc-c++ make cmake3 ccache git nasm redhat-rpm-config pkgconfig ccache ninja-build
+
+    # try to install multiarch libgcc, glibc-devel and pkgconfig if available
+    if [ -n "$amd64" ]; then
+        for pkg in pkgconfig libgcc glibc-devel; do
+            if [ "$target" = m32 ]; then
+                sudo yum -y install "$pkg".i686
+            else
+                sudo yum -y install "$pkg".x86_64
+            fi
+        done
+    fi
+
+    set --
+    if [ -z "$target" -o "$target" = m32 ]; then
+        # try to install both 64 bit and 32 bit versions on 64 bit hosts (see below)
+        if [ -n "$amd64" ]; then
+            # this is sometimes necessary for rawhide
+            set -- --exclude='glibc32*'
+        fi
+
+        warning='RHEL does not currently have SFML packages, LINK support will be disabled'
+        cmake_flags="$cmake_flags -DENABLE_LINK=NO"
+
+        for pkg in zlib-devel mesa-libGL-devel ffmpeg-devel gettext-devel libpng-devel SDL2-devel openal-soft-devel wxGTK3-devel gtk3-devel; do
+            case $pkg in
+                *ffmpeg*)
+                    [ -n "$no_ffmpeg" ] && continue
+                    ;;
+            esac
+
+            if [ -n "$amd64" ]; then
+                if [ "$target" = m32 ]; then
+                    set -- "$@" "${pkg}.i686"
+                else
+                    set -- "$@" "${pkg}.x86_64"
+                fi
+            else
+                set -- "$@" "$pkg"
+            fi
+        done
+
+        # redhat has a bug where all necessary -devel packages are not pulled in for 32 bit direct -devel deps
+        # this hack adds them to the list
+        if [ -n "$amd64" -a "$target" = m32 ]; then
+            info_msg 'Calculating dependencies, this will take a while..'
+            curdeps=
+            newdeps=$@
+            while [ "$curdeps" != "$newdeps" ]; do
+                curdeps=$newdeps
+                set -- $(echo "$@" $(repoquery --deplist "$@" 2>/dev/null | sed -n 's/\.x86_64$/.i686/; s/^ *provider: *\([^ ]*-devel-.*\)$/\1/p' | sort -u) | sed 's/  */\n/g' | sort -u)
+                newdeps=$@
+                printf '%s' .
+            done
+
+            echo
+            info_msg 'Done'
+
+            ## install the RPMs with rpm --force get around file conflicts
+
+            host_rpms=$(echo "$@" | sed 's/\.i686//g')
+
+            # first update the host arch versions to reduce chances of conflicts
+            check sudo yum -y install $host_rpms
+
+            oldcwd=$PWD
+            mkdir "$tmp/rpms"
+            cd "$tmp/rpms"
+
+            check sudo yum -y download "$@"
+
+            # first try installing with yum to pull in deps
+            check sudo yum -y --skip-broken install *.rpm
+
+            # follow up with rpm --force to ignore conflicts
+            check sudo rpm -Uvh --force *.rpm
+
+            rm -f *.rpm
+
+            # reinstall the host rpms to make sure any overwritten files are the host version
+            check sudo yum -y download $host_rpms
+
+            check sudo yum -y --skip-broken install *.rpm
+
+            check sudo rpm -Uvh --force *.rpm
+
+            cd "$oldcwd"
+            rm -rf "$tmp/rpms"
+
+            ffmpeg=ffmpeg-devel.i686
+
+            rpms_installed=1
+        fi
+    else # mingw build
+        set -- "$@" pkgconfig
+        case "$target" in
+            mingw-w64-i686)
+                target=mingw32
+                cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-MinGW-w64-i686.cmake -DENABLE_LINK=NO"
+                ;;
+            mingw-w64-x86_64)
+                target=mingw64
+                cmake_flags="$cmake_flags -DCMAKE_TOOLCHAIN_FILE=../cmake/Toolchain-cross-MinGW-w64-x86_64.cmake -DENABLE_LINK=NO"
+                ;;
+            *)
+                error 'unknown cross target (this should not happen)'
+                ;;
+        esac
+        # install static deps
+        for pkg in zlib gettext libpng SDL2 wxWidgets; do
+            set -- "$@" "${target}-${pkg}-static"
+        done
+        # install deps that are not available as static
+        for pkg in openal-soft; do
+            set -- "$@" "${target}-${pkg}"
+        done
+
+        warning='SFML is required for LINK support, RHEL/EPEL does not currently have a MinGW SFML package, if you want LINK support you will need to install it manually'
+    fi
+
+    [ -z "$rpms_installed" ] && check sudo yum -y install "$@"
+
+    if ! rpm -q $ffmpeg >/dev/null 2>&1; then
+        warning 'ffmpeg failed to install (probably due to conflicts)'
+        cmake_flags="$cmake_flags -DENABLE_FFMPEG=NO"
+    fi
+
+    [ -n "$warning" ] && warning "$warning"
+
+    build_instructions
+}
+
 suse_installdeps() {
     suse=1
     check_cross
diff --git a/src/Util.cpp b/src/Util.cpp
index dc2135b2..9b97bcf3 100644
--- a/src/Util.cpp
+++ b/src/Util.cpp
@@ -64,6 +64,62 @@ bool FileExists(const char *filename)
 #endif
 }
 
+// Get user-specific config dir manually.
+// apple:   ~/Library/Application Support/
+// windows: %APPDATA%/
+// unix:    ${XDG_CONFIG_HOME:-~/.config}/
+std::string get_xdg_user_config_home()
+{
+    std::string path;
+#ifdef __APPLE__
+    std::string home(getenv("HOME"));
+    path = home + "/Library/Application Support";
+#elif _WIN32
+    std::string app_data(getenv("LOCALAPPDATA"));
+    path = app_data;
+#else // Unix
+    char *xdg_var = getenv("XDG_CONFIG_HOME");
+    if (!xdg_var || !*xdg_var)
+    {
+	std::string xdg_default(getenv("HOME"));
+	path = xdg_default + "/.config";
+    }
+    else
+    {
+	path = xdg_var;
+    }
+#endif
+    return path + FILE_SEP;
+}
+
+// Get user-specific data dir manually.
+// apple:   ~/Library/Application Support/
+// windows: %APPDATA%/
+// unix:    ${XDG_DATA_HOME:-~/.local/share}/
+std::string get_xdg_user_data_home()
+{
+    std::string path;
+#ifdef __APPLE__
+    std::string home(getenv("HOME"));
+    path = home + "/Library/Application Support";
+#elif _WIN32
+    std::string app_data(getenv("LOCALAPPDATA"));
+    path = app_data;
+#else // Unix
+    char *xdg_var = getenv("XDG_DATA_HOME");
+    if (!xdg_var || !*xdg_var)
+    {
+	std::string xdg_default(getenv("HOME"));
+	path = xdg_default + "/.local/share";
+    }
+    else
+    {
+	path = xdg_var;
+    }
+#endif
+    return path + FILE_SEP;
+}
+
 void utilReadScreenPixels(uint8_t *dest, int w, int h)
 {
         uint8_t *b = dest;
diff --git a/src/Util.h b/src/Util.h
index 2cf0646a..5f738576 100644
--- a/src/Util.h
+++ b/src/Util.h
@@ -1,8 +1,17 @@
 #ifndef UTIL_H
 #define UTIL_H
 
+#include <string>
 #include "System.h"
 
+#ifdef _WIN32
+#define FILE_SEP '\\'
+#else // MacOS, Unix
+#define FILE_SEP '/'
+#endif
+
+#define FREAD_UNCHECKED(A,B,C,D) (void)(fread(A,B,C,D) + 1)
+
 enum IMAGE_TYPE { IMAGE_UNKNOWN = -1, IMAGE_GBA = 0, IMAGE_GB = 1 };
 
 // save game
@@ -13,6 +22,9 @@ typedef struct {
 
 bool FileExists(const char *filename);
 
+std::string get_xdg_user_config_home();
+std::string get_xdg_user_data_home();
+
 void utilReadScreenPixels(uint8_t *dest, int w, int h);
 bool utilWritePNGFile(const char *, int, int, uint8_t *);
 bool utilWriteBMPFile(const char *, int, int, uint8_t *);
diff --git a/src/common/ConfigManager.cpp b/src/common/ConfigManager.cpp
index a5e05014..11a74c9c 100644
--- a/src/common/ConfigManager.cpp
+++ b/src/common/ConfigManager.cpp
@@ -1,1351 +1,1366 @@
-// necessary to get portable strerror_r
-#undef _GNU_SOURCE
-#include <string.h>
-#define _GNU_SOURCE 1
-
-#include "ConfigManager.h"
-extern "C" {
-#include "../common/iniparser.h"
-}
-
-#include <stdarg.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <cmath>
-#include <cerrno>
-
-#include "../common/Patch.h"
-#include "../common/ConfigManager.h"
-#include "../gba/GBA.h"
-#include "../gba/agbprint.h"
-#include "../gba/Flash.h"
-#include "../gba/Cheats.h"
-#include "../gba/remote.h"
-#include "../gba/RTC.h"
-#include "../gba/Sound.h"
-#include "../gb/gb.h"
-#include "../gb/gbGlobals.h"
-#include "../gb/gbCheats.h"
-#include "../gb/gbSound.h"
-#include "../Util.h"
-
-#ifndef _WIN32
-#define GETCWD getcwd
-#else // _WIN32
-#include <direct.h>
-#define GETCWD _getcwd
-#define snprintf sprintf
-#endif // _WIN32
-
-#ifndef __GNUC__
-#define HAVE_DECL_GETOPT 0
-#define __STDC__ 1
-#include "getopt.h"
-#else // ! __GNUC__
-#define HAVE_DECL_GETOPT 1
-#include <getopt.h>
-#endif // ! __GNUC__
-#include <string>
-#include <sstream>
-
-enum named_opts
-{
-	OPT_AGB_PRINT = 1000,
-	OPT_AUTOFIRE,
-	OPT_AUTO_FRAME_SKIP,
-	OPT_AVI_RECORD_DIR,
-	OPT_BATTERY_DIR,
-	OPT_BIOS_FILE_NAME_GB,
-	OPT_BIOS_FILE_NAME_GBA,
-	OPT_BIOS_FILE_NAME_GBC,
-	OPT_CAPTURE_FORMAT,
-	OPT_CHEAT,
-	OPT_CPU_SAVE_TYPE,
-	OPT_DOTCODE_FILE_NAME_LOAD,
-	OPT_DOTCODE_FILE_NAME_SAVE,
-	OPT_EMULATOR_TYPE,
-	OPT_FS_ADAPTER,
-	OPT_FS_COLOR_DEPTH,
-	OPT_FS_FREQUENCY,
-	OPT_FS_HEIGHT,
-	OPT_FS_WIDTH,
-	OPT_GB_EMULATOR_TYPE,
-	OPT_GB_FRAME_SKIP,
-	OPT_GB_PALETTE_OPTION,
-	OPT_GDB_PORT,
-	OPT_GL_FILTER,
-	OPT_IFB_TYPE,
-	OPT_JOYPAD_DEFAULT,
-	OPT_LANGUAGE_OPTION,
-	OPT_LINK_AUTO,
-	OPT_LINK_HACKS,
-	OPT_LINK_HOST_ADDR,
-	OPT_LINK_MODE,
-	OPT_LINK_NUM_PLAYERS,
-	OPT_LINK_TIMEOUT,
-	OPT_MAX_SCALE,
-	OPT_MOVIE_RECORD_DIR,
-	OPT_OPT_FLASH_SIZE,
-	OPT_REWIND_TIMER,
-	OPT_ROM_DIR_GB,
-	OPT_ROM_DIR_GBA,
-	OPT_ROM_DIR_GBC,
-	OPT_RTC_ENABLED,
-	OPT_SAVE_DIR,
-	OPT_SCREEN_SHOT_DIR,
-	OPT_SHOW_SPEED,
-	OPT_SHOW_SPEED_TRANSPARENT,
-	OPT_SOUND_FILTERING,
-	OPT_SOUND_RECORD_DIR,
-	OPT_SYNCHRONIZE,
-	OPT_THREAD_PRIORITY,
-	OPT_VIDEO_OPTION,
-	OPT_WINDOW_POSITION_X,
-	OPT_WINDOW_POSITION_Y,
-	OPT_SPEEDUP_THROTTLE,
-	OPT_SPEEDUP_FRAME_SKIP
-};
-
-#define SOUND_MAX_VOLUME 2.0
-#define SOUND_ECHO       0.2
-#define SOUND_STEREO     0.15
-
-#define REWIND_NUM 8
-#define REWIND_SIZE 400000
-
-char path[2048];
-
-dictionary* preferences;
-
-bool cpuIsMultiBoot = false;
-bool mirroringEnable = true;
-bool parseDebug = true;
-bool speedHack = false;
-bool speedup = false;
-const char* aviRecordDir;
-const char* batteryDir;
-const char* biosFileNameGB;
-const char* biosFileNameGBA;
-const char* biosFileNameGBC;
-const char* loadDotCodeFile;
-const char* saveDotCodeFile;
-const char* linkHostAddr;
-const char* movieRecordDir;
-char* rewindMemory = NULL;
-const char* romDirGB;
-const char* romDirGBA;
-const char* romDirGBC;
-const char* saveDir;
-const char* screenShotDir;
-const char* soundRecordDir;
-int active = 1;
-int agbPrint;
-int autoFire;
-int autoFireMaxCount = 1;
-int autoFireToggle;
-int autoFrameSkip = 0;
-int autoLoadMostRecent;
-int autoPatch;
-int autoSaveLoadCheatList;
-int aviRecording;
-int captureFormat = 0;
-int cheatsEnabled = true;
-int cpuDisableSfx = false;
-int cpuSaveType = 0;
-int disableMMX;
-int disableStatusMessages = 0;
-int dsoundDisableHardwareAcceleration;
-int filterHeight;
-int filterMagnification;
-int filterMT; // enable multi-threading for pixel filters
-int filter = kStretch2x;
-int filterWidth;
-int frameSkip = 1;
-int frameskipadjust;
-int fsAdapter;
-int fsColorDepth;
-int fsForceChange;
-int fsFrequency;
-int fsHeight;
-int fsWidth;
-int fullScreen;
-int fullScreenStretch;
-int gdbBreakOnLoad;
-int gdbPort;
-int glFilter;
-int ifbType = kIFBNone;
-int joypadDefault;
-int languageOption;
-int layerEnable = 0xff00;
-int layerSettings = 0xff00;
-int linkAuto;
-int linkHacks = 1;
-int linkMode;
-int linkNumPlayers;
-int linkTimeout = 1;
-int maxScale;
-int mouseCounter = 0;
-int movieFrame;
-int moviePlayFrame;
-int moviePlaying;
-int movieRecording;
-int openGL;
-int optFlashSize;
-int optPrintUsage;
-int paused;
-int pauseWhenInactive = 0;
-int preparedCheats = 0;
-int recentFreeze;
-int renderedFrames;
-int rewindCount;
-int rewindCounter;
-int rewindPos;
-int rewindSaveNeeded = 0;
-int rewindTimer = 0;
-int rewindTopPos;
-int rtcEnabled;
-int saveType = GBA_SAVE_AUTO;
-int screenMessage;
-int sensorX;
-int sensorY;
-int showRenderedFrames;
-int showSpeed;
-int showSpeedTransparent;
-int sizeX;
-int sizeY;
-int skipBios = 0;
-int skipSaveGameBattery = false;
-int skipSaveGameCheats = false;
-int soundRecording;
-int speedupToggle;
-int sunBars;
-int surfaceSizeX;
-int surfaceSizeY;
-int threadPriority;
-int tripleBuffering;
-int useBios = 0;
-int useBiosFileGB;
-int useBiosFileGBA;
-int useBiosFileGBC;
-int videoOption;
-int vsync;
-int wasPaused = 0;
-int windowPositionX;
-int windowPositionY;
-int winFlashSize;
-int winGbBorderOn;
-int winGbPrinterEnabled;
-int winPauseNextFrame;
-int* rewindSerials = NULL;
-uint32_t autoFrameSkipLastTime;
-uint32_t movieLastJoypad;
-uint32_t movieNextJoypad;
-uint32_t throttle = 100;
-uint32_t speedup_throttle = 0;
-uint32_t speedup_frame_skip = 9;
-
-const char* preparedCheatCodes[MAX_CHEATS];
-
-FilterFunc filterFunction = 0;
-IFBFilterFunc ifbFunction = 0;
-
-// allow up to 100 IPS/UPS/PPF patches given on commandline
-int	patchNum = 0;
-char *(patchNames[PATCH_MAX_NUM]) = { NULL }; // and so on
-
-void(*dbgMain)() = remoteStubMain;
-void(*dbgSignal)(int, int) = remoteStubSignal;
-void(*dbgOutput)(const char *, uint32_t) = debuggerOutput;
-
-char* homeDir = NULL;
-char* arg0 = NULL;
-
-
-struct option argOptions[] = {
-
-	{ "agb-print", required_argument, 0, OPT_AGB_PRINT },
-	{ "auto-frame-skip", required_argument, 0, OPT_AUTO_FRAME_SKIP },
-	{ "auto-load-most-recent", no_argument, &autoLoadMostRecent, 1 },
-	{ "auto-patch", no_argument, &autoPatch, 1 },
-	{ "auto-save-cheat-list", no_argument, &autoSaveLoadCheatList, 1 },
-	{ "auto-save-load-cheat-list", no_argument, &autoSaveLoadCheatList, 1 },
-	{ "autofire", required_argument, 0, OPT_AUTOFIRE },
-	{ "avi-record-dir", required_argument, 0, OPT_AVI_RECORD_DIR },
-	{ "battery-dir", required_argument, 0, OPT_BATTERY_DIR },
-	{ "bios", required_argument, 0, 'b' },
-	{ "bios-file-name-gb", required_argument, 0, OPT_BIOS_FILE_NAME_GB },
-	{ "bios-file-name-gba", required_argument, 0, OPT_BIOS_FILE_NAME_GBA },
-	{ "bios-file-name-gbc", required_argument, 0, OPT_BIOS_FILE_NAME_GBC },
-	{ "border-automatic", no_argument, &gbBorderAutomatic, 1 },
-	{ "border-on", no_argument, &gbBorderOn, 1 },
-	{ "capture-format", required_argument, 0, OPT_CAPTURE_FORMAT },
-	{ "cheat", required_argument, 0, OPT_CHEAT },
-	{ "cheats-enabled", no_argument, &cheatsEnabled, 1 },
-	{ "color-option", no_argument, &gbColorOption, 1 },
-	{ "config", required_argument, 0, 'c' },
-	{ "cpu-disable-sfx", no_argument, &cpuDisableSfx, 1 },
-	{ "cpu-save-type", required_argument, 0, OPT_CPU_SAVE_TYPE },
-	{ "debug", no_argument, 0, 'd' },
-	{ "disable-mmx", no_argument, &disableMMX, 1 },
-	{ "disable-sfx", no_argument, &cpuDisableSfx, 1 },
-	{ "disable-status-messages", no_argument, &disableStatusMessages, 1 },
-	{ "dotcode-file-name-load", required_argument, 0, OPT_DOTCODE_FILE_NAME_LOAD },
-	{ "dotcode-file-name-save", required_argument, 0, OPT_DOTCODE_FILE_NAME_SAVE },
-	{ "emulator-type", required_argument, 0, OPT_EMULATOR_TYPE },
-	{ "filter", required_argument, 0, 'f' },
-	{ "filter-enable-multi-threading", no_argument, &filterMT, 1 },
-	{ "filter-mt", no_argument, &filterMT, 1 },
-	{ "flash-128k", no_argument, &optFlashSize, 1 },
-	{ "flash-64k", no_argument, &optFlashSize, 0 },
-	{ "flash-size", required_argument, 0, 'S' },
-	{ "frameskip", required_argument, 0, 's' },
-	{ "fs-adapter", required_argument, 0, OPT_FS_ADAPTER },
-	{ "fs-color-depth", required_argument, 0, OPT_FS_COLOR_DEPTH },
-	{ "fs-frequency", required_argument, 0, OPT_FS_FREQUENCY },
-	{ "fs-height", required_argument, 0, OPT_FS_HEIGHT },
-	{ "fs-width", required_argument, 0, OPT_FS_WIDTH },
-	{ "full-screen", no_argument, &fullScreen, 1 },
-	{ "full-screen-stretch", no_argument, &fullScreenStretch, 1 },
-	{ "gb-border-automatic", no_argument, &gbBorderAutomatic, 1 },
-	{ "gb-border-on", no_argument, &gbBorderOn, 1 },
-	{ "gb-color-option", no_argument, &gbColorOption, 1 },
-	{ "gb-emulator-type", required_argument, 0, OPT_GB_EMULATOR_TYPE },
-	{ "gb-frame-skip", required_argument, 0, OPT_GB_FRAME_SKIP },
-	{ "gb-palette-option", required_argument, 0, OPT_GB_PALETTE_OPTION },
-	{ "gb-printer", no_argument, &winGbPrinterEnabled, 1 },
-	{ "gdb", required_argument, 0, 'G' },
-	{ "gdb-break-on-load", no_argument, &gdbBreakOnLoad, 1 },
-	{ "gdb-port", required_argument, 0, OPT_GDB_PORT },
-	{ "gl-filter", required_argument, 0, OPT_GL_FILTER },
-	{ "help", no_argument, &optPrintUsage, 1 },
-	{ "ifb-filter", required_argument, 0, 'I' },
-	{ "ifb-type", required_argument, 0, OPT_IFB_TYPE },
-	{ "joypad-default", required_argument, 0, OPT_JOYPAD_DEFAULT },
-	{ "language-option", required_argument, 0, OPT_LANGUAGE_OPTION },
-	{ "link-auto", required_argument, 0, OPT_LINK_AUTO },
-	{ "link-hacks", required_argument, 0, OPT_LINK_HACKS },
-	{ "link-host-addr", required_argument, 0, OPT_LINK_HOST_ADDR },
-	{ "link-mode", required_argument, 0, OPT_LINK_MODE },
-	{ "link-num-players", required_argument, 0, OPT_LINK_NUM_PLAYERS },
-	{ "link-timeout", required_argument, 0, OPT_LINK_TIMEOUT },
-	{ "max-scale", required_argument, 0, OPT_MAX_SCALE },
-	{ "movie-record-dir", required_argument, 0, OPT_MOVIE_RECORD_DIR },
-	{ "no-agb-print", no_argument, &agbPrint, 0 },
-	{ "no-auto-frameskip", no_argument, &autoFrameSkip, 0 },
-	{ "no-debug", no_argument, 0, 'N' },
-	{ "no-opengl", no_argument, &openGL, 0 },
-	{ "no-patch", no_argument, &autoPatch, 0 },
-	{ "no-pause-when-inactive", no_argument, &pauseWhenInactive, 0 },
-	{ "no-rtc", no_argument, &rtcEnabled, 0 },
-	{ "no-show-speed", no_argument, &showSpeed, 0 },
-	{ "opengl", required_argument, 0, 'O' },
-	{ "opengl-bilinear", no_argument, &openGL, 2 },
-	{ "opengl-nearest", no_argument, &openGL, 1 },
-	{ "opt-flash-size", required_argument, 0, OPT_OPT_FLASH_SIZE },
-	{ "patch", required_argument, 0, 'i' },
-	{ "pause-when-inactive", no_argument, &pauseWhenInactive, 1 },
-	{ "profile", optional_argument, 0, 'p' },
-	{ "recent-freeze", no_argument, &recentFreeze, 1 },
-	{ "rewind-timer", required_argument, 0, OPT_REWIND_TIMER },
-	{ "rom-dir-gb", required_argument, 0, OPT_ROM_DIR_GB },
-	{ "rom-dir-gba", required_argument, 0, OPT_ROM_DIR_GBA },
-	{ "rom-dir-gbc", required_argument, 0, OPT_ROM_DIR_GBC },
-	{ "rtc", no_argument, &rtcEnabled, 1 },
-	{ "rtc-enabled", required_argument, 0, OPT_RTC_ENABLED },
-	{ "save-auto", no_argument, &cpuSaveType, 0 },
-	{ "save-dir", required_argument, 0, OPT_SAVE_DIR },
-	{ "save-eeprom", no_argument, &cpuSaveType, 1 },
-	{ "save-flash", no_argument, &cpuSaveType, 3 },
-	{ "save-none", no_argument, &cpuSaveType, 5 },
-	{ "save-sensor", no_argument, &cpuSaveType, 4 },
-	{ "save-sram", no_argument, &cpuSaveType, 2 },
-	{ "save-type", required_argument, 0, 't' },
-	{ "screen-shot-dir", required_argument, 0, OPT_SCREEN_SHOT_DIR },
-	{ "show-speed", required_argument, 0, OPT_SHOW_SPEED },
-	{ "show-speed-detailed", no_argument, &showSpeed, 2 },
-	{ "show-speed-normal", no_argument, &showSpeed, 1 },
-	{ "show-speed-transparent", required_argument, 0, OPT_SHOW_SPEED_TRANSPARENT },
-	{ "skip-bios", no_argument, &skipBios, 1 },
-	{ "skip-save-game-battery", no_argument, &skipSaveGameBattery, 1 },
-	{ "skip-save-game-cheats", no_argument, &skipSaveGameCheats, 1 },
-	{ "sound-filtering", required_argument, 0, OPT_SOUND_FILTERING },
-	{ "sound-record-dir", required_argument, 0, OPT_SOUND_RECORD_DIR },
-	{ "stretch", no_argument, &fullScreenStretch, 1 },
-	{ "synchronize", required_argument, 0, OPT_SYNCHRONIZE },
-	{ "thread-priority", required_argument, 0, OPT_THREAD_PRIORITY },
-	{ "throttle", required_argument, 0, 'T' },
-	{ "speedup_throttle", required_argument, 0, OPT_SPEEDUP_THROTTLE },
-	{ "speedup_frame_skip", required_argument, 0, OPT_SPEEDUP_FRAME_SKIP },
-	{ "triple-buffering", no_argument, &tripleBuffering, 1 },
-	{ "use-bios", no_argument, &useBios, 1 },
-	{ "use-bios-file-gb", no_argument, &useBiosFileGB, 1 },
-	{ "use-bios-file-gba", no_argument, &useBiosFileGBA, 1 },
-	{ "use-bios-file-gbc", no_argument, &useBiosFileGBC, 1 },
-	{ "verbose", required_argument, 0, 'v' },
-	{ "video-option", required_argument, 0, OPT_VIDEO_OPTION },
-	{ "vsync", no_argument, &vsync, 1 },
-	{ "win-gb-printer-enabled", no_argument, &winGbPrinterEnabled, 1 },
-	{ "window-position-x", required_argument, 0, OPT_WINDOW_POSITION_X },
-	{ "window-position-y", required_argument, 0, OPT_WINDOW_POSITION_Y },
-
-
-	{ NULL, no_argument, NULL, 0 }
-};
-
-
-uint32_t fromHex(const char *s)
-{
-	if (!s)
-		return 0;
-	uint32_t value;
-	sscanf(s, "%x", &value);
-	return value;
-}
-
-uint32_t fromDec(const char *s)
-{
-	if (!s)
-		return 0;
-	uint32_t value = 0;
-	sscanf(s, "%u", &value);
-	return value;
-}
-
-void SetHome(char *_arg0)
-{
-	arg0 = _arg0;
-}
-
-void OpenPreferences(const char *name)
-{
-	if (!preferences && name)
-		preferences = iniparser_load(name);
-}
-
-void ValidateConfig()
-{
-	if (gbEmulatorType < 0 || gbEmulatorType > 5)
-		gbEmulatorType = 1;
-	if (frameSkip < 0 || frameSkip > 9)
-		frameSkip = 2;
-	if (gbFrameSkip < 0 || gbFrameSkip > 9)
-		gbFrameSkip = 0;
-	if (filter < kStretch1x || filter >= kInvalidFilter)
-		filter = kStretch2x;
-
-	if (cpuSaveType < 0 || cpuSaveType > 5)
-		cpuSaveType = 0;
-	if (optFlashSize != 0 && optFlashSize != 1)
-		optFlashSize = 0;
-	if (ifbType < kIFBNone || ifbType >= kInvalidIFBFilter)
-		ifbType = kIFBNone;
-	if (showSpeed < 0 || showSpeed > 2)
-		showSpeed = 1;
-	if (rewindTimer < 0 || rewindTimer > 600)
-		rewindTimer = 0;
-	if (autoFireMaxCount < 1)
-		autoFireMaxCount = 1;
-
-	if (rewindTimer) {
-		rewindMemory = (char *)malloc(REWIND_NUM*REWIND_SIZE);
-		rewindSerials = (int *)calloc(REWIND_NUM, sizeof(int)); // init to zeroes
-	}
-}
-
-void LoadConfig()
-{
-	agbPrint = ReadPrefHex("agbPrint");
-	autoFireMaxCount = fromDec(ReadPrefString("autoFireMaxCount"));
-	autoFrameSkip = ReadPref("autoFrameSkip", 0);
-	autoLoadMostRecent = ReadPref("autoLoadMostRecent", 0);
-	autoPatch = ReadPref("autoPatch", 1);
-	autoSaveLoadCheatList = ReadPref("autoSaveCheatList", 1);
-	aviRecordDir = ReadPrefString("aviRecordDir");
-	batteryDir = ReadPrefString("batteryDir");
-	biosFileNameGB = ReadPrefString("biosFileGB");
-	biosFileNameGBA = ReadPrefString("biosFileGBA");
-	biosFileNameGBC = ReadPrefString("biosFileGBC");
-	captureFormat = ReadPref("captureFormat", 0);
-	cheatsEnabled = ReadPref("cheatsEnabled", 0);
-	cpuDisableSfx = ReadPref("disableSfx", 0);
-	cpuSaveType = ReadPrefHex("saveType");
-	disableMMX = ReadPref("disableMMX", 0);
-	disableStatusMessages = ReadPrefHex("disableStatus");
-	filterMT = ReadPref("filterEnableMultiThreading", 0);
-	filter = ReadPref("filter", 0);
-	frameSkip = ReadPref("frameSkip", 0);
-	fsAdapter = ReadPref("fsAdapter", 0);
-	fsColorDepth = ReadPref("fsColorDepth", 32);
-	fsFrequency = ReadPref("fsFrequency", 60);
-	fsHeight = ReadPref("fsHeight", 600);
-	fsWidth = ReadPref("fsWidth", 800);
-	fullScreen = ReadPrefHex("fullScreen");
-	fullScreenStretch = ReadPref("stretch", 0);
-	gbBorderAutomatic = ReadPref("borderAutomatic", 0);
-	gbBorderOn = ReadPrefHex("borderOn");
-	gbColorOption = ReadPref("colorOption", 0);
-	gbEmulatorType = ReadPref("emulatorType", 1);
-	gbFrameSkip = ReadPref("gbFrameSkip", 0);
-	gbPaletteOption = ReadPref("gbPaletteOption", 0);
-	gbSoundSetDeclicking(ReadPref("gbSoundDeclicking", 1));
-	gb_effects_config.echo = (float)ReadPref("gbSoundEffectsEcho", 20) / 100.0f;
-	gb_effects_config.enabled = ReadPref("gbSoundEffectsEnabled", 0);
-	gb_effects_config.stereo = (float)ReadPref("gbSoundEffectsStereo", 15) / 100.0f;
-	gb_effects_config.surround = ReadPref("gbSoundEffectsSurround", 0);
-	gdbBreakOnLoad = ReadPref("gdbBreakOnLoad", 0);
-	gdbPort = ReadPref("gdbPort", 55555);
-	glFilter = ReadPref("glFilter", 1);
-	ifbType = ReadPref("ifbType", 0);
-	joypadDefault = ReadPref("joypadDefault", 0);
-	languageOption = ReadPref("language", 1);
-	linkAuto = ReadPref("LinkAuto", 1);
-	linkHacks = ReadPref("LinkHacks", 0);
-	linkHostAddr = ReadPrefString("LinkHostAddr", "localhost");
-	linkMode = ReadPref("LinkMode", 0); // LINK_DISCONNECTED = 0
-	linkNumPlayers = ReadPref("LinkNumPlayers", 2);
-	linkTimeout = ReadPref("LinkTimeout", 1);
-	loadDotCodeFile = ReadPrefString("loadDotCodeFile");
-	maxScale = ReadPref("maxScale", 0);
-	movieRecordDir = ReadPrefString("movieRecordDir");
-	openGL = ReadPrefHex("openGL");
-	optFlashSize = ReadPrefHex("flashSize");
-	pauseWhenInactive = ReadPref("pauseWhenInactive", 1);
-	recentFreeze = ReadPref("recentFreeze", 0);
-	rewindTimer = ReadPref("rewindTimer", 0);
-	romDirGB = ReadPrefString("romDirGB");
-	romDirGBA = ReadPrefString("romDirGBA");
-	romDirGBC = ReadPrefString("romDirGBC");
-	rtcEnabled = ReadPref("rtcEnabled", 0);
-	saveDir = ReadPrefString("saveDir");
-	saveDotCodeFile = ReadPrefString("saveDotCodeFile");
-	screenShotDir = ReadPrefString("screenShotDir");
-	showSpeed = ReadPref("showSpeed", 0);
-	showSpeedTransparent = ReadPref("showSpeedTransparent", 1);
-	skipBios = ReadPref("skipBios", 0);
-	skipSaveGameBattery = ReadPref("skipSaveGameBattery", 0);
-	skipSaveGameCheats = ReadPref("skipSaveGameCheats", 0);
-	soundFiltering = (float)ReadPref("gbaSoundFiltering", 50) / 100.0f;
-	soundInterpolation = ReadPref("gbaSoundInterpolation", 1);
-	soundRecordDir = ReadPrefString("soundRecordDir");
-	threadPriority = ReadPref("priority", 2);
-	throttle = ReadPref("throttle", 100);
-        speedup_throttle = ReadPref("speedup_throttle", 0);
-        speedup_frame_skip = ReadPref("speedup_frame_skip", 9);
-	tripleBuffering = ReadPref("tripleBuffering", 0);
-	useBios = ReadPrefHex("useBiosGBA");
-	useBiosFileGB = ReadPref("useBiosGB", 0);
-	useBiosFileGBA = ReadPref("useBiosGBA", 0);
-	useBiosFileGBC = ReadPref("useBiosGBC", 0);
-	videoOption = ReadPref("video", 2); // VIDEO_3X = 2
-	vsync = ReadPref("vsync", false);
-	windowPositionX = ReadPref("windowX", 0);
-	windowPositionY = ReadPref("windowY", 0);
-	winFlashSize = ReadPref("flashSize", 0x10000);
-	winGbBorderOn = ReadPref("borderOn", 0);
-	winGbPrinterEnabled = ReadPref("gbPrinter", 0);
-
-	int soundQuality = (ReadPrefHex("soundQuality", 1));
-	switch (soundQuality) {
-	case 1:
-	case 2:
-	case 4:
-		break;
-	default:
-		log("Unknown sound quality %d. Defaulting to 44Khz\n", soundQuality);
-		soundQuality = 1;
-		break;
-	}
-	soundSetSampleRate(44100 / soundQuality);
-	int volume = ReadPref("soundVolume", 100);
-	float volume_percent = volume / 100.0f;
-	if (volume_percent < 0.0 || volume_percent > SOUND_MAX_VOLUME)
-		volume_percent = 1.0;
-	soundSetVolume(volume_percent);
-
-	soundSetEnable((ReadPrefHex("soundEnable", 0x30f)) & 0x30f);
-	if ((ReadPrefHex("soundStereo"))) {
-		gb_effects_config.enabled = true;
-	}
-	if ((ReadPrefHex("soundEcho"))) {
-		gb_effects_config.enabled = true;
-	}
-	if ((ReadPrefHex("soundSurround"))) {
-		gb_effects_config.surround = true;
-		gb_effects_config.enabled = true;
-	}
-
-	if (optFlashSize == 0)
-		flashSetSize(0x10000);
-	else
-		flashSetSize(0x20000);
-
-	rtcEnable(rtcEnabled ? true : false);
-	agbPrintEnable(agbPrint ? true : false);
-
-	for (int i = 0; i < 24;) {
-		systemGbPalette[i++] = (0x1f) | (0x1f << 5) | (0x1f << 10);
-		systemGbPalette[i++] = (0x15) | (0x15 << 5) | (0x15 << 10);
-		systemGbPalette[i++] = (0x0c) | (0x0c << 5) | (0x0c << 10);
-		systemGbPalette[i++] = 0;
-	}
-
-	systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
-
-	optPrintUsage = 0;
-
-	// TODO
-	//int s = ReadPref("mapViewStretch", 0);
-	//m_size = ReadPref("memViewerDataSize", 0);
-	//m_stretch = ReadPref("GBOamViewStretch", 0);
-	//m_stretch = ReadPref("tileViewStretch", 0);
-	//numberType = ReadPref("cheatsNumberType", 2);
-	//numberType = ReadPref("gbCheatsNumberType", 2);
-	//restoreValues = ReadPref("cheatsRestore", 0) ?
-	//scale = ReadPref("printerScale", 0);
-	//searchType = ReadPref("cheatsSearchType", SEARCH_EQ);
-	//searchType = ReadPref("gbCheatsSearchType",
-	//selectedFilter = ReadPref(("selectedFilter"), 0);
-	//sizeType = ReadPref("cheatsSizeType", 0);
-	//sizeType = ReadPref("gbCheatsSizeType", 0);
-	//updateValues = ReadPref("cheatsUpdate", 0);
-	//updateValues = ReadPref("gbCheatsUpdate", 0);
-	//valueType = ReadPref("cheatsValueType", 0);
-	//valueType = ReadPref("gbCheatsValueType", 0);
-
-	ValidateConfig();
-}
-
-void CloseConfig()
-{
-	if (preferences)
-		iniparser_freedict(preferences);
-}
-
-const char* FindConfigFile(const char *name)
-{
-	char buffer[4096];
-
-#ifdef _WIN32
-#define PATH_SEP ";"
-#define FILE_SEP '\\'
-#define EXE_NAME "vbam.exe"
-#else // ! _WIN32
-#define PATH_SEP ":"
-#define FILE_SEP '/'
-#define EXE_NAME "vbam"
-#endif // ! _WIN32
-
-	if (GETCWD(buffer, 2048)) {
-	}
-
-	if (FileExists(name))
-	{
-		return name;
-	}
-
-	if (homeDir) {
-		sprintf(path, "%s%c%s%c%s", homeDir, FILE_SEP, DOT_DIR, FILE_SEP, name);
-		if (FileExists(path))
-		{
-			return path;
-		}
-	}
-
-#ifdef _WIN32
-	char *home = getenv("USERPROFILE");
-	if (home != NULL) {
-		sprintf(path, "%s%c%s", home, FILE_SEP, name);
-		if (FileExists(path))
-		{
-			return path;
-		}
-	}
-
-	if (!strchr(arg0, '/') &&
-		!strchr(arg0, '\\')) {
-		char *path = getenv("PATH");
-
-		if (path != NULL) {
-			strncpy(buffer, path, 4096);
-			buffer[4095] = 0;
-			char *tok = strtok(buffer, PATH_SEP);
-
-			while (tok) {
-				sprintf(path, "%s%c%s", tok, FILE_SEP, EXE_NAME);
-				if (FileExists(path)) {
-					char path2[2048];
-					sprintf(path2, "%s%c%s", tok, FILE_SEP, name);
-					if (FileExists(path2)) {
-						return path2;
-					}
-				}
-				tok = strtok(NULL, PATH_SEP);
-			}
-		}
-	}
-	else {
-		// executable is relative to some directory
-		strcpy(buffer, arg0);
-		char *p = strrchr(buffer, FILE_SEP);
-		if (p) {
-			*p = 0;
-			sprintf(path, "%s%c%s", buffer, FILE_SEP, name);
-			if (FileExists(path))
-			{
-				return path;
-			}
-		}
-	}
-#else // ! _WIN32
-	sprintf(path, "%s%c%s", PKGDATADIR, FILE_SEP, name);
-	if (FileExists(path))
-	{
-		return path;
-	}
-
-	sprintf(path, "%s%c%s", SYSCONF_INSTALL_DIR, FILE_SEP, name);
-	if (FileExists(path))
-	{
-		return path;
-	}
-#endif // ! _WIN32
-	return 0;
-}
-
-void LoadConfigFile()
-{
-#if !defined(_WIN32) && !defined(__APPLE__)
-	homeDir = getenv("HOME");
-#else
-	homeDir = 0;
-#endif
-
-	if (preferences == NULL)
-	{
-		const char* configFile = FindConfigFile("vbam.ini");
-		OpenPreferences(configFile);
-	}
-
-	if (preferences == NULL)
-	{
-		const char* configFile = FindConfigFile("vbam.cfg");
-		OpenPreferences(configFile);
-	}
-}
-
-void SaveConfigFile()
-{
-#if !defined(_WIN32) && !defined(__APPLE__)
-	homeDir = getenv("HOME");
-#else
-	homeDir = 0;
-#endif
-
-	const char* configFile = FindConfigFile("vbam.ini");
-
-	if (configFile == NULL)
-	{
-		configFile = FindConfigFile("vbam.cfg");
-	}
-
-	if (configFile != NULL)
-	{
-		FILE *f = fopen(configFile, "w");
-		if (f == NULL) {
-                        char err_msg[4096] = "unknown error";
-                        strncpy(err_msg, strerror(errno), 4096);
-			fprintf(stderr, "Configuration file '%s' could not be written to: %s\n", configFile, err_msg);
-			return;
-		}
-		// Needs mixed case version of the option name to add new options into the ini
-		//for (int i = 0; i < (sizeof(argOptions) / sizeof(option)); i++)
-		//{
-		//	std::string pref = "preferences:";
-		//	pref.append(argOptions[i].name);
-		//	if (!iniparser_find_entry(preferences, pref.c_str()))
-		//	{
-		//		iniparser_set(preferences, pref.c_str(), NULL);
-		//	}
-		//}
-		iniparser_dump_ini(preferences, f);
-		fclose(f);
-	}
-}
-
-uint32_t ReadPrefHex(const char* pref_key, int default_value)
-{
-    std::stringstream ss;
-    std::string default_string;
-    ss.setf(std::ios::hex|std::ios::showbase, std::ios::basefield);
-    ss << default_value;
-    ss >> default_string;
-    LoadConfigFile();
-    std::string pref = "preferences:";
-    pref.append(pref_key);
-    return fromHex(iniparser_getstring(preferences, pref.c_str(), default_string.c_str()));
-}
-
-uint32_t ReadPrefHex(const char* pref_key)
-{
-	LoadConfigFile();
-	std::string pref = "preferences:";
-	pref.append(pref_key);
-	return fromHex(iniparser_getstring(preferences, pref.c_str(), 0));
-}
-
-uint32_t ReadPref(const char* pref_key, int default_value)
-{
-	LoadConfigFile();
-	std::string pref = "preferences:";
-	pref.append(pref_key);
-	return iniparser_getint(preferences, pref.c_str(), default_value);
-}
-
-uint32_t ReadPref(const char* pref_key)
-{
-	return ReadPref(pref_key, 0);
-}
-
-const char* ReadPrefString(const char* pref_key, const char* default_value)
-{
-	LoadConfigFile();
-	std::string pref = "preferences:";
-	pref.append(pref_key);
-	return iniparser_getstring(preferences, pref.c_str(), default_value);
-}
-
-const char* ReadPrefString(const char* pref_key)
-{
-	return ReadPrefString(pref_key, "");
-}
-
-/*-------------------------------------------------------------------------*/
-/**
-  @brief    Duplicate a string
-  @param    s String to duplicate
-  @return   Pointer to a newly allocated string, to be freed with free()
-
-  This is a replacement for strdup(). This implementation is provided
-  for systems that do not have it.
- */
-/*--------------------------------------------------------------------------*/
-static char *xstrdup(const char *s)
-{
-        char *t;
-        if (!s)
-                return NULL;
-        t = (char *)malloc(strlen(s) + 1);
-        if (t) {
-                strcpy(t, s);
-        }
-        return t;
-}
-
-int ReadOpts(int argc, char ** argv)
-{
-	int op = -1;
-	while ((op = getopt_long(argc,
-		argv,
-		"FNO:T:Y:G:I:D:b:c:df:hi:p::s:t:v:",
-		argOptions,
-		NULL)) != -1) {
-		switch (op) {
-		case 0:
-			// long option already processed by getopt_long
-			break;
-		case OPT_CHEAT:
-			// --cheat
-			if (preparedCheats >= MAX_CHEATS) {
-				log("Warning: cannot add more than %d cheats.\n", MAX_CHEATS);
-				break;
-			}
-		  {
-			  //char* cpy;
-			  //cpy = (char *)malloc(1 + strlen(optarg));
-			  //strcpy(cpy, optarg);
-			  //preparedCheatCodes[preparedCheats++] = cpy;
-			std::string cpy = optarg;
-			preparedCheatCodes[preparedCheats++] = cpy.c_str();
-		  }
-		  break;
-		case OPT_AUTOFIRE:
-			// --autofire
-			autoFireMaxCount = fromDec(optarg);
-			if (autoFireMaxCount < 1)
-				autoFireMaxCount = 1;
-			break;
-		case 'b':
-			useBios = true;
-			if (optarg == NULL) {
-				log("Missing BIOS file name\n");
-				break;
-			}
-			biosFileNameGBA = xstrdup(optarg);
-			break;
-		case 'c':
-		{
-			if (optarg == NULL) {
-				log("Missing config file name\n");
-				break;
-			}
-			FILE *f = fopen(optarg, "r");
-			if (f == NULL) {
-				log("File not found %s\n", optarg);
-				break;
-			}
-			preferences = NULL;
-			OpenPreferences(optarg);
-			fclose(f);
-		}
-		break;
-		case 'd':
-			debugger = true;
-			break;
-		case 'h':
-			optPrintUsage = 1;
-			break;
-		case 'i':
-			if (optarg == NULL) {
-				log("Missing patch name\n");
-				break;
-			}
-			if (patchNum >= PATCH_MAX_NUM) {
-				log("Too many patches given at %s (max is %d). Ignoring.\n", optarg, PATCH_MAX_NUM);
-			}
-			else {
-				patchNames[patchNum] = (char *)malloc(1 + strlen(optarg));
-				strcpy(patchNames[patchNum], optarg);
-				patchNum++;
-			}
-			break;
-		case 'G':
-			dbgMain = remoteStubMain;
-			dbgSignal = remoteStubSignal;
-			dbgOutput = remoteOutput;
-			debugger = true;
-			if (optarg) {
-				char *s = optarg;
-				if (strncmp(s, "tcp:", 4) == 0) {
-					s += 4;
-					int port = atoi(s);
-					remoteSetProtocol(0);
-					remoteSetPort(port);
-				}
-				else if (strcmp(s, "tcp") == 0) {
-					remoteSetProtocol(0);
-				}
-				else if (strcmp(s, "pipe") == 0) {
-					remoteSetProtocol(1);
-				}
-				else {
-					log("Unknown protocol %s\n", s);
-					break;
-				}
-			}
-			else {
-				remoteSetProtocol(0);
-			}
-			break;
-		case 'N':
-			parseDebug = false;
-			break;
-		case 'F':
-			fullScreen = 1;
-			mouseCounter = 120;
-			break;
-		case 'f':
-			if (optarg) {
-				filter = (Filter)atoi(optarg);
-			}
-			else {
-				filter = kStretch2x;
-			}
-			break;
-                case 'T':
-                        if (optarg)
-                            throttle = atoi(optarg);
-                        break;
-		case 'I':
-			if (optarg) {
-				ifbType = (IFBFilter)atoi(optarg);
-			}
-			else {
-				ifbType = kIFBNone;
-			}
-			break;
-		case 'p':
-#ifdef PROFILING
-			if (optarg) {
-				cpuEnableProfiling(atoi(optarg));
-			}
-			else
-				cpuEnableProfiling(100);
-#endif
-			break;
-		case 'S':
-			optFlashSize = atoi(optarg);
-			if (optFlashSize < 0 || optFlashSize > 1)
-				optFlashSize = 0;
-			break;
-		case 's':
-			if (optarg) {
-				int a = atoi(optarg);
-				if (a >= 0 && a <= 9) {
-					gbFrameSkip = a;
-					frameSkip = a;
-				}
-			}
-			else {
-				frameSkip = 2;
-				gbFrameSkip = 0;
-			}
-			break;
-		case 't':
-			if (optarg) {
-				int a = atoi(optarg);
-				if (a < 0 || a > 5)
-					a = 0;
-				cpuSaveType = a;
-			}
-			break;
-		case 'v':
-			if (optarg) {
-				systemVerbose = atoi(optarg);
-			}
-			else
-				systemVerbose = 0;
-			break;
-		case '?':
-			optPrintUsage = 1;
-			break;
-		case 'O':
-			if (optarg) {
-				openGL = atoi(optarg);
-				if (openGL < 0 || openGL > 2)
-					openGL = 1;
-			}
-			else
-				openGL = 0;
-			break;
-
-		case OPT_CAPTURE_FORMAT:
-			// --capture-format
-			if (optarg) {
-				captureFormat = atoi(optarg);
-			}
-			break;
-
-		case OPT_SHOW_SPEED_TRANSPARENT:
-			// --show-speed-transparent
-			if (optarg) {
-				showSpeedTransparent = atoi(optarg);
-			}
-			break;
-
-		case OPT_AUTO_FRAME_SKIP:
-			// --auto-frame-skip
-			if (optarg) {
-				autoFrameSkip = atoi(optarg);
-			}
-			break;
-
-		case OPT_AGB_PRINT:
-			// --agb-print
-			if (optarg) {
-				agbPrint = atoi(optarg);
-			}
-			break;
-
-		case OPT_RTC_ENABLED:
-			// --rtc-enabled
-			if (optarg) {
-				rtcEnabled = atoi(optarg);
-			}
-			break;
-
-		case OPT_VIDEO_OPTION:
-			// --video-option
-			if (optarg) {
-				videoOption = atoi(optarg);
-			}
-			break;
-
-		case OPT_LANGUAGE_OPTION:
-			// --language-option
-			if (optarg) {
-				languageOption = atoi(optarg);
-			}
-			break;
-
-		case OPT_GB_FRAME_SKIP:
-			// --gb-frame-skip
-			if (optarg) {
-				gbFrameSkip = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_ADAPTER:
-			// --fs-adapter
-			if (optarg) {
-				fsAdapter = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_WIDTH:
-			// --fs-width
-			if (optarg) {
-				fsWidth = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_HEIGHT:
-			// --fs-height
-			if (optarg) {
-				fsHeight = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_COLOR_DEPTH:
-			// --fs-color-depth
-			if (optarg) {
-				fsColorDepth = atoi(optarg);
-			}
-			break;
-
-		case OPT_FS_FREQUENCY:
-			// --fs-frequency
-			if (optarg) {
-				fsFrequency = atoi(optarg);
-			}
-			break;
-
-		case OPT_WINDOW_POSITION_X:
-			// --window-position-x
-			if (optarg) {
-				windowPositionX = atoi(optarg);
-			}
-			break;
-
-		case OPT_WINDOW_POSITION_Y:
-			// --window-position-y
-			if (optarg) {
-				windowPositionY = atoi(optarg);
-			}
-			break;
-
-		case OPT_SOUND_FILTERING:
-			// --sound-filtering
-			if (optarg) {
-				soundFiltering = atoi(optarg);
-			}
-			break;
-
-		case OPT_GL_FILTER:
-			// --gl-filter
-			if (optarg) {
-				glFilter = atoi(optarg);
-			}
-			break;
-
-		case OPT_SHOW_SPEED:
-			// --show-speed
-			if (optarg) {
-				showSpeed = atoi(optarg);
-			}
-			break;
-
-		case OPT_IFB_TYPE:
-			// --ifb-type
-			if (optarg) {
-				ifbType = atoi(optarg);
-			}
-			break;
-
-		case OPT_GB_EMULATOR_TYPE:
-			// --gb-emulator-type
-			if (optarg) {
-				gbEmulatorType = atoi(optarg);
-			}
-			break;
-
-		case OPT_THREAD_PRIORITY:
-			// --thread-priority
-			if (optarg) {
-				threadPriority = atoi(optarg);
-			}
-			break;
-
-		case OPT_GB_PALETTE_OPTION:
-			// --gb-palette-option
-			if (optarg) {
-				gbPaletteOption = atoi(optarg);
-			}
-			break;
-
-		case OPT_REWIND_TIMER:
-			// --rewind-timer
-			if (optarg) {
-				rewindTimer = atoi(optarg);
-			}
-			break;
-
-		case OPT_JOYPAD_DEFAULT:
-			// --joypad-default
-			if (optarg) {
-				joypadDefault = atoi(optarg);
-			}
-			break;
-
-		case OPT_MAX_SCALE:
-			// --max-scale
-			if (optarg) {
-				maxScale = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_TIMEOUT:
-			// --link-timeout
-			if (optarg) {
-				linkTimeout = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_MODE:
-			// --link-mode
-			if (optarg) {
-				linkMode = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_AUTO:
-			// --link-auto
-			if (optarg) {
-				linkAuto = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_HACKS:
-			// --link-hacks
-			if (optarg) {
-				linkHacks = atoi(optarg);
-			}
-			break;
-
-		case OPT_LINK_NUM_PLAYERS:
-			// --link-num-players
-			if (optarg) {
-				linkNumPlayers = atoi(optarg);
-			}
-			break;
-
-		case OPT_GDB_PORT:
-			// --gdb-port
-			if (optarg) {
-				gdbPort = atoi(optarg);
-			}
-			break;
-
-		case OPT_BIOS_FILE_NAME_GB:
-			// --bios-file-name-gb
-			biosFileNameGB = optarg;
-			break;
-
-		case OPT_BIOS_FILE_NAME_GBA:
-			// --bios-file-name-gba
-			biosFileNameGBA = optarg;
-			break;
-
-		case OPT_BIOS_FILE_NAME_GBC:
-			// --bios-file-name-gbc
-			biosFileNameGBC = optarg;
-			break;
-
-		case OPT_AVI_RECORD_DIR:
-			// --avi-record-dir
-			aviRecordDir = optarg;
-			break;
-
-		case OPT_MOVIE_RECORD_DIR:
-			// --movie-record-dir
-			movieRecordDir = optarg;
-			break;
-
-		case OPT_SOUND_RECORD_DIR:
-			// --sound-record-dir
-			soundRecordDir = optarg;
-			break;
-
-		case OPT_SCREEN_SHOT_DIR:
-			// --screen-shot-dir
-			screenShotDir = optarg;
-			break;
-
-		case OPT_SAVE_DIR:
-			// --save-dir
-			saveDir = optarg;
-			break;
-
-		case OPT_BATTERY_DIR:
-			// --battery-dir
-			batteryDir = optarg;
-			break;
-
-		case OPT_ROM_DIR_GBC:
-			// --rom-dir-gbc
-			romDirGBC = optarg;
-			break;
-
-		case OPT_ROM_DIR_GB:
-			// --rom-dir-gb
-			romDirGB = optarg;
-			break;
-
-		case OPT_ROM_DIR_GBA:
-			// --rom-dir-gba
-			romDirGBA = optarg;
-			break;
-
-		case OPT_LINK_HOST_ADDR:
-			// --link-host-addr
-			linkHostAddr = optarg;
-			break;
-
-		case OPT_CPU_SAVE_TYPE:
-			// --cpu-save-type
-			if (optarg) {
-				cpuSaveType = atoi(optarg);
-			}
-			break;
-
-		case OPT_OPT_FLASH_SIZE:
-			// --opt-flash-size
-			if (optarg) {
-				optFlashSize = atoi(optarg);
-			}
-			break;
-
-		case OPT_DOTCODE_FILE_NAME_LOAD:
-			// --dotcode-file-name-load
-			loadDotCodeFile = optarg;
-			break;
-
-		case OPT_DOTCODE_FILE_NAME_SAVE:
-			// --dotcode-file-name-save
-			saveDotCodeFile = optarg;
-			break;
-                case OPT_SPEEDUP_THROTTLE:
-                        if (optarg)
-                            speedup_throttle = atoi(optarg);
-                        break;
-                case OPT_SPEEDUP_FRAME_SKIP:
-                        if (optarg)
-                            speedup_frame_skip = atoi(optarg);
-                        break;
-		}
-	}
-	return op;
-}
-
+// necessary to get portable strerror_r
+#undef _GNU_SOURCE
+#include <string.h>
+#define _GNU_SOURCE 1
+
+#include "ConfigManager.h"
+extern "C" {
+#include "../common/iniparser.h"
+}
+
+#include <stdarg.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <cmath>
+#include <cerrno>
+
+#include "../common/Patch.h"
+#include "../common/ConfigManager.h"
+#include "../gba/GBA.h"
+#include "../gba/agbprint.h"
+#include "../gba/Flash.h"
+#include "../gba/Cheats.h"
+#include "../gba/remote.h"
+#include "../gba/RTC.h"
+#include "../gba/Sound.h"
+#include "../gb/gb.h"
+#include "../gb/gbGlobals.h"
+#include "../gb/gbCheats.h"
+#include "../gb/gbSound.h"
+#include "../Util.h"
+
+#ifndef _WIN32
+#define GETCWD getcwd
+#else // _WIN32
+#include <direct.h>
+#define GETCWD _getcwd
+#define snprintf sprintf
+#define stat _stat
+#define mkdir(X,Y) (_mkdir(X))
+// from: https://www.linuxquestions.org/questions/programming-9/porting-to-win32-429334/
+#ifndef S_ISDIR
+    #define S_ISDIR(mode)  (((mode) & _S_IFMT) == _S_IFDIR)
+#endif
+#endif // _WIN32
+
+#ifndef __GNUC__
+#define HAVE_DECL_GETOPT 0
+#define __STDC__ 1
+#include "getopt.h"
+#else // ! __GNUC__
+#define HAVE_DECL_GETOPT 1
+#include <getopt.h>
+#endif // ! __GNUC__
+#include <string>
+#include <sstream>
+
+enum named_opts
+{
+	OPT_AGB_PRINT = 1000,
+	OPT_AUTOFIRE,
+	OPT_AUTO_FRAME_SKIP,
+	OPT_AVI_RECORD_DIR,
+	OPT_BATTERY_DIR,
+	OPT_BIOS_FILE_NAME_GB,
+	OPT_BIOS_FILE_NAME_GBA,
+	OPT_BIOS_FILE_NAME_GBC,
+	OPT_CAPTURE_FORMAT,
+	OPT_CHEAT,
+	OPT_CPU_SAVE_TYPE,
+	OPT_DOTCODE_FILE_NAME_LOAD,
+	OPT_DOTCODE_FILE_NAME_SAVE,
+	OPT_EMULATOR_TYPE,
+	OPT_FS_ADAPTER,
+	OPT_FS_COLOR_DEPTH,
+	OPT_FS_FREQUENCY,
+	OPT_FS_HEIGHT,
+	OPT_FS_WIDTH,
+	OPT_GB_EMULATOR_TYPE,
+	OPT_GB_FRAME_SKIP,
+	OPT_GB_PALETTE_OPTION,
+	OPT_GDB_PORT,
+	OPT_GL_FILTER,
+	OPT_IFB_TYPE,
+	OPT_JOYPAD_DEFAULT,
+	OPT_LANGUAGE_OPTION,
+	OPT_LINK_AUTO,
+	OPT_LINK_HACKS,
+	OPT_LINK_HOST_ADDR,
+	OPT_LINK_MODE,
+	OPT_LINK_NUM_PLAYERS,
+	OPT_LINK_TIMEOUT,
+	OPT_MAX_SCALE,
+	OPT_MOVIE_RECORD_DIR,
+	OPT_OPT_FLASH_SIZE,
+	OPT_REWIND_TIMER,
+	OPT_ROM_DIR_GB,
+	OPT_ROM_DIR_GBA,
+	OPT_ROM_DIR_GBC,
+	OPT_RTC_ENABLED,
+	OPT_SAVE_DIR,
+	OPT_SCREEN_SHOT_DIR,
+	OPT_SHOW_SPEED,
+	OPT_SHOW_SPEED_TRANSPARENT,
+	OPT_SOUND_FILTERING,
+	OPT_SOUND_RECORD_DIR,
+	OPT_SYNCHRONIZE,
+	OPT_THREAD_PRIORITY,
+	OPT_VIDEO_OPTION,
+	OPT_WINDOW_HEIGHT,
+	OPT_WINDOW_POSITION_X,
+	OPT_WINDOW_POSITION_Y,
+	OPT_WINDOW_WIDTH,
+	OPT_SPEEDUP_THROTTLE,
+	OPT_SPEEDUP_FRAME_SKIP
+};
+
+#define SOUND_MAX_VOLUME 2.0
+#define SOUND_ECHO       0.2
+#define SOUND_STEREO     0.15
+
+#define REWIND_NUM 8
+#define REWIND_SIZE 400000
+
+char path[2048];
+
+dictionary* preferences;
+
+bool cpuIsMultiBoot = false;
+bool mirroringEnable = true;
+bool parseDebug = true;
+bool speedHack = false;
+bool speedup = false;
+const char* aviRecordDir;
+const char* batteryDir;
+const char* biosFileNameGB;
+const char* biosFileNameGBA;
+const char* biosFileNameGBC;
+const char* loadDotCodeFile;
+const char* saveDotCodeFile;
+const char* linkHostAddr;
+const char* movieRecordDir;
+char* rewindMemory = NULL;
+const char* romDirGB;
+const char* romDirGBA;
+const char* romDirGBC;
+const char* saveDir;
+const char* screenShotDir;
+const char* soundRecordDir;
+int active = 1;
+int agbPrint;
+int autoFire;
+int autoFireMaxCount = 1;
+int autoFireToggle;
+int autoFrameSkip = 0;
+int autoLoadMostRecent;
+int autoPatch;
+int autoSaveLoadCheatList;
+int aviRecording;
+int captureFormat = 0;
+int cheatsEnabled = true;
+int cpuDisableSfx = false;
+int cpuSaveType = 0;
+int disableMMX;
+int disableStatusMessages = 0;
+int dsoundDisableHardwareAcceleration;
+int filterHeight;
+int filterMagnification;
+int filterMT; // enable multi-threading for pixel filters
+int filter = kStretch2x;
+int filterWidth;
+int frameSkip = 1;
+int frameskipadjust;
+int fsAdapter;
+int fsColorDepth;
+int fsForceChange;
+int fsFrequency;
+int fsHeight;
+int fsWidth;
+int fullScreen;
+int fullScreenStretch;
+int gdbBreakOnLoad;
+int gdbPort;
+int glFilter;
+int ifbType = kIFBNone;
+int joypadDefault;
+int languageOption;
+int layerEnable = 0xff00;
+int layerSettings = 0xff00;
+int linkAuto;
+int linkHacks = 1;
+int linkMode;
+int linkNumPlayers;
+int linkTimeout = 1;
+int maxScale;
+int mouseCounter = 0;
+int movieFrame;
+int moviePlayFrame;
+int moviePlaying;
+int movieRecording;
+int openGL;
+int optFlashSize;
+int optPrintUsage;
+int paused;
+int pauseWhenInactive = 0;
+int preparedCheats = 0;
+int recentFreeze;
+int renderedFrames;
+int rewindCount;
+int rewindCounter;
+int rewindPos;
+int rewindSaveNeeded = 0;
+int rewindTimer = 0;
+int rewindTopPos;
+int rtcEnabled;
+int saveType = GBA_SAVE_AUTO;
+int screenMessage;
+int sensorX;
+int sensorY;
+int showRenderedFrames;
+int showSpeed;
+int showSpeedTransparent;
+int sizeX;
+int sizeY;
+int skipBios = 0;
+int skipSaveGameBattery = false;
+int skipSaveGameCheats = false;
+int soundRecording;
+int speedupToggle;
+int sunBars;
+int surfaceSizeX;
+int surfaceSizeY;
+int threadPriority;
+int tripleBuffering;
+int useBios = 0;
+int useBiosFileGB;
+int useBiosFileGBA;
+int useBiosFileGBC;
+int videoOption;
+int vsync;
+int wasPaused = 0;
+uint32_t windowHeight;
+int windowPositionX;
+int windowPositionY;
+uint32_t windowWidth;
+int winFlashSize;
+int winGbBorderOn;
+int winGbPrinterEnabled;
+int winPauseNextFrame;
+int* rewindSerials = NULL;
+uint32_t autoFrameSkipLastTime;
+uint32_t movieLastJoypad;
+uint32_t movieNextJoypad;
+uint32_t throttle = 100;
+uint32_t speedup_throttle = 0;
+uint32_t speedup_frame_skip = 9;
+
+const char* preparedCheatCodes[MAX_CHEATS];
+
+FilterFunc filterFunction = 0;
+IFBFilterFunc ifbFunction = 0;
+
+// allow up to 100 IPS/UPS/PPF patches given on commandline
+int	patchNum = 0;
+char *patchNames[PATCH_MAX_NUM] = { NULL }; // and so on
+
+void(*dbgMain)() = remoteStubMain;
+void(*dbgSignal)(int, int) = remoteStubSignal;
+void(*dbgOutput)(const char *, uint32_t) = debuggerOutput;
+
+char* homeDir = NULL;
+char* arg0 = NULL;
+
+
+struct option argOptions[] = {
+
+	{ "agb-print", required_argument, 0, OPT_AGB_PRINT },
+	{ "auto-frame-skip", required_argument, 0, OPT_AUTO_FRAME_SKIP },
+	{ "auto-load-most-recent", no_argument, &autoLoadMostRecent, 1 },
+	{ "auto-patch", no_argument, &autoPatch, 1 },
+	{ "auto-save-cheat-list", no_argument, &autoSaveLoadCheatList, 1 },
+	{ "auto-save-load-cheat-list", no_argument, &autoSaveLoadCheatList, 1 },
+	{ "autofire", required_argument, 0, OPT_AUTOFIRE },
+	{ "avi-record-dir", required_argument, 0, OPT_AVI_RECORD_DIR },
+	{ "battery-dir", required_argument, 0, OPT_BATTERY_DIR },
+	{ "bios", required_argument, 0, 'b' },
+	{ "bios-file-name-gb", required_argument, 0, OPT_BIOS_FILE_NAME_GB },
+	{ "bios-file-name-gba", required_argument, 0, OPT_BIOS_FILE_NAME_GBA },
+	{ "bios-file-name-gbc", required_argument, 0, OPT_BIOS_FILE_NAME_GBC },
+	{ "border-automatic", no_argument, &gbBorderAutomatic, 1 },
+	{ "border-on", no_argument, &gbBorderOn, 1 },
+	{ "capture-format", required_argument, 0, OPT_CAPTURE_FORMAT },
+	{ "cheat", required_argument, 0, OPT_CHEAT },
+	{ "cheats-enabled", no_argument, &cheatsEnabled, 1 },
+	{ "color-option", no_argument, &gbColorOption, 1 },
+	{ "config", required_argument, 0, 'c' },
+	{ "cpu-disable-sfx", no_argument, &cpuDisableSfx, 1 },
+	{ "cpu-save-type", required_argument, 0, OPT_CPU_SAVE_TYPE },
+	{ "debug", no_argument, 0, 'd' },
+	{ "disable-mmx", no_argument, &disableMMX, 1 },
+	{ "disable-sfx", no_argument, &cpuDisableSfx, 1 },
+	{ "disable-status-messages", no_argument, &disableStatusMessages, 1 },
+	{ "dotcode-file-name-load", required_argument, 0, OPT_DOTCODE_FILE_NAME_LOAD },
+	{ "dotcode-file-name-save", required_argument, 0, OPT_DOTCODE_FILE_NAME_SAVE },
+	{ "emulator-type", required_argument, 0, OPT_EMULATOR_TYPE },
+	{ "filter", required_argument, 0, 'f' },
+	{ "filter-enable-multi-threading", no_argument, &filterMT, 1 },
+	{ "filter-mt", no_argument, &filterMT, 1 },
+	{ "flash-128k", no_argument, &optFlashSize, 1 },
+	{ "flash-64k", no_argument, &optFlashSize, 0 },
+	{ "flash-size", required_argument, 0, 'S' },
+	{ "frameskip", required_argument, 0, 's' },
+	{ "fs-adapter", required_argument, 0, OPT_FS_ADAPTER },
+	{ "fs-color-depth", required_argument, 0, OPT_FS_COLOR_DEPTH },
+	{ "fs-frequency", required_argument, 0, OPT_FS_FREQUENCY },
+	{ "fs-height", required_argument, 0, OPT_FS_HEIGHT },
+	{ "fs-width", required_argument, 0, OPT_FS_WIDTH },
+	{ "full-screen", no_argument, &fullScreen, 1 },
+	{ "full-screen-stretch", no_argument, &fullScreenStretch, 1 },
+	{ "gb-border-automatic", no_argument, &gbBorderAutomatic, 1 },
+	{ "gb-border-on", no_argument, &gbBorderOn, 1 },
+	{ "gb-color-option", no_argument, &gbColorOption, 1 },
+	{ "gb-emulator-type", required_argument, 0, OPT_GB_EMULATOR_TYPE },
+	{ "gb-frame-skip", required_argument, 0, OPT_GB_FRAME_SKIP },
+	{ "gb-palette-option", required_argument, 0, OPT_GB_PALETTE_OPTION },
+	{ "gb-printer", no_argument, &winGbPrinterEnabled, 1 },
+	{ "gdb", required_argument, 0, 'G' },
+	{ "gdb-break-on-load", no_argument, &gdbBreakOnLoad, 1 },
+	{ "gdb-port", required_argument, 0, OPT_GDB_PORT },
+	{ "gl-filter", required_argument, 0, OPT_GL_FILTER },
+	{ "help", no_argument, &optPrintUsage, 1 },
+	{ "ifb-filter", required_argument, 0, 'I' },
+	{ "ifb-type", required_argument, 0, OPT_IFB_TYPE },
+	{ "joypad-default", required_argument, 0, OPT_JOYPAD_DEFAULT },
+	{ "language-option", required_argument, 0, OPT_LANGUAGE_OPTION },
+	{ "link-auto", required_argument, 0, OPT_LINK_AUTO },
+	{ "link-hacks", required_argument, 0, OPT_LINK_HACKS },
+	{ "link-host-addr", required_argument, 0, OPT_LINK_HOST_ADDR },
+	{ "link-mode", required_argument, 0, OPT_LINK_MODE },
+	{ "link-num-players", required_argument, 0, OPT_LINK_NUM_PLAYERS },
+	{ "link-timeout", required_argument, 0, OPT_LINK_TIMEOUT },
+	{ "max-scale", required_argument, 0, OPT_MAX_SCALE },
+	{ "movie-record-dir", required_argument, 0, OPT_MOVIE_RECORD_DIR },
+	{ "no-agb-print", no_argument, &agbPrint, 0 },
+	{ "no-auto-frameskip", no_argument, &autoFrameSkip, 0 },
+	{ "no-debug", no_argument, 0, 'N' },
+	{ "no-opengl", no_argument, &openGL, 0 },
+	{ "no-patch", no_argument, &autoPatch, 0 },
+	{ "no-pause-when-inactive", no_argument, &pauseWhenInactive, 0 },
+	{ "no-rtc", no_argument, &rtcEnabled, 0 },
+	{ "no-show-speed", no_argument, &showSpeed, 0 },
+	{ "opengl", required_argument, 0, 'O' },
+	{ "opengl-bilinear", no_argument, &openGL, 2 },
+	{ "opengl-nearest", no_argument, &openGL, 1 },
+	{ "opt-flash-size", required_argument, 0, OPT_OPT_FLASH_SIZE },
+	{ "patch", required_argument, 0, 'i' },
+	{ "pause-when-inactive", no_argument, &pauseWhenInactive, 1 },
+	{ "profile", optional_argument, 0, 'p' },
+	{ "recent-freeze", no_argument, &recentFreeze, 1 },
+	{ "rewind-timer", required_argument, 0, OPT_REWIND_TIMER },
+	{ "rom-dir-gb", required_argument, 0, OPT_ROM_DIR_GB },
+	{ "rom-dir-gba", required_argument, 0, OPT_ROM_DIR_GBA },
+	{ "rom-dir-gbc", required_argument, 0, OPT_ROM_DIR_GBC },
+	{ "rtc", no_argument, &rtcEnabled, 1 },
+	{ "rtc-enabled", required_argument, 0, OPT_RTC_ENABLED },
+	{ "save-auto", no_argument, &cpuSaveType, 0 },
+	{ "save-dir", required_argument, 0, OPT_SAVE_DIR },
+	{ "save-eeprom", no_argument, &cpuSaveType, 1 },
+	{ "save-flash", no_argument, &cpuSaveType, 3 },
+	{ "save-none", no_argument, &cpuSaveType, 5 },
+	{ "save-sensor", no_argument, &cpuSaveType, 4 },
+	{ "save-sram", no_argument, &cpuSaveType, 2 },
+	{ "save-type", required_argument, 0, 't' },
+	{ "screen-shot-dir", required_argument, 0, OPT_SCREEN_SHOT_DIR },
+	{ "show-speed", required_argument, 0, OPT_SHOW_SPEED },
+	{ "show-speed-detailed", no_argument, &showSpeed, 2 },
+	{ "show-speed-normal", no_argument, &showSpeed, 1 },
+	{ "show-speed-transparent", required_argument, 0, OPT_SHOW_SPEED_TRANSPARENT },
+	{ "skip-bios", no_argument, &skipBios, 1 },
+	{ "skip-save-game-battery", no_argument, &skipSaveGameBattery, 1 },
+	{ "skip-save-game-cheats", no_argument, &skipSaveGameCheats, 1 },
+	{ "sound-filtering", required_argument, 0, OPT_SOUND_FILTERING },
+	{ "sound-record-dir", required_argument, 0, OPT_SOUND_RECORD_DIR },
+	{ "stretch", no_argument, &fullScreenStretch, 1 },
+	{ "synchronize", required_argument, 0, OPT_SYNCHRONIZE },
+	{ "thread-priority", required_argument, 0, OPT_THREAD_PRIORITY },
+	{ "throttle", required_argument, 0, 'T' },
+	{ "speedup_throttle", required_argument, 0, OPT_SPEEDUP_THROTTLE },
+	{ "speedup_frame_skip", required_argument, 0, OPT_SPEEDUP_FRAME_SKIP },
+	{ "triple-buffering", no_argument, &tripleBuffering, 1 },
+	{ "use-bios", no_argument, &useBios, 1 },
+	{ "use-bios-file-gb", no_argument, &useBiosFileGB, 1 },
+	{ "use-bios-file-gba", no_argument, &useBiosFileGBA, 1 },
+	{ "use-bios-file-gbc", no_argument, &useBiosFileGBC, 1 },
+	{ "verbose", required_argument, 0, 'v' },
+	{ "video-option", required_argument, 0, OPT_VIDEO_OPTION },
+	{ "vsync", no_argument, &vsync, 1 },
+	{ "win-gb-printer-enabled", no_argument, &winGbPrinterEnabled, 1 },
+	{ "window-height", required_argument, 0, OPT_WINDOW_HEIGHT },
+	{ "window-position-x", required_argument, 0, OPT_WINDOW_POSITION_X },
+	{ "window-position-y", required_argument, 0, OPT_WINDOW_POSITION_Y },
+	{ "window-width", required_argument, 0, OPT_WINDOW_WIDTH },
+
+
+	{ NULL, no_argument, NULL, 0 }
+};
+
+
+uint32_t fromHex(const char *s)
+{
+	if (!s)
+		return 0;
+	uint32_t value;
+	sscanf(s, "%x", &value);
+	return value;
+}
+
+uint32_t fromDec(const char *s)
+{
+	if (!s)
+		return 0;
+	uint32_t value = 0;
+	sscanf(s, "%u", &value);
+	return value;
+}
+
+void SetHome(char *_arg0)
+{
+	arg0 = _arg0;
+}
+
+void OpenPreferences(const char *name)
+{
+	if (!preferences && name)
+		preferences = iniparser_load(name);
+}
+
+void ValidateConfig()
+{
+	if (gbEmulatorType < 0 || gbEmulatorType > 5)
+		gbEmulatorType = 1;
+	if (frameSkip < 0 || frameSkip > 9)
+		frameSkip = 2;
+	if (gbFrameSkip < 0 || gbFrameSkip > 9)
+		gbFrameSkip = 0;
+	if (filter < kStretch1x || filter >= kInvalidFilter)
+		filter = kStretch2x;
+
+	if (cpuSaveType < 0 || cpuSaveType > 5)
+		cpuSaveType = 0;
+	if (optFlashSize != 0 && optFlashSize != 1)
+		optFlashSize = 0;
+	if (ifbType < kIFBNone || ifbType >= kInvalidIFBFilter)
+		ifbType = kIFBNone;
+	if (showSpeed < 0 || showSpeed > 2)
+		showSpeed = 1;
+	if (rewindTimer < 0 || rewindTimer > 600)
+		rewindTimer = 0;
+	if (autoFireMaxCount < 1)
+		autoFireMaxCount = 1;
+
+	if (rewindTimer) {
+		rewindMemory = (char *)malloc(REWIND_NUM*REWIND_SIZE);
+		rewindSerials = (int *)calloc(REWIND_NUM, sizeof(int)); // init to zeroes
+	}
+}
+
+void LoadConfig()
+{
+	agbPrint = ReadPrefHex("agbPrint");
+	autoFireMaxCount = fromDec(ReadPrefString("autoFireMaxCount"));
+	autoFrameSkip = ReadPref("autoFrameSkip", 0);
+	autoLoadMostRecent = ReadPref("autoLoadMostRecent", 0);
+	autoPatch = ReadPref("autoPatch", 1);
+	autoSaveLoadCheatList = ReadPref("autoSaveCheatList", 1);
+	aviRecordDir = ReadPrefString("aviRecordDir");
+	batteryDir = ReadPrefString("batteryDir");
+	biosFileNameGB = ReadPrefString("biosFileGB");
+	biosFileNameGBA = ReadPrefString("biosFileGBA");
+	biosFileNameGBC = ReadPrefString("biosFileGBC");
+	captureFormat = ReadPref("captureFormat", 0);
+	cheatsEnabled = ReadPref("cheatsEnabled", 0);
+	cpuDisableSfx = ReadPref("disableSfx", 0);
+	cpuSaveType = ReadPrefHex("saveType");
+	disableMMX = ReadPref("disableMMX", 0);
+	disableStatusMessages = ReadPrefHex("disableStatus");
+	filterMT = ReadPref("filterEnableMultiThreading", 0);
+	filter = ReadPref("filter", 0);
+	frameSkip = ReadPref("frameSkip", 0);
+	fsAdapter = ReadPref("fsAdapter", 0);
+	fsColorDepth = ReadPref("fsColorDepth", 32);
+	fsFrequency = ReadPref("fsFrequency", 60);
+	fsHeight = ReadPref("fsHeight", 600);
+	fsWidth = ReadPref("fsWidth", 800);
+	fullScreen = ReadPrefHex("fullScreen");
+	fullScreenStretch = ReadPref("stretch", 0);
+	gbBorderAutomatic = ReadPref("borderAutomatic", 0);
+	gbBorderOn = ReadPrefHex("borderOn");
+	gbColorOption = ReadPref("colorOption", 0);
+	gbEmulatorType = ReadPref("emulatorType", 1);
+	gbFrameSkip = ReadPref("gbFrameSkip", 0);
+	gbPaletteOption = ReadPref("gbPaletteOption", 0);
+	gbSoundSetDeclicking(ReadPref("gbSoundDeclicking", 1));
+	gb_effects_config.echo = (float)ReadPref("gbSoundEffectsEcho", 20) / 100.0f;
+	gb_effects_config.enabled = ReadPref("gbSoundEffectsEnabled", 0);
+	gb_effects_config.stereo = (float)ReadPref("gbSoundEffectsStereo", 15) / 100.0f;
+	gb_effects_config.surround = ReadPref("gbSoundEffectsSurround", 0);
+	gdbBreakOnLoad = ReadPref("gdbBreakOnLoad", 0);
+	gdbPort = ReadPref("gdbPort", 55555);
+	glFilter = ReadPref("glFilter", 1);
+	ifbType = ReadPref("ifbType", 0);
+	joypadDefault = ReadPref("joypadDefault", 0);
+	languageOption = ReadPref("language", 1);
+	linkAuto = ReadPref("LinkAuto", 1);
+	linkHacks = ReadPref("LinkHacks", 0);
+	linkHostAddr = ReadPrefString("LinkHostAddr", "localhost");
+	linkMode = ReadPref("LinkMode", 0); // LINK_DISCONNECTED = 0
+	linkNumPlayers = ReadPref("LinkNumPlayers", 2);
+	linkTimeout = ReadPref("LinkTimeout", 1);
+	loadDotCodeFile = ReadPrefString("loadDotCodeFile");
+	maxScale = ReadPref("maxScale", 0);
+	movieRecordDir = ReadPrefString("movieRecordDir");
+	openGL = ReadPrefHex("openGL");
+	optFlashSize = ReadPrefHex("flashSize");
+	pauseWhenInactive = ReadPref("pauseWhenInactive", 1);
+	recentFreeze = ReadPref("recentFreeze", 0);
+	rewindTimer = ReadPref("rewindTimer", 0);
+	romDirGB = ReadPrefString("romDirGB");
+	romDirGBA = ReadPrefString("romDirGBA");
+	romDirGBC = ReadPrefString("romDirGBC");
+	rtcEnabled = ReadPref("rtcEnabled", 0);
+	saveDir = ReadPrefString("saveDir");
+	saveDotCodeFile = ReadPrefString("saveDotCodeFile");
+	screenShotDir = ReadPrefString("screenShotDir");
+	showSpeed = ReadPref("showSpeed", 0);
+	showSpeedTransparent = ReadPref("showSpeedTransparent", 1);
+	skipBios = ReadPref("skipBios", 0);
+	skipSaveGameBattery = ReadPref("skipSaveGameBattery", 0);
+	skipSaveGameCheats = ReadPref("skipSaveGameCheats", 0);
+	soundFiltering = (float)ReadPref("gbaSoundFiltering", 50) / 100.0f;
+	soundInterpolation = ReadPref("gbaSoundInterpolation", 1);
+	soundRecordDir = ReadPrefString("soundRecordDir");
+	threadPriority = ReadPref("priority", 2);
+	throttle = ReadPref("throttle", 100);
+        speedup_throttle = ReadPref("speedup_throttle", 0);
+        speedup_frame_skip = ReadPref("speedup_frame_skip", 9);
+	tripleBuffering = ReadPref("tripleBuffering", 0);
+	useBios = ReadPrefHex("useBiosGBA");
+	useBiosFileGB = ReadPref("useBiosGB", 0);
+	useBiosFileGBA = ReadPref("useBiosGBA", 0);
+	useBiosFileGBC = ReadPref("useBiosGBC", 0);
+	videoOption = ReadPref("video", 2); // VIDEO_3X = 2
+	vsync = ReadPref("vsync", false);
+	windowHeight = ReadPref("windowHeight", 0);
+	windowPositionX = ReadPref("windowX", -1);
+	windowPositionY = ReadPref("windowY", -1);
+	windowWidth = ReadPref("windowWidth", 0);
+	winFlashSize = ReadPref("flashSize", 0x10000);
+	winGbBorderOn = ReadPref("borderOn", 0);
+	winGbPrinterEnabled = ReadPref("gbPrinter", 0);
+
+	int soundQuality = (ReadPrefHex("soundQuality", 1));
+	switch (soundQuality) {
+	case 1:
+	case 2:
+	case 4:
+		break;
+	default:
+		log("Unknown sound quality %d. Defaulting to 44Khz\n", soundQuality);
+		soundQuality = 1;
+		break;
+	}
+	soundSetSampleRate(44100 / soundQuality);
+	int volume = ReadPref("soundVolume", 100);
+	float volume_percent = volume / 100.0f;
+	if (volume_percent < 0.0 || volume_percent > SOUND_MAX_VOLUME)
+		volume_percent = 1.0;
+	soundSetVolume(volume_percent);
+
+	soundSetEnable((ReadPrefHex("soundEnable", 0x30f)) & 0x30f);
+	if ((ReadPrefHex("soundStereo"))) {
+		gb_effects_config.enabled = true;
+	}
+	if ((ReadPrefHex("soundEcho"))) {
+		gb_effects_config.enabled = true;
+	}
+	if ((ReadPrefHex("soundSurround"))) {
+		gb_effects_config.surround = true;
+		gb_effects_config.enabled = true;
+	}
+
+	if (optFlashSize == 0)
+		flashSetSize(0x10000);
+	else
+		flashSetSize(0x20000);
+
+	rtcEnable(rtcEnabled ? true : false);
+	agbPrintEnable(agbPrint ? true : false);
+
+	for (int i = 0; i < 24;) {
+		systemGbPalette[i++] = (0x1f) | (0x1f << 5) | (0x1f << 10);
+		systemGbPalette[i++] = (0x15) | (0x15 << 5) | (0x15 << 10);
+		systemGbPalette[i++] = (0x0c) | (0x0c << 5) | (0x0c << 10);
+		systemGbPalette[i++] = 0;
+	}
+
+	systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
+
+	optPrintUsage = 0;
+
+	// TODO
+	//int s = ReadPref("mapViewStretch", 0);
+	//m_size = ReadPref("memViewerDataSize", 0);
+	//m_stretch = ReadPref("GBOamViewStretch", 0);
+	//m_stretch = ReadPref("tileViewStretch", 0);
+	//numberType = ReadPref("cheatsNumberType", 2);
+	//numberType = ReadPref("gbCheatsNumberType", 2);
+	//restoreValues = ReadPref("cheatsRestore", 0) ?
+	//scale = ReadPref("printerScale", 0);
+	//searchType = ReadPref("cheatsSearchType", SEARCH_EQ);
+	//searchType = ReadPref("gbCheatsSearchType",
+	//selectedFilter = ReadPref(("selectedFilter"), 0);
+	//sizeType = ReadPref("cheatsSizeType", 0);
+	//sizeType = ReadPref("gbCheatsSizeType", 0);
+	//updateValues = ReadPref("cheatsUpdate", 0);
+	//updateValues = ReadPref("gbCheatsUpdate", 0);
+	//valueType = ReadPref("cheatsValueType", 0);
+	//valueType = ReadPref("gbCheatsValueType", 0);
+
+	ValidateConfig();
+}
+
+void CloseConfig()
+{
+	if (preferences)
+		iniparser_freedict(preferences);
+}
+
+const char* FindConfigFile(const char *name)
+{
+	char buffer[4096];
+
+#ifdef _WIN32
+#define PATH_SEP ";"
+#define EXE_NAME "vbam.exe"
+#else // ! _WIN32
+#define PATH_SEP ":"
+#define EXE_NAME "vbam"
+#endif // ! _WIN32
+
+	if (GETCWD(buffer, 2048)) {
+	}
+
+	if (FileExists(name))
+	{
+		return name;
+	}
+
+	if (homeDir) {
+		sprintf(path, "%s%c%s", homeDir, FILE_SEP, name);
+		if (FileExists(path))
+		{
+			return path;
+		}
+	}
+
+#ifdef _WIN32
+	char *home = getenv("USERPROFILE");
+	if (home != NULL) {
+		sprintf(path, "%s%c%s", home, FILE_SEP, name);
+		if (FileExists(path))
+		{
+			return path;
+		}
+	}
+
+	if (!strchr(arg0, '/') &&
+		!strchr(arg0, '\\')) {
+		char *path = getenv("PATH");
+
+		if (path != NULL) {
+			strncpy(buffer, path, 4096);
+			buffer[4095] = 0;
+			char *tok = strtok(buffer, PATH_SEP);
+
+			while (tok) {
+				sprintf(path, "%s%c%s", tok, FILE_SEP, EXE_NAME);
+				if (FileExists(path)) {
+					static char path2[2048];
+					sprintf(path2, "%s%c%s", tok, FILE_SEP, name);
+					if (FileExists(path2)) {
+						return path2;
+					}
+				}
+				tok = strtok(NULL, PATH_SEP);
+			}
+		}
+	}
+	else {
+		// executable is relative to some directory
+		strcpy(buffer, arg0);
+		char *p = strrchr(buffer, FILE_SEP);
+		if (p) {
+			*p = 0;
+			sprintf(path, "%s%c%s", buffer, FILE_SEP, name);
+			if (FileExists(path))
+			{
+				return path;
+			}
+		}
+	}
+#else // ! _WIN32
+	sprintf(path, "%s%c%s", PKGDATADIR, FILE_SEP, name);
+	if (FileExists(path))
+	{
+		return path;
+	}
+
+	sprintf(path, "%s%c%s", SYSCONF_INSTALL_DIR, FILE_SEP, name);
+	if (FileExists(path))
+	{
+		return path;
+	}
+#endif // ! _WIN32
+	return 0;
+}
+
+void LoadConfigFile()
+{
+	struct stat s;
+	std::string homeDirTmp = get_xdg_user_config_home() + DOT_DIR;
+	homeDir = (char *)homeDirTmp.c_str();
+	if (stat(homeDir, &s) == -1 || !S_ISDIR(s.st_mode))
+		mkdir(homeDir, 0755);
+
+	if (preferences == NULL)
+	{
+		const char* configFile = FindConfigFile("vbam.ini");
+		OpenPreferences(configFile);
+	}
+}
+
+void SaveConfigFile()
+{
+	struct stat s;
+	std::string homeDirTmp = get_xdg_user_config_home() + DOT_DIR;
+	homeDir = (char *)homeDirTmp.c_str();
+	if (stat(homeDir, &s) == -1 || !S_ISDIR(s.st_mode))
+		mkdir(homeDir, 0755);
+
+	const char* configFile = FindConfigFile("vbam.ini");
+
+	if (configFile != NULL)
+	{
+		FILE *f = fopen(configFile, "w");
+		if (f == NULL) {
+                        char err_msg[4096] = "unknown error";
+                        strncpy(err_msg, strerror(errno), 4096);
+			fprintf(stderr, "Configuration file '%s' could not be written to: %s\n", configFile, err_msg);
+			return;
+		}
+		// Needs mixed case version of the option name to add new options into the ini
+		//for (int i = 0; i < (sizeof(argOptions) / sizeof(option)); i++)
+		//{
+		//	std::string pref = "preferences:";
+		//	pref.append(argOptions[i].name);
+		//	if (!iniparser_find_entry(preferences, pref.c_str()))
+		//	{
+		//		iniparser_set(preferences, pref.c_str(), NULL);
+		//	}
+		//}
+		iniparser_dump_ini(preferences, f);
+		fclose(f);
+	}
+}
+
+uint32_t ReadPrefHex(const char* pref_key, int default_value)
+{
+    std::stringstream ss;
+    std::string default_string;
+    ss.setf(std::ios::hex|std::ios::showbase, std::ios::basefield);
+    ss << default_value;
+    ss >> default_string;
+    LoadConfigFile();
+    std::string pref = "preferences:";
+    pref.append(pref_key);
+    return fromHex(iniparser_getstring(preferences, pref.c_str(), default_string.c_str()));
+}
+
+uint32_t ReadPrefHex(const char* pref_key)
+{
+	LoadConfigFile();
+	std::string pref = "preferences:";
+	pref.append(pref_key);
+	return fromHex(iniparser_getstring(preferences, pref.c_str(), 0));
+}
+
+uint32_t ReadPref(const char* pref_key, int default_value)
+{
+	LoadConfigFile();
+	std::string pref = "preferences:";
+	pref.append(pref_key);
+	return iniparser_getint(preferences, pref.c_str(), default_value);
+}
+
+uint32_t ReadPref(const char* pref_key)
+{
+	return ReadPref(pref_key, 0);
+}
+
+const char* ReadPrefString(const char* pref_key, const char* default_value)
+{
+	LoadConfigFile();
+	std::string pref = "preferences:";
+	pref.append(pref_key);
+	return iniparser_getstring(preferences, pref.c_str(), default_value);
+}
+
+const char* ReadPrefString(const char* pref_key)
+{
+	return ReadPrefString(pref_key, "");
+}
+
+/*-------------------------------------------------------------------------*/
+/**
+  @brief    Duplicate a string
+  @param    s String to duplicate
+  @return   Pointer to a newly allocated string, to be freed with free()
+
+  This is a replacement for strdup(). This implementation is provided
+  for systems that do not have it.
+ */
+/*--------------------------------------------------------------------------*/
+static char *xstrdup(const char *s)
+{
+        char *t;
+        if (!s)
+                return NULL;
+        t = (char *)malloc(strlen(s) + 1);
+        if (t) {
+                strcpy(t, s);
+        }
+        return t;
+}
+
+int ReadOpts(int argc, char ** argv)
+{
+	int op = -1;
+	while ((op = getopt_long(argc,
+		argv,
+		"FNO:T:Y:G:I:D:b:c:df:hi:p::s:t:v:",
+		argOptions,
+		NULL)) != -1) {
+		switch (op) {
+		case 0:
+			// long option already processed by getopt_long
+			break;
+		case OPT_CHEAT:
+			// --cheat
+			if (preparedCheats >= MAX_CHEATS) {
+				log("Warning: cannot add more than %d cheats.\n", MAX_CHEATS);
+				break;
+			}
+		  {
+			  //char* cpy;
+			  //cpy = (char *)malloc(1 + strlen(optarg));
+			  //strcpy(cpy, optarg);
+			  //preparedCheatCodes[preparedCheats++] = cpy;
+			std::string cpy = optarg;
+			preparedCheatCodes[preparedCheats++] = cpy.c_str();
+		  }
+		  break;
+		case OPT_AUTOFIRE:
+			// --autofire
+			autoFireMaxCount = fromDec(optarg);
+			if (autoFireMaxCount < 1)
+				autoFireMaxCount = 1;
+			break;
+		case 'b':
+			useBios = true;
+			if (optarg == NULL) {
+				log("Missing BIOS file name\n");
+				break;
+			}
+			biosFileNameGBA = xstrdup(optarg);
+			break;
+		case 'c':
+		{
+			if (optarg == NULL) {
+				log("Missing config file name\n");
+				break;
+			}
+			FILE *f = fopen(optarg, "r");
+			if (f == NULL) {
+				log("File not found %s\n", optarg);
+				break;
+			}
+			preferences = NULL;
+			OpenPreferences(optarg);
+			fclose(f);
+		}
+		break;
+		case 'd':
+			debugger = true;
+			break;
+		case 'h':
+			optPrintUsage = 1;
+			break;
+		case 'i':
+			if (optarg == NULL) {
+				log("Missing patch name\n");
+				break;
+			}
+			if (patchNum >= PATCH_MAX_NUM) {
+				log("Too many patches given at %s (max is %d). Ignoring.\n", optarg, PATCH_MAX_NUM);
+			}
+			else {
+				patchNames[patchNum] = (char *)malloc(1 + strlen(optarg));
+				strcpy(patchNames[patchNum], optarg);
+				patchNum++;
+			}
+			break;
+		case 'G':
+			dbgMain = remoteStubMain;
+			dbgSignal = remoteStubSignal;
+			dbgOutput = remoteOutput;
+			debugger = true;
+			if (optarg) {
+				char *s = optarg;
+				if (strncmp(s, "tcp:", 4) == 0) {
+					s += 4;
+					int port = atoi(s);
+					remoteSetProtocol(0);
+					remoteSetPort(port);
+				}
+				else if (strcmp(s, "tcp") == 0) {
+					remoteSetProtocol(0);
+				}
+				else if (strcmp(s, "pipe") == 0) {
+					remoteSetProtocol(1);
+				}
+				else {
+					log("Unknown protocol %s\n", s);
+					break;
+				}
+			}
+			else {
+				remoteSetProtocol(0);
+			}
+			break;
+		case 'N':
+			parseDebug = false;
+			break;
+		case 'F':
+			fullScreen = 1;
+			mouseCounter = 120;
+			break;
+		case 'f':
+			if (optarg) {
+				filter = (Filter)atoi(optarg);
+			}
+			else {
+				filter = kStretch2x;
+			}
+			break;
+                case 'T':
+                        if (optarg)
+                            throttle = atoi(optarg);
+                        break;
+		case 'I':
+			if (optarg) {
+				ifbType = (IFBFilter)atoi(optarg);
+			}
+			else {
+				ifbType = kIFBNone;
+			}
+			break;
+		case 'p':
+#ifdef PROFILING
+			if (optarg) {
+				cpuEnableProfiling(atoi(optarg));
+			}
+			else
+				cpuEnableProfiling(100);
+#endif
+			break;
+		case 'S':
+			optFlashSize = atoi(optarg);
+			if (optFlashSize < 0 || optFlashSize > 1)
+				optFlashSize = 0;
+			break;
+		case 's':
+			if (optarg) {
+				int a = atoi(optarg);
+				if (a >= 0 && a <= 9) {
+					gbFrameSkip = a;
+					frameSkip = a;
+				}
+			}
+			else {
+				frameSkip = 2;
+				gbFrameSkip = 0;
+			}
+			break;
+		case 't':
+			if (optarg) {
+				int a = atoi(optarg);
+				if (a < 0 || a > 5)
+					a = 0;
+				cpuSaveType = a;
+			}
+			break;
+		case 'v':
+			if (optarg) {
+				systemVerbose = atoi(optarg);
+			}
+			else
+				systemVerbose = 0;
+			break;
+		case '?':
+			optPrintUsage = 1;
+			break;
+		case 'O':
+			if (optarg) {
+				openGL = atoi(optarg);
+				if (openGL < 0 || openGL > 2)
+					openGL = 1;
+			}
+			else
+				openGL = 0;
+			break;
+
+		case OPT_CAPTURE_FORMAT:
+			// --capture-format
+			if (optarg) {
+				captureFormat = atoi(optarg);
+			}
+			break;
+
+		case OPT_SHOW_SPEED_TRANSPARENT:
+			// --show-speed-transparent
+			if (optarg) {
+				showSpeedTransparent = atoi(optarg);
+			}
+			break;
+
+		case OPT_AUTO_FRAME_SKIP:
+			// --auto-frame-skip
+			if (optarg) {
+				autoFrameSkip = atoi(optarg);
+			}
+			break;
+
+		case OPT_AGB_PRINT:
+			// --agb-print
+			if (optarg) {
+				agbPrint = atoi(optarg);
+			}
+			break;
+
+		case OPT_RTC_ENABLED:
+			// --rtc-enabled
+			if (optarg) {
+				rtcEnabled = atoi(optarg);
+			}
+			break;
+
+		case OPT_VIDEO_OPTION:
+			// --video-option
+			if (optarg) {
+				videoOption = atoi(optarg);
+			}
+			break;
+
+		case OPT_LANGUAGE_OPTION:
+			// --language-option
+			if (optarg) {
+				languageOption = atoi(optarg);
+			}
+			break;
+
+		case OPT_GB_FRAME_SKIP:
+			// --gb-frame-skip
+			if (optarg) {
+				gbFrameSkip = atoi(optarg);
+			}
+			break;
+
+		case OPT_FS_ADAPTER:
+			// --fs-adapter
+			if (optarg) {
+				fsAdapter = atoi(optarg);
+			}
+			break;
+
+		case OPT_FS_WIDTH:
+			// --fs-width
+			if (optarg) {
+				fsWidth = atoi(optarg);
+			}
+			break;
+
+		case OPT_FS_HEIGHT:
+			// --fs-height
+			if (optarg) {
+				fsHeight = atoi(optarg);
+			}
+			break;
+
+		case OPT_FS_COLOR_DEPTH:
+			// --fs-color-depth
+			if (optarg) {
+				fsColorDepth = atoi(optarg);
+			}
+			break;
+
+		case OPT_FS_FREQUENCY:
+			// --fs-frequency
+			if (optarg) {
+				fsFrequency = atoi(optarg);
+			}
+			break;
+
+		case OPT_WINDOW_POSITION_X:
+			// --window-position-x
+			if (optarg) {
+				windowPositionX = atoi(optarg);
+			}
+			break;
+
+		case OPT_WINDOW_POSITION_Y:
+			// --window-position-y
+			if (optarg) {
+				windowPositionY = atoi(optarg);
+			}
+			break;
+
+		case OPT_SOUND_FILTERING:
+			// --sound-filtering
+			if (optarg) {
+				soundFiltering = atoi(optarg);
+			}
+			break;
+
+		case OPT_GL_FILTER:
+			// --gl-filter
+			if (optarg) {
+				glFilter = atoi(optarg);
+			}
+			break;
+
+		case OPT_SHOW_SPEED:
+			// --show-speed
+			if (optarg) {
+				showSpeed = atoi(optarg);
+			}
+			break;
+
+		case OPT_IFB_TYPE:
+			// --ifb-type
+			if (optarg) {
+				ifbType = atoi(optarg);
+			}
+			break;
+
+		case OPT_GB_EMULATOR_TYPE:
+			// --gb-emulator-type
+			if (optarg) {
+				gbEmulatorType = atoi(optarg);
+			}
+			break;
+
+		case OPT_THREAD_PRIORITY:
+			// --thread-priority
+			if (optarg) {
+				threadPriority = atoi(optarg);
+			}
+			break;
+
+		case OPT_GB_PALETTE_OPTION:
+			// --gb-palette-option
+			if (optarg) {
+				gbPaletteOption = atoi(optarg);
+			}
+			break;
+
+		case OPT_REWIND_TIMER:
+			// --rewind-timer
+			if (optarg) {
+				rewindTimer = atoi(optarg);
+			}
+			break;
+
+		case OPT_JOYPAD_DEFAULT:
+			// --joypad-default
+			if (optarg) {
+				joypadDefault = atoi(optarg);
+			}
+			break;
+
+		case OPT_MAX_SCALE:
+			// --max-scale
+			if (optarg) {
+				maxScale = atoi(optarg);
+			}
+			break;
+
+		case OPT_LINK_TIMEOUT:
+			// --link-timeout
+			if (optarg) {
+				linkTimeout = atoi(optarg);
+			}
+			break;
+
+		case OPT_LINK_MODE:
+			// --link-mode
+			if (optarg) {
+				linkMode = atoi(optarg);
+			}
+			break;
+
+		case OPT_LINK_AUTO:
+			// --link-auto
+			if (optarg) {
+				linkAuto = atoi(optarg);
+			}
+			break;
+
+		case OPT_LINK_HACKS:
+			// --link-hacks
+			if (optarg) {
+				linkHacks = atoi(optarg);
+			}
+			break;
+
+		case OPT_LINK_NUM_PLAYERS:
+			// --link-num-players
+			if (optarg) {
+				linkNumPlayers = atoi(optarg);
+			}
+			break;
+
+		case OPT_GDB_PORT:
+			// --gdb-port
+			if (optarg) {
+				gdbPort = atoi(optarg);
+			}
+			break;
+
+		case OPT_BIOS_FILE_NAME_GB:
+			// --bios-file-name-gb
+			biosFileNameGB = optarg;
+			break;
+
+		case OPT_BIOS_FILE_NAME_GBA:
+			// --bios-file-name-gba
+			biosFileNameGBA = optarg;
+			break;
+
+		case OPT_BIOS_FILE_NAME_GBC:
+			// --bios-file-name-gbc
+			biosFileNameGBC = optarg;
+			break;
+
+		case OPT_AVI_RECORD_DIR:
+			// --avi-record-dir
+			aviRecordDir = optarg;
+			break;
+
+		case OPT_MOVIE_RECORD_DIR:
+			// --movie-record-dir
+			movieRecordDir = optarg;
+			break;
+
+		case OPT_SOUND_RECORD_DIR:
+			// --sound-record-dir
+			soundRecordDir = optarg;
+			break;
+
+		case OPT_SCREEN_SHOT_DIR:
+			// --screen-shot-dir
+			screenShotDir = optarg;
+			break;
+
+		case OPT_SAVE_DIR:
+			// --save-dir
+			saveDir = optarg;
+			break;
+
+		case OPT_BATTERY_DIR:
+			// --battery-dir
+			batteryDir = optarg;
+			break;
+
+		case OPT_ROM_DIR_GBC:
+			// --rom-dir-gbc
+			romDirGBC = optarg;
+			break;
+
+		case OPT_ROM_DIR_GB:
+			// --rom-dir-gb
+			romDirGB = optarg;
+			break;
+
+		case OPT_ROM_DIR_GBA:
+			// --rom-dir-gba
+			romDirGBA = optarg;
+			break;
+
+		case OPT_LINK_HOST_ADDR:
+			// --link-host-addr
+			linkHostAddr = optarg;
+			break;
+
+		case OPT_CPU_SAVE_TYPE:
+			// --cpu-save-type
+			if (optarg) {
+				cpuSaveType = atoi(optarg);
+			}
+			break;
+
+		case OPT_OPT_FLASH_SIZE:
+			// --opt-flash-size
+			if (optarg) {
+				optFlashSize = atoi(optarg);
+			}
+			break;
+
+		case OPT_WINDOW_HEIGHT:
+			// --window-height
+			if (optarg) {
+				windowHeight = atoi(optarg);
+			}
+			break;
+
+		case OPT_WINDOW_WIDTH:
+			// --window-width
+			if (optarg) {
+				windowWidth = atoi(optarg);
+			}
+			break;
+
+		case OPT_DOTCODE_FILE_NAME_LOAD:
+			// --dotcode-file-name-load
+			loadDotCodeFile = optarg;
+			break;
+
+		case OPT_DOTCODE_FILE_NAME_SAVE:
+			// --dotcode-file-name-save
+			saveDotCodeFile = optarg;
+			break;
+                case OPT_SPEEDUP_THROTTLE:
+                        if (optarg)
+                            speedup_throttle = atoi(optarg);
+                        break;
+                case OPT_SPEEDUP_FRAME_SKIP:
+                        if (optarg)
+                            speedup_frame_skip = atoi(optarg);
+                        break;
+		}
+	}
+	return op;
+}
+
diff --git a/src/common/ConfigManager.h b/src/common/ConfigManager.h
index 066d9a0d..0ad42024 100644
--- a/src/common/ConfigManager.h
+++ b/src/common/ConfigManager.h
@@ -1,181 +1,183 @@
-#ifndef _CONFIGMANAGER_H
-#define _CONFIGMANAGER_H
-
-#pragma once
-#include "../sdl/filters.h"
-#include <stdio.h>
-
-#ifndef __GNUC__
-#define HAVE_DECL_GETOPT 0
-#define __STDC__ 1
-#ifndef __LIBRETRO__
-#include "getopt.h"
-#endif
-#else // ! __GNUC__
-#define HAVE_DECL_GETOPT 1
-#ifndef __LIBRETRO__
-#include <getopt.h>
-#endif
-#endif // ! __GNUC__
-
-#define MAX_CHEATS 16384
-
-extern bool cpuIsMultiBoot;
-extern bool mirroringEnable;
-extern bool parseDebug;
-extern bool speedHack;
-extern bool speedup;
-extern char *rewindMemory;
-extern const char *aviRecordDir;
-extern const char *biosFileNameGB;
-extern const char *biosFileNameGBA;
-extern const char *biosFileNameGBC;
-extern const char *loadDotCodeFile;
-extern const char *saveDotCodeFile;
-extern const char *linkHostAddr;
-extern const char *movieRecordDir;
-extern const char *romDirGB;
-extern const char *romDirGBA;
-extern const char *romDirGBC;
-extern const char *soundRecordDir;
-extern int *rewindSerials;
-extern int active;
-extern int agbPrint;
-extern int autoFire;
-extern int autoFireMaxCount;
-extern int autoFireToggle;
-extern int autoFrameSkip;
-extern int autoLoadMostRecent;
-extern int autoPatch;
-extern int autoSaveLoadCheatList;
-extern int aviRecording;
-extern int captureFormat;
-extern int cheatsEnabled;
-extern int cpuDisableSfx;
-extern int cpuSaveType;
-extern int dinputKeyFocus;
-extern int disableMMX;
-extern int disableStatusMessages;
-extern int dsoundDisableHardwareAcceleration;
-extern int filterHeight;
-extern int filterMagnification;
-extern int filterMT; // enable multi-threading for pixel filters
-extern int filter;
-extern int filterWidth;
-extern int frameSkip;
-extern int frameskipadjust;
-extern int fsAdapter;
-extern int fsColorDepth;
-extern int fsForceChange;
-extern int fsFrequency;
-extern int fsHeight;
-extern int fsWidth;
-extern int fullScreen;
-extern int fullScreenStretch;
-extern int gdbBreakOnLoad;
-extern int gdbPort;
-extern int glFilter;
-extern int ifbType;
-extern int joypadDefault;
-extern int languageOption;
-extern int layerEnable;
-extern int layerSettings;
-extern int linkAuto;
-extern int linkHacks;
-extern int linkMode;
-extern int linkNumPlayers;
-extern int linkTimeout;
-extern int maxScale;
-extern int movieFrame;
-extern int moviePlayFrame;
-extern int moviePlaying;
-extern int movieRecording;
-extern int openGL;
-extern int autoPatch;
-extern int optFlashSize;
-extern int optPrintUsage;
-extern int paused;
-extern int pauseWhenInactive;
-extern int recentFreeze;
-extern int renderedFrames;
-extern int rewindCount;
-extern int rewindCounter;
-extern int rewindPos;
-extern int rewindSaveNeeded;
-extern int rewindTimer;
-extern int rewindTopPos;
-// extern int romSize;
-extern int rtcEnabled;
-extern int saveType;
-extern int screenMessage;
-extern int sensorX;
-extern int sensorY;
-extern int showRenderedFrames;
-extern int showSpeed;
-extern int showSpeedTransparent;
-extern int sizeX;
-extern int sizeY;
-extern int skipBios;
-extern int skipSaveGameBattery;
-extern int skipSaveGameCheats;
-extern int soundRecording;
-extern int speedupToggle;
-extern int sunBars;
-extern int surfaceSizeX;
-extern int surfaceSizeY;
-extern int threadPriority;
-extern int tripleBuffering;
-extern int useBios;
-extern int useBiosFileGB;
-extern int useBiosFileGBA;
-extern int useBiosFileGBC;
-extern int videoOption;
-extern int vsync;
-extern int wasPaused;
-extern int windowPositionX;
-extern int windowPositionY;
-extern int winFlashSize;
-extern int winGbBorderOn;
-extern int winGbPrinterEnabled;
-extern int winPauseNextFrame;
-extern uint32_t autoFrameSkipLastTime;
-extern uint32_t movieLastJoypad;
-extern uint32_t movieNextJoypad;
-extern uint32_t throttle;
-extern uint32_t speedup_throttle;
-extern uint32_t speedup_frame_skip;
-
-extern int preparedCheats;
-extern const char *preparedCheatCodes[MAX_CHEATS];
-
-// allow up to 100 IPS/UPS/PPF patches given on commandline
-#define PATCH_MAX_NUM 100
-extern int patchNum;
-extern char *patchNames[PATCH_MAX_NUM]; // and so on
-
-extern int mouseCounter;
-
-extern FilterFunc filterFunction;
-extern IFBFilterFunc ifbFunction;
-
-extern char *homeDir;
-extern const char *screenShotDir;
-extern const char *saveDir;
-extern const char *batteryDir;
-
-// Directory within homedir to use for default save location.
-#define DOT_DIR ".vbam"
-
-void SetHome(char *_arg0);
-void SaveConfigFile();
-void CloseConfig();
-uint32_t ReadPrefHex(const char *pref_key, int default_value);
-uint32_t ReadPrefHex(const char *pref_key);
-uint32_t ReadPref(const char *pref_key, int default_value);
-uint32_t ReadPref(const char *pref_key);
-const char *ReadPrefString(const char *pref_key, const char *default_value);
-const char *ReadPrefString(const char *pref_key);
-void LoadConfigFile(int argc, char **argv);
-void LoadConfig();
-int ReadOpts(int argc, char **argv);
-#endif
+#ifndef _CONFIGMANAGER_H
+#define _CONFIGMANAGER_H
+
+#pragma once
+#include "../sdl/filters.h"
+#include <stdio.h>
+
+#ifndef __GNUC__
+#define HAVE_DECL_GETOPT 0
+#define __STDC__ 1
+#ifndef __LIBRETRO__
+#include "getopt.h"
+#endif
+#else // ! __GNUC__
+#define HAVE_DECL_GETOPT 1
+#ifndef __LIBRETRO__
+#include <getopt.h>
+#endif
+#endif // ! __GNUC__
+
+#define MAX_CHEATS 16384
+
+extern bool cpuIsMultiBoot;
+extern bool mirroringEnable;
+extern bool parseDebug;
+extern bool speedHack;
+extern bool speedup;
+extern char *rewindMemory;
+extern const char *aviRecordDir;
+extern const char *biosFileNameGB;
+extern const char *biosFileNameGBA;
+extern const char *biosFileNameGBC;
+extern const char *loadDotCodeFile;
+extern const char *saveDotCodeFile;
+extern const char *linkHostAddr;
+extern const char *movieRecordDir;
+extern const char *romDirGB;
+extern const char *romDirGBA;
+extern const char *romDirGBC;
+extern const char *soundRecordDir;
+extern int *rewindSerials;
+extern int active;
+extern int agbPrint;
+extern int autoFire;
+extern int autoFireMaxCount;
+extern int autoFireToggle;
+extern int autoFrameSkip;
+extern int autoLoadMostRecent;
+extern int autoPatch;
+extern int autoSaveLoadCheatList;
+extern int aviRecording;
+extern int captureFormat;
+extern int cheatsEnabled;
+extern int cpuDisableSfx;
+extern int cpuSaveType;
+extern int dinputKeyFocus;
+extern int disableMMX;
+extern int disableStatusMessages;
+extern int dsoundDisableHardwareAcceleration;
+extern int filterHeight;
+extern int filterMagnification;
+extern int filterMT; // enable multi-threading for pixel filters
+extern int filter;
+extern int filterWidth;
+extern int frameSkip;
+extern int frameskipadjust;
+extern int fsAdapter;
+extern int fsColorDepth;
+extern int fsForceChange;
+extern int fsFrequency;
+extern int fsHeight;
+extern int fsWidth;
+extern int fullScreen;
+extern int fullScreenStretch;
+extern int gdbBreakOnLoad;
+extern int gdbPort;
+extern int glFilter;
+extern int ifbType;
+extern int joypadDefault;
+extern int languageOption;
+extern int layerEnable;
+extern int layerSettings;
+extern int linkAuto;
+extern int linkHacks;
+extern int linkMode;
+extern int linkNumPlayers;
+extern int linkTimeout;
+extern int maxScale;
+extern int movieFrame;
+extern int moviePlayFrame;
+extern int moviePlaying;
+extern int movieRecording;
+extern int openGL;
+extern int autoPatch;
+extern int optFlashSize;
+extern int optPrintUsage;
+extern int paused;
+extern int pauseWhenInactive;
+extern int recentFreeze;
+extern int renderedFrames;
+extern int rewindCount;
+extern int rewindCounter;
+extern int rewindPos;
+extern int rewindSaveNeeded;
+extern int rewindTimer;
+extern int rewindTopPos;
+// extern int romSize;
+extern int rtcEnabled;
+extern int saveType;
+extern int screenMessage;
+extern int sensorX;
+extern int sensorY;
+extern int showRenderedFrames;
+extern int showSpeed;
+extern int showSpeedTransparent;
+extern int sizeX;
+extern int sizeY;
+extern int skipBios;
+extern int skipSaveGameBattery;
+extern int skipSaveGameCheats;
+extern int soundRecording;
+extern int speedupToggle;
+extern int sunBars;
+extern int surfaceSizeX;
+extern int surfaceSizeY;
+extern int threadPriority;
+extern int tripleBuffering;
+extern int useBios;
+extern int useBiosFileGB;
+extern int useBiosFileGBA;
+extern int useBiosFileGBC;
+extern int videoOption;
+extern int vsync;
+extern int wasPaused;
+extern uint32_t windowHeight;
+extern int windowPositionX;
+extern int windowPositionY;
+extern uint32_t windowWidth;
+extern int winFlashSize;
+extern int winGbBorderOn;
+extern int winGbPrinterEnabled;
+extern int winPauseNextFrame;
+extern uint32_t autoFrameSkipLastTime;
+extern uint32_t movieLastJoypad;
+extern uint32_t movieNextJoypad;
+extern uint32_t throttle;
+extern uint32_t speedup_throttle;
+extern uint32_t speedup_frame_skip;
+
+extern int preparedCheats;
+extern const char *preparedCheatCodes[MAX_CHEATS];
+
+// allow up to 100 IPS/UPS/PPF patches given on commandline
+#define PATCH_MAX_NUM 100
+extern int patchNum;
+extern char *patchNames[PATCH_MAX_NUM]; // and so on
+
+extern int mouseCounter;
+
+extern FilterFunc filterFunction;
+extern IFBFilterFunc ifbFunction;
+
+extern char *homeDir;
+extern const char *screenShotDir;
+extern const char *saveDir;
+extern const char *batteryDir;
+
+// Directory within homedir to use for default save location.
+#define DOT_DIR "visualboyadvance-m"
+
+void SetHome(char *_arg0);
+void SaveConfigFile();
+void CloseConfig();
+uint32_t ReadPrefHex(const char *pref_key, int default_value);
+uint32_t ReadPrefHex(const char *pref_key);
+uint32_t ReadPref(const char *pref_key, int default_value);
+uint32_t ReadPref(const char *pref_key);
+const char *ReadPrefString(const char *pref_key, const char *default_value);
+const char *ReadPrefString(const char *pref_key);
+void LoadConfigFile(int argc, char **argv);
+void LoadConfig();
+int ReadOpts(int argc, char **argv);
+#endif
diff --git a/src/common/SoundDriver.h b/src/common/SoundDriver.h
index afceef3e..c6d405bf 100644
--- a/src/common/SoundDriver.h
+++ b/src/common/SoundDriver.h
@@ -58,7 +58,7 @@ class SoundDriver
          */
         virtual void write(uint16_t *finalWave, int length) = 0;
 
-        virtual void setThrottle(unsigned short throttle){};
+        virtual void setThrottle(unsigned short throttle) = 0;
 };
 
 #endif // __VBA_SOUND_DRIVER_H__
diff --git a/src/common/SoundSDL.cpp b/src/common/SoundSDL.cpp
index 079c9fd8..2ad7218e 100644
--- a/src/common/SoundSDL.cpp
+++ b/src/common/SoundSDL.cpp
@@ -60,11 +60,12 @@ void SoundSDL::read(uint16_t* stream, int length) {
     if (!initialized || !emulating)
         return;
 
-    if (!buffer_size())
+    if (!buffer_size()) {
         if (should_wait())
             SDL_SemWait(data_available);
         else
             return;
+    }
 
     SDL_LockMutex(mutex);
 
@@ -136,7 +137,7 @@ bool SoundSDL::init(long sampleRate) {
 
     sound_device = SDL_OpenAudioDevice(NULL, 0, &audio, &audio_spec, SDL_AUDIO_ALLOW_ANY_CHANGE);
 
-    if(sound_device < 0) {
+    if(sound_device == 0) {
         std::cerr << "Failed to open audio: " << SDL_GetError() << std::endl;
         return false;
     }
diff --git a/src/common/SoundSDL.h b/src/common/SoundSDL.h
index 2d2d1f25..d6f7ec0a 100644
--- a/src/common/SoundSDL.h
+++ b/src/common/SoundSDL.h
@@ -45,7 +45,7 @@ protected:
 private:
         RingBuffer<uint16_t> samples_buf;
 
-        SDL_AudioDeviceID sound_device = -1;
+        SDL_AudioDeviceID sound_device = 0;
 
         SDL_mutex* mutex;
         SDL_sem* data_available;
diff --git a/src/common/iniparser.c b/src/common/iniparser.c
index 5ffe7b5e..2d2e1416 100644
--- a/src/common/iniparser.c
+++ b/src/common/iniparser.c
@@ -643,7 +643,7 @@ dictionary *iniparser_load(const char *ininame)
         char line[ASCIILINESZ + 1];
         char section[ASCIILINESZ + 1];
         char key[ASCIILINESZ + 1];
-        char tmp[ASCIILINESZ + 1];
+        char tmp[2 * ASCIILINESZ + 3];
         char val[ASCIILINESZ + 1];
 
         int last = 0;
diff --git a/src/filters/2xSaI.cpp b/src/filters/2xSaI.cpp
index 62e51055..d6ab51e4 100644
--- a/src/filters/2xSaI.cpp
+++ b/src/filters/2xSaI.cpp
@@ -157,10 +157,10 @@ static inline uint32_t INTERPOLATE (uint32_t A, uint32_t B)
 
 static inline uint32_t Q_INTERPOLATE (uint32_t A, uint32_t B, uint32_t C, uint32_t D)
 {
-  register uint32_t x = ((A & qcolorMask) >> 2) +
+  uint32_t x = ((A & qcolorMask) >> 2) +
     ((B & qcolorMask) >> 2) +
     ((C & qcolorMask) >> 2) + ((D & qcolorMask) >> 2);
-  register uint32_t y = (A & qlowpixelMask) +
+  uint32_t y = (A & qlowpixelMask) +
     (B & qlowpixelMask) + (C & qlowpixelMask) + (D & qlowpixelMask);
 
   y = (y >> 2) & qlowpixelMask;
@@ -283,7 +283,7 @@ void Super2xSaI (uint8_t *srcPtr, uint32_t srcPitch,
           } else if (color5 == color3 && color2 != color6) {
             product2b = product1b = color5;
           } else if (color5 == color3 && color2 == color6) {
-            register int r = 0;
+            int r = 0;
 
             r += GetResult (color6, color5, color1, colorA1);
             r += GetResult (color6, color5, color4, colorB1);
@@ -415,7 +415,7 @@ void Super2xSaI32 (uint8_t *srcPtr, uint32_t srcPitch,
       } else if (color5 == color3 && color2 != color6) {
         product2b = product1b = color5;
       } else if (color5 == color3 && color2 == color6) {
-        register int r = 0;
+        int r = 0;
 
         r += GetResult (color6, color5, color1, colorA1);
         r += GetResult (color6, color5, color4, colorB1);
@@ -575,7 +575,7 @@ void SuperEagle (uint8_t *srcPtr, uint32_t srcPitch, uint8_t *deltaPtr,
           }
 
         } else if (color5 == color3 && color2 == color6) {
-          register int r = 0;
+          int r = 0;
 
           r += GetResult (color6, color5, color1, colorA1);
           r += GetResult (color6, color5, color4, colorB1);
@@ -710,7 +710,7 @@ void SuperEagle32 (uint8_t *srcPtr, uint32_t srcPitch, uint8_t *deltaPtr,
         }
 
       } else if (color5 == color3 && color2 == color6) {
-        register int r = 0;
+        int r = 0;
 
         r += GetResult (color6, color5, color1, colorA1);
         r += GetResult (color6, color5, color4, colorB1);
@@ -790,7 +790,7 @@ void _2xSaI (uint8_t *srcPtr, uint32_t srcPitch, uint8_t *deltaPtr,
 
       for (uint32_t finish = width; finish; finish -= inc_bP) {
 
-        register uint32_t colorA, colorB;
+        uint32_t colorA, colorB;
         uint32_t colorC, colorD,
           colorE, colorF, colorG, colorH,
           colorI, colorJ, colorK, colorL,
@@ -863,7 +863,7 @@ void _2xSaI (uint8_t *srcPtr, uint32_t srcPitch, uint8_t *deltaPtr,
             product1 = colorA;
             product2 = colorA;
           } else {
-            register int r = 0;
+            int r = 0;
 
             product1 = INTERPOLATE (colorA, colorC);
             product = INTERPOLATE (colorA, colorB);
@@ -950,7 +950,7 @@ void _2xSaI32 (uint8_t *srcPtr, uint32_t srcPitch, uint8_t * /* deltaPtr */,
     dP = (uint32_t *) dstPtr;
 
     for (uint32_t finish = width; finish; finish -= inc_bP) {
-      register uint32_t colorA, colorB;
+      uint32_t colorA, colorB;
       uint32_t colorC, colorD,
         colorE, colorF, colorG, colorH,
         colorI, colorJ, colorK, colorL,
@@ -1023,7 +1023,7 @@ void _2xSaI32 (uint8_t *srcPtr, uint32_t srcPitch, uint8_t * /* deltaPtr */,
           product1 = colorA;
           product2 = colorA;
         } else {
-          register int r = 0;
+          int r = 0;
 
           product1 = INTERPOLATE (colorA, colorC);
           product = INTERPOLATE (colorA, colorB);
diff --git a/src/filters/hq/c/hq_shared.h b/src/filters/hq/c/hq_shared.h
index b7122ac6..2b031cef 100644
--- a/src/filters/hq/c/hq_shared.h
+++ b/src/filters/hq/c/hq_shared.h
@@ -152,7 +152,7 @@ inline unsigned int RGBtoYUV_32(unsigned int c)
 {
         // Division through 3 slows down the emulation about 10% !!!
 
-        register unsigned char r, g, b;
+        unsigned char r, g, b;
         b = c & 0x0000FF;
         g = (c & 0x00FF00) >> 8;
         r = c >> 16;
@@ -254,7 +254,7 @@ inline unsigned int RGBtoYUV_16(unsigned short c)
 {
         // Division through 3 slows down the emulation about 10% !!!
 
-        register unsigned char r, g, b;
+        unsigned char r, g, b;
 #ifdef RGB555
         r = (c & 0x7C00) >> 7;
         g = (c & 0x03E0) >> 2;
diff --git a/src/filters/interframe.cpp b/src/filters/interframe.cpp
index c7e9d8ed..f255d748 100644
--- a/src/filters/interframe.cpp
+++ b/src/filters/interframe.cpp
@@ -20,7 +20,7 @@ static uint8_t *frm3 = NULL;
 
 extern uint32_t qRGB_COLOR_MASK[2];
 
-static void Init()
+void InterframeFilterInit()
 {
   frm1 = (uint8_t *)calloc(322*242,4);
   // 1 frame ago
@@ -163,8 +163,9 @@ static void SmartIB_MMX(uint8_t *srcPtr, uint32_t srcPitch, int width, int start
 
 void SmartIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
 {
+  (void)width; // unused param
   if(frm1 == NULL) {
-    Init();
+    InterframeFilterInit();
   }
 #ifdef MMX
   if(cpu_mmx) {
@@ -329,8 +330,9 @@ static void SmartIB32_MMX(uint8_t *srcPtr, uint32_t srcPitch, int width, int sta
 
 void SmartIB32(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
 {
+  (void)width; // unused param
   if(frm1 == NULL) {
-    Init();
+    InterframeFilterInit();
   }
 #ifdef MMX
   if(cpu_mmx) {
@@ -445,8 +447,9 @@ static void MotionBlurIB_MMX(uint8_t *srcPtr, uint32_t srcPitch, int width, int
 
 void MotionBlurIB(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
 {
+  (void)width; // unused param
   if(frm1 == NULL) {
-    Init();
+    InterframeFilterInit();
   }
 
 #ifdef MMX
@@ -550,8 +553,9 @@ static void MotionBlurIB32_MMX(uint8_t *srcPtr, uint32_t srcPitch, int width, in
 
 void MotionBlurIB32(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, int height)
 {
+  (void)width; // unused param
   if(frm1 == NULL) {
-    Init();
+    InterframeFilterInit();
   }
 
 #ifdef MMX
@@ -569,7 +573,7 @@ void MotionBlurIB32(uint8_t *srcPtr, uint32_t srcPitch, int width, int starty, i
   int sPitch = srcPitch >> 2;
   int pos = 0;
 
-  for (int j = 0; j < height;  j++)
+  for (int j = 0; j < height; j++)
     for (int i = 0; i < sPitch; i++) {
       uint32_t color = src0[pos];
       src0[pos] = (((color & colorMask) >> 1) +
diff --git a/src/filters/interframe.hpp b/src/filters/interframe.hpp
index 66c2d2f4..6a482866 100644
--- a/src/filters/interframe.hpp
+++ b/src/filters/interframe.hpp
@@ -5,7 +5,7 @@
 
 extern int RGB_LOW_BITS_MASK;
 
-static void Init();
+void InterframeFilterInit();
 
 // call ifc to ignore previous frame / when starting new
 void InterframeCleanup();
diff --git a/src/filters/xBRZ/config.h b/src/filters/xBRZ/config.h
index 8159e51b..07c5b69b 100644
--- a/src/filters/xBRZ/config.h
+++ b/src/filters/xBRZ/config.h
@@ -1,38 +1,38 @@
-// ****************************************************************************
-// * This file is part of the HqMAME project. It is distributed under         *
-// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved          *
-// *                                                                          *
-// * Additionally and as a special exception, the author gives permission     *
-// * to link the code of this program with the MAME library (or with modified *
-// * versions of MAME that use the same license as MAME), and distribute      *
-// * linked combinations including the two. You must obey the GNU General     *
-// * Public License in all respects for all of the code used other than MAME. *
-// * If you modify this file, you may extend this exception to your version   *
-// * of the file, but you are not obligated to do so. If you do not wish to   *
-// * do so, delete this exception statement from your version.                *
-// ****************************************************************************
-
-#ifndef XBRZ_CONFIG_HEADER_284578425345
-#define XBRZ_CONFIG_HEADER_284578425345
-
-// do NOT include any headers here! used by xBRZ_dll!!!
-
-namespace xbrz
-{
-struct ScalerCfg {
-        ScalerCfg()
-            : luminanceWeight(1), equalColorTolerance(30), dominantDirectionThreshold(3.6),
-              steepDirectionThreshold(2.2), newTestAttribute(0)
-        {
-        }
-
-        double luminanceWeight;
-        double equalColorTolerance;
-        double dominantDirectionThreshold;
-        double steepDirectionThreshold;
-        double newTestAttribute; // unused; test new parameters
-};
-}
-
+// ****************************************************************************
+// * This file is part of the HqMAME project. It is distributed under         *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved          *
+// *                                                                          *
+// * Additionally and as a special exception, the author gives permission     *
+// * to link the code of this program with the MAME library (or with modified *
+// * versions of MAME that use the same license as MAME), and distribute      *
+// * linked combinations including the two. You must obey the GNU General     *
+// * Public License in all respects for all of the code used other than MAME. *
+// * If you modify this file, you may extend this exception to your version   *
+// * of the file, but you are not obligated to do so. If you do not wish to   *
+// * do so, delete this exception statement from your version.                *
+// ****************************************************************************
+
+#ifndef XBRZ_CONFIG_HEADER_284578425345
+#define XBRZ_CONFIG_HEADER_284578425345
+
+// do NOT include any headers here! used by xBRZ_dll!!!
+
+namespace xbrz
+{
+struct ScalerCfg {
+        ScalerCfg()
+            : luminanceWeight(1), equalColorTolerance(30), dominantDirectionThreshold(3.6),
+              steepDirectionThreshold(2.2), newTestAttribute(0)
+        {
+        }
+
+        double luminanceWeight;
+        double equalColorTolerance;
+        double dominantDirectionThreshold;
+        double steepDirectionThreshold;
+        double newTestAttribute; // unused; test new parameters
+};
+}
+
 #endif
\ No newline at end of file
diff --git a/src/filters/xBRZ/xbrz.cpp b/src/filters/xBRZ/xbrz.cpp
index 7f15a3e0..7e73330a 100644
--- a/src/filters/xBRZ/xbrz.cpp
+++ b/src/filters/xBRZ/xbrz.cpp
@@ -1,1225 +1,1227 @@
-// ****************************************************************************
-// * This file is part of the HqMAME project. It is distributed under         *
-// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved          *
-// *                                                                          *
-// * Additionally and as a special exception, the author gives permission     *
-// * to link the code of this program with the MAME library (or with modified *
-// * versions of MAME that use the same license as MAME), and distribute      *
-// * linked combinations including the two. You must obey the GNU General     *
-// * Public License in all respects for all of the code used other than MAME. *
-// * If you modify this file, you may extend this exception to your version   *
-// * of the file, but you are not obligated to do so. If you do not wish to   *
-// * do so, delete this exception statement from your version.                *
-// ****************************************************************************
-
-#include "xbrz.h"
-#include <cassert>
-#include <cmath> // abs, pow, sqrt
-#include <algorithm>
-#include <vector>
-
-namespace
-{
-#ifdef _MSC_VER
-    #define FORCE_INLINE __forceinline
-#elif defined __GNUC__
-    #define FORCE_INLINE __attribute__((always_inline)) inline
-#else
-    #define FORCE_INLINE inline
-#endif
-
-
-template <uint32_t N> inline
-unsigned char getByte(uint32_t val) { return static_cast<unsigned char>((val >> (8 * N)) & 0xff); }
-
-inline unsigned char getAlpha(uint32_t pix) { return getByte<3>(pix); }
-inline unsigned char getRed  (uint32_t pix) { return getByte<2>(pix); }
-inline unsigned char getGreen(uint32_t pix) { return getByte<1>(pix); }
-inline unsigned char getBlue (uint32_t pix) { return getByte<0>(pix); }
-
-inline uint32_t makePixel(                 unsigned char r, unsigned char g, unsigned char b) { return             (r << 16) | (g << 8) | b; }
-inline uint32_t makePixel(unsigned char a, unsigned char r, unsigned char g, unsigned char b) { return (a << 24) | (r << 16) | (g << 8) | b; }
-
-
-template <unsigned int M, unsigned int N>
-FORCE_INLINE
-unsigned char calcColor(unsigned char colFront, unsigned char colBack)
-{
-    return (colFront * M + colBack * (N - M)) / N;
-}
-
-template <unsigned int M, unsigned int N> inline
-uint32_t gradientRGB(uint32_t pixFront, uint32_t pixBack) //blend front color with opacity M / N over opaque background: http://en.wikipedia.org/wiki/Alpha_compositing#Alpha_blending
-{
-    //~ static_assert(0 < M && M < N && N <= 1000, "");
-
-    return makePixel(calcColor<M, N>(getRed  (pixFront), getRed  (pixBack)),
-                     calcColor<M, N>(getGreen(pixFront), getGreen(pixBack)),
-                     calcColor<M, N>(getBlue (pixFront), getBlue (pixBack)));
-}
-
-FORCE_INLINE
-unsigned char calcColor(unsigned char colFront, unsigned char colBack, const unsigned int weightFront, const unsigned int weightBack, const unsigned int weightSum)
-{
-    return static_cast<unsigned char>((colFront * weightFront + colBack * weightBack) / weightSum);
-}
-
-template <unsigned int M, unsigned int N> inline
-uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate color between two colors with alpha channels (=> NO alpha blending!!!)
-{
-    //~ static_assert(0 < M && M < N && N <= 1000, "");
-
-    const unsigned int weightFront = getAlpha(pixFront) * M;
-    const unsigned int weightBack  = getAlpha(pixBack) * (N - M);
-    const unsigned int weightSum   = weightFront + weightBack;
-    if (weightSum == 0)
-        return 0;
-
-    return makePixel(static_cast<unsigned char>(weightSum / N),
-                     calcColor(getRed  (pixFront), getRed  (pixBack), weightFront, weightBack, weightSum),
-                     calcColor(getGreen(pixFront), getGreen(pixBack), weightFront, weightBack, weightSum),
-                     calcColor(getBlue (pixFront), getBlue (pixBack), weightFront, weightBack, weightSum));
-}
-
-
-//inline
-//double fastSqrt(double n)
-//{
-//    __asm //speeds up xBRZ by about 9% compared to std::sqrt which internally uses the same assembler instructions but adds some "fluff"
-//    {
-//        fld n
-//        fsqrt
-//    }
-//}
-//
-
-
-uint32_t*       byteAdvance(      uint32_t* ptr, int bytes) { return reinterpret_cast<      uint32_t*>(reinterpret_cast<      char*>(ptr) + bytes); }
-const uint32_t* byteAdvance(const uint32_t* ptr, int bytes) { return reinterpret_cast<const uint32_t*>(reinterpret_cast<const char*>(ptr) + bytes); }
-
-
-//fill block  with the given color
-inline
-void fillBlock(uint32_t* trg, int pitch, uint32_t col, int blockWidth, int blockHeight)
-{
-    //for (int y = 0; y < blockHeight; ++y, trg = byteAdvance(trg, pitch))
-    //    std::fill(trg, trg + blockWidth, col);
-
-    for (int y = 0; y < blockHeight; ++y, trg = byteAdvance(trg, pitch))
-        for (int x = 0; x < blockWidth; ++x)
-            trg[x] = col;
-}
-
-inline
-void fillBlock(uint32_t* trg, int pitch, uint32_t col, int n) { fillBlock(trg, pitch, col, n, n); }
-
-
-enum RotationDegree //clock-wise
-{
-    ROT_0,
-    ROT_90,
-    ROT_180,
-    ROT_270
-};
-
-//calculate input matrix coordinates after rotation at compile time
-template <RotationDegree rotDeg, size_t I, size_t J, size_t N>
-struct MatrixRotation;
-
-template <size_t I, size_t J, size_t N>
-struct MatrixRotation<ROT_0, I, J, N>
-{
-    static const size_t I_old = I;
-    static const size_t J_old = J;
-};
-
-template <RotationDegree rotDeg, size_t I, size_t J, size_t N> //(i, j) = (row, col) indices, N = size of (square) matrix
-struct MatrixRotation
-{
-    static const size_t I_old = N - 1 - MatrixRotation<static_cast<RotationDegree>(rotDeg - 1), I, J, N>::J_old; //old coordinates before rotation!
-    static const size_t J_old =         MatrixRotation<static_cast<RotationDegree>(rotDeg - 1), I, J, N>::I_old; //
-};
-
-
-template <size_t N, RotationDegree rotDeg>
-class OutputMatrix
-{
-public:
-    OutputMatrix(uint32_t* out, int outWidth) : //access matrix area, top-left at position "out" for image with given width
-        out_(out),
-        outWidth_(outWidth) {}
-
-    template <size_t I, size_t J>
-    uint32_t& ref() const
-    {
-        static const size_t I_old = MatrixRotation<rotDeg, I, J, N>::I_old;
-        static const size_t J_old = MatrixRotation<rotDeg, I, J, N>::J_old;
-        return *(out_ + J_old + I_old * outWidth_);
-    }
-
-private:
-    uint32_t* out_;
-    const int outWidth_;
-};
-
-
-template <class T> inline
-T square(T value) { return value * value; }
-
-
-
-inline
-double distRGB(uint32_t pix1, uint32_t pix2)
-{
-    const double r_diff = static_cast<int>(getRed  (pix1)) - getRed  (pix2);
-    const double g_diff = static_cast<int>(getGreen(pix1)) - getGreen(pix2);
-    const double b_diff = static_cast<int>(getBlue (pix1)) - getBlue (pix2);
-
-    //euklidean RGB distance
-    return std::sqrt(square(r_diff) + square(g_diff) + square(b_diff));
-}
-
-
-inline
-double distYCbCr(uint32_t pix1, uint32_t pix2, double lumaWeight)
-{
-    //http://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion
-    //YCbCr conversion is a matrix multiplication => take advantage of linearity by subtracting first!
-    const int r_diff = static_cast<int>(getRed  (pix1)) - getRed  (pix2); //we may delay division by 255 to after matrix multiplication
-    const int g_diff = static_cast<int>(getGreen(pix1)) - getGreen(pix2); //
-    const int b_diff = static_cast<int>(getBlue (pix1)) - getBlue (pix2); //substraction for int is noticeable faster than for double!
-
-    //const double k_b = 0.0722; //ITU-R BT.709 conversion
-    //const double k_r = 0.2126; //
-    const double k_b = 0.0593; //ITU-R BT.2020 conversion
-    const double k_r = 0.2627; //
-    const double k_g = 1 - k_b - k_r;
-
-    const double scale_b = 0.5 / (1 - k_b);
-    const double scale_r = 0.5 / (1 - k_r);
-
-    const double y   = k_r * r_diff + k_g * g_diff + k_b * b_diff; //[!], analog YCbCr!
-    const double c_b = scale_b * (b_diff - y);
-    const double c_r = scale_r * (r_diff - y);
-
-    //we skip division by 255 to have similar range like other distance functions
-    return std::sqrt(square(lumaWeight * y) + square(c_b) + square(c_r));
-}
-
-
-struct DistYCbCrBuffer //30% perf boost compared to distYCbCr()!
-{
-public:
-    DistYCbCrBuffer() : buffer(256 * 256 * 256)
-    {
-        for (uint32_t i = 0; i < 256 * 256 * 256; ++i) //startup time: 114 ms on Intel Core i5 (four cores)
-        {
-            const int r_diff = getByte<2>(i) * 2 - 255;
-            const int g_diff = getByte<1>(i) * 2 - 255;
-            const int b_diff = getByte<0>(i) * 2 - 255;
-
-            const double k_b = 0.0593; //ITU-R BT.2020 conversion
-            const double k_r = 0.2627; //
-            const double k_g = 1 - k_b - k_r;
-
-            const double scale_b = 0.5 / (1 - k_b);
-            const double scale_r = 0.5 / (1 - k_r);
-
-            const double y   = k_r * r_diff + k_g * g_diff + k_b * b_diff; //[!], analog YCbCr!
-            const double c_b = scale_b * (b_diff - y);
-            const double c_r = scale_r * (r_diff - y);
-
-            buffer[i] = static_cast<float>(std::sqrt(square(y) + square(c_b) + square(c_r)));
-        }
-    }
-
-    double dist(uint32_t pix1, uint32_t pix2) const
-    {
-        //if (pix1 == pix2) -> 8% perf degradation!
-        //    return 0;
-        //if (pix1 > pix2)
-        //	  std::swap(pix1, pix2); -> 30% perf degradation!!!
-
-        const int r_diff = static_cast<int>(getRed  (pix1)) - getRed  (pix2);
-        const int g_diff = static_cast<int>(getGreen(pix1)) - getGreen(pix2);
-        const int b_diff = static_cast<int>(getBlue (pix1)) - getBlue (pix2);
-
-        return buffer[(((r_diff + 255) / 2) << 16) | //slightly reduce precision (division by 2) to squeeze value into single byte
-                      (((g_diff + 255) / 2) <<  8) |
-                      (( b_diff + 255) / 2)];
-    }
-
-private:
-    std::vector<float> buffer; //consumes 64 MB memory; using double is 2% faster, but takes 128 MB
-} distYCbCrBuffer;
-
-
-enum BlendType
-{
-    BLEND_NONE = 0,
-    BLEND_NORMAL,   //a normal indication to blend
-    BLEND_DOMINANT, //a strong indication to blend
-    //attention: BlendType must fit into the value range of 2 bit!!!
-};
-
-struct BlendResult
-{
-    BlendType
-    /**/blend_f, blend_g,
-    /**/blend_j, blend_k;
-};
-
-
-struct Kernel_4x4 //kernel for preprocessing step
-{
-    uint32_t
-    /**/a, b, c, d,
-    /**/e, f, g, h,
-    /**/i, j, k, l,
-    /**/m, n, o, p;
-};
-
-template <class ColorDistance>
-FORCE_INLINE
-double dist(uint32_t pix1, uint32_t pix2, const xbrz::ScalerCfg& cfg)
-{
-    return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight);
-}
-
-template <class ColorDistance>
-FORCE_INLINE
-bool eq(uint32_t pix1, uint32_t pix2, const xbrz::ScalerCfg& cfg)
-{
-    return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight) < cfg.equalColorTolerance;
-}
-
-/*
-input kernel area naming convention:
------------------
-| A | B | C | D |
-----|---|---|---|
-| E | F | G | H |   //evaluate the four corners between F, G, J, K
-----|---|---|---|   //input pixel is at position F
-| I | J | K | L |
-----|---|---|---|
-| M | N | O | P |
------------------
-*/
-template <class ColorDistance>
-FORCE_INLINE //detect blend direction
-BlendResult preProcessCorners(const Kernel_4x4& ker, const xbrz::ScalerCfg& cfg) //result: F, G, J, K corners of "GradientType"
-{
-    BlendResult result = {};
-
-    if ((ker.f == ker.g &&
-         ker.j == ker.k) ||
-        (ker.f == ker.j &&
-         ker.g == ker.k))
-        return result;
-
-    const int weight = 4;
-    double jg = dist<ColorDistance>(ker.i, ker.f, cfg) + dist<ColorDistance>(ker.f, ker.c, cfg) + dist<ColorDistance>(ker.n, ker.k, cfg) + dist<ColorDistance>(ker.k, ker.h, cfg) + weight * dist<ColorDistance>(ker.j, ker.g, cfg);
-    double fk = dist<ColorDistance>(ker.e, ker.j, cfg) + dist<ColorDistance>(ker.j, ker.o, cfg) + dist<ColorDistance>(ker.b, ker.g, cfg) + dist<ColorDistance>(ker.g, ker.l, cfg) + weight * dist<ColorDistance>(ker.f, ker.k, cfg);
-
-    if (jg < fk) //test sample: 70% of values max(jg, fk) / min(jg, fk) are between 1.1 and 3.7 with median being 1.8
-    {
-        const bool dominantGradient = cfg.dominantDirectionThreshold * jg < fk;
-        if (ker.f != ker.g && ker.f != ker.j)
-            result.blend_f = dominantGradient ? BLEND_DOMINANT : BLEND_NORMAL;
-
-        if (ker.k != ker.j && ker.k != ker.g)
-            result.blend_k = dominantGradient ? BLEND_DOMINANT : BLEND_NORMAL;
-    }
-    else if (fk < jg)
-    {
-        const bool dominantGradient = cfg.dominantDirectionThreshold * fk < jg;
-        if (ker.j != ker.f && ker.j != ker.k)
-            result.blend_j = dominantGradient ? BLEND_DOMINANT : BLEND_NORMAL;
-
-        if (ker.g != ker.f && ker.g != ker.k)
-            result.blend_g = dominantGradient ? BLEND_DOMINANT : BLEND_NORMAL;
-    }
-    return result;
-}
-
-struct Kernel_3x3
-{
-    uint32_t
-    /**/a,  b,  c,
-    /**/d,  e,  f,
-    /**/g,  h,  i;
-};
-
-#define DEF_GETTER(x) template <RotationDegree rotDeg> uint32_t inline get_##x(const Kernel_3x3& ker) { return ker.x; }
-//we cannot and NEED NOT write "ker.##x" since ## concatenates preprocessor tokens but "." is not a token
-DEF_GETTER(a) DEF_GETTER(b) DEF_GETTER(c)
-DEF_GETTER(d) DEF_GETTER(e) DEF_GETTER(f)
-DEF_GETTER(g) DEF_GETTER(h) DEF_GETTER(i)
-#undef DEF_GETTER
-
-#define DEF_GETTER(x, y) template <> inline uint32_t get_##x<ROT_90>(const Kernel_3x3& ker) { return ker.y; }
-DEF_GETTER(a, g) DEF_GETTER(b, d) DEF_GETTER(c, a)
-DEF_GETTER(d, h) DEF_GETTER(e, e) DEF_GETTER(f, b)
-DEF_GETTER(g, i) DEF_GETTER(h, f) DEF_GETTER(i, c)
-#undef DEF_GETTER
-
-#define DEF_GETTER(x, y) template <> inline uint32_t get_##x<ROT_180>(const Kernel_3x3& ker) { return ker.y; }
-DEF_GETTER(a, i) DEF_GETTER(b, h) DEF_GETTER(c, g)
-DEF_GETTER(d, f) DEF_GETTER(e, e) DEF_GETTER(f, d)
-DEF_GETTER(g, c) DEF_GETTER(h, b) DEF_GETTER(i, a)
-#undef DEF_GETTER
-
-#define DEF_GETTER(x, y) template <> inline uint32_t get_##x<ROT_270>(const Kernel_3x3& ker) { return ker.y; }
-DEF_GETTER(a, c) DEF_GETTER(b, f) DEF_GETTER(c, i)
-DEF_GETTER(d, b) DEF_GETTER(e, e) DEF_GETTER(f, h)
-DEF_GETTER(g, a) DEF_GETTER(h, d) DEF_GETTER(i,	g)
-#undef DEF_GETTER
-
-
-//compress four blend types into a single byte
-inline BlendType getTopL   (unsigned char b) { return static_cast<BlendType>(0x3 & b); }
-inline BlendType getTopR   (unsigned char b) { return static_cast<BlendType>(0x3 & (b >> 2)); }
-inline BlendType getBottomR(unsigned char b) { return static_cast<BlendType>(0x3 & (b >> 4)); }
-inline BlendType getBottomL(unsigned char b) { return static_cast<BlendType>(0x3 & (b >> 6)); }
-
-inline void setTopL   (unsigned char& b, BlendType bt) { b |= bt; } //buffer is assumed to be initialized before preprocessing!
-inline void setTopR   (unsigned char& b, BlendType bt) { b |= (bt << 2); }
-inline void setBottomR(unsigned char& b, BlendType bt) { b |= (bt << 4); }
-inline void setBottomL(unsigned char& b, BlendType bt) { b |= (bt << 6); }
-
-inline bool blendingNeeded(unsigned char b) { return b != 0; }
-
-template <RotationDegree rotDeg> inline
-unsigned char rotateBlendInfo(unsigned char b) { return b; }
-template <> inline unsigned char rotateBlendInfo<ROT_90 >(unsigned char b) { return ((b << 2) | (b >> 6)) & 0xff; }
-template <> inline unsigned char rotateBlendInfo<ROT_180>(unsigned char b) { return ((b << 4) | (b >> 4)) & 0xff; }
-template <> inline unsigned char rotateBlendInfo<ROT_270>(unsigned char b) { return ((b << 6) | (b >> 2)) & 0xff; }
-
-
-#ifndef NDEBUG
-#ifdef _MSC_VER
-    int debugPixelX = -1;
-    int debugPixelY = 12;
-    __declspec(thread) bool breakIntoDebugger = false;
-#endif
-#endif
-
-
-/*
-input kernel area naming convention:
--------------
-| A | B | C |
-----|---|---|
-| D | E | F | //input pixel is at position E
-----|---|---|
-| G | H | I |
--------------
-*/
-template <class Scaler, class ColorDistance, RotationDegree rotDeg>
-FORCE_INLINE //perf: quite worth it!
-void blendPixel(const Kernel_3x3& ker,
-                uint32_t* target, int trgWidth,
-                unsigned char blendInfo, //result of preprocessing all four corners of pixel "e"
-                const xbrz::ScalerCfg& cfg)
-{
-#define a get_a<rotDeg>(ker)
-#define b get_b<rotDeg>(ker)
-#define c get_c<rotDeg>(ker)
-#define d get_d<rotDeg>(ker)
-#define e get_e<rotDeg>(ker)
-#define f get_f<rotDeg>(ker)
-#define g get_g<rotDeg>(ker)
-#define h get_h<rotDeg>(ker)
-#define i get_i<rotDeg>(ker)
-
-#ifndef NDEBUG
-#ifdef _MSC_VER
-    if (breakIntoDebugger)
-        __debugbreak(); //__asm int 3;
-#endif
-#endif
-
-    const unsigned char blend = rotateBlendInfo<rotDeg>(blendInfo);
-
-    if (getBottomR(blend) >= BLEND_NORMAL)
-    {
-        bool doLineBlend = (getBottomR(blend) >= BLEND_DOMINANT) || !(
-            //make sure there is no second blending in an adjacent rotation for this pixel: handles insular pixels, mario eyes
-            (getTopR(blend) != BLEND_NONE && !eq<ColorDistance>(e, g, cfg)) || //but support double-blending for 90° corners
-            (getBottomL(blend) != BLEND_NONE && !eq<ColorDistance>(e, c, cfg)) ||
-            //no full blending for L-shapes; blend corner only (handles "mario mushroom eyes")
-            (!eq<ColorDistance>(e, i, cfg) && eq<ColorDistance>(g, h, cfg) &&  eq<ColorDistance>(h , i, cfg) && eq<ColorDistance>(i, f, cfg) && eq<ColorDistance>(f, c, cfg))
-        );
-
-        const uint32_t px = dist<ColorDistance>(e, f, cfg) <= dist<ColorDistance>(e, h, cfg) ? f : h; //choose most similar color
-
-        OutputMatrix<Scaler::scale, rotDeg> out(target, trgWidth);
-
-        if (doLineBlend)
-        {
-            const double fg = dist<ColorDistance>(f, g, cfg); //test sample: 70% of values max(fg, hc) / min(fg, hc) are between 1.1 and 3.7 with median being 1.9
-            const double hc = dist<ColorDistance>(h, c, cfg); //
-
-            const bool haveShallowLine = cfg.steepDirectionThreshold * fg <= hc && e != g && d != g;
-            const bool haveSteepLine   = cfg.steepDirectionThreshold * hc <= fg && e != c && b != c;
-
-            if (haveShallowLine)
-            {
-                if (haveSteepLine)
-                    Scaler::blendLineSteepAndShallow(px, out);
-                else
-                    Scaler::blendLineShallow(px, out);
-            }
-            else
-            {
-                if (haveSteepLine)
-                    Scaler::blendLineSteep(px, out);
-                else
-                    Scaler::blendLineDiagonal(px,out);
-            }
-        }
-        else
-            Scaler::blendCorner(px, out);
-    }
-
-#undef a
-#undef b
-#undef c
-#undef d
-#undef e
-#undef f
-#undef g
-#undef h
-#undef i
-}
-
-
-template <class Scaler, class ColorDistance> //scaler policy: see "Scaler2x" reference implementation
-void scaleImage(const uint32_t* src, int srcWidth, int srcHeight, int srcPitch, uint32_t* trg, int trgWidth, const xbrz::ScalerCfg& cfg, int yFirst, int yLast)
-{
-    yFirst = std::max(yFirst, 0);
-    yLast  = std::min(yLast, srcHeight);
-    if (yFirst >= yLast || srcWidth <= 0)
-        return;
-
-    //"use" space at the end of the image as temporary buffer for "on the fly preprocessing": we even could use larger area of
-    //"sizeof(uint32_t) * srcWidth * (yLast - yFirst)" bytes without risk of accidental overwriting before accessing
-    const int bufferSize = srcWidth;
-    unsigned char* preProcBuffer = reinterpret_cast<unsigned char*>(trg + yLast * Scaler::scale * trgWidth) - bufferSize;
-    std::fill(preProcBuffer, preProcBuffer + bufferSize, 0);
-    //~ static_assert(BLEND_NONE == 0, "");
-
-    //initialize preprocessing buffer for first row of current stripe: detect upper left and right corner blending
-    //this cannot be optimized for adjacent processing stripes; we must not allow for a memory race condition!
-    if (yFirst > 0)
-    {
-        const int y = yFirst - 1;
-
-        const uint32_t* s_m1 = src + srcPitch * std::max(y - 1, 0);
-        const uint32_t* s_0  = src + srcPitch * y; //center line
-        const uint32_t* s_p1 = src + srcPitch * std::min(y + 1, srcHeight - 1);
-        const uint32_t* s_p2 = src + srcPitch * std::min(y + 2, srcHeight - 1);
-
-        for (int x = 0; x < srcWidth; ++x)
-        {
-            const int x_m1 = std::max(x - 1, 0);
-            const int x_p1 = std::min(x + 1, srcWidth - 1);
-            const int x_p2 = std::min(x + 2, srcWidth - 1);
-
-            Kernel_4x4 ker = {}; //perf: initialization is negligible
-            ker.a = s_m1[x_m1]; //read sequentially from memory as far as possible
-            ker.b = s_m1[x];
-            ker.c = s_m1[x_p1];
-            ker.d = s_m1[x_p2];
-
-            ker.e = s_0[x_m1];
-            ker.f = s_0[x];
-            ker.g = s_0[x_p1];
-            ker.h = s_0[x_p2];
-
-            ker.i = s_p1[x_m1];
-            ker.j = s_p1[x];
-            ker.k = s_p1[x_p1];
-            ker.l = s_p1[x_p2];
-
-            ker.m = s_p2[x_m1];
-            ker.n = s_p2[x];
-            ker.o = s_p2[x_p1];
-            ker.p = s_p2[x_p2];
-
-            const BlendResult res = preProcessCorners<ColorDistance>(ker, cfg);
-            /*
-            preprocessing blend result:
-            ---------
-            | F | G |   //evalute corner between F, G, J, K
-            ----|---|   //input pixel is at position F
-            | J | K |
-            ---------
-            */
-            setTopR(preProcBuffer[x], res.blend_j);
-
-            if (x + 1 < bufferSize)
-                setTopL(preProcBuffer[x + 1], res.blend_k);
-        }
-    }
-    //------------------------------------------------------------------------------------
-
-    for (int y = yFirst; y < yLast; ++y)
-    {
-        uint32_t* out = trg + Scaler::scale * y * trgWidth; //consider MT "striped" access
-
-        const uint32_t* s_m1 = src + srcPitch * std::max(y - 1, 0);
-        const uint32_t* s_0  = src + srcPitch * y; //center line
-        const uint32_t* s_p1 = src + srcPitch * std::min(y + 1, srcHeight - 1);
-        const uint32_t* s_p2 = src + srcPitch * std::min(y + 2, srcHeight - 1);
-
-        unsigned char blend_xy1 = 0; //corner blending for current (x, y + 1) position
-
-        for (int x = 0; x < srcWidth; ++x, out += Scaler::scale)
-        {
-#ifndef NDEBUG
-#ifdef _MSC_VER
-            breakIntoDebugger = debugPixelX == x && debugPixelY == y;
-#endif
-#endif
-            //all those bounds checks have only insignificant impact on performance!
-            const int x_m1 = std::max(x - 1, 0); //perf: prefer array indexing to additional pointers!
-            const int x_p1 = std::min(x + 1, srcWidth - 1);
-            const int x_p2 = std::min(x + 2, srcWidth - 1);
-
-            Kernel_4x4 ker4 = {}; //perf: initialization is negligible
-
-            ker4.a = s_m1[x_m1]; //read sequentially from memory as far as possible
-            ker4.b = s_m1[x];
-            ker4.c = s_m1[x_p1];
-            ker4.d = s_m1[x_p2];
-
-            ker4.e = s_0[x_m1];
-            ker4.f = s_0[x];
-            ker4.g = s_0[x_p1];
-            ker4.h = s_0[x_p2];
-
-            ker4.i = s_p1[x_m1];
-            ker4.j = s_p1[x];
-            ker4.k = s_p1[x_p1];
-            ker4.l = s_p1[x_p2];
-
-            ker4.m = s_p2[x_m1];
-            ker4.n = s_p2[x];
-            ker4.o = s_p2[x_p1];
-            ker4.p = s_p2[x_p2];
-
-            //evaluate the four corners on bottom-right of current pixel
-            unsigned char blend_xy = 0; //for current (x, y) position
-            {
-                const BlendResult res = preProcessCorners<ColorDistance>(ker4, cfg);
-                /*
-                preprocessing blend result:
-                ---------
-                | F | G |   //evalute corner between F, G, J, K
-                ----|---|   //current input pixel is at position F
-                | J | K |
-                ---------
-                */
-                blend_xy = preProcBuffer[x];
-                setBottomR(blend_xy, res.blend_f); //all four corners of (x, y) have been determined at this point due to processing sequence!
-
-                setTopR(blend_xy1, res.blend_j); //set 2nd known corner for (x, y + 1)
-                preProcBuffer[x] = blend_xy1; //store on current buffer position for use on next row
-
-                blend_xy1 = 0;
-                setTopL(blend_xy1, res.blend_k); //set 1st known corner for (x + 1, y + 1) and buffer for use on next column
-
-                if (x + 1 < bufferSize) //set 3rd known corner for (x + 1, y)
-                    setBottomL(preProcBuffer[x + 1], res.blend_g);
-            }
-
-            //fill block of size scale * scale with the given color
-            fillBlock(out, trgWidth * sizeof(uint32_t), ker4.f, Scaler::scale); //place *after* preprocessing step, to not overwrite the results while processing the the last pixel!
-
-            //blend four corners of current pixel
-            if (blendingNeeded(blend_xy)) //good 5% perf-improvement
-            {
-                Kernel_3x3 ker3 = {}; //perf: initialization is negligible
-
-                ker3.a = ker4.a;
-                ker3.b = ker4.b;
-                ker3.c = ker4.c;
-
-                ker3.d = ker4.e;
-                ker3.e = ker4.f;
-                ker3.f = ker4.g;
-
-                ker3.g = ker4.i;
-                ker3.h = ker4.j;
-                ker3.i = ker4.k;
-
-                blendPixel<Scaler, ColorDistance, ROT_0  >(ker3, out, trgWidth, blend_xy, cfg);
-                blendPixel<Scaler, ColorDistance, ROT_90 >(ker3, out, trgWidth, blend_xy, cfg);
-                blendPixel<Scaler, ColorDistance, ROT_180>(ker3, out, trgWidth, blend_xy, cfg);
-                blendPixel<Scaler, ColorDistance, ROT_270>(ker3, out, trgWidth, blend_xy, cfg);
-            }
-        }
-    }
-}
-
-//------------------------------------------------------------------------------------
-
-template <class ColorGradient>
-struct Scaler2x : public ColorGradient
-{
-    static const int scale = 2;
-
-    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
-    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
-
-
-    template <class OutputMatrix>
-    static void blendLineShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
-        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteep(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
-        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<1, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<0, 1>(), col);
-        alphaGrad<5, 6>(out.template ref<1, 1>(), col); //[!] fixes 7/8 used in xBR
-    }
-
-    template <class OutputMatrix>
-    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 2>(out.template ref<1, 1>(), col);
-    }
-
-    template <class OutputMatrix>
-    static void blendCorner(uint32_t col, OutputMatrix& out)
-    {
-        //model a round corner
-        alphaGrad<21, 100>(out.template ref<1, 1>(), col); //exact: 1 - pi/4 = 0.2146018366
-    }
-};
-
-
-template <class ColorGradient>
-struct Scaler3x : public ColorGradient
-{
-    static const int scale = 3;
-
-    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
-    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
-
-
-    template <class OutputMatrix>
-    static void blendLineShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
-
-        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
-        out.template ref<scale - 1, 2>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteep(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
-        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
-
-        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
-        out.template ref<2, scale - 1>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<2, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<0, 2>(), col);
-        alphaGrad<3, 4>(out.template ref<2, 1>(), col);
-        alphaGrad<3, 4>(out.template ref<1, 2>(), col);
-        out.template ref<2, 2>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 8>(out.template ref<1, 2>(), col); //conflict with other rotations for this odd scale
-        alphaGrad<1, 8>(out.template ref<2, 1>(), col);
-        alphaGrad<7, 8>(out.template ref<2, 2>(), col); //
-    }
-
-    template <class OutputMatrix>
-    static void blendCorner(uint32_t col, OutputMatrix& out)
-    {
-        //model a round corner
-        alphaGrad<45, 100>(out.template ref<2, 2>(), col); //exact: 0.4545939598
-        //alphaGrad<7, 256>(out.template ref<2, 1>(), col); //0.02826017254 -> negligible + avoid conflicts with other rotations for this odd scale
-        //alphaGrad<7, 256>(out.template ref<1, 2>(), col); //0.02826017254
-    }
-};
-
-
-template <class ColorGradient>
-struct Scaler4x : public ColorGradient
-{
-    static const int scale = 4;
-
-    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
-    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
-
-
-    template <class OutputMatrix>
-    static void blendLineShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
-
-        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
-        alphaGrad<3, 4>(out.template ref<scale - 2, 3>(), col);
-
-        out.template ref<scale - 1, 2>() = col;
-        out.template ref<scale - 1, 3>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteep(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
-        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
-
-        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
-        alphaGrad<3, 4>(out.template ref<3, scale - 2>(), col);
-
-        out.template ref<2, scale - 1>() = col;
-        out.template ref<3, scale - 1>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<3, 4>(out.template ref<3, 1>(), col);
-        alphaGrad<3, 4>(out.template ref<1, 3>(), col);
-        alphaGrad<1, 4>(out.template ref<3, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<0, 3>(), col);
-
-        alphaGrad<1, 3>(out.template ref<2, 2>(), col); //[!] fixes 1/4 used in xBR
-
-        out.template ref<3, 3>() = col;
-        out.template ref<3, 2>() = col;
-        out.template ref<2, 3>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 2>(out.template ref<scale - 1, scale / 2    >(), col);
-        alphaGrad<1, 2>(out.template ref<scale - 2, scale / 2 + 1>(), col);
-        out.template ref<scale - 1, scale - 1>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendCorner(uint32_t col, OutputMatrix& out)
-    {
-        //model a round corner
-        alphaGrad<68, 100>(out.template ref<3, 3>(), col); //exact: 0.6848532563
-        alphaGrad< 9, 100>(out.template ref<3, 2>(), col); //0.08677704501
-        alphaGrad< 9, 100>(out.template ref<2, 3>(), col); //0.08677704501
-    }
-};
-
-
-template <class ColorGradient>
-struct Scaler5x : public ColorGradient
-{
-    static const int scale = 5;
-
-    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
-    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
-
-
-    template <class OutputMatrix>
-    static void blendLineShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
-        alphaGrad<1, 4>(out.template ref<scale - 3, 4>(), col);
-
-        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
-        alphaGrad<3, 4>(out.template ref<scale - 2, 3>(), col);
-
-        out.template ref<scale - 1, 2>() = col;
-        out.template ref<scale - 1, 3>() = col;
-        out.template ref<scale - 1, 4>() = col;
-        out.template ref<scale - 2, 4>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteep(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
-        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
-        alphaGrad<1, 4>(out.template ref<4, scale - 3>(), col);
-
-        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
-        alphaGrad<3, 4>(out.template ref<3, scale - 2>(), col);
-
-        out.template ref<2, scale - 1>() = col;
-        out.template ref<3, scale - 1>() = col;
-        out.template ref<4, scale - 1>() = col;
-        out.template ref<4, scale - 2>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
-        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
-        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
-
-        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
-        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
-
-        alphaGrad<2, 3>(out.template ref<3, 3>(), col);
-
-        out.template ref<2, scale - 1>() = col;
-        out.template ref<3, scale - 1>() = col;
-        out.template ref<4, scale - 1>() = col;
-
-        out.template ref<scale - 1, 2>() = col;
-        out.template ref<scale - 1, 3>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 8>(out.template ref<scale - 1, scale / 2    >(), col); //conflict with other rotations for this odd scale
-        alphaGrad<1, 8>(out.template ref<scale - 2, scale / 2 + 1>(), col);
-        alphaGrad<1, 8>(out.template ref<scale - 3, scale / 2 + 2>(), col); //
-
-        alphaGrad<7, 8>(out.template ref<4, 3>(), col);
-        alphaGrad<7, 8>(out.template ref<3, 4>(), col);
-
-        out.template ref<4, 4>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendCorner(uint32_t col, OutputMatrix& out)
-    {
-        //model a round corner
-        alphaGrad<86, 100>(out.template ref<4, 4>(), col); //exact: 0.8631434088
-        alphaGrad<23, 100>(out.template ref<4, 3>(), col); //0.2306749731
-        alphaGrad<23, 100>(out.template ref<3, 4>(), col); //0.2306749731
-        //alphaGrad<1, 64>(out.template ref<4, 2>(), col); //0.01676812367 -> negligible + avoid conflicts with other rotations for this odd scale
-        //alphaGrad<1, 64>(out.template ref<2, 4>(), col); //0.01676812367
-    }
-};
-
-
-template <class ColorGradient>
-struct Scaler6x : public ColorGradient
-{
-    static const int scale = 6;
-
-    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
-    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
-
-
-    template <class OutputMatrix>
-    static void blendLineShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
-        alphaGrad<1, 4>(out.template ref<scale - 3, 4>(), col);
-
-        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
-        alphaGrad<3, 4>(out.template ref<scale - 2, 3>(), col);
-        alphaGrad<3, 4>(out.template ref<scale - 3, 5>(), col);
-
-        out.template ref<scale - 1, 2>() = col;
-        out.template ref<scale - 1, 3>() = col;
-        out.template ref<scale - 1, 4>() = col;
-        out.template ref<scale - 1, 5>() = col;
-
-        out.template ref<scale - 2, 4>() = col;
-        out.template ref<scale - 2, 5>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteep(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
-        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
-        alphaGrad<1, 4>(out.template ref<4, scale - 3>(), col);
-
-        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
-        alphaGrad<3, 4>(out.template ref<3, scale - 2>(), col);
-        alphaGrad<3, 4>(out.template ref<5, scale - 3>(), col);
-
-        out.template ref<2, scale - 1>() = col;
-        out.template ref<3, scale - 1>() = col;
-        out.template ref<4, scale - 1>() = col;
-        out.template ref<5, scale - 1>() = col;
-
-        out.template ref<4, scale - 2>() = col;
-        out.template ref<5, scale - 2>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
-        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
-        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
-        alphaGrad<3, 4>(out.template ref<3, scale - 2>(), col);
-
-        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
-        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
-        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
-        alphaGrad<3, 4>(out.template ref<scale - 2, 3>(), col);
-
-        out.template ref<2, scale - 1>() = col;
-        out.template ref<3, scale - 1>() = col;
-        out.template ref<4, scale - 1>() = col;
-        out.template ref<5, scale - 1>() = col;
-
-        out.template ref<4, scale - 2>() = col;
-        out.template ref<5, scale - 2>() = col;
-
-        out.template ref<scale - 1, 2>() = col;
-        out.template ref<scale - 1, 3>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
-    {
-        alphaGrad<1, 2>(out.template ref<scale - 1, scale / 2    >(), col);
-        alphaGrad<1, 2>(out.template ref<scale - 2, scale / 2 + 1>(), col);
-        alphaGrad<1, 2>(out.template ref<scale - 3, scale / 2 + 2>(), col);
-
-        out.template ref<scale - 2, scale - 1>() = col;
-        out.template ref<scale - 1, scale - 1>() = col;
-        out.template ref<scale - 1, scale - 2>() = col;
-    }
-
-    template <class OutputMatrix>
-    static void blendCorner(uint32_t col, OutputMatrix& out)
-    {
-        //model a round corner
-        alphaGrad<97, 100>(out.template ref<5, 5>(), col); //exact: 0.9711013910
-        alphaGrad<42, 100>(out.template ref<4, 5>(), col); //0.4236372243
-        alphaGrad<42, 100>(out.template ref<5, 4>(), col); //0.4236372243
-        alphaGrad< 6, 100>(out.template ref<5, 3>(), col); //0.05652034508
-        alphaGrad< 6, 100>(out.template ref<3, 5>(), col); //0.05652034508
-    }
-};
-
-//------------------------------------------------------------------------------------
-
-struct ColorDistanceRGB
-{
-    static double dist(uint32_t pix1, uint32_t pix2, double luminanceWeight)
-    {
-        return distYCbCrBuffer.dist(pix1, pix2);
-
-        //if (pix1 == pix2) //about 4% perf boost
-        //    return 0;
-        //return distYCbCr(pix1, pix2, luminanceWeight);
-    }
-};
-
-struct ColorDistanceARGB
-{
-    static double dist(uint32_t pix1, uint32_t pix2, double luminanceWeight)
-    {
-        const double a1 = getAlpha(pix1) / 255.0 ;
-        const double a2 = getAlpha(pix2) / 255.0 ;
-        /*
-        Requirements for a color distance handling alpha channel: with a1, a2 in [0, 1]
-
-        	1. if a1 = a2, distance should be: a1 * distYCbCr()
-        	2. if a1 = 0,  distance should be: a2 * distYCbCr(black, white) = a2 * 255
-        	3. if a1 = 1,  ??? maybe: 255 * (1 - a2) + a2 * distYCbCr()
-        */
-
-        //return std::min(a1, a2) * distYCbCrBuffer.dist(pix1, pix2) + 255 * abs(a1 - a2);
-        //=> following code is 15% faster:
-        const double d = distYCbCrBuffer.dist(pix1, pix2);
-        if (a1 < a2)
-            return a1 * d + 255 * (a2 - a1);
-        else
-            return a2 * d + 255 * (a1 - a2);
-
-        //alternative? return std::sqrt(a1 * a2 * square(distYCbCrBuffer.dist(pix1, pix2)) + square(255 * (a1 - a2)));
-    }
-};
-
-
-struct ColorGradientRGB
-{
-    template <unsigned int M, unsigned int N>
-    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront)
-    {
-        pixBack = gradientRGB<M, N>(pixFront, pixBack);
-    }
-};
-
-struct ColorGradientARGB
-{
-    template <unsigned int M, unsigned int N>
-    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront)
-    {
-        pixBack = gradientARGB<M, N>(pixFront, pixBack);
-    }
-};
-}
-
-
-void xbrz::scale(size_t factor, const uint32_t* src, int srcWidth, int srcHeight, int srcPitch, uint32_t* trg, int trgPitch, ColorFormat colFmt, const xbrz::ScalerCfg& cfg, int yFirst, int yLast)
-{
-    if (srcPitch %  static_cast<int>(sizeof(uint32_t)) != 0 ||
-        trgPitch %  static_cast<int>(sizeof(uint32_t)) != 0 ||
-        srcPitch < srcWidth * static_cast<int>(sizeof(uint32_t)) ||
-        trgPitch < srcWidth * static_cast<int>(factor) * static_cast<int>(sizeof(uint32_t)))
-    {
-        assert(false);
-        return;
-    }
-
-    int trgWidth = trgPitch / static_cast<int>(sizeof(uint32_t));
-    int srcPPitch = srcPitch / static_cast<int>(sizeof(uint32_t));
-
-    switch (colFmt)
-    {
-        case ARGB:
-            switch (factor)
-            {
-                case 2:
-                    return scaleImage<Scaler2x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-                case 3:
-                    return scaleImage<Scaler3x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-                case 4:
-                    return scaleImage<Scaler4x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-                case 5:
-                    return scaleImage<Scaler5x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-                case 6:
-                    return scaleImage<Scaler6x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-            }
-            break;
-
-        case RGB:
-            switch (factor)
-            {
-                case 2:
-                    return scaleImage<Scaler2x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-                case 3:
-                    return scaleImage<Scaler3x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-                case 4:
-                    return scaleImage<Scaler4x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-                case 5:
-                    return scaleImage<Scaler5x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-                case 6:
-                    return scaleImage<Scaler6x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
-            }
-            break;
-    }
-    assert(false);
-}
-
-
-bool xbrz::equalColorTest(uint32_t col1, uint32_t col2, ColorFormat colFmt, double luminanceWeight, double equalColorTolerance)
-{
-    switch (colFmt)
-    {
-        case ARGB:
-            return ColorDistanceARGB::dist(col1, col2, luminanceWeight) < equalColorTolerance;
-
-        case RGB:
-            return ColorDistanceRGB::dist(col1, col2, luminanceWeight) < equalColorTolerance;
-    }
-    assert(false);
-    return false;
-}
-
-
-void xbrz::nearestNeighborScale(const uint32_t* src, int srcWidth, int srcHeight, int srcPitch,
-                                uint32_t* trg, int trgWidth, int trgHeight, int trgPitch,
-                                SliceType st, int yFirst, int yLast)
-{
-    if (srcPitch < srcWidth * static_cast<int>(sizeof(uint32_t))  ||
-        trgPitch < trgWidth * static_cast<int>(sizeof(uint32_t)))
-    {
-        assert(false);
-        return;
-    }
-
-    switch (st)
-    {
-        case NN_SCALE_SLICE_SOURCE:
-            //nearest-neighbor (going over source image - fast for upscaling, since source is read only once
-            yFirst = std::max(yFirst, 0);
-            yLast  = std::min(yLast, srcHeight);
-            if (yFirst >= yLast || trgWidth <= 0 || trgHeight <= 0) return;
-
-            for (int y = yFirst; y < yLast; ++y)
-            {
-                //mathematically: ySrc = floor(srcHeight * yTrg / trgHeight)
-                // => search for integers in: [ySrc, ySrc + 1) * trgHeight / srcHeight
-
-                //keep within for loop to support MT input slices!
-                const int yTrg_first = ( y      * trgHeight + srcHeight - 1) / srcHeight; //=ceil(y * trgHeight / srcHeight)
-                const int yTrg_last  = ((y + 1) * trgHeight + srcHeight - 1) / srcHeight; //=ceil(((y + 1) * trgHeight) / srcHeight)
-                const int blockHeight = yTrg_last - yTrg_first;
-
-                if (blockHeight > 0)
-                {
-                    const uint32_t* srcLine = byteAdvance(src, y * srcPitch);
-                    uint32_t* trgLine  = byteAdvance(trg, yTrg_first * trgPitch);
-                    int xTrg_first = 0;
-
-                    for (int x = 0; x < srcWidth; ++x)
-                    {
-                        int xTrg_last = ((x + 1) * trgWidth + srcWidth - 1) / srcWidth;
-                        const int blockWidth = xTrg_last - xTrg_first;
-                        if (blockWidth > 0)
-                        {
-                            xTrg_first = xTrg_last;
-                            fillBlock(trgLine, trgPitch, srcLine[x], blockWidth, blockHeight);
-                            trgLine += blockWidth;
-                        }
-                    }
-                }
-            }
-            break;
-
-        case NN_SCALE_SLICE_TARGET:
-            //nearest-neighbor (going over target image - slow for upscaling, since source is read multiple times missing out on cache! Fast for similar image sizes!)
-            yFirst = std::max(yFirst, 0);
-            yLast  = std::min(yLast, trgHeight);
-            if (yFirst >= yLast || srcHeight <= 0 || srcWidth <= 0) return;
-
-            for (int y = yFirst; y < yLast; ++y)
-            {
-                uint32_t* trgLine = byteAdvance(trg, y * trgPitch);
-                const int ySrc = srcHeight * y / trgHeight;
-                const uint32_t* srcLine = byteAdvance(src, ySrc * srcPitch);
-                for (int x = 0; x < trgWidth; ++x)
-                {
-                    const int xSrc = srcWidth * x / trgWidth;
-                    trgLine[x] = srcLine[xSrc];
-                }
-            }
-            break;
-    }
-}
+// ****************************************************************************
+// * This file is part of the HqMAME project. It is distributed under         *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved          *
+// *                                                                          *
+// * Additionally and as a special exception, the author gives permission     *
+// * to link the code of this program with the MAME library (or with modified *
+// * versions of MAME that use the same license as MAME), and distribute      *
+// * linked combinations including the two. You must obey the GNU General     *
+// * Public License in all respects for all of the code used other than MAME. *
+// * If you modify this file, you may extend this exception to your version   *
+// * of the file, but you are not obligated to do so. If you do not wish to   *
+// * do so, delete this exception statement from your version.                *
+// ****************************************************************************
+
+#include "xbrz.h"
+#include <cassert>
+#include <cmath> // abs, pow, sqrt
+#include <algorithm>
+#include <vector>
+
+namespace
+{
+#ifdef _MSC_VER
+    #define FORCE_INLINE __forceinline
+#elif defined __GNUC__
+    #define FORCE_INLINE __attribute__((always_inline)) inline
+#else
+    #define FORCE_INLINE inline
+#endif
+
+
+template <uint32_t N> inline
+unsigned char getByte(uint32_t val) { return static_cast<unsigned char>((val >> (8 * N)) & 0xff); }
+
+inline unsigned char getAlpha(uint32_t pix) { return getByte<3>(pix); }
+inline unsigned char getRed  (uint32_t pix) { return getByte<2>(pix); }
+inline unsigned char getGreen(uint32_t pix) { return getByte<1>(pix); }
+inline unsigned char getBlue (uint32_t pix) { return getByte<0>(pix); }
+
+inline uint32_t makePixel(                 unsigned char r, unsigned char g, unsigned char b) { return             (r << 16) | (g << 8) | b; }
+inline uint32_t makePixel(unsigned char a, unsigned char r, unsigned char g, unsigned char b) { return (a << 24) | (r << 16) | (g << 8) | b; }
+
+
+template <unsigned int M, unsigned int N>
+FORCE_INLINE
+unsigned char calcColor(unsigned char colFront, unsigned char colBack)
+{
+    return (colFront * M + colBack * (N - M)) / N;
+}
+
+template <unsigned int M, unsigned int N> inline
+uint32_t gradientRGB(uint32_t pixFront, uint32_t pixBack) //blend front color with opacity M / N over opaque background: http://en.wikipedia.org/wiki/Alpha_compositing#Alpha_blending
+{
+    //~ static_assert(0 < M && M < N && N <= 1000, "");
+
+    return makePixel(calcColor<M, N>(getRed  (pixFront), getRed  (pixBack)),
+                     calcColor<M, N>(getGreen(pixFront), getGreen(pixBack)),
+                     calcColor<M, N>(getBlue (pixFront), getBlue (pixBack)));
+}
+
+FORCE_INLINE
+unsigned char calcColor(unsigned char colFront, unsigned char colBack, const unsigned int weightFront, const unsigned int weightBack, const unsigned int weightSum)
+{
+    return static_cast<unsigned char>((colFront * weightFront + colBack * weightBack) / weightSum);
+}
+
+template <unsigned int M, unsigned int N> inline
+uint32_t gradientARGB(uint32_t pixFront, uint32_t pixBack) //find intermediate color between two colors with alpha channels (=> NO alpha blending!!!)
+{
+    //~ static_assert(0 < M && M < N && N <= 1000, "");
+
+    const unsigned int weightFront = getAlpha(pixFront) * M;
+    const unsigned int weightBack  = getAlpha(pixBack) * (N - M);
+    const unsigned int weightSum   = weightFront + weightBack;
+    if (weightSum == 0)
+        return 0;
+
+    return makePixel(static_cast<unsigned char>(weightSum / N),
+                     calcColor(getRed  (pixFront), getRed  (pixBack), weightFront, weightBack, weightSum),
+                     calcColor(getGreen(pixFront), getGreen(pixBack), weightFront, weightBack, weightSum),
+                     calcColor(getBlue (pixFront), getBlue (pixBack), weightFront, weightBack, weightSum));
+}
+
+
+//inline
+//double fastSqrt(double n)
+//{
+//    __asm //speeds up xBRZ by about 9% compared to std::sqrt which internally uses the same assembler instructions but adds some "fluff"
+//    {
+//        fld n
+//        fsqrt
+//    }
+//}
+//
+
+
+uint32_t*       byteAdvance(      uint32_t* ptr, int bytes) { return reinterpret_cast<      uint32_t*>(reinterpret_cast<      char*>(ptr) + bytes); }
+const uint32_t* byteAdvance(const uint32_t* ptr, int bytes) { return reinterpret_cast<const uint32_t*>(reinterpret_cast<const char*>(ptr) + bytes); }
+
+
+//fill block  with the given color
+inline
+void fillBlock(uint32_t* trg, int pitch, uint32_t col, int blockWidth, int blockHeight)
+{
+    //for (int y = 0; y < blockHeight; ++y, trg = byteAdvance(trg, pitch))
+    //    std::fill(trg, trg + blockWidth, col);
+
+    for (int y = 0; y < blockHeight; ++y, trg = byteAdvance(trg, pitch))
+        for (int x = 0; x < blockWidth; ++x)
+            trg[x] = col;
+}
+
+inline
+void fillBlock(uint32_t* trg, int pitch, uint32_t col, int n) { fillBlock(trg, pitch, col, n, n); }
+
+
+enum RotationDegree //clock-wise
+{
+    ROT_0,
+    ROT_90,
+    ROT_180,
+    ROT_270
+};
+
+//calculate input matrix coordinates after rotation at compile time
+template <RotationDegree rotDeg, size_t I, size_t J, size_t N>
+struct MatrixRotation;
+
+template <size_t I, size_t J, size_t N>
+struct MatrixRotation<ROT_0, I, J, N>
+{
+    static const size_t I_old = I;
+    static const size_t J_old = J;
+};
+
+template <RotationDegree rotDeg, size_t I, size_t J, size_t N> //(i, j) = (row, col) indices, N = size of (square) matrix
+struct MatrixRotation
+{
+    static const size_t I_old = N - 1 - MatrixRotation<static_cast<RotationDegree>(rotDeg - 1), I, J, N>::J_old; //old coordinates before rotation!
+    static const size_t J_old =         MatrixRotation<static_cast<RotationDegree>(rotDeg - 1), I, J, N>::I_old; //
+};
+
+
+template <size_t N, RotationDegree rotDeg>
+class OutputMatrix
+{
+public:
+    OutputMatrix(uint32_t* out, int outWidth) : //access matrix area, top-left at position "out" for image with given width
+        out_(out),
+        outWidth_(outWidth) {}
+
+    template <size_t I, size_t J>
+    uint32_t& ref() const
+    {
+        static const size_t I_old = MatrixRotation<rotDeg, I, J, N>::I_old;
+        static const size_t J_old = MatrixRotation<rotDeg, I, J, N>::J_old;
+        return *(out_ + J_old + I_old * outWidth_);
+    }
+
+private:
+    uint32_t* out_;
+    const int outWidth_;
+};
+
+
+template <class T> inline
+T square(T value) { return value * value; }
+
+
+
+inline
+double distRGB(uint32_t pix1, uint32_t pix2)
+{
+    const double r_diff = static_cast<int>(getRed  (pix1)) - getRed  (pix2);
+    const double g_diff = static_cast<int>(getGreen(pix1)) - getGreen(pix2);
+    const double b_diff = static_cast<int>(getBlue (pix1)) - getBlue (pix2);
+
+    //euklidean RGB distance
+    return std::sqrt(square(r_diff) + square(g_diff) + square(b_diff));
+}
+
+
+inline
+double distYCbCr(uint32_t pix1, uint32_t pix2, double lumaWeight)
+{
+    //http://en.wikipedia.org/wiki/YCbCr#ITU-R_BT.601_conversion
+    //YCbCr conversion is a matrix multiplication => take advantage of linearity by subtracting first!
+    const int r_diff = static_cast<int>(getRed  (pix1)) - getRed  (pix2); //we may delay division by 255 to after matrix multiplication
+    const int g_diff = static_cast<int>(getGreen(pix1)) - getGreen(pix2); //
+    const int b_diff = static_cast<int>(getBlue (pix1)) - getBlue (pix2); //substraction for int is noticeable faster than for double!
+
+    //const double k_b = 0.0722; //ITU-R BT.709 conversion
+    //const double k_r = 0.2126; //
+    const double k_b = 0.0593; //ITU-R BT.2020 conversion
+    const double k_r = 0.2627; //
+    const double k_g = 1 - k_b - k_r;
+
+    const double scale_b = 0.5 / (1 - k_b);
+    const double scale_r = 0.5 / (1 - k_r);
+
+    const double y   = k_r * r_diff + k_g * g_diff + k_b * b_diff; //[!], analog YCbCr!
+    const double c_b = scale_b * (b_diff - y);
+    const double c_r = scale_r * (r_diff - y);
+
+    //we skip division by 255 to have similar range like other distance functions
+    return std::sqrt(square(lumaWeight * y) + square(c_b) + square(c_r));
+}
+
+
+struct DistYCbCrBuffer //30% perf boost compared to distYCbCr()!
+{
+public:
+    DistYCbCrBuffer() : buffer(256 * 256 * 256)
+    {
+        for (uint32_t i = 0; i < 256 * 256 * 256; ++i) //startup time: 114 ms on Intel Core i5 (four cores)
+        {
+            const int r_diff = getByte<2>(i) * 2 - 255;
+            const int g_diff = getByte<1>(i) * 2 - 255;
+            const int b_diff = getByte<0>(i) * 2 - 255;
+
+            const double k_b = 0.0593; //ITU-R BT.2020 conversion
+            const double k_r = 0.2627; //
+            const double k_g = 1 - k_b - k_r;
+
+            const double scale_b = 0.5 / (1 - k_b);
+            const double scale_r = 0.5 / (1 - k_r);
+
+            const double y   = k_r * r_diff + k_g * g_diff + k_b * b_diff; //[!], analog YCbCr!
+            const double c_b = scale_b * (b_diff - y);
+            const double c_r = scale_r * (r_diff - y);
+
+            buffer[i] = static_cast<float>(std::sqrt(square(y) + square(c_b) + square(c_r)));
+        }
+    }
+
+    double dist(uint32_t pix1, uint32_t pix2) const
+    {
+        //if (pix1 == pix2) -> 8% perf degradation!
+        //    return 0;
+        //if (pix1 > pix2)
+        //	  std::swap(pix1, pix2); -> 30% perf degradation!!!
+
+        const int r_diff = static_cast<int>(getRed  (pix1)) - getRed  (pix2);
+        const int g_diff = static_cast<int>(getGreen(pix1)) - getGreen(pix2);
+        const int b_diff = static_cast<int>(getBlue (pix1)) - getBlue (pix2);
+
+        return buffer[(((r_diff + 255) / 2) << 16) | //slightly reduce precision (division by 2) to squeeze value into single byte
+                      (((g_diff + 255) / 2) <<  8) |
+                      (( b_diff + 255) / 2)];
+    }
+
+private:
+    std::vector<float> buffer; //consumes 64 MB memory; using double is 2% faster, but takes 128 MB
+} distYCbCrBuffer;
+
+
+enum BlendType
+{
+    BLEND_NONE = 0,
+    BLEND_NORMAL,   //a normal indication to blend
+    BLEND_DOMINANT, //a strong indication to blend
+    //attention: BlendType must fit into the value range of 2 bit!!!
+};
+
+struct BlendResult
+{
+    BlendType
+    /**/blend_f, blend_g,
+    /**/blend_j, blend_k;
+};
+
+
+struct Kernel_4x4 //kernel for preprocessing step
+{
+    uint32_t
+    /**/a, b, c, d,
+    /**/e, f, g, h,
+    /**/i, j, k, l,
+    /**/m, n, o, p;
+};
+
+template <class ColorDistance>
+FORCE_INLINE
+double dist(uint32_t pix1, uint32_t pix2, const xbrz::ScalerCfg& cfg)
+{
+    return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight);
+}
+
+template <class ColorDistance>
+FORCE_INLINE
+bool eq(uint32_t pix1, uint32_t pix2, const xbrz::ScalerCfg& cfg)
+{
+    return ColorDistance::dist(pix1, pix2, cfg.luminanceWeight) < cfg.equalColorTolerance;
+}
+
+/*
+input kernel area naming convention:
+-----------------
+| A | B | C | D |
+----|---|---|---|
+| E | F | G | H |   //evaluate the four corners between F, G, J, K
+----|---|---|---|   //input pixel is at position F
+| I | J | K | L |
+----|---|---|---|
+| M | N | O | P |
+-----------------
+*/
+template <class ColorDistance>
+FORCE_INLINE //detect blend direction
+BlendResult preProcessCorners(const Kernel_4x4& ker, const xbrz::ScalerCfg& cfg) //result: F, G, J, K corners of "GradientType"
+{
+    BlendResult result = {};
+
+    if ((ker.f == ker.g &&
+         ker.j == ker.k) ||
+        (ker.f == ker.j &&
+         ker.g == ker.k))
+        return result;
+
+    const int weight = 4;
+    double jg = dist<ColorDistance>(ker.i, ker.f, cfg) + dist<ColorDistance>(ker.f, ker.c, cfg) + dist<ColorDistance>(ker.n, ker.k, cfg) + dist<ColorDistance>(ker.k, ker.h, cfg) + weight * dist<ColorDistance>(ker.j, ker.g, cfg);
+    double fk = dist<ColorDistance>(ker.e, ker.j, cfg) + dist<ColorDistance>(ker.j, ker.o, cfg) + dist<ColorDistance>(ker.b, ker.g, cfg) + dist<ColorDistance>(ker.g, ker.l, cfg) + weight * dist<ColorDistance>(ker.f, ker.k, cfg);
+
+    if (jg < fk) //test sample: 70% of values max(jg, fk) / min(jg, fk) are between 1.1 and 3.7 with median being 1.8
+    {
+        const bool dominantGradient = cfg.dominantDirectionThreshold * jg < fk;
+        if (ker.f != ker.g && ker.f != ker.j)
+            result.blend_f = dominantGradient ? BLEND_DOMINANT : BLEND_NORMAL;
+
+        if (ker.k != ker.j && ker.k != ker.g)
+            result.blend_k = dominantGradient ? BLEND_DOMINANT : BLEND_NORMAL;
+    }
+    else if (fk < jg)
+    {
+        const bool dominantGradient = cfg.dominantDirectionThreshold * fk < jg;
+        if (ker.j != ker.f && ker.j != ker.k)
+            result.blend_j = dominantGradient ? BLEND_DOMINANT : BLEND_NORMAL;
+
+        if (ker.g != ker.f && ker.g != ker.k)
+            result.blend_g = dominantGradient ? BLEND_DOMINANT : BLEND_NORMAL;
+    }
+    return result;
+}
+
+struct Kernel_3x3
+{
+    uint32_t
+    /**/a,  b,  c,
+    /**/d,  e,  f,
+    /**/g,  h,  i;
+};
+
+#define DEF_GETTER(x) template <RotationDegree rotDeg> uint32_t inline get_##x(const Kernel_3x3& ker) { return ker.x; }
+//we cannot and NEED NOT write "ker.##x" since ## concatenates preprocessor tokens but "." is not a token
+DEF_GETTER(a) DEF_GETTER(b) DEF_GETTER(c)
+DEF_GETTER(d) DEF_GETTER(e) DEF_GETTER(f)
+DEF_GETTER(g) DEF_GETTER(h) DEF_GETTER(i)
+#undef DEF_GETTER
+
+#define DEF_GETTER(x, y) template <> inline uint32_t get_##x<ROT_90>(const Kernel_3x3& ker) { return ker.y; }
+DEF_GETTER(a, g) DEF_GETTER(b, d) DEF_GETTER(c, a)
+DEF_GETTER(d, h) DEF_GETTER(e, e) DEF_GETTER(f, b)
+DEF_GETTER(g, i) DEF_GETTER(h, f) DEF_GETTER(i, c)
+#undef DEF_GETTER
+
+#define DEF_GETTER(x, y) template <> inline uint32_t get_##x<ROT_180>(const Kernel_3x3& ker) { return ker.y; }
+DEF_GETTER(a, i) DEF_GETTER(b, h) DEF_GETTER(c, g)
+DEF_GETTER(d, f) DEF_GETTER(e, e) DEF_GETTER(f, d)
+DEF_GETTER(g, c) DEF_GETTER(h, b) DEF_GETTER(i, a)
+#undef DEF_GETTER
+
+#define DEF_GETTER(x, y) template <> inline uint32_t get_##x<ROT_270>(const Kernel_3x3& ker) { return ker.y; }
+DEF_GETTER(a, c) DEF_GETTER(b, f) DEF_GETTER(c, i)
+DEF_GETTER(d, b) DEF_GETTER(e, e) DEF_GETTER(f, h)
+DEF_GETTER(g, a) DEF_GETTER(h, d) DEF_GETTER(i,	g)
+#undef DEF_GETTER
+
+
+//compress four blend types into a single byte
+inline BlendType getTopL   (unsigned char b) { return static_cast<BlendType>(0x3 & b); }
+inline BlendType getTopR   (unsigned char b) { return static_cast<BlendType>(0x3 & (b >> 2)); }
+inline BlendType getBottomR(unsigned char b) { return static_cast<BlendType>(0x3 & (b >> 4)); }
+inline BlendType getBottomL(unsigned char b) { return static_cast<BlendType>(0x3 & (b >> 6)); }
+
+inline void setTopL   (unsigned char& b, BlendType bt) { b |= bt; } //buffer is assumed to be initialized before preprocessing!
+inline void setTopR   (unsigned char& b, BlendType bt) { b |= (bt << 2); }
+inline void setBottomR(unsigned char& b, BlendType bt) { b |= (bt << 4); }
+inline void setBottomL(unsigned char& b, BlendType bt) { b |= (bt << 6); }
+
+inline bool blendingNeeded(unsigned char b) { return b != 0; }
+
+template <RotationDegree rotDeg> inline
+unsigned char rotateBlendInfo(unsigned char b) { return b; }
+template <> inline unsigned char rotateBlendInfo<ROT_90 >(unsigned char b) { return ((b << 2) | (b >> 6)) & 0xff; }
+template <> inline unsigned char rotateBlendInfo<ROT_180>(unsigned char b) { return ((b << 4) | (b >> 4)) & 0xff; }
+template <> inline unsigned char rotateBlendInfo<ROT_270>(unsigned char b) { return ((b << 6) | (b >> 2)) & 0xff; }
+
+
+#ifndef NDEBUG
+#ifdef _MSC_VER
+    int debugPixelX = -1;
+    int debugPixelY = 12;
+    __declspec(thread) bool breakIntoDebugger = false;
+#endif
+#endif
+
+
+/*
+input kernel area naming convention:
+-------------
+| A | B | C |
+----|---|---|
+| D | E | F | //input pixel is at position E
+----|---|---|
+| G | H | I |
+-------------
+*/
+template <class Scaler, class ColorDistance, RotationDegree rotDeg>
+FORCE_INLINE //perf: quite worth it!
+void blendPixel(const Kernel_3x3& ker,
+                uint32_t* target, int trgWidth,
+                unsigned char blendInfo, //result of preprocessing all four corners of pixel "e"
+                const xbrz::ScalerCfg& cfg)
+{
+#define a get_a<rotDeg>(ker)
+#define b get_b<rotDeg>(ker)
+#define c get_c<rotDeg>(ker)
+#define d get_d<rotDeg>(ker)
+#define e get_e<rotDeg>(ker)
+#define f get_f<rotDeg>(ker)
+#define g get_g<rotDeg>(ker)
+#define h get_h<rotDeg>(ker)
+#define i get_i<rotDeg>(ker)
+
+#ifndef NDEBUG
+#ifdef _MSC_VER
+    if (breakIntoDebugger)
+        __debugbreak(); //__asm int 3;
+#endif
+#endif
+
+    const unsigned char blend = rotateBlendInfo<rotDeg>(blendInfo);
+
+    if (getBottomR(blend) >= BLEND_NORMAL)
+    {
+        bool doLineBlend = (getBottomR(blend) >= BLEND_DOMINANT) || !(
+            //make sure there is no second blending in an adjacent rotation for this pixel: handles insular pixels, mario eyes
+            (getTopR(blend) != BLEND_NONE && !eq<ColorDistance>(e, g, cfg)) || //but support double-blending for 90° corners
+            (getBottomL(blend) != BLEND_NONE && !eq<ColorDistance>(e, c, cfg)) ||
+            //no full blending for L-shapes; blend corner only (handles "mario mushroom eyes")
+            (!eq<ColorDistance>(e, i, cfg) && eq<ColorDistance>(g, h, cfg) &&  eq<ColorDistance>(h , i, cfg) && eq<ColorDistance>(i, f, cfg) && eq<ColorDistance>(f, c, cfg))
+        );
+
+        const uint32_t px = dist<ColorDistance>(e, f, cfg) <= dist<ColorDistance>(e, h, cfg) ? f : h; //choose most similar color
+
+        OutputMatrix<Scaler::scale, rotDeg> out(target, trgWidth);
+
+        if (doLineBlend)
+        {
+            const double fg = dist<ColorDistance>(f, g, cfg); //test sample: 70% of values max(fg, hc) / min(fg, hc) are between 1.1 and 3.7 with median being 1.9
+            const double hc = dist<ColorDistance>(h, c, cfg); //
+
+            const bool haveShallowLine = cfg.steepDirectionThreshold * fg <= hc && e != g && d != g;
+            const bool haveSteepLine   = cfg.steepDirectionThreshold * hc <= fg && e != c && b != c;
+
+            if (haveShallowLine)
+            {
+                if (haveSteepLine)
+                    Scaler::blendLineSteepAndShallow(px, out);
+                else
+                    Scaler::blendLineShallow(px, out);
+            }
+            else
+            {
+                if (haveSteepLine)
+                    Scaler::blendLineSteep(px, out);
+                else
+                    Scaler::blendLineDiagonal(px,out);
+            }
+        }
+        else
+            Scaler::blendCorner(px, out);
+    }
+
+#undef a
+#undef b
+#undef c
+#undef d
+#undef e
+#undef f
+#undef g
+#undef h
+#undef i
+}
+
+
+template <class Scaler, class ColorDistance> //scaler policy: see "Scaler2x" reference implementation
+void scaleImage(const uint32_t* src, int srcWidth, int srcHeight, int srcPitch, uint32_t* trg, int trgWidth, const xbrz::ScalerCfg& cfg, int yFirst, int yLast)
+{
+    yFirst = std::max(yFirst, 0);
+    yLast  = std::min(yLast, srcHeight);
+    if (yFirst >= yLast || srcWidth <= 0)
+        return;
+
+    //"use" space at the end of the image as temporary buffer for "on the fly preprocessing": we even could use larger area of
+    //"sizeof(uint32_t) * srcWidth * (yLast - yFirst)" bytes without risk of accidental overwriting before accessing
+    const int bufferSize = srcWidth;
+    unsigned char* preProcBuffer = reinterpret_cast<unsigned char*>(trg + yLast * Scaler::scale * trgWidth) - bufferSize;
+    std::fill(preProcBuffer, preProcBuffer + bufferSize, 0);
+    //~ static_assert(BLEND_NONE == 0, "");
+
+    //initialize preprocessing buffer for first row of current stripe: detect upper left and right corner blending
+    //this cannot be optimized for adjacent processing stripes; we must not allow for a memory race condition!
+    if (yFirst > 0)
+    {
+        const int y = yFirst - 1;
+
+        const uint32_t* s_m1 = src + srcPitch * std::max(y - 1, 0);
+        const uint32_t* s_0  = src + srcPitch * y; //center line
+        const uint32_t* s_p1 = src + srcPitch * std::min(y + 1, srcHeight - 1);
+        const uint32_t* s_p2 = src + srcPitch * std::min(y + 2, srcHeight - 1);
+
+        for (int x = 0; x < srcWidth; ++x)
+        {
+            const int x_m1 = std::max(x - 1, 0);
+            const int x_p1 = std::min(x + 1, srcWidth - 1);
+            const int x_p2 = std::min(x + 2, srcWidth - 1);
+
+            Kernel_4x4 ker = {}; //perf: initialization is negligible
+            ker.a = s_m1[x_m1]; //read sequentially from memory as far as possible
+            ker.b = s_m1[x];
+            ker.c = s_m1[x_p1];
+            ker.d = s_m1[x_p2];
+
+            ker.e = s_0[x_m1];
+            ker.f = s_0[x];
+            ker.g = s_0[x_p1];
+            ker.h = s_0[x_p2];
+
+            ker.i = s_p1[x_m1];
+            ker.j = s_p1[x];
+            ker.k = s_p1[x_p1];
+            ker.l = s_p1[x_p2];
+
+            ker.m = s_p2[x_m1];
+            ker.n = s_p2[x];
+            ker.o = s_p2[x_p1];
+            ker.p = s_p2[x_p2];
+
+            const BlendResult res = preProcessCorners<ColorDistance>(ker, cfg);
+            /*
+            preprocessing blend result:
+            ---------
+            | F | G |   //evalute corner between F, G, J, K
+            ----|---|   //input pixel is at position F
+            | J | K |
+            ---------
+            */
+            setTopR(preProcBuffer[x], res.blend_j);
+
+            if (x + 1 < bufferSize)
+                setTopL(preProcBuffer[x + 1], res.blend_k);
+        }
+    }
+    //------------------------------------------------------------------------------------
+
+    for (int y = yFirst; y < yLast; ++y)
+    {
+        uint32_t* out = trg + Scaler::scale * y * trgWidth; //consider MT "striped" access
+
+        const uint32_t* s_m1 = src + srcPitch * std::max(y - 1, 0);
+        const uint32_t* s_0  = src + srcPitch * y; //center line
+        const uint32_t* s_p1 = src + srcPitch * std::min(y + 1, srcHeight - 1);
+        const uint32_t* s_p2 = src + srcPitch * std::min(y + 2, srcHeight - 1);
+
+        unsigned char blend_xy1 = 0; //corner blending for current (x, y + 1) position
+
+        for (int x = 0; x < srcWidth; ++x, out += Scaler::scale)
+        {
+#ifndef NDEBUG
+#ifdef _MSC_VER
+            breakIntoDebugger = debugPixelX == x && debugPixelY == y;
+#endif
+#endif
+            //all those bounds checks have only insignificant impact on performance!
+            const int x_m1 = std::max(x - 1, 0); //perf: prefer array indexing to additional pointers!
+            const int x_p1 = std::min(x + 1, srcWidth - 1);
+            const int x_p2 = std::min(x + 2, srcWidth - 1);
+
+            Kernel_4x4 ker4 = {}; //perf: initialization is negligible
+
+            ker4.a = s_m1[x_m1]; //read sequentially from memory as far as possible
+            ker4.b = s_m1[x];
+            ker4.c = s_m1[x_p1];
+            ker4.d = s_m1[x_p2];
+
+            ker4.e = s_0[x_m1];
+            ker4.f = s_0[x];
+            ker4.g = s_0[x_p1];
+            ker4.h = s_0[x_p2];
+
+            ker4.i = s_p1[x_m1];
+            ker4.j = s_p1[x];
+            ker4.k = s_p1[x_p1];
+            ker4.l = s_p1[x_p2];
+
+            ker4.m = s_p2[x_m1];
+            ker4.n = s_p2[x];
+            ker4.o = s_p2[x_p1];
+            ker4.p = s_p2[x_p2];
+
+            //evaluate the four corners on bottom-right of current pixel
+            unsigned char blend_xy = 0; //for current (x, y) position
+            {
+                const BlendResult res = preProcessCorners<ColorDistance>(ker4, cfg);
+                /*
+                preprocessing blend result:
+                ---------
+                | F | G |   //evalute corner between F, G, J, K
+                ----|---|   //current input pixel is at position F
+                | J | K |
+                ---------
+                */
+                blend_xy = preProcBuffer[x];
+                setBottomR(blend_xy, res.blend_f); //all four corners of (x, y) have been determined at this point due to processing sequence!
+
+                setTopR(blend_xy1, res.blend_j); //set 2nd known corner for (x, y + 1)
+                preProcBuffer[x] = blend_xy1; //store on current buffer position for use on next row
+
+                blend_xy1 = 0;
+                setTopL(blend_xy1, res.blend_k); //set 1st known corner for (x + 1, y + 1) and buffer for use on next column
+
+                if (x + 1 < bufferSize) //set 3rd known corner for (x + 1, y)
+                    setBottomL(preProcBuffer[x + 1], res.blend_g);
+            }
+
+            //fill block of size scale * scale with the given color
+            fillBlock(out, trgWidth * sizeof(uint32_t), ker4.f, Scaler::scale); //place *after* preprocessing step, to not overwrite the results while processing the the last pixel!
+
+            //blend four corners of current pixel
+            if (blendingNeeded(blend_xy)) //good 5% perf-improvement
+            {
+                Kernel_3x3 ker3 = {}; //perf: initialization is negligible
+
+                ker3.a = ker4.a;
+                ker3.b = ker4.b;
+                ker3.c = ker4.c;
+
+                ker3.d = ker4.e;
+                ker3.e = ker4.f;
+                ker3.f = ker4.g;
+
+                ker3.g = ker4.i;
+                ker3.h = ker4.j;
+                ker3.i = ker4.k;
+
+                blendPixel<Scaler, ColorDistance, ROT_0  >(ker3, out, trgWidth, blend_xy, cfg);
+                blendPixel<Scaler, ColorDistance, ROT_90 >(ker3, out, trgWidth, blend_xy, cfg);
+                blendPixel<Scaler, ColorDistance, ROT_180>(ker3, out, trgWidth, blend_xy, cfg);
+                blendPixel<Scaler, ColorDistance, ROT_270>(ker3, out, trgWidth, blend_xy, cfg);
+            }
+        }
+    }
+}
+
+//------------------------------------------------------------------------------------
+
+template <class ColorGradient>
+struct Scaler2x : public ColorGradient
+{
+    static const int scale = 2;
+
+    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
+    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
+
+
+    template <class OutputMatrix>
+    static void blendLineShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
+        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteep(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
+        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<1, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<0, 1>(), col);
+        alphaGrad<5, 6>(out.template ref<1, 1>(), col); //[!] fixes 7/8 used in xBR
+    }
+
+    template <class OutputMatrix>
+    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 2>(out.template ref<1, 1>(), col);
+    }
+
+    template <class OutputMatrix>
+    static void blendCorner(uint32_t col, OutputMatrix& out)
+    {
+        //model a round corner
+        alphaGrad<21, 100>(out.template ref<1, 1>(), col); //exact: 1 - pi/4 = 0.2146018366
+    }
+};
+
+
+template <class ColorGradient>
+struct Scaler3x : public ColorGradient
+{
+    static const int scale = 3;
+
+    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
+    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
+
+
+    template <class OutputMatrix>
+    static void blendLineShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
+
+        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
+        out.template ref<scale - 1, 2>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteep(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
+        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
+
+        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
+        out.template ref<2, scale - 1>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<2, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<0, 2>(), col);
+        alphaGrad<3, 4>(out.template ref<2, 1>(), col);
+        alphaGrad<3, 4>(out.template ref<1, 2>(), col);
+        out.template ref<2, 2>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 8>(out.template ref<1, 2>(), col); //conflict with other rotations for this odd scale
+        alphaGrad<1, 8>(out.template ref<2, 1>(), col);
+        alphaGrad<7, 8>(out.template ref<2, 2>(), col); //
+    }
+
+    template <class OutputMatrix>
+    static void blendCorner(uint32_t col, OutputMatrix& out)
+    {
+        //model a round corner
+        alphaGrad<45, 100>(out.template ref<2, 2>(), col); //exact: 0.4545939598
+        //alphaGrad<7, 256>(out.template ref<2, 1>(), col); //0.02826017254 -> negligible + avoid conflicts with other rotations for this odd scale
+        //alphaGrad<7, 256>(out.template ref<1, 2>(), col); //0.02826017254
+    }
+};
+
+
+template <class ColorGradient>
+struct Scaler4x : public ColorGradient
+{
+    static const int scale = 4;
+
+    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
+    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
+
+
+    template <class OutputMatrix>
+    static void blendLineShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
+
+        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
+        alphaGrad<3, 4>(out.template ref<scale - 2, 3>(), col);
+
+        out.template ref<scale - 1, 2>() = col;
+        out.template ref<scale - 1, 3>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteep(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
+        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
+
+        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
+        alphaGrad<3, 4>(out.template ref<3, scale - 2>(), col);
+
+        out.template ref<2, scale - 1>() = col;
+        out.template ref<3, scale - 1>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<3, 4>(out.template ref<3, 1>(), col);
+        alphaGrad<3, 4>(out.template ref<1, 3>(), col);
+        alphaGrad<1, 4>(out.template ref<3, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<0, 3>(), col);
+
+        alphaGrad<1, 3>(out.template ref<2, 2>(), col); //[!] fixes 1/4 used in xBR
+
+        out.template ref<3, 3>() = col;
+        out.template ref<3, 2>() = col;
+        out.template ref<2, 3>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 2>(out.template ref<scale - 1, scale / 2    >(), col);
+        alphaGrad<1, 2>(out.template ref<scale - 2, scale / 2 + 1>(), col);
+        out.template ref<scale - 1, scale - 1>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendCorner(uint32_t col, OutputMatrix& out)
+    {
+        //model a round corner
+        alphaGrad<68, 100>(out.template ref<3, 3>(), col); //exact: 0.6848532563
+        alphaGrad< 9, 100>(out.template ref<3, 2>(), col); //0.08677704501
+        alphaGrad< 9, 100>(out.template ref<2, 3>(), col); //0.08677704501
+    }
+};
+
+
+template <class ColorGradient>
+struct Scaler5x : public ColorGradient
+{
+    static const int scale = 5;
+
+    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
+    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
+
+
+    template <class OutputMatrix>
+    static void blendLineShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
+        alphaGrad<1, 4>(out.template ref<scale - 3, 4>(), col);
+
+        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
+        alphaGrad<3, 4>(out.template ref<scale - 2, 3>(), col);
+
+        out.template ref<scale - 1, 2>() = col;
+        out.template ref<scale - 1, 3>() = col;
+        out.template ref<scale - 1, 4>() = col;
+        out.template ref<scale - 2, 4>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteep(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
+        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
+        alphaGrad<1, 4>(out.template ref<4, scale - 3>(), col);
+
+        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
+        alphaGrad<3, 4>(out.template ref<3, scale - 2>(), col);
+
+        out.template ref<2, scale - 1>() = col;
+        out.template ref<3, scale - 1>() = col;
+        out.template ref<4, scale - 1>() = col;
+        out.template ref<4, scale - 2>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
+        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
+        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
+
+        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
+        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
+
+        alphaGrad<2, 3>(out.template ref<3, 3>(), col);
+
+        out.template ref<2, scale - 1>() = col;
+        out.template ref<3, scale - 1>() = col;
+        out.template ref<4, scale - 1>() = col;
+
+        out.template ref<scale - 1, 2>() = col;
+        out.template ref<scale - 1, 3>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 8>(out.template ref<scale - 1, scale / 2    >(), col); //conflict with other rotations for this odd scale
+        alphaGrad<1, 8>(out.template ref<scale - 2, scale / 2 + 1>(), col);
+        alphaGrad<1, 8>(out.template ref<scale - 3, scale / 2 + 2>(), col); //
+
+        alphaGrad<7, 8>(out.template ref<4, 3>(), col);
+        alphaGrad<7, 8>(out.template ref<3, 4>(), col);
+
+        out.template ref<4, 4>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendCorner(uint32_t col, OutputMatrix& out)
+    {
+        //model a round corner
+        alphaGrad<86, 100>(out.template ref<4, 4>(), col); //exact: 0.8631434088
+        alphaGrad<23, 100>(out.template ref<4, 3>(), col); //0.2306749731
+        alphaGrad<23, 100>(out.template ref<3, 4>(), col); //0.2306749731
+        //alphaGrad<1, 64>(out.template ref<4, 2>(), col); //0.01676812367 -> negligible + avoid conflicts with other rotations for this odd scale
+        //alphaGrad<1, 64>(out.template ref<2, 4>(), col); //0.01676812367
+    }
+};
+
+
+template <class ColorGradient>
+struct Scaler6x : public ColorGradient
+{
+    static const int scale = 6;
+
+    template <unsigned int M, unsigned int N> //bring template function into scope for GCC
+    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront) { ColorGradient::template alphaGrad<M, N>(pixBack, pixFront); }
+
+
+    template <class OutputMatrix>
+    static void blendLineShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
+        alphaGrad<1, 4>(out.template ref<scale - 3, 4>(), col);
+
+        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
+        alphaGrad<3, 4>(out.template ref<scale - 2, 3>(), col);
+        alphaGrad<3, 4>(out.template ref<scale - 3, 5>(), col);
+
+        out.template ref<scale - 1, 2>() = col;
+        out.template ref<scale - 1, 3>() = col;
+        out.template ref<scale - 1, 4>() = col;
+        out.template ref<scale - 1, 5>() = col;
+
+        out.template ref<scale - 2, 4>() = col;
+        out.template ref<scale - 2, 5>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteep(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
+        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
+        alphaGrad<1, 4>(out.template ref<4, scale - 3>(), col);
+
+        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
+        alphaGrad<3, 4>(out.template ref<3, scale - 2>(), col);
+        alphaGrad<3, 4>(out.template ref<5, scale - 3>(), col);
+
+        out.template ref<2, scale - 1>() = col;
+        out.template ref<3, scale - 1>() = col;
+        out.template ref<4, scale - 1>() = col;
+        out.template ref<5, scale - 1>() = col;
+
+        out.template ref<4, scale - 2>() = col;
+        out.template ref<5, scale - 2>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineSteepAndShallow(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 4>(out.template ref<0, scale - 1>(), col);
+        alphaGrad<1, 4>(out.template ref<2, scale - 2>(), col);
+        alphaGrad<3, 4>(out.template ref<1, scale - 1>(), col);
+        alphaGrad<3, 4>(out.template ref<3, scale - 2>(), col);
+
+        alphaGrad<1, 4>(out.template ref<scale - 1, 0>(), col);
+        alphaGrad<1, 4>(out.template ref<scale - 2, 2>(), col);
+        alphaGrad<3, 4>(out.template ref<scale - 1, 1>(), col);
+        alphaGrad<3, 4>(out.template ref<scale - 2, 3>(), col);
+
+        out.template ref<2, scale - 1>() = col;
+        out.template ref<3, scale - 1>() = col;
+        out.template ref<4, scale - 1>() = col;
+        out.template ref<5, scale - 1>() = col;
+
+        out.template ref<4, scale - 2>() = col;
+        out.template ref<5, scale - 2>() = col;
+
+        out.template ref<scale - 1, 2>() = col;
+        out.template ref<scale - 1, 3>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendLineDiagonal(uint32_t col, OutputMatrix& out)
+    {
+        alphaGrad<1, 2>(out.template ref<scale - 1, scale / 2    >(), col);
+        alphaGrad<1, 2>(out.template ref<scale - 2, scale / 2 + 1>(), col);
+        alphaGrad<1, 2>(out.template ref<scale - 3, scale / 2 + 2>(), col);
+
+        out.template ref<scale - 2, scale - 1>() = col;
+        out.template ref<scale - 1, scale - 1>() = col;
+        out.template ref<scale - 1, scale - 2>() = col;
+    }
+
+    template <class OutputMatrix>
+    static void blendCorner(uint32_t col, OutputMatrix& out)
+    {
+        //model a round corner
+        alphaGrad<97, 100>(out.template ref<5, 5>(), col); //exact: 0.9711013910
+        alphaGrad<42, 100>(out.template ref<4, 5>(), col); //0.4236372243
+        alphaGrad<42, 100>(out.template ref<5, 4>(), col); //0.4236372243
+        alphaGrad< 6, 100>(out.template ref<5, 3>(), col); //0.05652034508
+        alphaGrad< 6, 100>(out.template ref<3, 5>(), col); //0.05652034508
+    }
+};
+
+//------------------------------------------------------------------------------------
+
+struct ColorDistanceRGB
+{
+    static double dist(uint32_t pix1, uint32_t pix2, double luminanceWeight)
+    {
+        (void)luminanceWeight; // unused param
+        return distYCbCrBuffer.dist(pix1, pix2);
+
+        //if (pix1 == pix2) //about 4% perf boost
+        //    return 0;
+        //return distYCbCr(pix1, pix2, luminanceWeight);
+    }
+};
+
+struct ColorDistanceARGB
+{
+    static double dist(uint32_t pix1, uint32_t pix2, double luminanceWeight)
+    {
+        (void)luminanceWeight; // unused param
+        const double a1 = getAlpha(pix1) / 255.0 ;
+        const double a2 = getAlpha(pix2) / 255.0 ;
+        /*
+        Requirements for a color distance handling alpha channel: with a1, a2 in [0, 1]
+
+        	1. if a1 = a2, distance should be: a1 * distYCbCr()
+        	2. if a1 = 0,  distance should be: a2 * distYCbCr(black, white) = a2 * 255
+        	3. if a1 = 1,  ??? maybe: 255 * (1 - a2) + a2 * distYCbCr()
+        */
+
+        //return std::min(a1, a2) * distYCbCrBuffer.dist(pix1, pix2) + 255 * abs(a1 - a2);
+        //=> following code is 15% faster:
+        const double d = distYCbCrBuffer.dist(pix1, pix2);
+        if (a1 < a2)
+            return a1 * d + 255 * (a2 - a1);
+        else
+            return a2 * d + 255 * (a1 - a2);
+
+        //alternative? return std::sqrt(a1 * a2 * square(distYCbCrBuffer.dist(pix1, pix2)) + square(255 * (a1 - a2)));
+    }
+};
+
+
+struct ColorGradientRGB
+{
+    template <unsigned int M, unsigned int N>
+    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront)
+    {
+        pixBack = gradientRGB<M, N>(pixFront, pixBack);
+    }
+};
+
+struct ColorGradientARGB
+{
+    template <unsigned int M, unsigned int N>
+    static void alphaGrad(uint32_t& pixBack, uint32_t pixFront)
+    {
+        pixBack = gradientARGB<M, N>(pixFront, pixBack);
+    }
+};
+}
+
+
+void xbrz::scale(size_t factor, const uint32_t* src, int srcWidth, int srcHeight, int srcPitch, uint32_t* trg, int trgPitch, ColorFormat colFmt, const xbrz::ScalerCfg& cfg, int yFirst, int yLast)
+{
+    if (srcPitch %  static_cast<int>(sizeof(uint32_t)) != 0 ||
+        trgPitch %  static_cast<int>(sizeof(uint32_t)) != 0 ||
+        srcPitch < srcWidth * static_cast<int>(sizeof(uint32_t)) ||
+        trgPitch < srcWidth * static_cast<int>(factor) * static_cast<int>(sizeof(uint32_t)))
+    {
+        assert(false);
+        return;
+    }
+
+    int trgWidth = trgPitch / static_cast<int>(sizeof(uint32_t));
+    int srcPPitch = srcPitch / static_cast<int>(sizeof(uint32_t));
+
+    switch (colFmt)
+    {
+        case ARGB:
+            switch (factor)
+            {
+                case 2:
+                    return scaleImage<Scaler2x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+                case 3:
+                    return scaleImage<Scaler3x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+                case 4:
+                    return scaleImage<Scaler4x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+                case 5:
+                    return scaleImage<Scaler5x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+                case 6:
+                    return scaleImage<Scaler6x<ColorGradientARGB>, ColorDistanceARGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+            }
+            break;
+
+        case RGB:
+            switch (factor)
+            {
+                case 2:
+                    return scaleImage<Scaler2x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+                case 3:
+                    return scaleImage<Scaler3x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+                case 4:
+                    return scaleImage<Scaler4x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+                case 5:
+                    return scaleImage<Scaler5x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+                case 6:
+                    return scaleImage<Scaler6x<ColorGradientRGB>, ColorDistanceRGB>(src, srcWidth, srcHeight, srcPPitch, trg, trgWidth, cfg, yFirst, yLast);
+            }
+            break;
+    }
+    assert(false);
+}
+
+
+bool xbrz::equalColorTest(uint32_t col1, uint32_t col2, ColorFormat colFmt, double luminanceWeight, double equalColorTolerance)
+{
+    switch (colFmt)
+    {
+        case ARGB:
+            return ColorDistanceARGB::dist(col1, col2, luminanceWeight) < equalColorTolerance;
+
+        case RGB:
+            return ColorDistanceRGB::dist(col1, col2, luminanceWeight) < equalColorTolerance;
+    }
+    assert(false);
+    return false;
+}
+
+
+void xbrz::nearestNeighborScale(const uint32_t* src, int srcWidth, int srcHeight, int srcPitch,
+                                uint32_t* trg, int trgWidth, int trgHeight, int trgPitch,
+                                SliceType st, int yFirst, int yLast)
+{
+    if (srcPitch < srcWidth * static_cast<int>(sizeof(uint32_t))  ||
+        trgPitch < trgWidth * static_cast<int>(sizeof(uint32_t)))
+    {
+        assert(false);
+        return;
+    }
+
+    switch (st)
+    {
+        case NN_SCALE_SLICE_SOURCE:
+            //nearest-neighbor (going over source image - fast for upscaling, since source is read only once
+            yFirst = std::max(yFirst, 0);
+            yLast  = std::min(yLast, srcHeight);
+            if (yFirst >= yLast || trgWidth <= 0 || trgHeight <= 0) return;
+
+            for (int y = yFirst; y < yLast; ++y)
+            {
+                //mathematically: ySrc = floor(srcHeight * yTrg / trgHeight)
+                // => search for integers in: [ySrc, ySrc + 1) * trgHeight / srcHeight
+
+                //keep within for loop to support MT input slices!
+                const int yTrg_first = ( y      * trgHeight + srcHeight - 1) / srcHeight; //=ceil(y * trgHeight / srcHeight)
+                const int yTrg_last  = ((y + 1) * trgHeight + srcHeight - 1) / srcHeight; //=ceil(((y + 1) * trgHeight) / srcHeight)
+                const int blockHeight = yTrg_last - yTrg_first;
+
+                if (blockHeight > 0)
+                {
+                    const uint32_t* srcLine = byteAdvance(src, y * srcPitch);
+                    uint32_t* trgLine  = byteAdvance(trg, yTrg_first * trgPitch);
+                    int xTrg_first = 0;
+
+                    for (int x = 0; x < srcWidth; ++x)
+                    {
+                        int xTrg_last = ((x + 1) * trgWidth + srcWidth - 1) / srcWidth;
+                        const int blockWidth = xTrg_last - xTrg_first;
+                        if (blockWidth > 0)
+                        {
+                            xTrg_first = xTrg_last;
+                            fillBlock(trgLine, trgPitch, srcLine[x], blockWidth, blockHeight);
+                            trgLine += blockWidth;
+                        }
+                    }
+                }
+            }
+            break;
+
+        case NN_SCALE_SLICE_TARGET:
+            //nearest-neighbor (going over target image - slow for upscaling, since source is read multiple times missing out on cache! Fast for similar image sizes!)
+            yFirst = std::max(yFirst, 0);
+            yLast  = std::min(yLast, trgHeight);
+            if (yFirst >= yLast || srcHeight <= 0 || srcWidth <= 0) return;
+
+            for (int y = yFirst; y < yLast; ++y)
+            {
+                uint32_t* trgLine = byteAdvance(trg, y * trgPitch);
+                const int ySrc = srcHeight * y / trgHeight;
+                const uint32_t* srcLine = byteAdvance(src, ySrc * srcPitch);
+                for (int x = 0; x < trgWidth; ++x)
+                {
+                    const int xSrc = srcWidth * x / trgWidth;
+                    trgLine[x] = srcLine[xSrc];
+                }
+            }
+            break;
+    }
+}
diff --git a/src/filters/xBRZ/xbrz.h b/src/filters/xBRZ/xbrz.h
index 7bc9590b..42c7a315 100644
--- a/src/filters/xBRZ/xbrz.h
+++ b/src/filters/xBRZ/xbrz.h
@@ -1,102 +1,102 @@
-// ****************************************************************************
-// * This file is part of the HqMAME project. It is distributed under         *
-// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0          *
-// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved          *
-// *                                                                          *
-// * Additionally and as a special exception, the author gives permission     *
-// * to link the code of this program with the MAME library (or with modified *
-// * versions of MAME that use the same license as MAME), and distribute      *
-// * linked combinations including the two. You must obey the GNU General     *
-// * Public License in all respects for all of the code used other than MAME. *
-// * If you modify this file, you may extend this exception to your version   *
-// * of the file, but you are not obligated to do so. If you do not wish to   *
-// * do so, delete this exception statement from your version.                *
-// ****************************************************************************
-
-#ifndef XBRZ_HEADER_3847894708239054
-#define XBRZ_HEADER_3847894708239054
-
-#include "config.h"
-#include <cstddef> //size_t
-#include <limits>
-#include <stdint.h> //uint32_t
-
-namespace xbrz
-{
-/*
--------------------------------------------------------------------------
-| xBRZ: "Scale by rules" - high quality image upscaling filter by Zenju |
--------------------------------------------------------------------------
-using a modified approach of xBR:
-http://board.byuu.org/viewtopic.php?f=10&t=2248
-- new rule set preserving small image features
-- highly optimized for performance
-- support alpha channel
-- support multithreading
-- support 64-bit architectures
-- support processing image slices
-- support scaling up to 6xBRZ
-*/
-
-enum ColorFormat // from high bits -> low bits, 8 bit per channel
-{ RGB,           // 8 bit for each red, green, blue, upper 8 bits unused
-  ARGB,          // including alpha channel, BGRA byte order on little-endian machines
-};
-
-/*
--> map source (srcWidth * srcHeight) to target (scale * width x scale * height) image, optionally
-processing a half-open slice of rows [yFirst, yLast) only
--> support for source/target pitch in bytes!
--> if your emulator changes only a few image slices during each cycle (e.g. DOSBox) then there's no
-need to run xBRZ on the complete image:
-   Just make sure you enlarge the source image slice by 2 rows on top and 2 on bottom (this is the
-additional range the xBRZ algorithm is using during analysis)
-   Caveat: If there are multiple changed slices, make sure they do not overlap after adding these
-additional rows in order to avoid a memory race condition
-   in the target image data if you are using multiple threads for processing each enlarged slice!
-
-THREAD-SAFETY: - parts of the same image may be scaled by multiple threads as long as the [yFirst,
-yLast) ranges do not overlap!
-               - there is a minor inefficiency for the first row of a slice, so avoid processing
-single rows only; suggestion: process 8-16 rows at least
-*/
-void scale(size_t factor, // valid range: 2 - 6
-           const uint32_t *src, int srcWidth, int srcHeight, int srcPitch, uint32_t *trg,
-           int trgPitch, ColorFormat colFmt, const ScalerCfg &cfg = ScalerCfg(), int yFirst = 0,
-           int yLast = std::numeric_limits<int>::max()); // slice of source image
-
-void nearestNeighborScale(const uint32_t *src, int srcWidth, int srcHeight, uint32_t *trg,
-                          int trgWidth, int trgHeight);
-
-enum SliceType {
-        NN_SCALE_SLICE_SOURCE,
-        NN_SCALE_SLICE_TARGET,
-};
-void nearestNeighborScale(const uint32_t *src, int srcWidth, int srcHeight,
-                          int srcPitch, // pitch in bytes!
-                          uint32_t *trg, int trgWidth, int trgHeight, int trgPitch, SliceType st,
-                          int yFirst, int yLast);
-
-// parameter tuning
-bool equalColorTest(uint32_t col1, uint32_t col2, ColorFormat colFmt, double luminanceWeight,
-                    double equalColorTolerance);
-
-//########################### implementation ###########################
-inline void nearestNeighborScale(const uint32_t *src, int srcWidth, int srcHeight, uint32_t *trg,
-                                 int trgWidth, int trgHeight)
-{
-        nearestNeighborScale(src,
-                             srcWidth,
-                             srcHeight,
-                             srcWidth * sizeof(uint32_t),
-                             trg,
-                             trgWidth,
-                             trgHeight,
-                             trgWidth * sizeof(uint32_t),
-                             NN_SCALE_SLICE_TARGET,
-                             0,
-                             trgHeight);
-}
-}
-
-#endif
+// ****************************************************************************
+// * This file is part of the HqMAME project. It is distributed under         *
+// * GNU General Public License: http://www.gnu.org/licenses/gpl-3.0          *
+// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved          *
+// *                                                                          *
+// * Additionally and as a special exception, the author gives permission     *
+// * to link the code of this program with the MAME library (or with modified *
+// * versions of MAME that use the same license as MAME), and distribute      *
+// * linked combinations including the two. You must obey the GNU General     *
+// * Public License in all respects for all of the code used other than MAME. *
+// * If you modify this file, you may extend this exception to your version   *
+// * of the file, but you are not obligated to do so. If you do not wish to   *
+// * do so, delete this exception statement from your version.                *
+// ****************************************************************************
+
+#ifndef XBRZ_HEADER_3847894708239054
+#define XBRZ_HEADER_3847894708239054
+
+#include "config.h"
+#include <cstddef> //size_t
+#include <limits>
+#include <stdint.h> //uint32_t
+
+namespace xbrz
+{
+/*
+-------------------------------------------------------------------------
+| xBRZ: "Scale by rules" - high quality image upscaling filter by Zenju |
+-------------------------------------------------------------------------
+using a modified approach of xBR:
+http://board.byuu.org/viewtopic.php?f=10&t=2248
+- new rule set preserving small image features
+- highly optimized for performance
+- support alpha channel
+- support multithreading
+- support 64-bit architectures
+- support processing image slices
+- support scaling up to 6xBRZ
+*/
+
+enum ColorFormat // from high bits -> low bits, 8 bit per channel
+{ RGB,           // 8 bit for each red, green, blue, upper 8 bits unused
+  ARGB,          // including alpha channel, BGRA byte order on little-endian machines
+};
+
+/*
+-> map source (srcWidth * srcHeight) to target (scale * width x scale * height) image, optionally
+processing a half-open slice of rows [yFirst, yLast) only
+-> support for source/target pitch in bytes!
+-> if your emulator changes only a few image slices during each cycle (e.g. DOSBox) then there's no
+need to run xBRZ on the complete image:
+   Just make sure you enlarge the source image slice by 2 rows on top and 2 on bottom (this is the
+additional range the xBRZ algorithm is using during analysis)
+   Caveat: If there are multiple changed slices, make sure they do not overlap after adding these
+additional rows in order to avoid a memory race condition
+   in the target image data if you are using multiple threads for processing each enlarged slice!
+
+THREAD-SAFETY: - parts of the same image may be scaled by multiple threads as long as the [yFirst,
+yLast) ranges do not overlap!
+               - there is a minor inefficiency for the first row of a slice, so avoid processing
+single rows only; suggestion: process 8-16 rows at least
+*/
+void scale(size_t factor, // valid range: 2 - 6
+           const uint32_t *src, int srcWidth, int srcHeight, int srcPitch, uint32_t *trg,
+           int trgPitch, ColorFormat colFmt, const ScalerCfg &cfg = ScalerCfg(), int yFirst = 0,
+           int yLast = std::numeric_limits<int>::max()); // slice of source image
+
+void nearestNeighborScale(const uint32_t *src, int srcWidth, int srcHeight, uint32_t *trg,
+                          int trgWidth, int trgHeight);
+
+enum SliceType {
+        NN_SCALE_SLICE_SOURCE,
+        NN_SCALE_SLICE_TARGET,
+};
+void nearestNeighborScale(const uint32_t *src, int srcWidth, int srcHeight,
+                          int srcPitch, // pitch in bytes!
+                          uint32_t *trg, int trgWidth, int trgHeight, int trgPitch, SliceType st,
+                          int yFirst, int yLast);
+
+// parameter tuning
+bool equalColorTest(uint32_t col1, uint32_t col2, ColorFormat colFmt, double luminanceWeight,
+                    double equalColorTolerance);
+
+//########################### implementation ###########################
+inline void nearestNeighborScale(const uint32_t *src, int srcWidth, int srcHeight, uint32_t *trg,
+                                 int trgWidth, int trgHeight)
+{
+        nearestNeighborScale(src,
+                             srcWidth,
+                             srcHeight,
+                             srcWidth * sizeof(uint32_t),
+                             trg,
+                             trgWidth,
+                             trgHeight,
+                             trgWidth * sizeof(uint32_t),
+                             NN_SCALE_SLICE_TARGET,
+                             0,
+                             trgHeight);
+}
+}
+
+#endif
diff --git a/src/gb/GB.cpp b/src/gb/GB.cpp
index 382aa964..0982d619 100644
--- a/src/gb/GB.cpp
+++ b/src/gb/GB.cpp
@@ -900,7 +900,7 @@ void gbCompareLYToLYC()
     }
 }
 
-void gbWriteMemory(register uint16_t address, register uint8_t value)
+void gbWriteMemory(uint16_t address, uint8_t value)
 {
 
     if (address < 0x8000) {
@@ -1720,7 +1720,7 @@ void gbWriteMemory(register uint16_t address, register uint8_t value)
     gbMemory[address] = value;
 }
 
-uint8_t gbReadMemory(register uint16_t address)
+uint8_t gbReadMemory(uint16_t address)
 {
     if (gbCheatMap[address])
         return gbCheatRead(address);
@@ -2189,7 +2189,7 @@ static void gbSelectColorizationPalette()
         }
 
         // Check if the checksum is in the list.
-        int idx;
+        size_t idx;
         for (idx = 0; idx < sizeof(gbColorizationChecksums); idx++) {
             if (gbColorizationChecksums[idx] == checksum) {
                 break;
@@ -2201,7 +2201,7 @@ static void gbSelectColorizationPalette()
             // Indexes above 0x40 have to be disambiguated.
             if (idx > 0x40) {
                 // No idea how that works. But it works.
-                for (int i = idx - 0x41, j = 0; i < sizeof(gbColorizationDisambigChars); i += 14, j += 14) {
+                for (size_t i = idx - 0x41, j = 0; i < sizeof(gbColorizationDisambigChars); i += 14, j += 14) {
                     if (gbRom[0x0137] == gbColorizationDisambigChars[i]) {
                         infoIdx = idx + j;
                         break;
@@ -3430,7 +3430,7 @@ bool gbReadGSASnapshot(const char* fileName)
     fseek(file, 0x4, SEEK_SET);
     char buffer[16];
     char buffer2[16];
-    fread(buffer, 1, 15, file);
+    FREAD_UNCHECKED(buffer, 1, 15, file);
     buffer[15] = 0;
     memcpy(buffer2, &gbRom[0x134], 15);
     buffer2[15] = 0;
@@ -3443,8 +3443,6 @@ bool gbReadGSASnapshot(const char* fileName)
         return false;
     }
     fseek(file, 0x13, SEEK_SET);
-    size_t read = 0;
-    int toRead = 0;
     switch (gbRomType) {
     case 0x03:
     case 0x0f:
@@ -3453,13 +3451,11 @@ bool gbReadGSASnapshot(const char* fileName)
     case 0x1b:
     case 0x1e:
     case 0xff:
-        read = fread(gbRam, 1, (gbRamSizeMask + 1), file);
-        toRead = (gbRamSizeMask + 1);
+        FREAD_UNCHECKED(gbRam, 1, (gbRamSizeMask + 1), file);
         break;
     case 0x06:
     case 0x22:
-        read = fread(&gbMemory[0xa000], 1, 256, file);
-        toRead = 256;
+        FREAD_UNCHECKED(&gbMemory[0xa000], 1, 256, file);
         break;
     default:
         systemMessage(MSG_UNSUPPORTED_SNAPSHOT_FILE,
@@ -4509,7 +4505,7 @@ void gbEmulate(int ticksToStop)
     clockTicks = 0;
     gbDmaTicks = 0;
 
-    register int opcode = 0;
+    int opcode = 0;
 
     int opcode1 = 0;
     int opcode2 = 0;
diff --git a/src/gb/gb.h b/src/gb/gb.h
index d17acb5c..0d35c65a 100644
--- a/src/gb/gb.h
+++ b/src/gb/gb.h
@@ -24,7 +24,7 @@ int gbDis(char*, uint16_t);
 bool gbLoadRom(const char*);
 bool gbUpdateSizes();
 void gbEmulate(int);
-void gbWriteMemory(register uint16_t, register uint8_t);
+void gbWriteMemory(uint16_t, uint8_t);
 void gbDrawLine();
 bool gbIsGameboyRom(const char*);
 void gbGetHardwareType();
diff --git a/src/gb/gbCheats.cpp b/src/gb/gbCheats.cpp
index 90947906..e75039af 100644
--- a/src/gb/gbCheats.cpp
+++ b/src/gb/gbCheats.cpp
@@ -416,10 +416,10 @@ bool gbCheatReadGSCodeFile(const char* fileName)
     char code[9];
     int i;
     for (i = 0; i < count; i++) {
-        fread(&dummy, 1, 2, file);
-        fread(desc, 1, 12, file);
+        FREAD_UNCHECKED(&dummy, 1, 2, file);
+        FREAD_UNCHECKED(desc, 1, 12, file);
         desc[12] = 0;
-        fread(code, 1, 8, file);
+        FREAD_UNCHECKED(code, 1, 8, file);
         code[8] = 0;
         gbAddGsCheat(code, desc);
     }
diff --git a/src/gb/gbMemory.cpp b/src/gb/gbMemory.cpp
index 85cd45ed..98cda0be 100644
--- a/src/gb/gbMemory.cpp
+++ b/src/gb/gbMemory.cpp
@@ -991,8 +991,17 @@ mapperHuC3 gbDataHuC3 = {
     1, // ROM bank
     0, // RAM bank
     0, // RAM address
+    0, // Address
     0, // RAM flag
-    0 // RAM read value
+    0, // RAM read value
+    0, // Register 1
+    0, // Register 2
+    0, // Register 3
+    0, // Register 4
+    0, // Register 5
+    0, // Register 6
+    0, // Register 7
+    0  // Register 8
 };
 
 // HuC3 ROM write registers
diff --git a/src/gb/gbSGB.cpp b/src/gb/gbSGB.cpp
index c2155a31..fd8f0bb8 100644
--- a/src/gb/gbSGB.cpp
+++ b/src/gb/gbSGB.cpp
@@ -67,7 +67,7 @@ void gbSgbReset()
     gbSgbNextController = 0x0f;
     gbSgbReadingController = 0;
 
-    memset(gbSgbSCPPalette, 0, 512 * 4);
+    memset(gbSgbSCPPalette, 0, 512 * 4 * sizeof(uint16_t));
     memset(gbSgbATF, 0, 20 * 18);
     memset(gbSgbATFList, 0, 45 * 20 * 18);
     memset(gbSgbPacket, 0, 16 * 7);
@@ -119,7 +119,7 @@ void gbSgbFillScreen(uint16_t color)
             int yLine = (y + gbBorderRowSkip + 1) * (gbBorderLineSkip + 2) + gbBorderColumnSkip;
 #endif
             uint16_t* dest = (uint16_t*)pix + yLine;
-            for (register int x = 0; x < 160; x++)
+            for (int x = 0; x < 160; x++)
                 gbSgbDraw16Bit(dest++, color);
         }
     } break;
@@ -127,7 +127,7 @@ void gbSgbFillScreen(uint16_t color)
         for (int y = 0; y < 144; y++) {
             int yLine = (y + gbBorderRowSkip) * gbBorderLineSkip + gbBorderColumnSkip;
             uint8_t* dest = (uint8_t*)pix + yLine * 3;
-            for (register int x = 0; x < 160; x++) {
+            for (int x = 0; x < 160; x++) {
                 gbSgbDraw24Bit(dest, color);
                 dest += 3;
             }
@@ -141,7 +141,7 @@ void gbSgbFillScreen(uint16_t color)
             int yLine = (y + gbBorderRowSkip + 1) * (gbBorderLineSkip + 1) + gbBorderColumnSkip;
 #endif
             uint32_t* dest = (uint32_t*)pix + yLine;
-            for (register int x = 0; x < 160; x++) {
+            for (int x = 0; x < 160; x++) {
                 gbSgbDraw32Bit(dest++, color);
             }
         }
diff --git a/src/gb/gbSound.cpp b/src/gb/gbSound.cpp
index ee72a2b6..186ca61e 100644
--- a/src/gb/gbSound.cpp
+++ b/src/gb/gbSound.cpp
@@ -37,7 +37,7 @@ uint8_t gbSoundRead(uint16_t address)
     return gbMemory[address];
 }
 
-void gbSoundEvent(register uint16_t address, register int data)
+void gbSoundEvent(uint16_t address, int data)
 {
     gbMemory[address] = data;
 
diff --git a/src/gba/BreakpointStructures.cpp b/src/gba/BreakpointStructures.cpp
index e1a78d68..35ae0920 100644
--- a/src/gba/BreakpointStructures.cpp
+++ b/src/gba/BreakpointStructures.cpp
@@ -1,14 +1,14 @@
-/*New code made for the new breakpoint system.
-
-Each breakpoint is now marked by a halfword in an array on map,
-breakpoint array. Each bit means one different type of breakpoint.
-Bit		Value
-0 -		write
-1 -		read
-2 -		ARM
-3 -		THUMB
-4 -		Always on Write		
-5 -		Always on Read
+/*New code made for the new breakpoint system.
+
+Each breakpoint is now marked by a halfword in an array on map,
+breakpoint array. Each bit means one different type of breakpoint.
+Bit		Value
+0 -		write
+1 -		read
+2 -		ARM
+3 -		THUMB
+4 -		Always on Write		
+5 -		Always on Read
 6 -		Always on ARM
 7 -		Always on THUMB
 
@@ -16,43 +16,43 @@ Each flag is independent, and can be used as such, as well as together.
 You can define a break on access (0xf), break on IO (0x3), break on 
 execution(0xc) or any other combination you need. 0xf0 will always break on
 any passage through the address
-
-This structure is accompanied by two other structures for the accesses.
-One of them is the Conditional structure. It's available for all types.
-
-The breaking address header is placed at ConditionalBreak. The type_flags
-indicate the type of break, in the format indicated above.
-Then, it links to the several conditions needed for the break to take place.
-
-Those conditions are then sequentially executed, and if all are true, the
-break takes place.
-They are composed of an address to test, a value to test against, the value's
-type, the flag conditons to test and a link to the next condition to test if 
-that was true. Address and value are stored as Evaluatable expressions, 
-according to the already defined eval from expr.c
-However, be reminded that sometimes registers and memory positions may contain
-values that are not addresses at some times. If such is the case, the program 
-will show garbage results or crash.
-
-The flags are bit-based
-Bit		Value
-0 -		equal
-1 -		greater
-2 -		lesser
-3 -		force Signed comparison
-
-Bit		Value
-0,1 -	addr is: 00 - byte, 01 - halfword, 10 - word, 11 - undefined, assume word
-2 -		addr_is_signed
-3 -		addr_is_array of values (not implemented yet)
-4,5 -	00 is byte, 01 is halfword, 10 is word, 11 undefined
-6 -		val_is_signed
-7 -		val_is_array		(also not implemented)
-Usage:
-Instructions that accept this kind of implementation will follow this pattern
-if <EXP_addr> <addr_type><op><val_type> <EXP_val> [<;>OR<||>OR<&&> [repeat]
-if indicates that the following there is a condition. no If counts as always break
-<EXP_addr> is the first value expression, that unlike what the name implies, may be
+
+This structure is accompanied by two other structures for the accesses.
+One of them is the Conditional structure. It's available for all types.
+
+The breaking address header is placed at ConditionalBreak. The type_flags
+indicate the type of break, in the format indicated above.
+Then, it links to the several conditions needed for the break to take place.
+
+Those conditions are then sequentially executed, and if all are true, the
+break takes place.
+They are composed of an address to test, a value to test against, the value's
+type, the flag conditons to test and a link to the next condition to test if 
+that was true. Address and value are stored as Evaluatable expressions, 
+according to the already defined eval from expr.c
+However, be reminded that sometimes registers and memory positions may contain
+values that are not addresses at some times. If such is the case, the program 
+will show garbage results or crash.
+
+The flags are bit-based
+Bit		Value
+0 -		equal
+1 -		greater
+2 -		lesser
+3 -		force Signed comparison
+
+Bit		Value
+0,1 -	addr is: 00 - byte, 01 - halfword, 10 - word, 11 - undefined, assume word
+2 -		addr_is_signed
+3 -		addr_is_array of values (not implemented yet)
+4,5 -	00 is byte, 01 is halfword, 10 is word, 11 undefined
+6 -		val_is_signed
+7 -		val_is_array		(also not implemented)
+Usage:
+Instructions that accept this kind of implementation will follow this pattern
+if <EXP_addr> <addr_type><op><val_type> <EXP_val> [<;>OR<||>OR<&&> [repeat]
+if indicates that the following there is a condition. no If counts as always break
+<EXP_addr> is the first value expression, that unlike what the name implies, may be
 anything.
 <op> is one of the comparation Operands. Full list bellow
 <EXP_val> is the value to compare to.
@@ -60,823 +60,826 @@ Following can be a ||(or), that adds a second, independent break condition, or
 a &&(and), that specifies that the next condition is a conjoined requisite to the break.
 EX: [0x03005000] == 0x77777777 && 0x50 == [0x03005000]
 	Would be impossible, but tested anyway, and make it never break due to this condition.
-	[0x03005000] == 0x77777777 || 0x50 == [0x03005000]
-	Would make it break when the contents of 0x03005000 were either 0x77777777 or 0x50
-
-Ex: to implement stop only when r2 is 0xf, use
-	if r2 == 0xf
-	to implement stop when PC is above 0x08005000 and 0x03005000 is signed halfword 0x2500
-	if pc > 0x08005000 && 0x03005000 == +0x2500
-*/
-
-/*
-Full Operands lists
-Op1, op2, ...,opN                       --> Meaning
-
-== , =, eq                              --> equal
-
-<, lt                                   --> lesser than
-
-<=, le                                  --> less or equal to
-
-> gt                                    --> greater than
-
->=, ge                                  --> greater or equal to
-
-!=, <>, ne                              --> not equal to
-
-
-valid content types
-b, byte, uint8_t                        --> byte
-sb, sbyte, int8_t                       --> signed byte
-h,hw, halfword, uint16_t, ushort        --> halfword
-sh, shw, shalfword, int16_t short       --> signed halfword
-w, word, uint2_t                        --> word
-sw, sword, int32_t, int                 --> signed word
-*/
-
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "BreakpointStructures.h"
-#include "remote.h"
-
-#if (defined __WIN32__ || defined _WIN32)
-#define strdup _strdup
-#endif
-
-extern bool dexp_eval(char*, uint32_t*);
-
-//struct intToString{
-//	int value;
-//	char mapping[20];
-//};
-
-struct ConditionalBreak* conditionals[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
-
-//struct intToString breakFlagMapping[] = {
-//	{0x80,"Thumb"},
-//	{0x40,"ARM"},
-//	{0x20,"Read"},
-//	{0x10,"Write"},
-//	{0x8,"Thumb"},
-//	{0x4,"ARM"},
-//	{0x2,"Read"},
-//	{0x1,"Write"},
-//	{0x0,"None"}
-//};
-/*
-struct intToString compareFlagMapping[] = {
-	{0x7,"Always"},
-	{0x6,"!="},
-	{0x5,"<="},
-	{0x4,"<"},
-	{0x3,">="},
-	{0x2,">"},
-	{0x1,"=="},
-	{0x0,"Never"}
-};*/
-
-//char* typeMapping[] = {"'uint8_t","'uint16_t","'uint32_t","'uint32_t","'int8_t","'int16_t","'int32_t","'int32_t"};
-//
-//char* compareFlagMapping[] = {"Never","==",">",">=","<","<=","!=","<=>"};
-
-//Constructors
-//case '*':	flag = 0xf;	break;
-//case 't':	flag = 0x8;	break; // thumb
-//case 'a':	flag = 0x4;	break; // arm
-//case 'x':	flag = 0xC;	break;
-//case 'r':	flag = 0x2;	break; // mem read
-//case 'w':	flag = 0x1;	break; // mem write
-//case 'i':	flag = 0x3;	break;
-struct ConditionalBreak* addConditionalBreak(uint32_t address, uint8_t flag)
-{
-    uint8_t condIndex = address >> 24;
-    struct ConditionalBreak* cond = NULL;
-    BreakSet((&map[condIndex])->breakPoints, address & (&map[condIndex])->mask, ((flag & 0xf) | (flag >> 4)));
-    if (flag & 0xf0) {
-        struct ConditionalBreak* base = conditionals[condIndex];
-        struct ConditionalBreak* prev = conditionals[condIndex];
-        if (conditionals[condIndex]) {
-            while ((base) && (address >= base->break_address)) {
-                if (base->break_address == address) {
-                    if (base->type_flags & 0xf0) {
-                        base->type_flags |= (flag & 0xf0);
-                        flag &= 0xf;
-                        cond = base;
-                        goto addCB_nextHandle;
-                    } else {
-                        goto condCreateForFlagAlways;
-                    }
-                } else {
-                    prev = base;
-                    base = base->next;
-                }
-            }
-        }
-    condCreateForFlagAlways:
-        cond = (struct ConditionalBreak*)malloc(sizeof(struct ConditionalBreak));
-        cond->break_address = address;
-        cond->type_flags = flag & 0xf0;
-        cond->next = base;
-        cond->firstCond = NULL;
-        if (prev == conditionals[condIndex])
-            conditionals[condIndex] = cond;
-        else
-            prev->next = cond;
-    }
-    flag &= 0xf;
-
-addCB_nextHandle:
-    if (flag == 0)
-        return cond;
-
-    cond = (struct ConditionalBreak*)malloc(sizeof(struct ConditionalBreak));
-    cond->break_address = address;
-    cond->type_flags = flag;
-    cond->next = NULL;
-    cond->firstCond = NULL;
-    if (conditionals[condIndex] == NULL) {
-        conditionals[condIndex] = cond;
-        return cond;
-    } else {
-        struct ConditionalBreak *curr, *prev;
-        curr = conditionals[condIndex];
-        prev = conditionals[condIndex];
-        while (curr) {
-            if (curr->break_address > address) {
-                if (prev == curr) {
-                    conditionals[condIndex] = cond;
-                } else {
-                    prev->next = cond;
-                }
-                cond->next = curr;
-                return cond;
-            }
-            prev = curr;
-            curr = prev->next;
-        }
-        prev->next = cond;
-        return cond;
-    }
-}
-
-void addCondition(struct ConditionalBreak* base, struct ConditionalBreakNode* toAdd)
-{
-    if (base->firstCond) {
-        struct ConditionalBreakNode *curr, *prev;
-        curr = base->firstCond;
-        prev = base->firstCond;
-        while (curr) {
-            prev = curr;
-            curr = curr->next;
-        }
-        prev->next = toAdd;
-    } else {
-        base->firstCond = toAdd;
-    }
-}
-
-//destructors
-void freeConditionalBreak(struct ConditionalBreak* toFree)
-{
-    struct ConditionalBreakNode* freeMe;
-    while (toFree->firstCond) {
-        freeMe = toFree->firstCond;
-        toFree->firstCond = toFree->firstCond->next;
-        free(freeMe);
-    }
-    free(toFree);
-}
-
-void freeConditionalNode(struct ConditionalBreakNode* toDel)
-{
-    if (toDel->next)
-        freeConditionalNode(toDel->next);
-    if (toDel->address)
-        free(toDel->address);
-    if (toDel->value)
-        free(toDel->value);
-    free(toDel);
-}
-
-void freeAllConditionals()
-{
-    for (int i = 0; i < 16; i++) {
-        while (conditionals[i]) {
-            struct ConditionalBreak* tmp = conditionals[i];
-            conditionals[i] = conditionals[i]->next;
-            freeConditionalBreak(tmp);
-        }
-    }
-}
-
-int removeConditionalBreak(struct ConditionalBreak* toDelete)
-{
-    if (toDelete) {
-        uint8_t condIndex = toDelete->break_address >> 24;
-        struct ConditionalBreak* base = conditionals[condIndex];
-        struct ConditionalBreak* prev = conditionals[condIndex];
-        while (base) {
-            if (base == toDelete) {
-                if (base == prev) {
-                    conditionals[condIndex] = base->next;
-                } else {
-                    prev->next = base->next;
-                }
-                freeConditionalBreak(toDelete);
-                return 0;
-            }
-            prev = base;
-            base = base->next;
-        }
-        return -1; //failed to remove
-    }
-    return -2; //delete failed because container was not there
-}
-
-/*
-int removeConditionalBreak(uint32_t address, uint8_t num, uint8_t flag){
-	uint8_t condIndex = address>>24;
-	struct ConditionalBreak* base = conditionals[condIndex];
-	struct ConditionalBreak* prev = conditionals[condIndex];
-	uint8_t counter = 0;
-	while(base){
-		if(base->break_address > address)
-			return -2;	//failed to remove
-		if(base->break_address == address){
-			counter++;
-		}
-		if(counter == num){
-			base->type_flags &= ~flag;
-			if(base->type_flags == 0){
-				if(prev == base){
-					conditionals[condIndex] = base->next;
-				}else{
-					prev->next = base->next;
-				}
-				freeConditionalBreak(base);
-				return 0;
-			}
-			return 1;
-		}
-		prev = base;
-		base = base->next;
-	}
-	return -2;
-}
-
-bool removeCondition(struct ConditionalBreak* base, struct ConditionalBreakNode* toDel){
-	if(base->firstCond){
-		if(toDel == base->firstCond){
-			base->firstCond = toDel->next;
-			freeConditionalNode(toDel);
-			return true;
-		}
-		struct ConditionalBreakNode* curr, *prev;
-		curr = base->firstCond;
-		prev = base->firstCond;
-		while(curr){
-			if(curr == toDel){
-				prev->next = curr->next;
-				freeConditionalNode(toDel);
-				return true;
-			}
-			prev = curr;
-			curr = curr->next;
-		}
-	}
-	freeConditionalNode(toDel);
-	return false;
-}
-
-bool removeCondition(uint32_t address, uint8_t flags, uint8_t num){
-	struct ConditionalBreak* base  = conditionals[address>>24];
-	while(base && base->break_address < address){
-		base = base->next;
-	}
-	if(base && base->break_address == address){
-		struct ConditionalBreakNode* curr = base->firstCond; 
-		for(int i = 0; i < num; i++){
-			if(!curr && ((!base) || (!base->next))){
-				return false;
-			}if(!curr){
-				while(!curr){
-				base = base->next;
-				if(base->break_address > address)
-					return false;
-				
-				curr = base->firstCond;
-			}
-		}
-	}
-	}
-}*/
-
-/*
-int removeAllConditions(uint32_t address, uint8_t flags){
-	struct ConditionalBreak* base  = conditionals[address>>24];
-	while(base && base->break_address < address){
-		base = base->next;
-	}
-	struct ConditionalBreak* curr = base;
-	while(base && base->break_address == address){
-		base->type_flags &= ~flags;
-		if(!base->type_flags){
-			curr = base;
-			base = base->next;
-			removeCondition(base);
-		}
-	}
-	return true;
-}*/
-
-void recountFlagsForAddress(uint32_t address)
-{
-    struct ConditionalBreak* base = conditionals[address >> 24];
-    uint8_t flags = 0;
-    while (base) {
-        if (base->break_address < address) {
-            base = base->next;
-        } else {
-            if (base->break_address == address) {
-                flags |= base->type_flags;
-            } else {
-                BreakClear((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, 0xff);
-                BreakSet((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, ((flags >> 4) | (flags & 0x8)));
-                return;
-            }
-            base = base->next;
-        }
-    }
-    BreakClear((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, 0xff);
-    BreakSet((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, ((flags >> 4) | (flags & 0x8)));
-}
-
-//Removers
-int removeConditionalBreakNo(uint32_t addrNo, uint8_t number)
-{
-    if (conditionals[addrNo >> 24]) {
-        struct ConditionalBreak* base = conditionals[addrNo >> 24];
-        struct ConditionalBreak* curr = conditionals[addrNo >> 24];
-        while (curr->break_address < addrNo) {
-            base = curr;
-            curr = curr->next;
-        }
-        if (curr->break_address == addrNo) {
-            if (number == 1) {
-                if (base == curr) {
-                    conditionals[addrNo >> 24] = curr->next;
-                    freeConditionalBreak(curr);
-                } else {
-                    base->next = curr->next;
-                    freeConditionalBreak(curr);
-                }
-                recountFlagsForAddress(addrNo);
-                return 0;
-            } else {
-                int count = 1;
-                while (curr && (curr->break_address == addrNo)) {
-                    if (count == number) {
-                        base->next = curr->next;
-                        freeConditionalBreak(curr);
-                        recountFlagsForAddress(addrNo);
-                        return 1;
-                    }
-                    count++;
-                    base = curr;
-                    curr = curr->next;
-                }
-                return -1;
-            }
-        }
-    }
-    return -2;
-}
-
-int removeFlagFromConditionalBreakNo(uint32_t addrNo, uint8_t number, uint8_t flag)
-{
-    if (conditionals[addrNo >> 24]) {
-        struct ConditionalBreak* base = conditionals[addrNo >> 24];
-        struct ConditionalBreak* curr = conditionals[addrNo >> 24];
-        while (curr->break_address < addrNo) {
-            base = curr;
-            curr = curr->next;
-        }
-        if (curr->break_address == addrNo) {
-            if (number == 1) {
-                curr->type_flags &= ~flag;
-                if (curr->type_flags == 0) {
-                    if (base == curr) {
-                        conditionals[addrNo >> 24] = curr->next;
-                        freeConditionalBreak(curr);
-                    } else {
-                        base->next = curr->next;
-                        freeConditionalBreak(curr);
-                    }
-                }
-                recountFlagsForAddress(addrNo);
-                return 0;
-            } else {
-                int count = 1;
-                while (curr && (curr->break_address == addrNo)) {
-                    if (count == number) {
-                        curr->type_flags &= ~flag;
-                        if (!curr->type_flags) {
-                            base->next = curr->next;
-                            freeConditionalBreak(curr);
-                            recountFlagsForAddress(addrNo);
-                            return 1;
-                        }
-                        recountFlagsForAddress(addrNo);
-                        return 0;
-                    }
-                    count++;
-                    base = curr;
-                    curr = curr->next;
-                }
-                return -1;
-            }
-        }
-    }
-    return -2;
-}
-
-int removeConditionalWithAddress(uint32_t address)
-{
-    uint8_t addrNo = address >> 24;
-    if (conditionals[addrNo] != NULL) {
-        struct ConditionalBreak* base = conditionals[addrNo];
-        struct ConditionalBreak* curr = conditionals[addrNo];
-        uint8_t count = 0;
-        uint8_t flags = 0;
-        while (curr && address >= curr->break_address) {
-            if (curr->break_address == address) {
-                base->next = curr->next;
-                flags |= curr->type_flags;
-                freeConditionalBreak(curr);
-                curr = base->next;
-                count++;
-            } else {
-                base = curr;
-                curr = curr->next;
-            }
-        }
-        BreakClear((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, ((flags & 0xf) | (flags >> 4)));
-        return count;
-    }
-    return -2;
-}
-
-int removeConditionalWithFlag(uint8_t flag, bool orMode)
-{
-    for (uint8_t addrNo = 0; addrNo < 16; addrNo++) {
-        if (conditionals[addrNo] != NULL) {
-            struct ConditionalBreak* base = conditionals[addrNo];
-            struct ConditionalBreak* curr = conditionals[addrNo];
-            uint8_t count = 0;
-            while (curr) {
-                if (((curr->type_flags & flag) == curr->type_flags) || (orMode && (curr->type_flags & flag))) {
-                    curr->type_flags &= ~flag;
-                    BreakClear((&map[addrNo])->breakPoints, curr->break_address & (&map[addrNo])->mask, ((flag & 0xf) | (flag >> 4)));
-                    if (curr->type_flags == 0) {
-                        if (base == conditionals[addrNo]) {
-                            conditionals[addrNo] = curr->next;
-                            base = curr->next;
-                            curr = base;
-                        } else {
-                            base->next = curr->next;
-                            freeConditionalBreak(curr);
-                            curr = base->next;
-                        }
-                        count++;
-                    } else {
-                        base = curr;
-                        curr = curr->next;
-                    }
-                } else {
-                    base = curr;
-                    curr = curr->next;
-                }
-            }
-            return count;
-        }
-    }
-    return -2;
-}
-
-int removeConditionalWithAddressAndFlag(uint32_t address, uint8_t flag, bool orMode)
-{
-    uint8_t addrNo = address >> 24;
-    if (conditionals[addrNo] != NULL) {
-        struct ConditionalBreak* base = conditionals[addrNo];
-        struct ConditionalBreak* curr = conditionals[addrNo];
-        uint8_t count = 0;
-        while (curr && address >= curr->break_address) {
-            if ((curr->break_address == address) && (((curr->type_flags & flag) == curr->type_flags) || (orMode && (curr->type_flags & flag)))) {
-                curr->type_flags &= ~flag;
-                BreakClear((&map[address >> 24])->breakPoints, curr->break_address & (&map[address >> 24])->mask, ((flag & 0xf) | (flag >> 4)));
-                if (curr->type_flags == 0) {
-                    if (curr == conditionals[addrNo]) {
-                        conditionals[addrNo] = curr->next;
-                        freeConditionalBreak(curr);
-                        curr = conditionals[addrNo];
-                    } else {
-                        base->next = curr->next;
-                        freeConditionalBreak(curr);
-                        curr = base->next;
-                    }
-                    count++;
-                } else {
-                    base = curr;
-                    curr = curr->next;
-                }
-            } else {
-                base = curr;
-                curr = curr->next;
-            }
-        }
-        return count;
-    }
-    return -2;
-}
-
-//true creating code for a given expression.
-//It assumes an if was found, and that all up to the if was removed.
-//receives an array of chars following the pattern:
-//{'<expType>,<exp>,<op>,'<expType>,<exp>,<And_symbol|or_symbol>, (repeats)
-//<expType is optional, and always assumes int-compare as default.
-uint8_t parseExpressionType(char* type);
-uint8_t parseConditionOperand(char* type);
-void parseAndCreateConditionalBreaks(uint32_t address, uint8_t flags, char** exp, int n)
-{
-    struct ConditionalBreak* workBreak = addConditionalBreak(address, flags);
-    flags &= 0xf;
-    if (!flags)
-        return;
-    struct ConditionalBreakNode* now = (struct ConditionalBreakNode*)malloc(sizeof(struct ConditionalBreakNode));
-    struct ConditionalBreakNode* toAdd = now;
-    for (int i = 0; i < n; i++) {
-        now->next = 0;
-        now->exp_type_flags = 0;
-        if (exp[i][0] == '\'') {
-            now->exp_type_flags |= parseExpressionType(&exp[i][1]);
-            i++;
-            if (i >= n)
-                goto fail;
-        } else {
-            now->exp_type_flags |= 6; //assume signed word
-        }
-        now->address = strdup(exp[i]);
-        i++;
-        if (i >= n)
-            goto fail;
-        char* operandName = exp[i];
-        now->cond_flags = parseConditionOperand(exp[i]);
-        i++;
-        if (i >= n)
-            goto fail;
-
-        if (exp[i][0] == '\'') {
-            now->exp_type_flags |= (parseExpressionType(&exp[i][1]) << 4);
-            i++;
-            if (i >= n)
-                goto fail;
-        } else {
-            now->exp_type_flags |= 0x60; //assume signed word
-        }
-        now->value = strdup(exp[i]);
-        i++;
-        uint32_t val;
-        if (!dexp_eval(now->value, &val) || !dexp_eval(now->address, &val)) {
-            printf("Invalid expression.\n");
-            if (workBreak)
-                removeConditionalBreak(workBreak);
-            return;
-        }
-        if (i < n) {
-            if (strcmp(exp[i], "&&") == 0) {
-                now = (struct ConditionalBreakNode*)malloc(sizeof(struct ConditionalBreakNode));
-                toAdd->next = now;
-            } else if (strcmp(exp[i], "||") == 0) {
-                addCondition(workBreak, toAdd);
-                printf("Added break on address %08x, with condition:\n%s %s %s\n", address, now->address, operandName, now->value);
-                workBreak = addConditionalBreak(address, flags);
-                now = (struct ConditionalBreakNode*)malloc(sizeof(struct ConditionalBreakNode));
-                toAdd = now;
-            }
-        } else {
-            addCondition(workBreak, toAdd);
-            printf("Added break on address %08x, ending with condition: \n%s %s %s\n", address, now->address, operandName, now->value);
-            return;
-        }
-    }
-    return;
-
-fail:
-    printf("Not enough material (expressions) to work with.");
-    removeConditionalBreak(workBreak);
-    return;
-}
-
-//aux
-uint8_t parseExpressionType(char* given_type)
-{
-    uint8_t flags = 0;
-    //for such a small string, pays off to convert first
-    char* type = strdup(given_type);
-    for (int i = 0; type[i] != '\0'; i++) {
-        type[i] = toupper(type[i]);
-    }
-    if ((type[0] == 'S') || type[0] == 'U') {
-        flags |= (4 - ((type[0] - 'S') << 1));
-        type++;
-        if (type[0] == 'H') {
-            type[0] = '1';
-            type[1] = '6';
-            type[2] = '\0';
-        } else if (type[0] == 'W') {
-            type[0] = '3';
-            type[1] = '2';
-            type[2] = '\0';
-        } else if (type[0] == 'B') {
-            type[0] = '8';
-            type[1] = '\0';
-        }
-        int size;
-        sscanf(type, "%d", &size);
-        size = (size >> 3) - 1;
-        flags |= (size >= 2 ? 2 : ((uint8_t)size));
-        free(type);
-        return flags;
-    }
-    if (strcmp(type, "INT") == 0) {
-        flags = 6;
-    }
-    if (type[0] == 'H') {
-        flags = 1;
-    } else if (type[0] == 'W') {
-        flags = 2;
-    } else if (type[0] == 'B') {
-        flags = 0;
-    } else {
-        flags = 6;
-    }
-    free(type);
-    return flags;
-}
-
-uint8_t parseConditionOperand(char* type)
-{
-    uint8_t flag = 0;
-    if (toupper(type[0]) == 'S') {
-        flag = 8;
-        type++;
-    }
-    switch (type[0]) {
-    case '!':
-        if (type[1] == '=' || type[1] == '\0')
-            return flag | 0x6;
-        break;
-    case '=':
-        if (type[1] == '=' || type[1] == '\0')
-            return flag | 0x1;
-        break;
-    case '<':
-        if (type[1] == '>')
-            return flag | 0x6;
-        if (type[1] == '=')
-            return flag | 0x5;
-        if (type[1] == '\0')
-            return flag | 0x4;
-        break;
-    case '>':
-        if (type[1] == '<')
-            return flag | 0x6;
-        if (type[1] == '=')
-            return flag | 0x3;
-        if (type[1] == '\0')
-            return flag | 0x2;
-        break;
-    default:;
-    }
-    switch (tolower(type[0])) {
-    case 'l':
-        if (tolower(type[1]) == 'e')
-            return flag | 0x5;
-        if (tolower(type[1]) == 't')
-            return flag | 0x4;
-        break;
-    case 'g':
-        if (tolower(type[1]) == 'e')
-            return flag | 0x3;
-        if (tolower(type[1]) == 't')
-            return flag | 0x2;
-
-    case 'e':
-        if (tolower(type[1]) == 'q')
-            return flag | 0x1;
-        if (type[1] == '\0')
-            return flag | 0x1;
-    case 'n':
-        if (tolower(type[1]) == 'e')
-            return flag | 0x6;
-    default:;
-    }
-    return flag;
-}
-
-uint32_t calculateFinalValue(char* expToEval, uint8_t type_of_flags)
-{
-    uint32_t val;
-    if (!dexp_eval(expToEval, &val)) {
-        printf("Invalid expression.\n");
-        return 0;
-    }
-    if (type_of_flags & 0x4) {
-        switch (type_of_flags & 0x3) {
-        case 0:
-            return (int8_t)(val & 0xff);
-        case 1:
-            return (int16_t)(val & 0xffff);
-        default:
-            return (int)val;
-        }
-    } else {
-        switch (type_of_flags & 0x3) {
-        case 0:
-            return (uint8_t)(val & 0xff);
-        case 1:
-            return (uint16_t)(val & 0xffff);
-        default:
-            return val;
-        }
-    }
-}
-
-//check for execution
-bool isCorrectBreak(struct ConditionalBreak* toTest, uint8_t accessType)
-{
-
-    return (toTest->type_flags & accessType);
-}
-
-bool doBreak(struct ConditionalBreak* toTest)
-{
-    struct ConditionalBreakNode* toExamine = toTest->firstCond;
-
-    bool globalVeredict = true;
-    bool veredict = false;
-    while (toExamine && globalVeredict) {
-        uint32_t address = calculateFinalValue(toExamine->address, toExamine->exp_type_flags & 0xf);
-        uint32_t value = calculateFinalValue(toExamine->value, toExamine->exp_type_flags >> 4);
-        if ((toExamine->cond_flags & 0x7) != 0) {
-            veredict = veredict || ((toExamine->cond_flags & 1) ? (address == value) : false);
-            veredict = veredict || ((toExamine->cond_flags & 4) ? ((toExamine->cond_flags & 8) ? ((int)address < (int)value) : (address < value)) : false);
-            veredict = veredict || ((toExamine->cond_flags & 2) ? ((toExamine->cond_flags & 8) ? ((int)address > (int)value) : (address > value)) : false);
-        }
-        toExamine = toExamine->next;
-        globalVeredict = veredict && globalVeredict;
-    }
-    return globalVeredict;
-}
-
-bool doesBreak(uint32_t address, uint8_t allowedFlags)
-{
-    uint8_t addrNo = address >> 24;
-    if (conditionals[addrNo]) {
-        struct ConditionalBreak* base = conditionals[addrNo];
-        while (base && base->break_address < address) {
-            base = base->next;
-        }
-        while (base && base->break_address == address) {
-            if (base->type_flags & allowedFlags & 0xf0) {
-                return true;
-            }
-            if (isCorrectBreak(base, allowedFlags) && doBreak(base)) {
-                return true;
-            }
-            base = base->next;
-        }
-    }
-    return false;
-}
-
-/*
-//Test main
-int main (int argc, char** args){
-	char* argv[] = {"r7","s==","0", "||","'byte","0x25","ge","'hword","0x0001"};
-	parseAndCreateConditionalBreaks(0x0203fd00, 0x1f, argv, 9);
-	parseAndCreateConditionalBreaks(0x0203fd00, 0x10, argv, 9);
-	parseAndCreateConditionalBreaks(0x0203fd00, 0x40, argv, 9);
-	parseAndCreateConditionalBreaks(0x0203fd04, 0x04, argv, 9);
-	printAllFlagConditionals(0xff, true);
-	removeFlagFromConditionalBreakNo(0x0203fd00, 0x3,0xff);
-	printf("after\n");
-	printAllFlagConditionals(0xff, true);
-	
-	getchar();
-}
-*/
+	[0x03005000] == 0x77777777 || 0x50 == [0x03005000]
+	Would make it break when the contents of 0x03005000 were either 0x77777777 or 0x50
+
+Ex: to implement stop only when r2 is 0xf, use
+	if r2 == 0xf
+	to implement stop when PC is above 0x08005000 and 0x03005000 is signed halfword 0x2500
+	if pc > 0x08005000 && 0x03005000 == +0x2500
+*/
+
+/*
+Full Operands lists
+Op1, op2, ...,opN                       --> Meaning
+
+== , =, eq                              --> equal
+
+<, lt                                   --> lesser than
+
+<=, le                                  --> less or equal to
+
+> gt                                    --> greater than
+
+>=, ge                                  --> greater or equal to
+
+!=, <>, ne                              --> not equal to
+
+
+valid content types
+b, byte, uint8_t                        --> byte
+sb, sbyte, int8_t                       --> signed byte
+h,hw, halfword, uint16_t, ushort        --> halfword
+sh, shw, shalfword, int16_t short       --> signed halfword
+w, word, uint2_t                        --> word
+sw, sword, int32_t, int                 --> signed word
+*/
+
+#include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "BreakpointStructures.h"
+#include "remote.h"
+
+#if (defined __WIN32__ || defined _WIN32)
+#define strdup _strdup
+#endif
+
+extern bool dexp_eval(char*, uint32_t*);
+
+//struct intToString{
+//	int value;
+//	char mapping[20];
+//};
+
+struct ConditionalBreak* conditionals[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+
+//struct intToString breakFlagMapping[] = {
+//	{0x80,"Thumb"},
+//	{0x40,"ARM"},
+//	{0x20,"Read"},
+//	{0x10,"Write"},
+//	{0x8,"Thumb"},
+//	{0x4,"ARM"},
+//	{0x2,"Read"},
+//	{0x1,"Write"},
+//	{0x0,"None"}
+//};
+/*
+struct intToString compareFlagMapping[] = {
+	{0x7,"Always"},
+	{0x6,"!="},
+	{0x5,"<="},
+	{0x4,"<"},
+	{0x3,">="},
+	{0x2,">"},
+	{0x1,"=="},
+	{0x0,"Never"}
+};*/
+
+//char* typeMapping[] = {"'uint8_t","'uint16_t","'uint32_t","'uint32_t","'int8_t","'int16_t","'int32_t","'int32_t"};
+//
+//char* compareFlagMapping[] = {"Never","==",">",">=","<","<=","!=","<=>"};
+
+//Constructors
+//case '*':	flag = 0xf;	break;
+//case 't':	flag = 0x8;	break; // thumb
+//case 'a':	flag = 0x4;	break; // arm
+//case 'x':	flag = 0xC;	break;
+//case 'r':	flag = 0x2;	break; // mem read
+//case 'w':	flag = 0x1;	break; // mem write
+//case 'i':	flag = 0x3;	break;
+struct ConditionalBreak* addConditionalBreak(uint32_t address, uint8_t flag)
+{
+    uint8_t condIndex = address >> 24;
+    struct ConditionalBreak* cond = NULL;
+    BreakSet((&map[condIndex])->breakPoints, address & (&map[condIndex])->mask, ((flag & 0xf) | (flag >> 4)));
+    if (flag & 0xf0) {
+        struct ConditionalBreak* base = conditionals[condIndex];
+        struct ConditionalBreak* prev = conditionals[condIndex];
+        if (conditionals[condIndex]) {
+            while ((base) && (address >= base->break_address)) {
+                if (base->break_address == address) {
+                    if (base->type_flags & 0xf0) {
+                        base->type_flags |= (flag & 0xf0);
+                        flag &= 0xf;
+                        cond = base;
+                        goto addCB_nextHandle;
+                    } else {
+                        goto condCreateForFlagAlways;
+                    }
+                } else {
+                    prev = base;
+                    base = base->next;
+                }
+            }
+        }
+    condCreateForFlagAlways:
+        cond = (struct ConditionalBreak*)malloc(sizeof(struct ConditionalBreak));
+        cond->break_address = address;
+        cond->type_flags = flag & 0xf0;
+        cond->next = base;
+        cond->firstCond = NULL;
+        if (prev == conditionals[condIndex])
+            conditionals[condIndex] = cond;
+        else
+            prev->next = cond;
+    }
+    flag &= 0xf;
+
+addCB_nextHandle:
+    if (flag == 0)
+        return cond;
+
+    cond = (struct ConditionalBreak*)malloc(sizeof(struct ConditionalBreak));
+    cond->break_address = address;
+    cond->type_flags = flag;
+    cond->next = NULL;
+    cond->firstCond = NULL;
+    if (conditionals[condIndex] == NULL) {
+        conditionals[condIndex] = cond;
+        return cond;
+    } else {
+        struct ConditionalBreak *curr, *prev;
+        curr = conditionals[condIndex];
+        prev = conditionals[condIndex];
+        while (curr) {
+            if (curr->break_address > address) {
+                if (prev == curr) {
+                    conditionals[condIndex] = cond;
+                } else {
+                    prev->next = cond;
+                }
+                cond->next = curr;
+                return cond;
+            }
+            prev = curr;
+            curr = prev->next;
+        }
+        prev->next = cond;
+        return cond;
+    }
+}
+
+void addCondition(struct ConditionalBreak* base, struct ConditionalBreakNode* toAdd)
+{
+    if (base->firstCond) {
+        struct ConditionalBreakNode *curr, *prev;
+        curr = base->firstCond;
+        prev = base->firstCond;
+        while (curr) {
+            prev = curr;
+            curr = curr->next;
+        }
+        prev->next = toAdd;
+    } else {
+        base->firstCond = toAdd;
+    }
+}
+
+//destructors
+void freeConditionalBreak(struct ConditionalBreak* toFree)
+{
+    struct ConditionalBreakNode* freeMe;
+    while (toFree->firstCond) {
+        freeMe = toFree->firstCond;
+        toFree->firstCond = toFree->firstCond->next;
+        free(freeMe);
+    }
+    free(toFree);
+}
+
+void freeConditionalNode(struct ConditionalBreakNode* toDel)
+{
+    if (toDel->next)
+        freeConditionalNode(toDel->next);
+    if (toDel->address)
+        free(toDel->address);
+    if (toDel->value)
+        free(toDel->value);
+    free(toDel);
+}
+
+void freeAllConditionals()
+{
+    for (int i = 0; i < 16; i++) {
+        while (conditionals[i]) {
+            struct ConditionalBreak* tmp = conditionals[i];
+            conditionals[i] = conditionals[i]->next;
+            freeConditionalBreak(tmp);
+        }
+    }
+}
+
+int removeConditionalBreak(struct ConditionalBreak* toDelete)
+{
+    if (toDelete) {
+        uint8_t condIndex = toDelete->break_address >> 24;
+        struct ConditionalBreak* base = conditionals[condIndex];
+        struct ConditionalBreak* prev = conditionals[condIndex];
+        while (base) {
+            if (base == toDelete) {
+                if (base == prev) {
+                    conditionals[condIndex] = base->next;
+                } else {
+                    prev->next = base->next;
+                }
+                freeConditionalBreak(toDelete);
+                return 0;
+            }
+            prev = base;
+            base = base->next;
+        }
+        return -1; //failed to remove
+    }
+    return -2; //delete failed because container was not there
+}
+
+/*
+int removeConditionalBreak(uint32_t address, uint8_t num, uint8_t flag){
+	uint8_t condIndex = address>>24;
+	struct ConditionalBreak* base = conditionals[condIndex];
+	struct ConditionalBreak* prev = conditionals[condIndex];
+	uint8_t counter = 0;
+	while(base){
+		if(base->break_address > address)
+			return -2;	//failed to remove
+		if(base->break_address == address){
+			counter++;
+		}
+		if(counter == num){
+			base->type_flags &= ~flag;
+			if(base->type_flags == 0){
+				if(prev == base){
+					conditionals[condIndex] = base->next;
+				}else{
+					prev->next = base->next;
+				}
+				freeConditionalBreak(base);
+				return 0;
+			}
+			return 1;
+		}
+		prev = base;
+		base = base->next;
+	}
+	return -2;
+}
+
+bool removeCondition(struct ConditionalBreak* base, struct ConditionalBreakNode* toDel){
+	if(base->firstCond){
+		if(toDel == base->firstCond){
+			base->firstCond = toDel->next;
+			freeConditionalNode(toDel);
+			return true;
+		}
+		struct ConditionalBreakNode* curr, *prev;
+		curr = base->firstCond;
+		prev = base->firstCond;
+		while(curr){
+			if(curr == toDel){
+				prev->next = curr->next;
+				freeConditionalNode(toDel);
+				return true;
+			}
+			prev = curr;
+			curr = curr->next;
+		}
+	}
+	freeConditionalNode(toDel);
+	return false;
+}
+
+bool removeCondition(uint32_t address, uint8_t flags, uint8_t num){
+	struct ConditionalBreak* base  = conditionals[address>>24];
+	while(base && base->break_address < address){
+		base = base->next;
+	}
+	if(base && base->break_address == address){
+		struct ConditionalBreakNode* curr = base->firstCond; 
+		for(int i = 0; i < num; i++){
+			if(!curr && ((!base) || (!base->next))){
+				return false;
+			}if(!curr){
+				while(!curr){
+				base = base->next;
+				if(base->break_address > address)
+					return false;
+				
+				curr = base->firstCond;
+			}
+		}
+	}
+	}
+}*/
+
+/*
+int removeAllConditions(uint32_t address, uint8_t flags){
+	struct ConditionalBreak* base  = conditionals[address>>24];
+	while(base && base->break_address < address){
+		base = base->next;
+	}
+	struct ConditionalBreak* curr = base;
+	while(base && base->break_address == address){
+		base->type_flags &= ~flags;
+		if(!base->type_flags){
+			curr = base;
+			base = base->next;
+			removeCondition(base);
+		}
+	}
+	return true;
+}*/
+
+void recountFlagsForAddress(uint32_t address)
+{
+    struct ConditionalBreak* base = conditionals[address >> 24];
+    uint8_t flags = 0;
+    while (base) {
+        if (base->break_address < address) {
+            base = base->next;
+        } else {
+            if (base->break_address == address) {
+                flags |= base->type_flags;
+            } else {
+                BreakClear((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, 0xff);
+                BreakSet((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, ((flags >> 4) | (flags & 0x8)));
+                return;
+            }
+            base = base->next;
+        }
+    }
+    BreakClear((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, 0xff);
+    BreakSet((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, ((flags >> 4) | (flags & 0x8)));
+}
+
+//Removers
+int removeConditionalBreakNo(uint32_t addrNo, uint8_t number)
+{
+    if (conditionals[addrNo >> 24]) {
+        struct ConditionalBreak* base = conditionals[addrNo >> 24];
+        struct ConditionalBreak* curr = conditionals[addrNo >> 24];
+        while (curr->break_address < addrNo) {
+            base = curr;
+            curr = curr->next;
+        }
+        if (curr->break_address == addrNo) {
+            if (number == 1) {
+                if (base == curr) {
+                    conditionals[addrNo >> 24] = curr->next;
+                    freeConditionalBreak(curr);
+                } else {
+                    base->next = curr->next;
+                    freeConditionalBreak(curr);
+                }
+                recountFlagsForAddress(addrNo);
+                return 0;
+            } else {
+                int count = 1;
+                while (curr && (curr->break_address == addrNo)) {
+                    if (count == number) {
+                        base->next = curr->next;
+                        freeConditionalBreak(curr);
+                        recountFlagsForAddress(addrNo);
+                        return 1;
+                    }
+                    count++;
+                    base = curr;
+                    curr = curr->next;
+                }
+                return -1;
+            }
+        }
+    }
+    return -2;
+}
+
+int removeFlagFromConditionalBreakNo(uint32_t addrNo, uint8_t number, uint8_t flag)
+{
+    if (conditionals[addrNo >> 24]) {
+        struct ConditionalBreak* base = conditionals[addrNo >> 24];
+        struct ConditionalBreak* curr = conditionals[addrNo >> 24];
+        while (curr->break_address < addrNo) {
+            base = curr;
+            curr = curr->next;
+        }
+        if (curr->break_address == addrNo) {
+            if (number == 1) {
+                curr->type_flags &= ~flag;
+                if (curr->type_flags == 0) {
+                    if (base == curr) {
+                        conditionals[addrNo >> 24] = curr->next;
+                        freeConditionalBreak(curr);
+                    } else {
+                        base->next = curr->next;
+                        freeConditionalBreak(curr);
+                    }
+                }
+                recountFlagsForAddress(addrNo);
+                return 0;
+            } else {
+                int count = 1;
+                while (curr && (curr->break_address == addrNo)) {
+                    if (count == number) {
+                        curr->type_flags &= ~flag;
+                        if (!curr->type_flags) {
+                            base->next = curr->next;
+                            freeConditionalBreak(curr);
+                            recountFlagsForAddress(addrNo);
+                            return 1;
+                        }
+                        recountFlagsForAddress(addrNo);
+                        return 0;
+                    }
+                    count++;
+                    base = curr;
+                    curr = curr->next;
+                }
+                return -1;
+            }
+        }
+    }
+    return -2;
+}
+
+int removeConditionalWithAddress(uint32_t address)
+{
+    uint8_t addrNo = address >> 24;
+    if (conditionals[addrNo] != NULL) {
+        struct ConditionalBreak* base = conditionals[addrNo];
+        struct ConditionalBreak* curr = conditionals[addrNo];
+        uint8_t count = 0;
+        uint8_t flags = 0;
+        while (curr && address >= curr->break_address) {
+            if (curr->break_address == address) {
+                base->next = curr->next;
+                flags |= curr->type_flags;
+                freeConditionalBreak(curr);
+                curr = base->next;
+                count++;
+            } else {
+                base = curr;
+                curr = curr->next;
+            }
+        }
+        BreakClear((&map[address >> 24])->breakPoints, address & (&map[address >> 24])->mask, ((flags & 0xf) | (flags >> 4)));
+        return count;
+    }
+    return -2;
+}
+
+int removeConditionalWithFlag(uint8_t flag, bool orMode)
+{
+    for (uint8_t addrNo = 0; addrNo < 16; addrNo++) {
+        if (conditionals[addrNo] != NULL) {
+            struct ConditionalBreak* base = conditionals[addrNo];
+            struct ConditionalBreak* curr = conditionals[addrNo];
+            uint8_t count = 0;
+            while (curr) {
+                if (((curr->type_flags & flag) == curr->type_flags) || (orMode && (curr->type_flags & flag))) {
+                    curr->type_flags &= ~flag;
+                    BreakClear((&map[addrNo])->breakPoints, curr->break_address & (&map[addrNo])->mask, ((flag & 0xf) | (flag >> 4)));
+                    if (curr->type_flags == 0) {
+                        if (base == conditionals[addrNo]) {
+                            conditionals[addrNo] = curr->next;
+                            base = curr->next;
+                            curr = base;
+                        } else {
+                            base->next = curr->next;
+                            freeConditionalBreak(curr);
+                            curr = base->next;
+                        }
+                        count++;
+                    } else {
+                        base = curr;
+                        curr = curr->next;
+                    }
+                } else {
+                    base = curr;
+                    curr = curr->next;
+                }
+            }
+            return count;
+        }
+    }
+    return -2;
+}
+
+int removeConditionalWithAddressAndFlag(uint32_t address, uint8_t flag, bool orMode)
+{
+    uint8_t addrNo = address >> 24;
+    if (conditionals[addrNo] != NULL) {
+        struct ConditionalBreak* base = conditionals[addrNo];
+        struct ConditionalBreak* curr = conditionals[addrNo];
+        uint8_t count = 0;
+        while (curr && address >= curr->break_address) {
+            if ((curr->break_address == address) && (((curr->type_flags & flag) == curr->type_flags) || (orMode && (curr->type_flags & flag)))) {
+                curr->type_flags &= ~flag;
+                BreakClear((&map[address >> 24])->breakPoints, curr->break_address & (&map[address >> 24])->mask, ((flag & 0xf) | (flag >> 4)));
+                if (curr->type_flags == 0) {
+                    if (curr == conditionals[addrNo]) {
+                        conditionals[addrNo] = curr->next;
+                        freeConditionalBreak(curr);
+                        curr = conditionals[addrNo];
+                    } else {
+                        base->next = curr->next;
+                        freeConditionalBreak(curr);
+                        curr = base->next;
+                    }
+                    count++;
+                } else {
+                    base = curr;
+                    curr = curr->next;
+                }
+            } else {
+                base = curr;
+                curr = curr->next;
+            }
+        }
+        return count;
+    }
+    return -2;
+}
+
+//true creating code for a given expression.
+//It assumes an if was found, and that all up to the if was removed.
+//receives an array of chars following the pattern:
+//{'<expType>,<exp>,<op>,'<expType>,<exp>,<And_symbol|or_symbol>, (repeats)
+//<expType is optional, and always assumes int-compare as default.
+uint8_t parseExpressionType(char* type);
+uint8_t parseConditionOperand(char* type);
+void parseAndCreateConditionalBreaks(uint32_t address, uint8_t flags, char** exp, int n)
+{
+    struct ConditionalBreak* workBreak = addConditionalBreak(address, flags);
+    flags &= 0xf;
+    if (!flags)
+        return;
+    struct ConditionalBreakNode* now = (struct ConditionalBreakNode*)malloc(sizeof(struct ConditionalBreakNode));
+    struct ConditionalBreakNode* toAdd = now;
+    for (int i = 0; i < n; i++) {
+        now->next = 0;
+        now->exp_type_flags = 0;
+        if (exp[i][0] == '\'') {
+            now->exp_type_flags |= parseExpressionType(&exp[i][1]);
+            i++;
+            if (i >= n)
+                goto fail;
+        } else {
+            now->exp_type_flags |= 6; //assume signed word
+        }
+        now->address = strdup(exp[i]);
+        i++;
+        if (i >= n)
+            goto fail;
+        char* operandName = exp[i];
+        now->cond_flags = parseConditionOperand(exp[i]);
+        i++;
+        if (i >= n)
+            goto fail;
+
+        if (exp[i][0] == '\'') {
+            now->exp_type_flags |= (parseExpressionType(&exp[i][1]) << 4);
+            i++;
+            if (i >= n)
+                goto fail;
+        } else {
+            now->exp_type_flags |= 0x60; //assume signed word
+        }
+        now->value = strdup(exp[i]);
+        i++;
+        uint32_t val;
+        if (!dexp_eval(now->value, &val) || !dexp_eval(now->address, &val)) {
+            printf("Invalid expression.\n");
+            if (workBreak)
+                removeConditionalBreak(workBreak);
+            return;
+        }
+        if (i < n) {
+            if (strcmp(exp[i], "&&") == 0) {
+                now = (struct ConditionalBreakNode*)malloc(sizeof(struct ConditionalBreakNode));
+                toAdd->next = now;
+            } else if (strcmp(exp[i], "||") == 0) {
+                addCondition(workBreak, toAdd);
+                printf("Added break on address %08x, with condition:\n%s %s %s\n", address, now->address, operandName, now->value);
+                workBreak = addConditionalBreak(address, flags);
+                now = (struct ConditionalBreakNode*)malloc(sizeof(struct ConditionalBreakNode));
+                toAdd = now;
+            }
+        } else {
+            addCondition(workBreak, toAdd);
+            printf("Added break on address %08x, ending with condition: \n%s %s %s\n", address, now->address, operandName, now->value);
+            return;
+        }
+    }
+    return;
+
+fail:
+    printf("Not enough material (expressions) to work with.");
+    removeConditionalBreak(workBreak);
+    return;
+}
+
+//aux
+uint8_t parseExpressionType(char* given_type)
+{
+    uint8_t flags = 0;
+    //for such a small string, pays off to convert first
+    char* type = strdup(given_type);
+    for (int i = 0; type[i] != '\0'; i++) {
+        type[i] = toupper(type[i]);
+    }
+    if ((type[0] == 'S') || type[0] == 'U') {
+        flags |= (4 - ((type[0] - 'S') << 1));
+        type++;
+        if (type[0] == 'H') {
+            type[0] = '1';
+            type[1] = '6';
+            type[2] = '\0';
+        } else if (type[0] == 'W') {
+            type[0] = '3';
+            type[1] = '2';
+            type[2] = '\0';
+        } else if (type[0] == 'B') {
+            type[0] = '8';
+            type[1] = '\0';
+        }
+        int size;
+        sscanf(type, "%d", &size);
+        size = (size >> 3) - 1;
+        flags |= (size >= 2 ? 2 : ((uint8_t)size));
+        free(type);
+        return flags;
+    }
+    if (strcmp(type, "INT") == 0) {
+        flags = 6;
+    }
+    if (type[0] == 'H') {
+        flags = 1;
+    } else if (type[0] == 'W') {
+        flags = 2;
+    } else if (type[0] == 'B') {
+        flags = 0;
+    } else {
+        flags = 6;
+    }
+    free(type);
+    return flags;
+}
+
+uint8_t parseConditionOperand(char* type)
+{
+    uint8_t flag = 0;
+    if (toupper(type[0]) == 'S') {
+        flag = 8;
+        type++;
+    }
+    switch (type[0]) {
+    case '!':
+        if (type[1] == '=' || type[1] == '\0')
+            return flag | 0x6;
+        break;
+    case '=':
+        if (type[1] == '=' || type[1] == '\0')
+            return flag | 0x1;
+        break;
+    case '<':
+        if (type[1] == '>')
+            return flag | 0x6;
+        if (type[1] == '=')
+            return flag | 0x5;
+        if (type[1] == '\0')
+            return flag | 0x4;
+        break;
+    case '>':
+        if (type[1] == '<')
+            return flag | 0x6;
+        if (type[1] == '=')
+            return flag | 0x3;
+        if (type[1] == '\0')
+            return flag | 0x2;
+        break;
+    default:;
+    }
+    switch (tolower(type[0])) {
+    case 'l':
+        if (tolower(type[1]) == 'e')
+            return flag | 0x5;
+        if (tolower(type[1]) == 't')
+            return flag | 0x4;
+        break;
+    case 'g':
+        if (tolower(type[1]) == 'e')
+            return flag | 0x3;
+        if (tolower(type[1]) == 't')
+            return flag | 0x2;
+	break;
+
+    case 'e':
+        if (tolower(type[1]) == 'q')
+            return flag | 0x1;
+        if (type[1] == '\0')
+            return flag | 0x1;
+	break;
+    case 'n':
+        if (tolower(type[1]) == 'e')
+            return flag | 0x6;
+    default:
+	break;
+    }
+    return flag;
+}
+
+uint32_t calculateFinalValue(char* expToEval, uint8_t type_of_flags)
+{
+    uint32_t val;
+    if (!dexp_eval(expToEval, &val)) {
+        printf("Invalid expression.\n");
+        return 0;
+    }
+    if (type_of_flags & 0x4) {
+        switch (type_of_flags & 0x3) {
+        case 0:
+            return (int8_t)(val & 0xff);
+        case 1:
+            return (int16_t)(val & 0xffff);
+        default:
+            return (int)val;
+        }
+    } else {
+        switch (type_of_flags & 0x3) {
+        case 0:
+            return (uint8_t)(val & 0xff);
+        case 1:
+            return (uint16_t)(val & 0xffff);
+        default:
+            return val;
+        }
+    }
+}
+
+//check for execution
+bool isCorrectBreak(struct ConditionalBreak* toTest, uint8_t accessType)
+{
+
+    return (toTest->type_flags & accessType);
+}
+
+bool doBreak(struct ConditionalBreak* toTest)
+{
+    struct ConditionalBreakNode* toExamine = toTest->firstCond;
+
+    bool globalVeredict = true;
+    bool veredict = false;
+    while (toExamine && globalVeredict) {
+        uint32_t address = calculateFinalValue(toExamine->address, toExamine->exp_type_flags & 0xf);
+        uint32_t value = calculateFinalValue(toExamine->value, toExamine->exp_type_flags >> 4);
+        if ((toExamine->cond_flags & 0x7) != 0) {
+            veredict = veredict || ((toExamine->cond_flags & 1) ? (address == value) : false);
+            veredict = veredict || ((toExamine->cond_flags & 4) ? ((toExamine->cond_flags & 8) ? ((int)address < (int)value) : (address < value)) : false);
+            veredict = veredict || ((toExamine->cond_flags & 2) ? ((toExamine->cond_flags & 8) ? ((int)address > (int)value) : (address > value)) : false);
+        }
+        toExamine = toExamine->next;
+        globalVeredict = veredict && globalVeredict;
+    }
+    return globalVeredict;
+}
+
+bool doesBreak(uint32_t address, uint8_t allowedFlags)
+{
+    uint8_t addrNo = address >> 24;
+    if (conditionals[addrNo]) {
+        struct ConditionalBreak* base = conditionals[addrNo];
+        while (base && base->break_address < address) {
+            base = base->next;
+        }
+        while (base && base->break_address == address) {
+            if (base->type_flags & allowedFlags & 0xf0) {
+                return true;
+            }
+            if (isCorrectBreak(base, allowedFlags) && doBreak(base)) {
+                return true;
+            }
+            base = base->next;
+        }
+    }
+    return false;
+}
+
+/*
+//Test main
+int main (int argc, char** args){
+	char* argv[] = {"r7","s==","0", "||","'byte","0x25","ge","'hword","0x0001"};
+	parseAndCreateConditionalBreaks(0x0203fd00, 0x1f, argv, 9);
+	parseAndCreateConditionalBreaks(0x0203fd00, 0x10, argv, 9);
+	parseAndCreateConditionalBreaks(0x0203fd00, 0x40, argv, 9);
+	parseAndCreateConditionalBreaks(0x0203fd04, 0x04, argv, 9);
+	printAllFlagConditionals(0xff, true);
+	removeFlagFromConditionalBreakNo(0x0203fd00, 0x3,0xff);
+	printf("after\n");
+	printAllFlagConditionals(0xff, true);
+	
+	getchar();
+}
+*/
diff --git a/src/gba/Cheats.cpp b/src/gba/Cheats.cpp
index bf0c2202..0c59678c 100644
--- a/src/gba/Cheats.cpp
+++ b/src/gba/Cheats.cpp
@@ -2055,15 +2055,15 @@ bool cheatsImportGSACodeFile(const char* name, int game, bool v3)
             found = true;
             break;
         }
-        fread(&len, 1, 4, f);
+        FREAD_UNCHECKED(&len, 1, 4, f);
         fseek(f, len, SEEK_CUR);
         int codes = 0;
-        fread(&codes, 1, 4, f);
+        FREAD_UNCHECKED(&codes, 1, 4, f);
         while (codes > 0) {
-            fread(&len, 1, 4, f);
+            FREAD_UNCHECKED(&len, 1, 4, f);
             fseek(f, len, SEEK_CUR);
             fseek(f, 8, SEEK_CUR);
-            fread(&len, 1, 4, f);
+            FREAD_UNCHECKED(&len, 1, 4, f);
             fseek(f, len * 12, SEEK_CUR);
             codes--;
         }
@@ -2073,26 +2073,26 @@ bool cheatsImportGSACodeFile(const char* name, int game, bool v3)
     if (found) {
         char desc[256];
         char code[17];
-        fread(&len, 1, 4, f);
+        FREAD_UNCHECKED(&len, 1, 4, f);
         fseek(f, len, SEEK_CUR);
         int codes = 0;
-        fread(&codes, 1, 4, f);
+        FREAD_UNCHECKED(&codes, 1, 4, f);
         while (codes > 0) {
-            fread(&len, 1, 4, f);
+            FREAD_UNCHECKED(&len, 1, 4, f);
 	    if (len > 255)
 		    goto evil_gsa_code_file;	//XXX: this functione needs a rewrite in general, so for the short this is better than nothing
-            fread(desc, 1, len, f);
+            FREAD_UNCHECKED(desc, 1, len, f);
             desc[len] = 0;
             desc[31] = 0;
-            fread(&len, 1, 4, f);
+            FREAD_UNCHECKED(&len, 1, 4, f);
             fseek(f, len, SEEK_CUR);
             fseek(f, 4, SEEK_CUR);
-            fread(&len, 1, 4, f);
+            FREAD_UNCHECKED(&len, 1, 4, f);
             while (len) {
                 fseek(f, 4, SEEK_CUR);
-                fread(code, 1, 8, f);
+                FREAD_UNCHECKED(code, 1, 8, f);
                 fseek(f, 4, SEEK_CUR);
-                fread(&code[8], 1, 8, f);
+                FREAD_UNCHECKED(&code[8], 1, 8, f);
                 code[16] = 0;
                 cheatsAddGSACode(code, desc, v3);
                 len -= 2;
@@ -2734,16 +2734,16 @@ bool cheatsLoadCheatList(const char* file)
         }
     } else if (type == 0) {
         for (int i = 0; i < count; i++) {
-            fread(&cheatsList[i].code, 1, sizeof(int), f);
-            fread(&cheatsList[i].size, 1, sizeof(int), f);
-            fread(&cheatsList[i].status, 1, sizeof(int), f);
-            fread(&cheatsList[i].enabled, 1, sizeof(int), f);
+            FREAD_UNCHECKED(&cheatsList[i].code, 1, sizeof(int), f);
+            FREAD_UNCHECKED(&cheatsList[i].size, 1, sizeof(int), f);
+            FREAD_UNCHECKED(&cheatsList[i].status, 1, sizeof(int), f);
+            FREAD_UNCHECKED(&cheatsList[i].enabled, 1, sizeof(int), f);
             cheatsList[i].enabled = cheatsList[i].enabled ? true : false;
-            fread(&cheatsList[i].address, 1, sizeof(uint32_t), f);
+            FREAD_UNCHECKED(&cheatsList[i].address, 1, sizeof(uint32_t), f);
             cheatsList[i].rawaddress = cheatsList[i].address;
-            fread(&cheatsList[i].value, 1, sizeof(uint32_t), f);
-            fread(&cheatsList[i].oldValue, 1, sizeof(uint32_t), f);
-            fread(&cheatsList[i].codestring, 1, 20 * sizeof(char), f);
+            FREAD_UNCHECKED(&cheatsList[i].value, 1, sizeof(uint32_t), f);
+            FREAD_UNCHECKED(&cheatsList[i].oldValue, 1, sizeof(uint32_t), f);
+            FREAD_UNCHECKED(&cheatsList[i].codestring, 1, 20 * sizeof(char), f);
             if (fread(&cheatsList[i].desc, 1, 32 * sizeof(char), f) != 32 * sizeof(char)) {
                 fclose(f);
                 return false;
diff --git a/src/gba/GBA-arm.cpp b/src/gba/GBA-arm.cpp
index bc078784..2eea3824 100644
--- a/src/gba/GBA-arm.cpp
+++ b/src/gba/GBA-arm.cpp
@@ -144,8 +144,8 @@ static void count(uint32_t opcode, int cond_res)
 //#ifdef __POWERPC__
 #define OP_SUBS                            \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("subco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -161,8 +161,8 @@ static void count(uint32_t opcode, int cond_res)
     }
 #define OP_RSBS                             \
     {                                       \
-        register int Flags;                 \
-        register int Result;                \
+        int Flags;                 \
+        int Result;                \
         asm volatile("subfco. %0, %2, %3\n" \
                      "mcrxr cr1\n"          \
                      "mfcr %1\n"            \
@@ -178,8 +178,8 @@ static void count(uint32_t opcode, int cond_res)
     }
 #define OP_ADDS                            \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("addco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -195,8 +195,8 @@ static void count(uint32_t opcode, int cond_res)
     }
 #define OP_ADCS                            \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("mtspr xer, %4\n"     \
                      "addeo. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
@@ -214,8 +214,8 @@ static void count(uint32_t opcode, int cond_res)
     }
 #define OP_SBCS                             \
     {                                       \
-        register int Flags;                 \
-        register int Result;                \
+        int Flags;                 \
+        int Result;                \
         asm volatile("mtspr xer, %4\n"      \
                      "subfeo. %0, %3, %2\n" \
                      "mcrxr cr1\n"          \
@@ -233,8 +233,8 @@ static void count(uint32_t opcode, int cond_res)
     }
 #define OP_RSCS                             \
     {                                       \
-        register int Flags;                 \
-        register int Result;                \
+        int Flags;                 \
+        int Result;                \
         asm volatile("mtspr xer, %4\n"      \
                      "subfeo. %0, %2, %3\n" \
                      "mcrxr cr1\n"          \
@@ -252,8 +252,8 @@ static void count(uint32_t opcode, int cond_res)
     }
 #define OP_CMP                             \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("subco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -268,8 +268,8 @@ static void count(uint32_t opcode, int cond_res)
     }
 #define OP_CMN                             \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("addco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
diff --git a/src/gba/GBA-thumb.cpp b/src/gba/GBA-thumb.cpp
index f9636aaa..1b788540 100644
--- a/src/gba/GBA-thumb.cpp
+++ b/src/gba/GBA-thumb.cpp
@@ -89,8 +89,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
 #ifdef __POWERPC__
 #define ADD_RD_RS_RN(N)                    \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("addco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -106,8 +106,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
     }
 #define ADD_RD_RS_O3(N)                    \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("addco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -124,8 +124,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
 #define ADD_RD_RS_O3_0 ADD_RD_RS_O3
 #define ADD_RN_O8(d)                       \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("addco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -141,8 +141,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
     }
 #define CMN_RD_RS                          \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("addco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -157,8 +157,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
     }
 #define ADC_RD_RS            \
     {                        \
-        register int Flags;  \
-        register int Result; \
+        int Flags;  \
+        int Result; \
                 asm volatile("mtspr 1, %4\n"		\ /* reg 1 is xer */
                              "addeo. %0, %2, %3\n"	\
                              "mcrxr cr1\n"			\
@@ -177,8 +177,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
                              }
 #define SUB_RD_RS_RN(N)                    \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("subco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -194,8 +194,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
     }
 #define SUB_RD_RS_O3(N)                    \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("subco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -212,8 +212,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
 #define SUB_RD_RS_O3_0 SUB_RD_RS_O3
 #define SUB_RN_O8(d)                       \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("subco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -229,8 +229,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
     }
 #define CMP_RN_O8(d)                       \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("subco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
@@ -245,8 +245,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
     }
 #define SBC_RD_RS            \
     {                        \
-        register int Flags;  \
-        register int Result; \
+        int Flags;  \
+        int Result; \
                 asm volatile("mtspr 1, %4\n"		\ /* reg 1 is xer */
                              "subfeo. %0, %3, %2\n"	\
                              "mcrxr cr1\n"			\
@@ -265,8 +265,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
                              }
 #define NEG_RD_RS                           \
     {                                       \
-        register int Flags;                 \
-        register int Result;                \
+        int Flags;                 \
+        int Result;                \
         asm volatile("subfco. %0, %2, %3\n" \
                      "mcrxr cr1\n"          \
                      "mfcr %1\n"            \
@@ -282,8 +282,8 @@ static INSN_REGPARM void thumbBreakpoint(uint32_t opcode)
     }
 #define CMP_RD_RS                          \
     {                                      \
-        register int Flags;                \
-        register int Result;               \
+        int Flags;                \
+        int Result;               \
         asm volatile("subco. %0, %2, %3\n" \
                      "mcrxr cr1\n"         \
                      "mfcr %1\n"           \
diff --git a/src/gba/GBA.cpp b/src/gba/GBA.cpp
index eb90a2aa..c0cc468b 100644
--- a/src/gba/GBA.cpp
+++ b/src/gba/GBA.cpp
@@ -1007,21 +1007,21 @@ bool CPUReadGSASnapshot(const char* fileName)
 
     // long size = ftell(file);
     fseek(file, 0x0, SEEK_SET);
-    fread(&i, 1, 4, file);
+    FREAD_UNCHECKED(&i, 1, 4, file);
     fseek(file, i, SEEK_CUR); // Skip SharkPortSave
     fseek(file, 4, SEEK_CUR); // skip some sort of flag
-    fread(&i, 1, 4, file); // name length
+    FREAD_UNCHECKED(&i, 1, 4, file); // name length
     fseek(file, i, SEEK_CUR); // skip name
-    fread(&i, 1, 4, file); // desc length
+    FREAD_UNCHECKED(&i, 1, 4, file); // desc length
     fseek(file, i, SEEK_CUR); // skip desc
-    fread(&i, 1, 4, file); // notes length
+    FREAD_UNCHECKED(&i, 1, 4, file); // notes length
     fseek(file, i, SEEK_CUR); // skip notes
     int saveSize;
-    fread(&saveSize, 1, 4, file); // read length
+    FREAD_UNCHECKED(&saveSize, 1, 4, file); // read length
     saveSize -= 0x1c; // remove header size
     char buffer[17];
     char buffer2[17];
-    fread(buffer, 1, 16, file);
+    FREAD_UNCHECKED(buffer, 1, 16, file);
     buffer[16] = 0;
     for (i = 0; i < 16; i++)
         if (buffer[i] < 32)
@@ -1074,7 +1074,7 @@ bool CPUReadGSASPSnapshot(const char* fileName)
 
     // read save name
     fseek(file, namepos, SEEK_SET);
-    fread(savename, 1, namesz, file);
+    FREAD_UNCHECKED(savename, 1, namesz, file);
     savename[namesz] = 0;
 
     memcpy(romname, &rom[0xa0], namesz);
@@ -1091,7 +1091,7 @@ bool CPUReadGSASPSnapshot(const char* fileName)
 
     // read footer tag
     fseek(file, footerpos, SEEK_SET);
-    fread(footer, 1, footersz, file);
+    FREAD_UNCHECKED(footer, 1, footersz, file);
     footer[footersz] = 0;
 
     if (memcmp(footer, gsvfooter, footersz)) {
@@ -1106,7 +1106,7 @@ bool CPUReadGSASPSnapshot(const char* fileName)
     }
 
     // Read up to 128k save
-    fread(flashSaveMemory, 1, FLASH_128K_SZ, file);
+    FREAD_UNCHECKED(flashSaveMemory, 1, FLASH_128K_SZ, file);
 
     fclose(file);
     CPUReset();
diff --git a/src/gba/GBA.h b/src/gba/GBA.h
index b45fed9f..8649b2e5 100644
--- a/src/gba/GBA.h
+++ b/src/gba/GBA.h
@@ -3,6 +3,7 @@
 
 #include "../common/Types.h"
 #include "../System.h"
+#include "../Util.h"
 
 const uint64_t TICKS_PER_SECOND = 16777216;
 
diff --git a/src/gba/GBALink.cpp b/src/gba/GBALink.cpp
index 560e6927..ba7c2691 100644
--- a/src/gba/GBALink.cpp
+++ b/src/gba/GBALink.cpp
@@ -609,6 +609,7 @@ void EnableSpeedHacks(bool enable)
 
 void BootLink(int m_type, const char* hostAddr, int timeout, bool m_hacks, int m_numplayers)
 {
+    (void)m_numplayers; // unused param
     if (linkDriver) {
         // Connection has already been established
         return;
@@ -888,7 +889,7 @@ bool CableServer::RecvGB(void)
     if (counter == 1)
         return false;
 
-    int numbytes;
+    int numbytes = 0;
     if (lanlink.type == 0) { // TCP
         fdset.clear();
 
@@ -1230,6 +1231,7 @@ void StartCableSocket(uint16_t value)
 
 static void UpdateCableSocket(int ticks)
 {
+    (void)ticks; // unused param
     if (linkid && transfer_direction == SENDING && lc.transferring && linktime >= transfer_start_time_from_master) {
         cable_data[linkid] = READ16LE(&ioMem[COMM_SIODATA8]);
 
@@ -2199,7 +2201,8 @@ static void StartRFUSocket(uint16_t value)
                         case 0x24: // send [non-important] data (used by server often)
                             rfu_data.rfu_linktime[linkid] = linktime; //save the ticks before reseted to zero
 
-                            if (rfu_cansend && rfu_qsend2 >= 0) {
+			    // rfu_qsend2 >= 0 due to being `uint8_t`
+                            if (rfu_cansend) {
                                 if (rfu_ishost) {
                                     for (int j = 0; j < rfu_data.numgbas; j++)
                                         if (j != linkid) {
@@ -2560,7 +2563,7 @@ uint16_t gbLinkUpdate(uint8_t b, int gbSerialOn) //used on external clock
     rfu_enabled = false;
 
     if (gbSerialOn) {
-        if (gba_link_enabled)
+        if (gba_link_enabled) {
             //Single Computer
             if (GetLinkMode() == LINK_GAMEBOY_IPC) {
 #if (defined __WIN32__ || defined _WIN32)
@@ -2595,7 +2598,7 @@ uint16_t gbLinkUpdate(uint8_t b, int gbSerialOn) //used on external clock
                     }
                 }
             }
-
+	}
         if (dat == 0xff /*||dat==0x00||b==0x00*/) //dat==0xff||dat==0x00
             LinkFirstTime = true;
     }
diff --git a/src/gba/GBASockClient.cpp b/src/gba/GBASockClient.cpp
index 57c4ecb2..56163213 100644
--- a/src/gba/GBASockClient.cpp
+++ b/src/gba/GBASockClient.cpp
@@ -59,6 +59,7 @@ char GBASockClient::ReceiveCmd(char* data_in, bool block)
 
 void GBASockClient::ReceiveClock(bool block)
 {
+    (void)block; // unused param
     if (IsDisconnected())
         return;
 
diff --git a/src/gba/GBAinline.h b/src/gba/GBAinline.h
index 6cca2173..0fc9d869 100644
--- a/src/gba/GBAinline.h
+++ b/src/gba/GBAinline.h
@@ -56,7 +56,7 @@ static inline uint32_t CPUReadMemory(uint32_t address)
         }
     }
 #endif
-    uint32_t value;
+    uint32_t value = 0;
     uint32_t oldAddress = address;
 
     if (address & 3) {
diff --git a/src/gba/debugger-expr-lex.cpp b/src/gba/debugger-expr-lex.cpp
index e3b97b64..ec548b76 100644
--- a/src/gba/debugger-expr-lex.cpp
+++ b/src/gba/debugger-expr-lex.cpp
@@ -701,9 +701,9 @@ extern int dexp_lex(void);
  */
 YY_DECL
 {
-    register yy_state_type yy_current_state;
-    register char *yy_cp, *yy_bp;
-    register int yy_act;
+    yy_state_type yy_current_state;
+    char *yy_cp, *yy_bp;
+    int yy_act;
 
 #line 31 "debugger-expr.l"
 
@@ -748,7 +748,7 @@ YY_DECL
         yy_current_state = (yy_start);
     yy_match:
         do {
-            register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+            YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
             if (yy_accept[yy_current_state]) {
                 (yy_last_accepting_state) = yy_current_state;
                 (yy_last_accepting_cpos) = yy_cp;
@@ -1073,9 +1073,9 @@ YY_DECL
  */
 static int yy_get_next_buffer(void)
 {
-    register char* dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-    register char* source = (yytext_ptr);
-    register int number_to_move, i;
+    char* dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+    char* source = (yytext_ptr);
+    int number_to_move, i;
     int ret_val;
 
     if ((yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1])
@@ -1192,13 +1192,13 @@ static int yy_get_next_buffer(void)
 
 static yy_state_type yy_get_previous_state(void)
 {
-    register yy_state_type yy_current_state;
-    register char* yy_cp;
+    yy_state_type yy_current_state;
+    char* yy_cp;
 
     yy_current_state = (yy_start);
 
     for (yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp) {
-        register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+        YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
         if (yy_accept[yy_current_state]) {
             (yy_last_accepting_state) = yy_current_state;
             (yy_last_accepting_cpos) = yy_cp;
@@ -1221,10 +1221,10 @@ static yy_state_type yy_get_previous_state(void)
  */
 static yy_state_type yy_try_NUL_trans(yy_state_type yy_current_state)
 {
-    register int yy_is_jam;
-    register char* yy_cp = (yy_c_buf_p);
+    int yy_is_jam;
+    char* yy_cp = (yy_c_buf_p);
 
-    register YY_CHAR yy_c = 1;
+    YY_CHAR yy_c = 1;
     if (yy_accept[yy_current_state]) {
         (yy_last_accepting_state) = yy_current_state;
         (yy_last_accepting_cpos) = yy_cp;
@@ -1240,9 +1240,9 @@ static yy_state_type yy_try_NUL_trans(yy_state_type yy_current_state)
     return yy_is_jam ? 0 : yy_current_state;
 }
 
-static void yyunput(int c, register char* yy_bp)
+static void yyunput(int c, char* yy_bp)
 {
-    register char* yy_cp;
+    char* yy_cp;
 
     yy_cp = (yy_c_buf_p);
 
@@ -1251,9 +1251,9 @@ static void yyunput(int c, register char* yy_bp)
 
     if (yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2) { /* need to shift things up to make room */
         /* +2 for EOB chars. */
-        register int number_to_move = (yy_n_chars) + 2;
-        register char* dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
-        register char* source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
+        int number_to_move = (yy_n_chars) + 2;
+        char* dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
+        char* source = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move];
 
         while (source > YY_CURRENT_BUFFER_LVALUE->yy_ch_buf)
             *--dest = *--source;
@@ -1849,7 +1849,7 @@ int dexp_lex_destroy(void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy(char* s1, yyconst char* s2, int n)
 {
-    register int i;
+    int i;
     for (i = 0; i < n; ++i)
         s1[i] = s2[i];
 }
@@ -1858,7 +1858,7 @@ static void yy_flex_strncpy(char* s1, yyconst char* s2, int n)
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen(yyconst char* s)
 {
-    register int n;
+    int n;
     for (n = 0; s[n]; ++n)
         ;
 
diff --git a/src/gba/debugger-expr-yacc.cpp b/src/gba/debugger-expr-yacc.cpp
index 1e33a505..3f57b14e 100644
--- a/src/gba/debugger-expr-yacc.cpp
+++ b/src/gba/debugger-expr-yacc.cpp
@@ -1,1753 +1,1753 @@
-/* A Bison parser, made by GNU Bison 2.3.  */
-
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
-
-/* As a special exception, you may create a larger work that contains
-   part or all of the Bison parser skeleton and distribute that work
-   under terms of your choice, so long as that work isn't itself a
-   parser generator using the skeleton or a modified version thereof
-   as a parser skeleton.  Alternatively, if you modify or redistribute
-   the parser skeleton itself, you may (at your option) remove this
-   special exception, which will cause the skeleton and the resulting
-   Bison output files to be licensed under the GNU General Public
-   License without this special exception.
-
-   This special exception was added by the Free Software Foundation in
-   version 2.2 of Bison.  */
-
-/* C LALR(1) parser skeleton written by Richard Stallman, by
-   simplifying the original so-called "semantic" parser.  */
-
-/* All symbols defined below should begin with yy or YY, to avoid
-   infringing on user name space.  This should be done even for local
-   variables, as they might otherwise be expanded by user macros.
-   There are some unavoidable exceptions within include files to
-   define necessary library symbols; they are noted "INFRINGES ON
-   USER NAME SPACE" below.  */
-
-/* Identify Bison output.  */
-#define YYBISON 1
-
-/* Bison version.  */
-#define YYBISON_VERSION "2.3"
-
-/* Skeleton name.  */
-#define YYSKELETON_NAME "yacc.c"
-
-/* Pure parsers.  */
-#define YYPURE 0
-
-/* Using locations.  */
-#define YYLSP_NEEDED 0
-
-#define yyparse dexp_parse
-#define yylex dexp_lex
-#define yyerror dexp_error
-#define yylval dexp_lval
-#define yychar dexp_char
-#define yydebug dexp_debug
-#define yynerrs dexp_nerrs
-
-/* Tokens.  */
-#ifndef YYTOKENTYPE
-#define YYTOKENTYPE
-/* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-enum yytokentype {
-    TOK_PLUS = 258,
-    TOK_MINUS = 259,
-    TOK_DIVIDE = 260,
-    TOK_MULTIPLY = 261,
-    TOK_LSHIFT = 262,
-    TOK_RSHIFT = 263,
-    TOK_LPAREN = 264,
-    TOK_RPAREN = 265,
-    TOK_OR = 266,
-    TOK_AND = 267,
-    TOK_XOR = 268,
-    TOK_NEGATE = 269,
-    TOK_BBRACKET = 270,
-    TOK_HBRACKET = 271,
-    TOK_WBRACKET = 272,
-    TOK_LBRACKET = 273,
-    TOK_RBRACKET = 274,
-    TOK_REGISTER = 275,
-    TOK_NUMBER = 276,
-    TOK_ID = 277
-};
-#endif
-/* Tokens.  */
-#define TOK_PLUS 258
-#define TOK_MINUS 259
-#define TOK_DIVIDE 260
-#define TOK_MULTIPLY 261
-#define TOK_LSHIFT 262
-#define TOK_RSHIFT 263
-#define TOK_LPAREN 264
-#define TOK_RPAREN 265
-#define TOK_OR 266
-#define TOK_AND 267
-#define TOK_XOR 268
-#define TOK_NEGATE 269
-#define TOK_BBRACKET 270
-#define TOK_HBRACKET 271
-#define TOK_WBRACKET 272
-#define TOK_LBRACKET 273
-#define TOK_RBRACKET 274
-#define TOK_REGISTER 275
-#define TOK_NUMBER 276
-#define TOK_ID 277
-
-/* Copy the first part of user declarations.  */
-#line 1 "src/sdl/debugger-expr.y"
-
-#include <stdio.h>
-
-#include "../System.h"
-#include "../common/Port.h"
-#include "GBA.h"
-
-#include <iostream>
-#include <map>
-#include <string>
-
-unsigned int dexp_result = 0;
-extern int dexp_error(char*);
-extern int dexp_lex();
-extern char* dexp_text;
-
-std::map<std::string, uint32_t> dexp_vars;
-
-#define readWord(addr) \
-    READ32LE((&map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]))
-
-#define readHalfWord(addr) \
-    READ16LE((&map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]))
-
-#define readByte(addr) \
-    map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-#define YYDEBUG 0
-#endif
-
-/* Enabling verbose error messages.  */
-#ifdef YYERROR_VERBOSE
-#undef YYERROR_VERBOSE
-#define YYERROR_VERBOSE 1
-#else
-#define YYERROR_VERBOSE 0
-#endif
-
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-#define YYTOKEN_TABLE 0
-#endif
-
-#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
-typedef union YYSTYPE
-#line 44 "src/sdl/debugger-expr.y"
-{
-    unsigned int number;
-    char* string;
-}
-/* Line 187 of yacc.c.  */
-#line 175 "src/sdl/debugger-expr-yacc.cpp"
-YYSTYPE;
-#define yystype YYSTYPE /* obsolescent; will be withdrawn */
-#define YYSTYPE_IS_DECLARED 1
-#define YYSTYPE_IS_TRIVIAL 1
-#endif
-
-/* Copy the second part of user declarations.  */
-
-/* Line 216 of yacc.c.  */
-#line 188 "src/sdl/debugger-expr-yacc.cpp"
-
-#ifdef short
-#undef short
-#endif
-
-#ifdef YYTYPE_UINT8
-typedef YYTYPE_UINT8 yytype_uint8;
-#else
-typedef unsigned char yytype_uint8;
-#endif
-
-#ifdef YYTYPE_INT8
-typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
-#else
-typedef short int yytype_int8;
-#endif
-
-#ifdef YYTYPE_UINT16
-typedef YYTYPE_UINT16 yytype_uint16;
-#else
-typedef unsigned short int yytype_uint16;
-#endif
-
-#ifdef YYTYPE_INT16
-typedef YYTYPE_INT16 yytype_int16;
-#else
-typedef short int yytype_int16;
-#endif
-
-#ifndef YYSIZE_T
-#ifdef __SIZE_TYPE__
-#define YYSIZE_T __SIZE_TYPE__
-#elif defined size_t
-#define YYSIZE_T size_t
-#elif !defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-                               || defined __cplusplus || defined _MSC_VER)
-#include <stddef.h> /* INFRINGES ON USER NAME SPACE */
-#define YYSIZE_T size_t
-#else
-#define YYSIZE_T unsigned int
-#endif
-#endif
-
-#define YYSIZE_MAXIMUM ((YYSIZE_T)-1)
-
-#ifndef YY_
-#if YYENABLE_NLS
-#if ENABLE_NLS
-#include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#define YY_(msgid) dgettext("bison-runtime", msgid)
-#endif
-#endif
-#ifndef YY_
-#define YY_(msgid) msgid
-#endif
-#endif
-
-/* Suppress unused-variable warnings by "using" E.  */
-#if !defined lint || defined __GNUC__
-#define YYUSE(e) ((void)(e))
-#else
-#define YYUSE(e) /* empty */
-#endif
-
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-#define YYID(n) (n)
-#else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-static int
-YYID(int i)
-#else
-static int
-    YYID(i) int i;
-#endif
-{
-    return i;
-}
-#endif
-
-#if !defined yyoverflow || YYERROR_VERBOSE
-
-/* The parser invokes alloca or malloc; define the necessary symbols.  */
-
-#ifdef YYSTACK_USE_ALLOCA
-#if YYSTACK_USE_ALLOCA
-#ifdef __GNUC__
-#define YYSTACK_ALLOC __builtin_alloca
-#elif defined __BUILTIN_VA_ARG_INCR
-#include <alloca.h> /* INFRINGES ON USER NAME SPACE */
-#elif defined _AIX
-#define YYSTACK_ALLOC __alloca
-#elif defined _MSC_VER
-#include <malloc.h> /* INFRINGES ON USER NAME SPACE */
-#define alloca _alloca
-#else
-#define YYSTACK_ALLOC alloca
-#if !defined _ALLOCA_H && !defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-                                                    || defined __cplusplus || defined _MSC_VER)
-#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#ifndef _STDLIB_H
-#define _STDLIB_H 1
-#endif
-#endif
-#endif
-#endif
-#endif
-
-#ifdef YYSTACK_ALLOC
-/* Pacify GCC's `empty if-body' warning.  */
-#define YYSTACK_FREE(Ptr) \
-    do { /* empty */      \
-        ;                 \
-    } while (YYID(0))
-#ifndef YYSTACK_ALLOC_MAXIMUM
-/* The OS might guarantee only one guard page at the bottom of the stack,
-       and a page size can be as small as 4096 bytes.  So we cannot safely
-       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
-       to allow for a few compiler-allocated temporary stack slots.  */
-#define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
-#endif
-#else
-#define YYSTACK_ALLOC YYMALLOC
-#define YYSTACK_FREE YYFREE
-#ifndef YYSTACK_ALLOC_MAXIMUM
-#define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
-#endif
-#if (defined __cplusplus && !defined _STDLIB_H \
-    && !((defined YYMALLOC || defined malloc)  \
-           && (defined YYFREE || defined free)))
-#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#ifndef _STDLIB_H
-#define _STDLIB_H 1
-#endif
-#endif
-#ifndef YYMALLOC
-#define YYMALLOC malloc
-#if !defined malloc && !defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-                                                 || defined __cplusplus || defined _MSC_VER)
-void* malloc(YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
-#endif
-#endif
-#ifndef YYFREE
-#define YYFREE free
-#if !defined free && !defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-                                               || defined __cplusplus || defined _MSC_VER)
-void free(void*); /* INFRINGES ON USER NAME SPACE */
-#endif
-#endif
-#endif
-#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
-
-#if (!defined yyoverflow     \
-    && (!defined __cplusplus \
-           || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
-
-/* A type that is properly aligned for any stack member.  */
-union yyalloc {
-    yytype_int16 yyss;
-    YYSTYPE yyvs;
-};
-
-/* The size of the maximum gap between one aligned stack and the next.  */
-#define YYSTACK_GAP_MAXIMUM (sizeof(union yyalloc) - 1)
-
-/* The size of an array large to enough to hold all stacks, each with
-   N elements.  */
-#define YYSTACK_BYTES(N)                            \
-    ((N) * (sizeof(yytype_int16) + sizeof(YYSTYPE)) \
-        + YYSTACK_GAP_MAXIMUM)
-
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-#ifndef YYCOPY
-#if defined __GNUC__ && 1 < __GNUC__
-#define YYCOPY(To, From, Count) \
-    __builtin_memcpy(To, From, (Count) * sizeof(*(From)))
-#else
-#define YYCOPY(To, From, Count)             \
-    do {                                    \
-        YYSIZE_T yyi;                       \
-        for (yyi = 0; yyi < (Count); yyi++) \
-            (To)[yyi] = (From)[yyi];        \
-    } while (YYID(0))
-#endif
-#endif
-
-/* Relocate STACK from its old location to the new one.  The
-   local variables YYSIZE and YYSTACKSIZE give the old and new number of
-   elements in the stack, and YYPTR gives the new location of the
-   stack.  Advance YYPTR to a properly aligned location for the next
-   stack.  */
-#define YYSTACK_RELOCATE(Stack)                                          \
-    do {                                                                 \
-        YYSIZE_T yynewbytes;                                             \
-        YYCOPY(&yyptr->Stack, Stack, yysize);                            \
-        Stack = &yyptr->Stack;                                           \
-        yynewbytes = yystacksize * sizeof(*Stack) + YYSTACK_GAP_MAXIMUM; \
-        yyptr += yynewbytes / sizeof(*yyptr);                            \
-    } while (YYID(0))
-
-#endif
-
-/* YYFINAL -- State number of the termination state.  */
-#define YYFINAL 20
-/* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST 135
-
-/* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS 23
-/* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS 3
-/* YYNRULES -- Number of rules.  */
-#define YYNRULES 21
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES 44
-
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
-#define YYUNDEFTOK 2
-#define YYMAXUTOK 277
-
-#define YYTRANSLATE(YYX) \
-    ((unsigned int)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
-
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
-static const yytype_uint8 yytranslate[] = {
-    0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
-    5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
-    15, 16, 17, 18, 19, 20, 21, 22
-};
-
-#if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint8 yyprhs[] = {
-    0, 0, 3, 5, 7, 9, 13, 17, 20, 23,
-    27, 31, 35, 39, 43, 47, 51, 55, 57, 61,
-    65, 69
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] = {
-    24, 0, -1, 25, -1, 21, -1, 22, -1, 25,
-    3, 25, -1, 25, 4, 25, -1, 4, 25, -1,
-    14, 25, -1, 25, 5, 25, -1, 25, 6, 25,
-    -1, 25, 7, 25, -1, 25, 8, 25, -1, 9,
-    25, 10, -1, 25, 12, 25, -1, 25, 11, 25,
-    -1, 25, 13, 25, -1, 20, -1, 15, 25, 19,
-    -1, 16, 25, 19, -1, 17, 25, 19, -1, 18,
-    25, 19, -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
-static const yytype_uint8 yyrline[] = {
-    0, 56, 56, 59, 60, 68, 69, 70, 71, 72,
-    73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
-    83, 84
-};
-#endif
-
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
-/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
-   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
-static const char* const yytname[] = {
-    "$end", "error", "$undefined", "TOK_PLUS", "TOK_MINUS", "TOK_DIVIDE",
-    "TOK_MULTIPLY", "TOK_LSHIFT", "TOK_RSHIFT", "TOK_LPAREN", "TOK_RPAREN",
-    "TOK_OR", "TOK_AND", "TOK_XOR", "TOK_NEGATE", "TOK_BBRACKET",
-    "TOK_HBRACKET", "TOK_WBRACKET", "TOK_LBRACKET", "TOK_RBRACKET",
-    "TOK_REGISTER", "TOK_NUMBER", "TOK_ID", "$accept", "final", "exp", 0
-};
-#endif
-
-#ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
-static const yytype_uint16 yytoknum[] = {
-    0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
-    265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
-    275, 276, 277
-};
-#endif
-
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] = {
-    0, 23, 24, 25, 25, 25, 25, 25, 25, 25,
-    25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-    25, 25
-};
-
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] = {
-    0, 2, 1, 1, 1, 3, 3, 2, 2, 3,
-    3, 3, 3, 3, 3, 3, 3, 1, 3, 3,
-    3, 3
-};
-
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
-static const yytype_uint8 yydefact[] = {
-    0, 0, 0, 0, 0, 0, 0, 0, 17, 3,
-    4, 0, 2, 7, 0, 8, 0, 0, 0, 0,
-    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-    13, 18, 19, 20, 21, 5, 6, 9, 10, 11,
-    12, 15, 14, 16
-};
-
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int8 yydefgoto[] = {
-    -1, 11, 12
-};
-
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -2
-static const yytype_int8 yypact[] = {
-    25, 25, 25, 25, 25, 25, 25, 25, -2, -2,
-    -2, 13, 113, 122, 4, 122, 45, 62, 79, 96,
-    -2, 25, 25, 25, 25, 25, 25, 25, 25, 25,
-    -2, -2, -2, -2, -2, 122, 122, 24, 24, 48,
-    48, 6, 17, -2
-};
-
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int8 yypgoto[] = {
-    -2, -2, -1
-};
-
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -1
-static const yytype_uint8 yytable[] = {
-    13, 14, 15, 16, 17, 18, 19, 21, 22, 23,
-    24, 25, 26, 20, 30, 27, 28, 29, 28, 29,
-    35, 36, 37, 38, 39, 40, 41, 42, 43, 1,
-    29, 25, 26, 0, 2, 27, 28, 29, 0, 3,
-    4, 5, 6, 7, 0, 8, 9, 10, 21, 22,
-    23, 24, 25, 26, 0, 0, 27, 28, 29, 27,
-    28, 29, 0, 0, 31, 21, 22, 23, 24, 25,
-    26, 0, 0, 27, 28, 29, 0, 0, 0, 0,
-    0, 32, 21, 22, 23, 24, 25, 26, 0, 0,
-    27, 28, 29, 0, 0, 0, 0, 0, 33, 21,
-    22, 23, 24, 25, 26, 0, 0, 27, 28, 29,
-    0, 0, 0, 0, 0, 34, 21, 22, 23, 24,
-    25, 26, 0, 0, 27, 28, 29, 23, 24, 25,
-    26, 0, 0, 27, 28, 29
-};
-
-static const yytype_int8 yycheck[] = {
-    1, 2, 3, 4, 5, 6, 7, 3, 4, 5,
-    6, 7, 8, 0, 10, 11, 12, 13, 12, 13,
-    21, 22, 23, 24, 25, 26, 27, 28, 29, 4,
-    13, 7, 8, -1, 9, 11, 12, 13, -1, 14,
-    15, 16, 17, 18, -1, 20, 21, 22, 3, 4,
-    5, 6, 7, 8, -1, -1, 11, 12, 13, 11,
-    12, 13, -1, -1, 19, 3, 4, 5, 6, 7,
-    8, -1, -1, 11, 12, 13, -1, -1, -1, -1,
-    -1, 19, 3, 4, 5, 6, 7, 8, -1, -1,
-    11, 12, 13, -1, -1, -1, -1, -1, 19, 3,
-    4, 5, 6, 7, 8, -1, -1, 11, 12, 13,
-    -1, -1, -1, -1, -1, 19, 3, 4, 5, 6,
-    7, 8, -1, -1, 11, 12, 13, 5, 6, 7,
-    8, -1, -1, 11, 12, 13
-};
-
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
-static const yytype_uint8 yystos[] = {
-    0, 4, 9, 14, 15, 16, 17, 18, 20, 21,
-    22, 24, 25, 25, 25, 25, 25, 25, 25, 25,
-    0, 3, 4, 5, 6, 7, 8, 11, 12, 13,
-    10, 19, 19, 19, 19, 25, 25, 25, 25, 25,
-    25, 25, 25, 25
-};
-
-#define yyerrok (yyerrstatus = 0)
-#define yyclearin (yychar = YYEMPTY)
-#define YYEMPTY (-2)
-#define YYEOF 0
-
-#define YYACCEPT goto yyacceptlab
-#define YYABORT goto yyabortlab
-#define YYERROR goto yyerrorlab
-
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
-
-#define YYFAIL goto yyerrlab
-
-#define YYRECOVERING() (!!yyerrstatus)
-
-#define YYBACKUP(Token, Value)                        \
-    \
-do if (yychar == YYEMPTY && yylen == 1)               \
-    {                                                 \
-        yychar = (Token);                             \
-        yylval = (Value);                             \
-        yytoken = YYTRANSLATE(yychar);                \
-        YYPOPSTACK(1);                                \
-        goto yybackup;                                \
-    }                                                 \
-    else                                              \
-    {                                                 \
-        yyerror(YY_("syntax error: cannot back up")); \
-        YYERROR;                                      \
-    }                                                 \
-    \
-while(YYID(0))
-
-#define YYTERROR 1
-#define YYERRCODE 256
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-#define YYLLOC_DEFAULT(Current, Rhs, N)                                                    \
-    do                                                                                     \
-        if (YYID(N)) {                                                                     \
-            (Current).first_line = YYRHSLOC(Rhs, 1).first_line;                            \
-            (Current).first_column = YYRHSLOC(Rhs, 1).first_column;                        \
-            (Current).last_line = YYRHSLOC(Rhs, N).last_line;                              \
-            (Current).last_column = YYRHSLOC(Rhs, N).last_column;                          \
-        } else {                                                                           \
-            (Current).first_line = (Current).last_line = YYRHSLOC(Rhs, 0).last_line;       \
-            (Current).first_column = (Current).last_column = YYRHSLOC(Rhs, 0).last_column; \
-        }                                                                                  \
-    while (YYID(0))
-#endif
-
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
-
-#ifndef YY_LOCATION_PRINT
-#if YYLTYPE_IS_TRIVIAL
-#define YY_LOCATION_PRINT(File, Loc)          \
-    fprintf(File, "%d.%d-%d.%d",              \
-        (Loc).first_line, (Loc).first_column, \
-        (Loc).last_line, (Loc).last_column)
-#else
-#define YY_LOCATION_PRINT(File, Loc) ((void)0)
-#endif
-#endif
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-#define YYLEX yylex(YYLEX_PARAM)
-#else
-#define YYLEX yylex()
-#endif
-
-/* Enable debugging if requested.  */
-#if YYDEBUG
-
-#ifndef YYFPRINTF
-#include <stdio.h> /* INFRINGES ON USER NAME SPACE */
-#define YYFPRINTF fprintf
-#endif
-
-#define YYDPRINTF(Args)     \
-    \
-do                   \
-    {                       \
-        if (yydebug)        \
-            YYFPRINTF Args; \
-    \
-}                    \
-    while (YYID(0))
-
-#define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
-    \
-do                                             \
-    {                                                 \
-        if (yydebug) {                                \
-            YYFPRINTF(stderr, "%s ", Title);          \
-            yy_symbol_print(stderr,                   \
-                Type, Value);                         \
-            YYFPRINTF(stderr, "\n");                  \
-        }                                             \
-    \
-}                                              \
-    while (YYID(0))
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_value_print(FILE* yyoutput, int yytype, YYSTYPE const* const yyvaluep)
-#else
-static void
-    yy_symbol_value_print(yyoutput, yytype, yyvaluep)
-        FILE* yyoutput;
-int yytype;
-YYSTYPE const* const yyvaluep;
-#endif
-{
-    if (!yyvaluep)
-        return;
-#ifdef YYPRINT
-    if (yytype < YYNTOKENS)
-        YYPRINT(yyoutput, yytoknum[yytype], *yyvaluep);
-#else
-    YYUSE(yyoutput);
-#endif
-    switch (yytype) {
-    default:
-        break;
-    }
-}
-
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-static void
-yy_symbol_print(FILE* yyoutput, int yytype, YYSTYPE const* const yyvaluep)
-#else
-static void
-    yy_symbol_print(yyoutput, yytype, yyvaluep)
-        FILE* yyoutput;
-int yytype;
-YYSTYPE const* const yyvaluep;
-#endif
-{
-    if (yytype < YYNTOKENS)
-        YYFPRINTF(yyoutput, "token %s (", yytname[yytype]);
-    else
-        YYFPRINTF(yyoutput, "nterm %s (", yytname[yytype]);
-
-    yy_symbol_value_print(yyoutput, yytype, yyvaluep);
-    YYFPRINTF(yyoutput, ")");
-}
-
-/*------------------------------------------------------------------.
-| yy_stack_print -- Print the state stack from its BOTTOM up to its |
-| TOP (included).                                                   |
-`------------------------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-static void
-yy_stack_print(yytype_int16* bottom, yytype_int16* top)
-#else
-static void
-    yy_stack_print(bottom, top)
-        yytype_int16* bottom;
-yytype_int16* top;
-#endif
-{
-    YYFPRINTF(stderr, "Stack now");
-    for (; bottom <= top; ++bottom)
-        YYFPRINTF(stderr, " %d", *bottom);
-    YYFPRINTF(stderr, "\n");
-}
-
-#define YY_STACK_PRINT(Bottom, Top)          \
-    \
-do                                    \
-    {                                        \
-        if (yydebug)                         \
-            yy_stack_print((Bottom), (Top)); \
-    \
-}                                     \
-    while (YYID(0))
-
-/*------------------------------------------------.
-| Report that the YYRULE is going to be reduced.  |
-`------------------------------------------------*/
-
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-static void
-yy_reduce_print(YYSTYPE* yyvsp, int yyrule)
-#else
-static void
-    yy_reduce_print(yyvsp, yyrule)
-        YYSTYPE* yyvsp;
-int yyrule;
-#endif
-{
-    int yynrhs = yyr2[yyrule];
-    int yyi;
-    unsigned long int yylno = yyrline[yyrule];
-    YYFPRINTF(stderr, "Reducing stack by rule %d (line %lu):\n",
-        yyrule - 1, yylno);
-    /* The symbols being reduced.  */
-    for (yyi = 0; yyi < yynrhs; yyi++) {
-        fprintf(stderr, "   $%d = ", yyi + 1);
-        yy_symbol_print(stderr, yyrhs[yyprhs[yyrule] + yyi],
-            &(yyvsp[(yyi + 1) - (yynrhs)]));
-        fprintf(stderr, "\n");
-    }
-}
-
-#define YY_REDUCE_PRINT(Rule)             \
-    \
-do                                 \
-    {                                     \
-        if (yydebug)                      \
-            yy_reduce_print(yyvsp, Rule); \
-    \
-}                                  \
-    while (YYID(0))
-
-/* Nonzero means print parse trace.  It is left uninitialized so that
-   multiple parsers can coexist.  */
-int yydebug;
-#else /* !YYDEBUG */
-#define YYDPRINTF(Args)
-#define YY_SYMBOL_PRINT(Title, Type, Value, Location)
-#define YY_STACK_PRINT(Bottom, Top)
-#define YY_REDUCE_PRINT(Rule)
-#endif /* !YYDEBUG */
-
-/* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef YYINITDEPTH
-#define YYINITDEPTH 200
-#endif
-
-/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
-   if the built-in stack extension method is used).
-
-   Do not make this value too large; the results are undefined if
-   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
-   evaluated with infinite-precision integer arithmetic.  */
-
-#ifndef YYMAXDEPTH
-#define YYMAXDEPTH 10000
-#endif
-
-#if YYERROR_VERBOSE
-
-#ifndef yystrlen
-#if defined __GLIBC__ && defined _STRING_H
-#define yystrlen strlen
-#else
-/* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-static YYSIZE_T
-yystrlen(const char* yystr)
-#else
-static YYSIZE_T
-    yystrlen(yystr)
-        const char* yystr;
-#endif
-{
-    YYSIZE_T yylen;
-    for (yylen = 0; yystr[yylen]; yylen++)
-        continue;
-    return yylen;
-}
-#endif
-#endif
-
-#ifndef yystpcpy
-#if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
-#define yystpcpy stpcpy
-#else
-/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
-   YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-static char*
-yystpcpy(char* yydest, const char* yysrc)
-#else
-static char*
-    yystpcpy(yydest, yysrc) char* yydest;
-const char* yysrc;
-#endif
-{
-    char* yyd = yydest;
-    const char* yys = yysrc;
-
-    while ((*yyd++ = *yys++) != '\0')
-        continue;
-
-    return yyd - 1;
-}
-#endif
-#endif
-
-#ifndef yytnamerr
-/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
-   quotes and backslashes, so that it's suitable for yyerror.  The
-   heuristic is that double-quoting is unnecessary unless the string
-   contains an apostrophe, a comma, or backslash (other than
-   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
-   null, do not copy; instead, return the length of what the result
-   would have been.  */
-static YYSIZE_T
-yytnamerr(char* yyres, const char* yystr)
-{
-    if (*yystr == '"') {
-        YYSIZE_T yyn = 0;
-        char const* yyp = yystr;
-
-        for (;;)
-            switch (*++yyp) {
-            case '\'':
-            case ',':
-                goto do_not_strip_quotes;
-
-            case '\\':
-                if (*++yyp != '\\')
-                    goto do_not_strip_quotes;
-            /* Fall through.  */
-            default:
-                if (yyres)
-                    yyres[yyn] = *yyp;
-                yyn++;
-                break;
-
-            case '"':
-                if (yyres)
-                    yyres[yyn] = '\0';
-                return yyn;
-            }
-    do_not_strip_quotes:;
-    }
-
-    if (!yyres)
-        return yystrlen(yystr);
-
-    return yystpcpy(yyres, yystr) - yyres;
-}
-#endif
-
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error(char* yyresult, int yystate, int yychar)
-{
-    int yyn = yypact[yystate];
-
-    if (!(YYPACT_NINF < yyn && yyn <= YYLAST))
-        return 0;
-    else {
-        int yytype = YYTRANSLATE(yychar);
-        YYSIZE_T yysize0 = yytnamerr(0, yytname[yytype]);
-        YYSIZE_T yysize = yysize0;
-        YYSIZE_T yysize1;
-        int yysize_overflow = 0;
-        enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-        char const* yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-        int yyx;
-
-#if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-#endif
-        char* yyfmt;
-        char const* yyf;
-        static char const yyunexpected[] = "syntax error, unexpected %s";
-        static char const yyexpecting[] = ", expecting %s";
-        static char const yyor[] = " or %s";
-        char yyformat[sizeof yyunexpected
-            + sizeof yyexpecting - 1
-            + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-                          * (sizeof yyor - 1))];
-        char const* yyprefix = yyexpecting;
-
-        /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-        int yyxbegin = yyn < 0 ? -yyn : 0;
-
-        /* Stay within bounds of both yycheck and yytname.  */
-        int yychecklim = YYLAST - yyn + 1;
-        int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-        int yycount = 1;
-
-        yyarg[0] = yytname[yytype];
-        yyfmt = yystpcpy(yyformat, yyunexpected);
-
-        for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) {
-                    yycount = 1;
-                    yysize = yysize0;
-                    yyformat[sizeof yyunexpected - 1] = '\0';
-                    break;
-                }
-                yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr(0, yytname[yyx]);
-                yysize_overflow |= (yysize1 < yysize);
-                yysize = yysize1;
-                yyfmt = yystpcpy(yyfmt, yyprefix);
-                yyprefix = yyor;
-            }
-
-        yyf = YY_(yyformat);
-        yysize1 = yysize + yystrlen(yyf);
-        yysize_overflow |= (yysize1 < yysize);
-        yysize = yysize1;
-
-        if (yysize_overflow)
-            return YYSIZE_MAXIMUM;
-
-        if (yyresult) {
-            /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-            char* yyp = yyresult;
-            int yyi = 0;
-            while ((*yyp = *yyf) != '\0') {
-                if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) {
-                    yyp += yytnamerr(yyp, yyarg[yyi++]);
-                    yyf += 2;
-                } else {
-                    yyp++;
-                    yyf++;
-                }
-            }
-        }
-        return yysize;
-    }
-}
-#endif /* YYERROR_VERBOSE */
-
-/*-----------------------------------------------.
-| Release the memory associated to this symbol.  |
-`-----------------------------------------------*/
-
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-static void
-yydestruct(const char* yymsg, int yytype, YYSTYPE* yyvaluep)
-#else
-static void
-    yydestruct(yymsg, yytype, yyvaluep)
-        const char* yymsg;
-int yytype;
-YYSTYPE* yyvaluep;
-#endif
-{
-    YYUSE(yyvaluep);
-
-    if (!yymsg)
-        yymsg = "Deleting";
-    YY_SYMBOL_PRINT(yymsg, yytype, yyvaluep, yylocationp);
-
-    switch (yytype) {
-
-    default:
-        break;
-    }
-}
-
-/* Prevent warnings from -Wmissing-prototypes.  */
-
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse(void* YYPARSE_PARAM);
-#else
-int yyparse();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse(void);
-#else
-int yyparse();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-/* The look-ahead symbol.  */
-int yychar;
-
-/* The semantic value of the look-ahead symbol.  */
-YYSTYPE yylval;
-
-/* Number of syntax errors so far.  */
-int yynerrs;
-
-/*----------.
-| yyparse.  |
-`----------*/
-
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-int yyparse(void* YYPARSE_PARAM)
-#else
-int
-    yyparse(YYPARSE_PARAM) void* YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-    || defined __cplusplus || defined _MSC_VER)
-int yyparse(void)
-#else
-int yyparse()
-
-#endif
-#endif
-{
-
-    int yystate;
-    int yyn;
-    int yyresult;
-    /* Number of tokens to shift before error messages enabled.  */
-    int yyerrstatus;
-    /* Look-ahead token as an internal (translated) token number.  */
-    int yytoken = 0;
-#if YYERROR_VERBOSE
-    /* Buffer for error messages, and its allocated size.  */
-    char yymsgbuf[128];
-    char* yymsg = yymsgbuf;
-    YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
-#endif
-
-    /* Three stacks and their tools:
-     `yyss': related to states,
-     `yyvs': related to semantic values,
-     `yyls': related to locations.
-
-     Refer to the stacks thru separate pointers, to allow yyoverflow
-     to reallocate them elsewhere.  */
-
-    /* The state stack.  */
-    yytype_int16 yyssa[YYINITDEPTH];
-    yytype_int16* yyss = yyssa;
-    yytype_int16* yyssp;
-
-    /* The semantic value stack.  */
-    YYSTYPE yyvsa[YYINITDEPTH];
-    YYSTYPE* yyvs = yyvsa;
-    YYSTYPE* yyvsp;
-
-#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
-
-    YYSIZE_T yystacksize = YYINITDEPTH;
-
-    /* The variables used to return semantic value and location from the
-     action routines.  */
-    YYSTYPE yyval;
-
-    /* The number of symbols on the RHS of the reduced rule.
-     Keep to zero when no symbol should be popped.  */
-    int yylen = 0;
-
-    YYDPRINTF((stderr, "Starting parse\n"));
-
-    yystate = 0;
-    yyerrstatus = 0;
-    yynerrs = 0;
-    yychar = YYEMPTY; /* Cause a token to be read.  */
-
-    /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-
-    yyssp = yyss;
-    yyvsp = yyvs;
-
-    goto yysetstate;
-
-/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate.  |
-`------------------------------------------------------------*/
-yynewstate:
-    /* In all cases, when you get here, the value and location stacks
-     have just been pushed.  So pushing a state here evens the stacks.  */
-    yyssp++;
-
-yysetstate:
-    *yyssp = yystate;
-
-    if (yyss + yystacksize - 1 <= yyssp) {
-        /* Get the current used size of the three stacks, in elements.  */
-        YYSIZE_T yysize = yyssp - yyss + 1;
-
-#ifdef yyoverflow
-        {
-            /* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-            YYSTYPE* yyvs1 = yyvs;
-            yytype_int16* yyss1 = yyss;
-
-            /* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-            yyoverflow(YY_("memory exhausted"),
-                &yyss1, yysize * sizeof(*yyssp),
-                &yyvs1, yysize * sizeof(*yyvsp),
-
-                &yystacksize);
-
-            yyss = yyss1;
-            yyvs = yyvs1;
-        }
-#else /* no yyoverflow */
-#ifndef YYSTACK_RELOCATE
-        goto yyexhaustedlab;
-#else
-        /* Extend the stack our own way.  */
-        if (YYMAXDEPTH <= yystacksize)
-            goto yyexhaustedlab;
-        yystacksize *= 2;
-        if (YYMAXDEPTH < yystacksize)
-            yystacksize = YYMAXDEPTH;
-
-        {
-            yytype_int16* yyss1 = yyss;
-            union yyalloc* yyptr = (union yyalloc*)YYSTACK_ALLOC(YYSTACK_BYTES(yystacksize));
-            if (!yyptr)
-                goto yyexhaustedlab;
-            YYSTACK_RELOCATE(yyss);
-            YYSTACK_RELOCATE(yyvs);
-
-#undef YYSTACK_RELOCATE
-            if (yyss1 != yyssa)
-                YYSTACK_FREE(yyss1);
-        }
-#endif
-#endif /* no yyoverflow */
-
-        yyssp = yyss + yysize - 1;
-        yyvsp = yyvs + yysize - 1;
-
-        YYDPRINTF((stderr, "Stack size increased to %lu\n",
-            (unsigned long int)yystacksize));
-
-        if (yyss + yystacksize - 1 <= yyssp)
-            YYABORT;
-    }
-
-    YYDPRINTF((stderr, "Entering state %d\n", yystate));
-
-    goto yybackup;
-
-/*-----------.
-| yybackup.  |
-`-----------*/
-yybackup:
-
-    /* Do appropriate processing given the current state.  Read a
-     look-ahead token if we need one and don't already have one.  */
-
-    /* First try to decide what to do without reference to look-ahead token.  */
-    yyn = yypact[yystate];
-    if (yyn == YYPACT_NINF)
-        goto yydefault;
-
-    /* Not known => get a look-ahead token if don't already have one.  */
-
-    /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
-    if (yychar == YYEMPTY) {
-        YYDPRINTF((stderr, "Reading a token: "));
-        yychar = YYLEX;
-    }
-
-    if (yychar <= YYEOF) {
-        yychar = yytoken = YYEOF;
-        YYDPRINTF((stderr, "Now at end of input.\n"));
-    } else {
-        yytoken = YYTRANSLATE(yychar);
-        YY_SYMBOL_PRINT("Next token is", yytoken, &yylval, &yylloc);
-    }
-
-    /* If the proper action on seeing token YYTOKEN is to reduce or to
-     detect an error, take that action.  */
-    yyn += yytoken;
-    if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
-        goto yydefault;
-    yyn = yytable[yyn];
-    if (yyn <= 0) {
-        if (yyn == 0 || yyn == YYTABLE_NINF)
-            goto yyerrlab;
-        yyn = -yyn;
-        goto yyreduce;
-    }
-
-    if (yyn == YYFINAL)
-        YYACCEPT;
-
-    /* Count tokens shifted since error; after three, turn off error
-     status.  */
-    if (yyerrstatus)
-        yyerrstatus--;
-
-    /* Shift the look-ahead token.  */
-    YY_SYMBOL_PRINT("Shifting", yytoken, &yylval, &yylloc);
-
-    /* Discard the shifted token unless it is eof.  */
-    if (yychar != YYEOF)
-        yychar = YYEMPTY;
-
-    yystate = yyn;
-    *++yyvsp = yylval;
-
-    goto yynewstate;
-
-/*-----------------------------------------------------------.
-| yydefault -- do the default action for the current state.  |
-`-----------------------------------------------------------*/
-yydefault:
-    yyn = yydefact[yystate];
-    if (yyn == 0)
-        goto yyerrlab;
-    goto yyreduce;
-
-/*-----------------------------.
-| yyreduce -- Do a reduction.  |
-`-----------------------------*/
-yyreduce:
-    /* yyn is the number of a rule to reduce with.  */
-    yylen = yyr2[yyn];
-
-    /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
-
-     Otherwise, the following line sets YYVAL to garbage.
-     This behavior is undocumented and Bison
-     users should not rely upon it.  Assigning to YYVAL
-     unconditionally makes the parser a bit smaller, and it avoids a
-     GCC warning that YYVAL may be used uninitialized.  */
-    yyval = yyvsp[1 - yylen];
-
-    YY_REDUCE_PRINT(yyn);
-    switch (yyn) {
-    case 2:
-#line 56 "src/sdl/debugger-expr.y"
-    {
-        dexp_result = (yyvsp[(1) - (1)].number);
-    } break;
-
-    case 3:
-#line 59 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (1)].number);
-    } break;
-
-    case 4:
-#line 60 "src/sdl/debugger-expr.y"
-    {
-        std::string v((yyvsp[(1) - (1)].string));
-        if (dexp_vars.count(v) == 0) {
-            printf("Variable %s not defined.\n", (yyvsp[(1) - (1)].string));
-            YYABORT;
-        }
-        (yyval.number) = dexp_vars[v];
-    } break;
-
-    case 5:
-#line 68 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 6:
-#line 69 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) - (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 7:
-#line 70 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = -(yyvsp[(2) - (2)].number);
-    } break;
-
-    case 8:
-#line 71 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = ~(yyvsp[(2) - (2)].number);
-    } break;
-
-    case 9:
-#line 72 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) / (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 10:
-#line 73 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) * (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 11:
-#line 74 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) << (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 12:
-#line 75 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) >> (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 13:
-#line 76 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(2) - (3)].number);
-    } break;
-
-    case 14:
-#line 77 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) & (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 15:
-#line 78 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) | (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 16:
-#line 79 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = (yyvsp[(1) - (3)].number) ^ (yyvsp[(3) - (3)].number);
-    } break;
-
-    case 17:
-#line 80 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = reg[(yyvsp[(1) - (1)].number)].I;
-    } break;
-
-    case 18:
-#line 81 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = readByte((yyvsp[(2) - (3)].number));
-    } break;
-
-    case 19:
-#line 82 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = readHalfWord((yyvsp[(2) - (3)].number));
-    } break;
-
-    case 20:
-#line 83 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = readWord((yyvsp[(2) - (3)].number));
-    } break;
-
-    case 21:
-#line 84 "src/sdl/debugger-expr.y"
-    {
-        (yyval.number) = readWord((yyvsp[(2) - (3)].number));
-    } break;
-
-/* Line 1267 of yacc.c.  */
-#line 1534 "src/sdl/debugger-expr-yacc.cpp"
-    default:
-        break;
-    }
-    YY_SYMBOL_PRINT("-> $$ =", yyr1[yyn], &yyval, &yyloc);
-
-    YYPOPSTACK(yylen);
-    yylen = 0;
-    YY_STACK_PRINT(yyss, yyssp);
-
-    *++yyvsp = yyval;
-
-    /* Now `shift' the result of the reduction.  Determine what state
-     that goes to, based on the state we popped back to and the rule
-     number reduced by.  */
-
-    yyn = yyr1[yyn];
-
-    yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
-    if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
-        yystate = yytable[yystate];
-    else
-        yystate = yydefgoto[yyn - YYNTOKENS];
-
-    goto yynewstate;
-
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
-yyerrlab:
-    /* If not already recovering from an error, report this error.  */
-    if (!yyerrstatus) {
-        ++yynerrs;
-#if !YYERROR_VERBOSE
-        yyerror(YY_("syntax error"));
-#else
-        {
-            YYSIZE_T yysize = yysyntax_error(0, yystate, yychar);
-            if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) {
-                YYSIZE_T yyalloc = 2 * yysize;
-                if (!(yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-                    yyalloc = YYSTACK_ALLOC_MAXIMUM;
-                if (yymsg != yymsgbuf)
-                    YYSTACK_FREE(yymsg);
-                yymsg = (char*)YYSTACK_ALLOC(yyalloc);
-                if (yymsg)
-                    yymsg_alloc = yyalloc;
-                else {
-                    yymsg = yymsgbuf;
-                    yymsg_alloc = sizeof yymsgbuf;
-                }
-            }
-
-            if (0 < yysize && yysize <= yymsg_alloc) {
-                (void)yysyntax_error(yymsg, yystate, yychar);
-                yyerror(yymsg);
-            } else {
-                yyerror(YY_("syntax error"));
-                if (yysize != 0)
-                    goto yyexhaustedlab;
-            }
-        }
-#endif
-    }
-
-    if (yyerrstatus == 3) {
-        /* If just tried and failed to reuse look-ahead token after an
-	 error, discard it.  */
-
-        if (yychar <= YYEOF) {
-            /* Return failure if at end of input.  */
-            if (yychar == YYEOF)
-                YYABORT;
-        } else {
-            yydestruct("Error: discarding",
-                yytoken, &yylval);
-            yychar = YYEMPTY;
-        }
-    }
-
-    /* Else will try to reuse look-ahead token after shifting the error
-     token.  */
-    goto yyerrlab1;
-
-/*---------------------------------------------------.
-| yyerrorlab -- error raised explicitly by YYERROR.  |
-`---------------------------------------------------*/
-yyerrorlab:
-
-    /* Pacify compilers like GCC when the user code never invokes
-     YYERROR and the label yyerrorlab therefore never appears in user
-     code.  */
-    if (/*CONSTCOND*/ 0)
-        goto yyerrorlab;
-
-    /* Do not reclaim the symbols of the rule which action triggered
-     this YYERROR.  */
-    YYPOPSTACK(yylen);
-    yylen = 0;
-    YY_STACK_PRINT(yyss, yyssp);
-    yystate = *yyssp;
-    goto yyerrlab1;
-
-/*-------------------------------------------------------------.
-| yyerrlab1 -- common code for both syntax error and YYERROR.  |
-`-------------------------------------------------------------*/
-yyerrlab1:
-    yyerrstatus = 3; /* Each real token shifted decrements this.  */
-
-    for (;;) {
-        yyn = yypact[yystate];
-        if (yyn != YYPACT_NINF) {
-            yyn += YYTERROR;
-            if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) {
-                yyn = yytable[yyn];
-                if (0 < yyn)
-                    break;
-            }
-        }
-
-        /* Pop the current state because it cannot handle the error token.  */
-        if (yyssp == yyss)
-            YYABORT;
-
-        yydestruct("Error: popping",
-            yystos[yystate], yyvsp);
-        YYPOPSTACK(1);
-        yystate = *yyssp;
-        YY_STACK_PRINT(yyss, yyssp);
-    }
-
-    if (yyn == YYFINAL)
-        YYACCEPT;
-
-    *++yyvsp = yylval;
-
-    /* Shift the error token.  */
-    YY_SYMBOL_PRINT("Shifting", yystos[yyn], yyvsp, yylsp);
-
-    yystate = yyn;
-    goto yynewstate;
-
-/*-------------------------------------.
-| yyacceptlab -- YYACCEPT comes here.  |
-`-------------------------------------*/
-yyacceptlab:
-    yyresult = 0;
-    goto yyreturn;
-
-/*-----------------------------------.
-| yyabortlab -- YYABORT comes here.  |
-`-----------------------------------*/
-yyabortlab:
-    yyresult = 1;
-    goto yyreturn;
-
-#ifndef yyoverflow
-/*-------------------------------------------------.
-| yyexhaustedlab -- memory exhaustion comes here.  |
-`-------------------------------------------------*/
-yyexhaustedlab:
-    yyerror(YY_("memory exhausted"));
-    yyresult = 2;
-/* Fall through.  */
-#endif
-
-yyreturn:
-    if (yychar != YYEOF && yychar != YYEMPTY)
-        yydestruct("Cleanup: discarding lookahead",
-            yytoken, &yylval);
-    /* Do not reclaim the symbols of the rule which action triggered
-     this YYABORT or YYACCEPT.  */
-    YYPOPSTACK(yylen);
-    YY_STACK_PRINT(yyss, yyssp);
-    while (yyssp != yyss) {
-        yydestruct("Cleanup: popping",
-            yystos[*yyssp], yyvsp);
-        YYPOPSTACK(1);
-    }
-#ifndef yyoverflow
-    if (yyss != yyssa)
-        YYSTACK_FREE(yyss);
-#endif
-#if YYERROR_VERBOSE
-    if (yymsg != yymsgbuf)
-        YYSTACK_FREE(yymsg);
-#endif
-    /* Make sure YYID is used.  */
-    return YYID(yyresult);
-}
-
-#line 86 "src/sdl/debugger-expr.y"
-
-bool dexp_eval(char* expr, uint32_t* result)
-{
-    extern void dexp_flush();
-    extern char* dexprString;
-    extern int dexprCol;
-
-    dexp_flush();
-
-    dexprString = expr;
-    dexprCol = 0;
-
-    if (!dexp_parse()) {
-        *result = dexp_result;
-        return true;
-    } else {
-        return false;
-    }
-}
-
-int dexp_error(char* s)
-{
-    return 0;
-}
-
-void dexp_setVar(char* name, uint32_t value)
-{
-    std::string a(name);
-    dexp_vars[a] = value;
-}
-
-void dexp_listVars()
-{
-    std::map<std::string, uint32_t>::iterator iter;
-
-    for (iter = dexp_vars.begin(); iter != dexp_vars.end(); iter++) {
-        printf("%s = %08X\n", iter->first.c_str(), iter->second);
-    }
-}
-
-void dexp_saveVars(char* file)
-{
-    std::map<std::string, uint32_t>::iterator iter;
-
-    FILE* f = fopen(file, "w");
-    if (!f) {
-        printf("Could not open file %s\n", file);
-        return;
-    }
-
-    for (iter = dexp_vars.begin(); iter != dexp_vars.end(); iter++) {
-        fprintf(f, "%s = %08X\n", iter->first.c_str(), iter->second);
-    }
-    fclose(f);
-}
-
-void dexp_loadVars(char* file)
-{
-    std::map<std::string, uint32_t>::iterator iter;
-    char buffer[500];
-    char name[500];
-    uint32_t val;
-
-    FILE* f = fopen(file, "r");
-    if (!f) {
-        printf("Could not open file %s\n", file);
-        return;
-    }
-
-    while (fgets(buffer, 500, f) != NULL) {
-        if (sscanf(buffer, "%s = %x", name, &val) == 2) {
-            dexp_setVar(name, val);
-        }
-    }
-}
+/* A Bison parser, made by GNU Bison 2.3.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
+
+/* As a special exception, you may create a larger work that contains
+   part or all of the Bison parser skeleton and distribute that work
+   under terms of your choice, so long as that work isn't itself a
+   parser generator using the skeleton or a modified version thereof
+   as a parser skeleton.  Alternatively, if you modify or redistribute
+   the parser skeleton itself, you may (at your option) remove this
+   special exception, which will cause the skeleton and the resulting
+   Bison output files to be licensed under the GNU General Public
+   License without this special exception.
+
+   This special exception was added by the Free Software Foundation in
+   version 2.2 of Bison.  */
+
+/* C LALR(1) parser skeleton written by Richard Stallman, by
+   simplifying the original so-called "semantic" parser.  */
+
+/* All symbols defined below should begin with yy or YY, to avoid
+   infringing on user name space.  This should be done even for local
+   variables, as they might otherwise be expanded by user macros.
+   There are some unavoidable exceptions within include files to
+   define necessary library symbols; they are noted "INFRINGES ON
+   USER NAME SPACE" below.  */
+
+/* Identify Bison output.  */
+#define YYBISON 1
+
+/* Bison version.  */
+#define YYBISON_VERSION "2.3"
+
+/* Skeleton name.  */
+#define YYSKELETON_NAME "yacc.c"
+
+/* Pure parsers.  */
+#define YYPURE 0
+
+/* Using locations.  */
+#define YYLSP_NEEDED 0
+
+#define yyparse dexp_parse
+#define yylex dexp_lex
+#define yyerror dexp_error
+#define yylval dexp_lval
+#define yychar dexp_char
+#define yydebug dexp_debug
+#define yynerrs dexp_nerrs
+
+/* Tokens.  */
+#ifndef YYTOKENTYPE
+#define YYTOKENTYPE
+/* Put the tokens into the symbol table, so that GDB and other debuggers
+      know about them.  */
+enum yytokentype {
+    TOK_PLUS = 258,
+    TOK_MINUS = 259,
+    TOK_DIVIDE = 260,
+    TOK_MULTIPLY = 261,
+    TOK_LSHIFT = 262,
+    TOK_RSHIFT = 263,
+    TOK_LPAREN = 264,
+    TOK_RPAREN = 265,
+    TOK_OR = 266,
+    TOK_AND = 267,
+    TOK_XOR = 268,
+    TOK_NEGATE = 269,
+    TOK_BBRACKET = 270,
+    TOK_HBRACKET = 271,
+    TOK_WBRACKET = 272,
+    TOK_LBRACKET = 273,
+    TOK_RBRACKET = 274,
+    TOK_REGISTER = 275,
+    TOK_NUMBER = 276,
+    TOK_ID = 277
+};
+#endif
+/* Tokens.  */
+#define TOK_PLUS 258
+#define TOK_MINUS 259
+#define TOK_DIVIDE 260
+#define TOK_MULTIPLY 261
+#define TOK_LSHIFT 262
+#define TOK_RSHIFT 263
+#define TOK_LPAREN 264
+#define TOK_RPAREN 265
+#define TOK_OR 266
+#define TOK_AND 267
+#define TOK_XOR 268
+#define TOK_NEGATE 269
+#define TOK_BBRACKET 270
+#define TOK_HBRACKET 271
+#define TOK_WBRACKET 272
+#define TOK_LBRACKET 273
+#define TOK_RBRACKET 274
+#define TOK_REGISTER 275
+#define TOK_NUMBER 276
+#define TOK_ID 277
+
+/* Copy the first part of user declarations.  */
+#line 1 "src/sdl/debugger-expr.y"
+
+#include <stdio.h>
+
+#include "../System.h"
+#include "../common/Port.h"
+#include "GBA.h"
+
+#include <iostream>
+#include <map>
+#include <string>
+
+unsigned int dexp_result = 0;
+extern int dexp_error(char*);
+extern int dexp_lex();
+extern char* dexp_text;
+
+std::map<std::string, uint32_t> dexp_vars;
+
+#define readWord(addr) \
+    READ32LE((&map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]))
+
+#define readHalfWord(addr) \
+    READ16LE((&map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]))
+
+#define readByte(addr) \
+    map[(addr) >> 24].address[(addr)&map[(addr) >> 24].mask]
+
+/* Enabling traces.  */
+#ifndef YYDEBUG
+#define YYDEBUG 0
+#endif
+
+/* Enabling verbose error messages.  */
+#ifdef YYERROR_VERBOSE
+#undef YYERROR_VERBOSE
+#define YYERROR_VERBOSE 1
+#else
+#define YYERROR_VERBOSE 0
+#endif
+
+/* Enabling the token table.  */
+#ifndef YYTOKEN_TABLE
+#define YYTOKEN_TABLE 0
+#endif
+
+#if !defined YYSTYPE && !defined YYSTYPE_IS_DECLARED
+typedef union YYSTYPE
+#line 44 "src/sdl/debugger-expr.y"
+{
+    unsigned int number;
+    char* string;
+}
+/* Line 187 of yacc.c.  */
+#line 175 "src/sdl/debugger-expr-yacc.cpp"
+YYSTYPE;
+#define yystype YYSTYPE /* obsolescent; will be withdrawn */
+#define YYSTYPE_IS_DECLARED 1
+#define YYSTYPE_IS_TRIVIAL 1
+#endif
+
+/* Copy the second part of user declarations.  */
+
+/* Line 216 of yacc.c.  */
+#line 188 "src/sdl/debugger-expr-yacc.cpp"
+
+#ifdef short
+#undef short
+#endif
+
+#ifdef YYTYPE_UINT8
+typedef YYTYPE_UINT8 yytype_uint8;
+#else
+typedef unsigned char yytype_uint8;
+#endif
+
+#ifdef YYTYPE_INT8
+typedef YYTYPE_INT8 yytype_int8;
+#elif (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+typedef signed char yytype_int8;
+#else
+typedef short int yytype_int8;
+#endif
+
+#ifdef YYTYPE_UINT16
+typedef YYTYPE_UINT16 yytype_uint16;
+#else
+typedef unsigned short int yytype_uint16;
+#endif
+
+#ifdef YYTYPE_INT16
+typedef YYTYPE_INT16 yytype_int16;
+#else
+typedef short int yytype_int16;
+#endif
+
+#ifndef YYSIZE_T
+#ifdef __SIZE_TYPE__
+#define YYSIZE_T __SIZE_TYPE__
+#elif defined size_t
+#define YYSIZE_T size_t
+#elif !defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
+                               || defined __cplusplus || defined _MSC_VER)
+#include <stddef.h> /* INFRINGES ON USER NAME SPACE */
+#define YYSIZE_T size_t
+#else
+#define YYSIZE_T unsigned int
+#endif
+#endif
+
+#define YYSIZE_MAXIMUM ((YYSIZE_T)-1)
+
+#ifndef YY_
+#if YYENABLE_NLS
+#if ENABLE_NLS
+#include <libintl.h> /* INFRINGES ON USER NAME SPACE */
+#define YY_(msgid) dgettext("bison-runtime", msgid)
+#endif
+#endif
+#ifndef YY_
+#define YY_(msgid) msgid
+#endif
+#endif
+
+/* Suppress unused-variable warnings by "using" E.  */
+#if !defined lint || defined __GNUC__
+#define YYUSE(e) ((void)(e))
+#else
+#define YYUSE(e) /* empty */
+#endif
+
+/* Identity function, used to suppress warnings about constant conditions.  */
+#ifndef lint
+#define YYID(n) (n)
+#else
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+static int
+YYID(int i)
+#else
+static int
+    YYID(i) int i;
+#endif
+{
+    return i;
+}
+#endif
+
+#if !defined yyoverflow || YYERROR_VERBOSE
+
+/* The parser invokes alloca or malloc; define the necessary symbols.  */
+
+#ifdef YYSTACK_USE_ALLOCA
+#if YYSTACK_USE_ALLOCA
+#ifdef __GNUC__
+#define YYSTACK_ALLOC __builtin_alloca
+#elif defined __BUILTIN_VA_ARG_INCR
+#include <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#elif defined _AIX
+#define YYSTACK_ALLOC __alloca
+#elif defined _MSC_VER
+#include <malloc.h> /* INFRINGES ON USER NAME SPACE */
+#define alloca _alloca
+#else
+#define YYSTACK_ALLOC alloca
+#if !defined _ALLOCA_H && !defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+                                                    || defined __cplusplus || defined _MSC_VER)
+#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#ifndef _STDLIB_H
+#define _STDLIB_H 1
+#endif
+#endif
+#endif
+#endif
+#endif
+
+#ifdef YYSTACK_ALLOC
+/* Pacify GCC's `empty if-body' warning.  */
+#define YYSTACK_FREE(Ptr) \
+    do { /* empty */      \
+        ;                 \
+    } while (YYID(0))
+#ifndef YYSTACK_ALLOC_MAXIMUM
+/* The OS might guarantee only one guard page at the bottom of the stack,
+       and a page size can be as small as 4096 bytes.  So we cannot safely
+       invoke alloca (N) if N exceeds 4096.  Use a slightly smaller number
+       to allow for a few compiler-allocated temporary stack slots.  */
+#define YYSTACK_ALLOC_MAXIMUM 4032 /* reasonable circa 2006 */
+#endif
+#else
+#define YYSTACK_ALLOC YYMALLOC
+#define YYSTACK_FREE YYFREE
+#ifndef YYSTACK_ALLOC_MAXIMUM
+#define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
+#endif
+#if (defined __cplusplus && !defined _STDLIB_H \
+    && !((defined YYMALLOC || defined malloc)  \
+           && (defined YYFREE || defined free)))
+#include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
+#ifndef _STDLIB_H
+#define _STDLIB_H 1
+#endif
+#endif
+#ifndef YYMALLOC
+#define YYMALLOC malloc
+#if !defined malloc && !defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+                                                 || defined __cplusplus || defined _MSC_VER)
+void* malloc(YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
+#endif
+#endif
+#ifndef YYFREE
+#define YYFREE free
+#if !defined free && !defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
+                                               || defined __cplusplus || defined _MSC_VER)
+void free(void*); /* INFRINGES ON USER NAME SPACE */
+#endif
+#endif
+#endif
+#endif /* ! defined yyoverflow || YYERROR_VERBOSE */
+
+#if (!defined yyoverflow     \
+    && (!defined __cplusplus \
+           || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+
+/* A type that is properly aligned for any stack member.  */
+union yyalloc {
+    yytype_int16 yyss;
+    YYSTYPE yyvs;
+};
+
+/* The size of the maximum gap between one aligned stack and the next.  */
+#define YYSTACK_GAP_MAXIMUM (sizeof(union yyalloc) - 1)
+
+/* The size of an array large to enough to hold all stacks, each with
+   N elements.  */
+#define YYSTACK_BYTES(N)                            \
+    ((N) * (sizeof(yytype_int16) + sizeof(YYSTYPE)) \
+        + YYSTACK_GAP_MAXIMUM)
+
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+#ifndef YYCOPY
+#if defined __GNUC__ && 1 < __GNUC__
+#define YYCOPY(To, From, Count) \
+    __builtin_memcpy(To, From, (Count) * sizeof(*(From)))
+#else
+#define YYCOPY(To, From, Count)             \
+    do {                                    \
+        YYSIZE_T yyi;                       \
+        for (yyi = 0; yyi < (Count); yyi++) \
+            (To)[yyi] = (From)[yyi];        \
+    } while (YYID(0))
+#endif
+#endif
+
+/* Relocate STACK from its old location to the new one.  The
+   local variables YYSIZE and YYSTACKSIZE give the old and new number of
+   elements in the stack, and YYPTR gives the new location of the
+   stack.  Advance YYPTR to a properly aligned location for the next
+   stack.  */
+#define YYSTACK_RELOCATE(Stack)                                          \
+    do {                                                                 \
+        YYSIZE_T yynewbytes;                                             \
+        YYCOPY(&yyptr->Stack, Stack, yysize);                            \
+        Stack = &yyptr->Stack;                                           \
+        yynewbytes = yystacksize * sizeof(*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof(*yyptr);                            \
+    } while (YYID(0))
+
+#endif
+
+/* YYFINAL -- State number of the termination state.  */
+#define YYFINAL 20
+/* YYLAST -- Last index in YYTABLE.  */
+#define YYLAST 135
+
+/* YYNTOKENS -- Number of terminals.  */
+#define YYNTOKENS 23
+/* YYNNTS -- Number of nonterminals.  */
+#define YYNNTS 3
+/* YYNRULES -- Number of rules.  */
+#define YYNRULES 21
+/* YYNRULES -- Number of states.  */
+#define YYNSTATES 44
+
+/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+#define YYUNDEFTOK 2
+#define YYMAXUTOK 277
+
+#define YYTRANSLATE(YYX) \
+    ((unsigned int)(YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+
+/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+static const yytype_uint8 yytranslate[] = {
+    0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+    2, 2, 2, 2, 2, 2, 1, 2, 3, 4,
+    5, 6, 7, 8, 9, 10, 11, 12, 13, 14,
+    15, 16, 17, 18, 19, 20, 21, 22
+};
+
+#if YYDEBUG
+/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
+   YYRHS.  */
+static const yytype_uint8 yyprhs[] = {
+    0, 0, 3, 5, 7, 9, 13, 17, 20, 23,
+    27, 31, 35, 39, 43, 47, 51, 55, 57, 61,
+    65, 69
+};
+
+/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
+static const yytype_int8 yyrhs[] = {
+    24, 0, -1, 25, -1, 21, -1, 22, -1, 25,
+    3, 25, -1, 25, 4, 25, -1, 4, 25, -1,
+    14, 25, -1, 25, 5, 25, -1, 25, 6, 25,
+    -1, 25, 7, 25, -1, 25, 8, 25, -1, 9,
+    25, 10, -1, 25, 12, 25, -1, 25, 11, 25,
+    -1, 25, 13, 25, -1, 20, -1, 15, 25, 19,
+    -1, 16, 25, 19, -1, 17, 25, 19, -1, 18,
+    25, 19, -1
+};
+
+/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+static const yytype_uint8 yyrline[] = {
+    0, 56, 56, 59, 60, 68, 69, 70, 71, 72,
+    73, 74, 75, 76, 77, 78, 79, 80, 81, 82,
+    83, 84
+};
+#endif
+
+#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+/* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
+   First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
+static const char* const yytname[] = {
+    "$end", "error", "$undefined", "TOK_PLUS", "TOK_MINUS", "TOK_DIVIDE",
+    "TOK_MULTIPLY", "TOK_LSHIFT", "TOK_RSHIFT", "TOK_LPAREN", "TOK_RPAREN",
+    "TOK_OR", "TOK_AND", "TOK_XOR", "TOK_NEGATE", "TOK_BBRACKET",
+    "TOK_HBRACKET", "TOK_WBRACKET", "TOK_LBRACKET", "TOK_RBRACKET",
+    "TOK_REGISTER", "TOK_NUMBER", "TOK_ID", "$accept", "final", "exp", 0
+};
+#endif
+
+#ifdef YYPRINT
+/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
+   token YYLEX-NUM.  */
+static const yytype_uint16 yytoknum[] = {
+    0, 256, 257, 258, 259, 260, 261, 262, 263, 264,
+    265, 266, 267, 268, 269, 270, 271, 272, 273, 274,
+    275, 276, 277
+};
+#endif
+
+/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] = {
+    0, 23, 24, 25, 25, 25, 25, 25, 25, 25,
+    25, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+    25, 25
+};
+
+/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] = {
+    0, 2, 1, 1, 1, 3, 3, 2, 2, 3,
+    3, 3, 3, 3, 3, 3, 3, 1, 3, 3,
+    3, 3
+};
+
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
+   means the default is an error.  */
+static const yytype_uint8 yydefact[] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 17, 3,
+    4, 0, 2, 7, 0, 8, 0, 0, 0, 0,
+    1, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    13, 18, 19, 20, 21, 5, 6, 9, 10, 11,
+    12, 15, 14, 16
+};
+
+/* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int8 yydefgoto[] = {
+    -1, 11, 12
+};
+
+/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+   STATE-NUM.  */
+#define YYPACT_NINF -2
+static const yytype_int8 yypact[] = {
+    25, 25, 25, 25, 25, 25, 25, 25, -2, -2,
+    -2, 13, 113, 122, 4, 122, 45, 62, 79, 96,
+    -2, 25, 25, 25, 25, 25, 25, 25, 25, 25,
+    -2, -2, -2, -2, -2, 122, 122, 24, 24, 48,
+    48, 6, 17, -2
+};
+
+/* YYPGOTO[NTERM-NUM].  */
+static const yytype_int8 yypgoto[] = {
+    -2, -2, -1
+};
+
+/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
+   positive, shift that token.  If negative, reduce the rule which
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
+#define YYTABLE_NINF -1
+static const yytype_uint8 yytable[] = {
+    13, 14, 15, 16, 17, 18, 19, 21, 22, 23,
+    24, 25, 26, 20, 30, 27, 28, 29, 28, 29,
+    35, 36, 37, 38, 39, 40, 41, 42, 43, 1,
+    29, 25, 26, 0, 2, 27, 28, 29, 0, 3,
+    4, 5, 6, 7, 0, 8, 9, 10, 21, 22,
+    23, 24, 25, 26, 0, 0, 27, 28, 29, 27,
+    28, 29, 0, 0, 31, 21, 22, 23, 24, 25,
+    26, 0, 0, 27, 28, 29, 0, 0, 0, 0,
+    0, 32, 21, 22, 23, 24, 25, 26, 0, 0,
+    27, 28, 29, 0, 0, 0, 0, 0, 33, 21,
+    22, 23, 24, 25, 26, 0, 0, 27, 28, 29,
+    0, 0, 0, 0, 0, 34, 21, 22, 23, 24,
+    25, 26, 0, 0, 27, 28, 29, 23, 24, 25,
+    26, 0, 0, 27, 28, 29
+};
+
+static const yytype_int8 yycheck[] = {
+    1, 2, 3, 4, 5, 6, 7, 3, 4, 5,
+    6, 7, 8, 0, 10, 11, 12, 13, 12, 13,
+    21, 22, 23, 24, 25, 26, 27, 28, 29, 4,
+    13, 7, 8, -1, 9, 11, 12, 13, -1, 14,
+    15, 16, 17, 18, -1, 20, 21, 22, 3, 4,
+    5, 6, 7, 8, -1, -1, 11, 12, 13, 11,
+    12, 13, -1, -1, 19, 3, 4, 5, 6, 7,
+    8, -1, -1, 11, 12, 13, -1, -1, -1, -1,
+    -1, 19, 3, 4, 5, 6, 7, 8, -1, -1,
+    11, 12, 13, -1, -1, -1, -1, -1, 19, 3,
+    4, 5, 6, 7, 8, -1, -1, 11, 12, 13,
+    -1, -1, -1, -1, -1, 19, 3, 4, 5, 6,
+    7, 8, -1, -1, 11, 12, 13, 5, 6, 7,
+    8, -1, -1, 11, 12, 13
+};
+
+/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+   symbol of state STATE-NUM.  */
+static const yytype_uint8 yystos[] = {
+    0, 4, 9, 14, 15, 16, 17, 18, 20, 21,
+    22, 24, 25, 25, 25, 25, 25, 25, 25, 25,
+    0, 3, 4, 5, 6, 7, 8, 11, 12, 13,
+    10, 19, 19, 19, 19, 25, 25, 25, 25, 25,
+    25, 25, 25, 25
+};
+
+#define yyerrok (yyerrstatus = 0)
+#define yyclearin (yychar = YYEMPTY)
+#define YYEMPTY (-2)
+#define YYEOF 0
+
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
+#define YYERROR goto yyerrorlab
+
+/* Like YYERROR except do call yyerror.  This remains here temporarily
+   to ease the transition to the new meaning of YYERROR, for GCC.
+   Once GCC version 2 has supplanted version 1, this can go.  */
+
+#define YYFAIL goto yyerrlab
+
+#define YYRECOVERING() (!!yyerrstatus)
+
+#define YYBACKUP(Token, Value)                        \
+    \
+do if (yychar == YYEMPTY && yylen == 1)               \
+    {                                                 \
+        yychar = (Token);                             \
+        yylval = (Value);                             \
+        yytoken = YYTRANSLATE(yychar);                \
+        YYPOPSTACK(1);                                \
+        goto yybackup;                                \
+    }                                                 \
+    else                                              \
+    {                                                 \
+        yyerror(YY_("syntax error: cannot back up")); \
+        YYERROR;                                      \
+    }                                                 \
+    \
+while(YYID(0))
+
+#define YYTERROR 1
+#define YYERRCODE 256
+
+/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
+   If N is 0, then set CURRENT to the empty location which ends
+   the previous symbol: RHS[0] (always defined).  */
+
+#define YYRHSLOC(Rhs, K) ((Rhs)[K])
+#ifndef YYLLOC_DEFAULT
+#define YYLLOC_DEFAULT(Current, Rhs, N)                                                    \
+    do                                                                                     \
+        if (YYID(N)) {                                                                     \
+            (Current).first_line = YYRHSLOC(Rhs, 1).first_line;                            \
+            (Current).first_column = YYRHSLOC(Rhs, 1).first_column;                        \
+            (Current).last_line = YYRHSLOC(Rhs, N).last_line;                              \
+            (Current).last_column = YYRHSLOC(Rhs, N).last_column;                          \
+        } else {                                                                           \
+            (Current).first_line = (Current).last_line = YYRHSLOC(Rhs, 0).last_line;       \
+            (Current).first_column = (Current).last_column = YYRHSLOC(Rhs, 0).last_column; \
+        }                                                                                  \
+    while (YYID(0))
+#endif
+
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
+
+#ifndef YY_LOCATION_PRINT
+#if YYLTYPE_IS_TRIVIAL
+#define YY_LOCATION_PRINT(File, Loc)          \
+    fprintf(File, "%d.%d-%d.%d",              \
+        (Loc).first_line, (Loc).first_column, \
+        (Loc).last_line, (Loc).last_column)
+#else
+#define YY_LOCATION_PRINT(File, Loc) ((void)0)
+#endif
+#endif
+
+/* YYLEX -- calling `yylex' with the right arguments.  */
+
+#ifdef YYLEX_PARAM
+#define YYLEX yylex(YYLEX_PARAM)
+#else
+#define YYLEX yylex()
+#endif
+
+/* Enable debugging if requested.  */
+#if YYDEBUG
+
+#ifndef YYFPRINTF
+#include <stdio.h> /* INFRINGES ON USER NAME SPACE */
+#define YYFPRINTF fprintf
+#endif
+
+#define YYDPRINTF(Args)     \
+    \
+do                   \
+    {                       \
+        if (yydebug)        \
+            YYFPRINTF Args; \
+    \
+}                    \
+    while (YYID(0))
+
+#define YY_SYMBOL_PRINT(Title, Type, Value, Location) \
+    \
+do                                             \
+    {                                                 \
+        if (yydebug) {                                \
+            YYFPRINTF(stderr, "%s ", Title);          \
+            yy_symbol_print(stderr,                   \
+                Type, Value);                         \
+            YYFPRINTF(stderr, "\n");                  \
+        }                                             \
+    \
+}                                              \
+    while (YYID(0))
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_value_print(FILE* yyoutput, int yytype, YYSTYPE const* const yyvaluep)
+#else
+static void
+    yy_symbol_value_print(yyoutput, yytype, yyvaluep)
+        FILE* yyoutput;
+int yytype;
+YYSTYPE const* const yyvaluep;
+#endif
+{
+    if (!yyvaluep)
+        return;
+#ifdef YYPRINT
+    if (yytype < YYNTOKENS)
+        YYPRINT(yyoutput, yytoknum[yytype], *yyvaluep);
+#else
+    YYUSE(yyoutput);
+#endif
+    switch (yytype) {
+    default:
+        break;
+    }
+}
+
+/*--------------------------------.
+| Print this symbol on YYOUTPUT.  |
+`--------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+static void
+yy_symbol_print(FILE* yyoutput, int yytype, YYSTYPE const* const yyvaluep)
+#else
+static void
+    yy_symbol_print(yyoutput, yytype, yyvaluep)
+        FILE* yyoutput;
+int yytype;
+YYSTYPE const* const yyvaluep;
+#endif
+{
+    if (yytype < YYNTOKENS)
+        YYFPRINTF(yyoutput, "token %s (", yytname[yytype]);
+    else
+        YYFPRINTF(yyoutput, "nterm %s (", yytname[yytype]);
+
+    yy_symbol_value_print(yyoutput, yytype, yyvaluep);
+    YYFPRINTF(yyoutput, ")");
+}
+
+/*------------------------------------------------------------------.
+| yy_stack_print -- Print the state stack from its BOTTOM up to its |
+| TOP (included).                                                   |
+`------------------------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+static void
+yy_stack_print(yytype_int16* bottom, yytype_int16* top)
+#else
+static void
+    yy_stack_print(bottom, top)
+        yytype_int16* bottom;
+yytype_int16* top;
+#endif
+{
+    YYFPRINTF(stderr, "Stack now");
+    for (; bottom <= top; ++bottom)
+        YYFPRINTF(stderr, " %d", *bottom);
+    YYFPRINTF(stderr, "\n");
+}
+
+#define YY_STACK_PRINT(Bottom, Top)          \
+    \
+do                                    \
+    {                                        \
+        if (yydebug)                         \
+            yy_stack_print((Bottom), (Top)); \
+    \
+}                                     \
+    while (YYID(0))
+
+/*------------------------------------------------.
+| Report that the YYRULE is going to be reduced.  |
+`------------------------------------------------*/
+
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+static void
+yy_reduce_print(YYSTYPE* yyvsp, int yyrule)
+#else
+static void
+    yy_reduce_print(yyvsp, yyrule)
+        YYSTYPE* yyvsp;
+int yyrule;
+#endif
+{
+    int yynrhs = yyr2[yyrule];
+    int yyi;
+    unsigned long int yylno = yyrline[yyrule];
+    YYFPRINTF(stderr, "Reducing stack by rule %d (line %lu):\n",
+        yyrule - 1, yylno);
+    /* The symbols being reduced.  */
+    for (yyi = 0; yyi < yynrhs; yyi++) {
+        fprintf(stderr, "   $%d = ", yyi + 1);
+        yy_symbol_print(stderr, yyrhs[yyprhs[yyrule] + yyi],
+            &(yyvsp[(yyi + 1) - (yynrhs)]));
+        fprintf(stderr, "\n");
+    }
+}
+
+#define YY_REDUCE_PRINT(Rule)             \
+    \
+do                                 \
+    {                                     \
+        if (yydebug)                      \
+            yy_reduce_print(yyvsp, Rule); \
+    \
+}                                  \
+    while (YYID(0))
+
+/* Nonzero means print parse trace.  It is left uninitialized so that
+   multiple parsers can coexist.  */
+int yydebug;
+#else /* !YYDEBUG */
+#define YYDPRINTF(Args)
+#define YY_SYMBOL_PRINT(Title, Type, Value, Location)
+#define YY_STACK_PRINT(Bottom, Top)
+#define YY_REDUCE_PRINT(Rule)
+#endif /* !YYDEBUG */
+
+/* YYINITDEPTH -- initial size of the parser's stacks.  */
+#ifndef YYINITDEPTH
+#define YYINITDEPTH 200
+#endif
+
+/* YYMAXDEPTH -- maximum size the stacks can grow to (effective only
+   if the built-in stack extension method is used).
+
+   Do not make this value too large; the results are undefined if
+   YYSTACK_ALLOC_MAXIMUM < YYSTACK_BYTES (YYMAXDEPTH)
+   evaluated with infinite-precision integer arithmetic.  */
+
+#ifndef YYMAXDEPTH
+#define YYMAXDEPTH 10000
+#endif
+
+#if YYERROR_VERBOSE
+
+#ifndef yystrlen
+#if defined __GLIBC__ && defined _STRING_H
+#define yystrlen strlen
+#else
+/* Return the length of YYSTR.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+static YYSIZE_T
+yystrlen(const char* yystr)
+#else
+static YYSIZE_T
+    yystrlen(yystr)
+        const char* yystr;
+#endif
+{
+    YYSIZE_T yylen;
+    for (yylen = 0; yystr[yylen]; yylen++)
+        continue;
+    return yylen;
+}
+#endif
+#endif
+
+#ifndef yystpcpy
+#if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE
+#define yystpcpy stpcpy
+#else
+/* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
+   YYDEST.  */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+static char*
+yystpcpy(char* yydest, const char* yysrc)
+#else
+static char*
+    yystpcpy(yydest, yysrc) char* yydest;
+const char* yysrc;
+#endif
+{
+    char* yyd = yydest;
+    const char* yys = yysrc;
+
+    while ((*yyd++ = *yys++) != '\0')
+        continue;
+
+    return yyd - 1;
+}
+#endif
+#endif
+
+#ifndef yytnamerr
+/* Copy to YYRES the contents of YYSTR after stripping away unnecessary
+   quotes and backslashes, so that it's suitable for yyerror.  The
+   heuristic is that double-quoting is unnecessary unless the string
+   contains an apostrophe, a comma, or backslash (other than
+   backslash-backslash).  YYSTR is taken from yytname.  If YYRES is
+   null, do not copy; instead, return the length of what the result
+   would have been.  */
+static YYSIZE_T
+yytnamerr(char* yyres, const char* yystr)
+{
+    if (*yystr == '"') {
+        YYSIZE_T yyn = 0;
+        char const* yyp = yystr;
+
+        for (;;)
+            switch (*++yyp) {
+            case '\'':
+            case ',':
+                goto do_not_strip_quotes;
+
+            case '\\':
+                if (*++yyp != '\\')
+                    goto do_not_strip_quotes;
+            /* Fall through.  */
+            default:
+                if (yyres)
+                    yyres[yyn] = *yyp;
+                yyn++;
+                break;
+
+            case '"':
+                if (yyres)
+                    yyres[yyn] = '\0';
+                return yyn;
+            }
+    do_not_strip_quotes:;
+    }
+
+    if (!yyres)
+        return yystrlen(yystr);
+
+    return yystpcpy(yyres, yystr) - yyres;
+}
+#endif
+
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error(char* yyresult, int yystate, int yychar)
+{
+    int yyn = yypact[yystate];
+
+    if (!(YYPACT_NINF < yyn && yyn <= YYLAST))
+        return 0;
+    else {
+        int yytype = YYTRANSLATE(yychar);
+        YYSIZE_T yysize0 = yytnamerr(0, yytname[yytype]);
+        YYSIZE_T yysize = yysize0;
+        YYSIZE_T yysize1;
+        int yysize_overflow = 0;
+        enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+        char const* yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+        int yyx;
+
+#if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+#endif
+        char* yyfmt;
+        char const* yyf;
+        static char const yyunexpected[] = "syntax error, unexpected %s";
+        static char const yyexpecting[] = ", expecting %s";
+        static char const yyor[] = " or %s";
+        char yyformat[sizeof yyunexpected
+            + sizeof yyexpecting - 1
+            + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+                          * (sizeof yyor - 1))];
+        char const* yyprefix = yyexpecting;
+
+        /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+        int yyxbegin = yyn < 0 ? -yyn : 0;
+
+        /* Stay within bounds of both yycheck and yytname.  */
+        int yychecklim = YYLAST - yyn + 1;
+        int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+        int yycount = 1;
+
+        yyarg[0] = yytname[yytype];
+        yyfmt = yystpcpy(yyformat, yyunexpected);
+
+        for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR) {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM) {
+                    yycount = 1;
+                    yysize = yysize0;
+                    yyformat[sizeof yyunexpected - 1] = '\0';
+                    break;
+                }
+                yyarg[yycount++] = yytname[yyx];
+                yysize1 = yysize + yytnamerr(0, yytname[yyx]);
+                yysize_overflow |= (yysize1 < yysize);
+                yysize = yysize1;
+                yyfmt = yystpcpy(yyfmt, yyprefix);
+                yyprefix = yyor;
+            }
+
+        yyf = YY_(yyformat);
+        yysize1 = yysize + yystrlen(yyf);
+        yysize_overflow |= (yysize1 < yysize);
+        yysize = yysize1;
+
+        if (yysize_overflow)
+            return YYSIZE_MAXIMUM;
+
+        if (yyresult) {
+            /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+            char* yyp = yyresult;
+            int yyi = 0;
+            while ((*yyp = *yyf) != '\0') {
+                if (*yyp == '%' && yyf[1] == 's' && yyi < yycount) {
+                    yyp += yytnamerr(yyp, yyarg[yyi++]);
+                    yyf += 2;
+                } else {
+                    yyp++;
+                    yyf++;
+                }
+            }
+        }
+        return yysize;
+    }
+}
+#endif /* YYERROR_VERBOSE */
+
+/*-----------------------------------------------.
+| Release the memory associated to this symbol.  |
+`-----------------------------------------------*/
+
+/*ARGSUSED*/
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+static void
+yydestruct(const char* yymsg, int yytype, YYSTYPE* yyvaluep)
+#else
+static void
+    yydestruct(yymsg, yytype, yyvaluep)
+        const char* yymsg;
+int yytype;
+YYSTYPE* yyvaluep;
+#endif
+{
+    YYUSE(yyvaluep);
+
+    if (!yymsg)
+        yymsg = "Deleting";
+    YY_SYMBOL_PRINT(yymsg, yytype, yyvaluep, yylocationp);
+
+    switch (yytype) {
+
+    default:
+        break;
+    }
+}
+
+/* Prevent warnings from -Wmissing-prototypes.  */
+
+#ifdef YYPARSE_PARAM
+#if defined __STDC__ || defined __cplusplus
+int yyparse(void* YYPARSE_PARAM);
+#else
+int yyparse();
+#endif
+#else /* ! YYPARSE_PARAM */
+#if defined __STDC__ || defined __cplusplus
+int yyparse(void);
+#else
+int yyparse();
+#endif
+#endif /* ! YYPARSE_PARAM */
+
+/* The look-ahead symbol.  */
+int yychar;
+
+/* The semantic value of the look-ahead symbol.  */
+YYSTYPE yylval;
+
+/* Number of syntax errors so far.  */
+int yynerrs;
+
+/*----------.
+| yyparse.  |
+`----------*/
+
+#ifdef YYPARSE_PARAM
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+int yyparse(void* YYPARSE_PARAM)
+#else
+int
+    yyparse(YYPARSE_PARAM) void* YYPARSE_PARAM;
+#endif
+#else /* ! YYPARSE_PARAM */
+#if (defined __STDC__ || defined __C99__FUNC__ \
+    || defined __cplusplus || defined _MSC_VER)
+int yyparse(void)
+#else
+int yyparse()
+
+#endif
+#endif
+{
+
+    int yystate;
+    int yyn;
+    int yyresult;
+    /* Number of tokens to shift before error messages enabled.  */
+    int yyerrstatus;
+    /* Look-ahead token as an internal (translated) token number.  */
+    int yytoken = 0;
+#if YYERROR_VERBOSE
+    /* Buffer for error messages, and its allocated size.  */
+    char yymsgbuf[128];
+    char* yymsg = (char *)yymsgbuf;
+    YYSIZE_T yymsg_alloc = sizeof yymsgbuf;
+#endif
+
+    /* Three stacks and their tools:
+     `yyss': related to states,
+     `yyvs': related to semantic values,
+     `yyls': related to locations.
+
+     Refer to the stacks thru separate pointers, to allow yyoverflow
+     to reallocate them elsewhere.  */
+
+    /* The state stack.  */
+    yytype_int16 yyssa[YYINITDEPTH];
+    yytype_int16* yyss = yyssa;
+    yytype_int16* yyssp;
+
+    /* The semantic value stack.  */
+    YYSTYPE yyvsa[YYINITDEPTH];
+    YYSTYPE* yyvs = yyvsa;
+    YYSTYPE* yyvsp;
+
+#define YYPOPSTACK(N) (yyvsp -= (N), yyssp -= (N))
+
+    YYSIZE_T yystacksize = YYINITDEPTH;
+
+    /* The variables used to return semantic value and location from the
+     action routines.  */
+    YYSTYPE yyval;
+
+    /* The number of symbols on the RHS of the reduced rule.
+     Keep to zero when no symbol should be popped.  */
+    int yylen = 0;
+
+    YYDPRINTF((stderr, "Starting parse\n"));
+
+    yystate = 0;
+    yyerrstatus = 0;
+    yynerrs = 0;
+    yychar = YYEMPTY; /* Cause a token to be read.  */
+
+    /* Initialize stack pointers.
+     Waste one element of value and location stack
+     so that they stay on the same level as the state stack.
+     The wasted elements are never initialized.  */
+
+    yyssp = yyss;
+    yyvsp = yyvs;
+
+    goto yysetstate;
+
+/*------------------------------------------------------------.
+| yynewstate -- Push a new state, which is found in yystate.  |
+`------------------------------------------------------------*/
+yynewstate:
+    /* In all cases, when you get here, the value and location stacks
+     have just been pushed.  So pushing a state here evens the stacks.  */
+    yyssp++;
+
+yysetstate:
+    *yyssp = yystate;
+
+    if (yyss + yystacksize - 1 <= yyssp) {
+        /* Get the current used size of the three stacks, in elements.  */
+        YYSIZE_T yysize = yyssp - yyss + 1;
+
+#ifdef yyoverflow
+        {
+            /* Give user a chance to reallocate the stack.  Use copies of
+	   these so that the &'s don't force the real ones into
+	   memory.  */
+            YYSTYPE* yyvs1 = yyvs;
+            yytype_int16* yyss1 = yyss;
+
+            /* Each stack pointer address is followed by the size of the
+	   data in use in that stack, in bytes.  This used to be a
+	   conditional around just the two extra args, but that might
+	   be undefined if yyoverflow is a macro.  */
+            yyoverflow(YY_("memory exhausted"),
+                &yyss1, yysize * sizeof(*yyssp),
+                &yyvs1, yysize * sizeof(*yyvsp),
+
+                &yystacksize);
+
+            yyss = yyss1;
+            yyvs = yyvs1;
+        }
+#else /* no yyoverflow */
+#ifndef YYSTACK_RELOCATE
+        goto yyexhaustedlab;
+#else
+        /* Extend the stack our own way.  */
+        if (YYMAXDEPTH <= yystacksize)
+            goto yyexhaustedlab;
+        yystacksize *= 2;
+        if (YYMAXDEPTH < yystacksize)
+            yystacksize = YYMAXDEPTH;
+
+        {
+            yytype_int16* yyss1 = yyss;
+            union yyalloc* yyptr = (union yyalloc*)YYSTACK_ALLOC(YYSTACK_BYTES(yystacksize));
+            if (!yyptr)
+                goto yyexhaustedlab;
+            YYSTACK_RELOCATE(yyss);
+            YYSTACK_RELOCATE(yyvs);
+
+#undef YYSTACK_RELOCATE
+            if (yyss1 != yyssa)
+                YYSTACK_FREE(yyss1);
+        }
+#endif
+#endif /* no yyoverflow */
+
+        yyssp = yyss + yysize - 1;
+        yyvsp = yyvs + yysize - 1;
+
+        YYDPRINTF((stderr, "Stack size increased to %lu\n",
+            (unsigned long int)yystacksize));
+
+        if (yyss + yystacksize - 1 <= yyssp)
+            YYABORT;
+    }
+
+    YYDPRINTF((stderr, "Entering state %d\n", yystate));
+
+    goto yybackup;
+
+/*-----------.
+| yybackup.  |
+`-----------*/
+yybackup:
+
+    /* Do appropriate processing given the current state.  Read a
+     look-ahead token if we need one and don't already have one.  */
+
+    /* First try to decide what to do without reference to look-ahead token.  */
+    yyn = yypact[yystate];
+    if (yyn == YYPACT_NINF)
+        goto yydefault;
+
+    /* Not known => get a look-ahead token if don't already have one.  */
+
+    /* YYCHAR is either YYEMPTY or YYEOF or a valid look-ahead symbol.  */
+    if (yychar == YYEMPTY) {
+        YYDPRINTF((stderr, "Reading a token: "));
+        yychar = YYLEX;
+    }
+
+    if (yychar <= YYEOF) {
+        yychar = yytoken = YYEOF;
+        YYDPRINTF((stderr, "Now at end of input.\n"));
+    } else {
+        yytoken = YYTRANSLATE(yychar);
+        YY_SYMBOL_PRINT("Next token is", yytoken, &yylval, &yylloc);
+    }
+
+    /* If the proper action on seeing token YYTOKEN is to reduce or to
+     detect an error, take that action.  */
+    yyn += yytoken;
+    if (yyn < 0 || YYLAST < yyn || yycheck[yyn] != yytoken)
+        goto yydefault;
+    yyn = yytable[yyn];
+    if (yyn <= 0) {
+        if (yyn == 0 || yyn == YYTABLE_NINF)
+            goto yyerrlab;
+        yyn = -yyn;
+        goto yyreduce;
+    }
+
+    if (yyn == YYFINAL)
+        YYACCEPT;
+
+    /* Count tokens shifted since error; after three, turn off error
+     status.  */
+    if (yyerrstatus)
+        yyerrstatus--;
+
+    /* Shift the look-ahead token.  */
+    YY_SYMBOL_PRINT("Shifting", yytoken, &yylval, &yylloc);
+
+    /* Discard the shifted token unless it is eof.  */
+    if (yychar != YYEOF)
+        yychar = YYEMPTY;
+
+    yystate = yyn;
+    *++yyvsp = yylval;
+
+    goto yynewstate;
+
+/*-----------------------------------------------------------.
+| yydefault -- do the default action for the current state.  |
+`-----------------------------------------------------------*/
+yydefault:
+    yyn = yydefact[yystate];
+    if (yyn == 0)
+        goto yyerrlab;
+    goto yyreduce;
+
+/*-----------------------------.
+| yyreduce -- Do a reduction.  |
+`-----------------------------*/
+yyreduce:
+    /* yyn is the number of a rule to reduce with.  */
+    yylen = yyr2[yyn];
+
+    /* If YYLEN is nonzero, implement the default value of the action:
+     `$$ = $1'.
+
+     Otherwise, the following line sets YYVAL to garbage.
+     This behavior is undocumented and Bison
+     users should not rely upon it.  Assigning to YYVAL
+     unconditionally makes the parser a bit smaller, and it avoids a
+     GCC warning that YYVAL may be used uninitialized.  */
+    yyval = yyvsp[1 - yylen];
+
+    YY_REDUCE_PRINT(yyn);
+    switch (yyn) {
+    case 2:
+#line 56 "src/sdl/debugger-expr.y"
+    {
+        dexp_result = (yyvsp[(1) - (1)].number);
+    } break;
+
+    case 3:
+#line 59 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (1)].number);
+    } break;
+
+    case 4:
+#line 60 "src/sdl/debugger-expr.y"
+    {
+        std::string v((yyvsp[(1) - (1)].string));
+        if (dexp_vars.count(v) == 0) {
+            printf("Variable %s not defined.\n", (yyvsp[(1) - (1)].string));
+            YYABORT;
+        }
+        (yyval.number) = dexp_vars[v];
+    } break;
+
+    case 5:
+#line 68 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) + (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 6:
+#line 69 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) - (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 7:
+#line 70 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = -(yyvsp[(2) - (2)].number);
+    } break;
+
+    case 8:
+#line 71 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = ~(yyvsp[(2) - (2)].number);
+    } break;
+
+    case 9:
+#line 72 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) / (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 10:
+#line 73 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) * (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 11:
+#line 74 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) << (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 12:
+#line 75 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) >> (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 13:
+#line 76 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(2) - (3)].number);
+    } break;
+
+    case 14:
+#line 77 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) & (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 15:
+#line 78 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) | (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 16:
+#line 79 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = (yyvsp[(1) - (3)].number) ^ (yyvsp[(3) - (3)].number);
+    } break;
+
+    case 17:
+#line 80 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = reg[(yyvsp[(1) - (1)].number)].I;
+    } break;
+
+    case 18:
+#line 81 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = readByte((yyvsp[(2) - (3)].number));
+    } break;
+
+    case 19:
+#line 82 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = readHalfWord((yyvsp[(2) - (3)].number));
+    } break;
+
+    case 20:
+#line 83 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = readWord((yyvsp[(2) - (3)].number));
+    } break;
+
+    case 21:
+#line 84 "src/sdl/debugger-expr.y"
+    {
+        (yyval.number) = readWord((yyvsp[(2) - (3)].number));
+    } break;
+
+/* Line 1267 of yacc.c.  */
+#line 1534 "src/sdl/debugger-expr-yacc.cpp"
+    default:
+        break;
+    }
+    YY_SYMBOL_PRINT("-> $$ =", yyr1[yyn], &yyval, &yyloc);
+
+    YYPOPSTACK(yylen);
+    yylen = 0;
+    YY_STACK_PRINT(yyss, yyssp);
+
+    *++yyvsp = yyval;
+
+    /* Now `shift' the result of the reduction.  Determine what state
+     that goes to, based on the state we popped back to and the rule
+     number reduced by.  */
+
+    yyn = yyr1[yyn];
+
+    yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
+    if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
+        yystate = yytable[yystate];
+    else
+        yystate = yydefgoto[yyn - YYNTOKENS];
+
+    goto yynewstate;
+
+/*------------------------------------.
+| yyerrlab -- here on detecting error |
+`------------------------------------*/
+yyerrlab:
+    /* If not already recovering from an error, report this error.  */
+    if (!yyerrstatus) {
+        ++yynerrs;
+#if !YYERROR_VERBOSE
+        yyerror((char *)YY_("syntax error"));
+#else
+        {
+            YYSIZE_T yysize = yysyntax_error(0, yystate, yychar);
+            if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM) {
+                YYSIZE_T yyalloc = 2 * yysize;
+                if (!(yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+                    yyalloc = YYSTACK_ALLOC_MAXIMUM;
+                if (yymsg != yymsgbuf)
+                    YYSTACK_FREE(yymsg);
+                yymsg = (char*)YYSTACK_ALLOC(yyalloc);
+                if (yymsg)
+                    yymsg_alloc = yyalloc;
+                else {
+                    yymsg = yymsgbuf;
+                    yymsg_alloc = sizeof yymsgbuf;
+                }
+            }
+
+            if (0 < yysize && yysize <= yymsg_alloc) {
+                (void)yysyntax_error(yymsg, yystate, yychar);
+                yyerror(yymsg);
+            } else {
+                yyerror((char *)YY_("syntax error"));
+                if (yysize != 0)
+                    goto yyexhaustedlab;
+            }
+        }
+#endif
+    }
+
+    if (yyerrstatus == 3) {
+        /* If just tried and failed to reuse look-ahead token after an
+	 error, discard it.  */
+
+        if (yychar <= YYEOF) {
+            /* Return failure if at end of input.  */
+            if (yychar == YYEOF)
+                YYABORT;
+        } else {
+            yydestruct("Error: discarding",
+                yytoken, &yylval);
+            yychar = YYEMPTY;
+        }
+    }
+
+    /* Else will try to reuse look-ahead token after shifting the error
+     token.  */
+    goto yyerrlab1;
+
+/*---------------------------------------------------.
+| yyerrorlab -- error raised explicitly by YYERROR.  |
+`---------------------------------------------------*/
+yyerrorlab:
+
+    /* Pacify compilers like GCC when the user code never invokes
+     YYERROR and the label yyerrorlab therefore never appears in user
+     code.  */
+    if (/*CONSTCOND*/ 0)
+        goto yyerrorlab;
+
+    /* Do not reclaim the symbols of the rule which action triggered
+     this YYERROR.  */
+    YYPOPSTACK(yylen);
+    yylen = 0;
+    YY_STACK_PRINT(yyss, yyssp);
+    yystate = *yyssp;
+    goto yyerrlab1;
+
+/*-------------------------------------------------------------.
+| yyerrlab1 -- common code for both syntax error and YYERROR.  |
+`-------------------------------------------------------------*/
+yyerrlab1:
+    yyerrstatus = 3; /* Each real token shifted decrements this.  */
+
+    for (;;) {
+        yyn = yypact[yystate];
+        if (yyn != YYPACT_NINF) {
+            yyn += YYTERROR;
+            if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR) {
+                yyn = yytable[yyn];
+                if (0 < yyn)
+                    break;
+            }
+        }
+
+        /* Pop the current state because it cannot handle the error token.  */
+        if (yyssp == yyss)
+            YYABORT;
+
+        yydestruct("Error: popping",
+            yystos[yystate], yyvsp);
+        YYPOPSTACK(1);
+        yystate = *yyssp;
+        YY_STACK_PRINT(yyss, yyssp);
+    }
+
+    if (yyn == YYFINAL)
+        YYACCEPT;
+
+    *++yyvsp = yylval;
+
+    /* Shift the error token.  */
+    YY_SYMBOL_PRINT("Shifting", yystos[yyn], yyvsp, yylsp);
+
+    yystate = yyn;
+    goto yynewstate;
+
+/*-------------------------------------.
+| yyacceptlab -- YYACCEPT comes here.  |
+`-------------------------------------*/
+yyacceptlab:
+    yyresult = 0;
+    goto yyreturn;
+
+/*-----------------------------------.
+| yyabortlab -- YYABORT comes here.  |
+`-----------------------------------*/
+yyabortlab:
+    yyresult = 1;
+    goto yyreturn;
+
+#ifndef yyoverflow
+/*-------------------------------------------------.
+| yyexhaustedlab -- memory exhaustion comes here.  |
+`-------------------------------------------------*/
+yyexhaustedlab:
+    yyerror((char *)YY_("memory exhausted"));
+    yyresult = 2;
+/* Fall through.  */
+#endif
+
+yyreturn:
+    if (yychar != YYEOF && yychar != YYEMPTY)
+        yydestruct("Cleanup: discarding lookahead",
+            yytoken, &yylval);
+    /* Do not reclaim the symbols of the rule which action triggered
+     this YYABORT or YYACCEPT.  */
+    YYPOPSTACK(yylen);
+    YY_STACK_PRINT(yyss, yyssp);
+    while (yyssp != yyss) {
+        yydestruct("Cleanup: popping",
+            yystos[*yyssp], yyvsp);
+        YYPOPSTACK(1);
+    }
+#ifndef yyoverflow
+    if (yyss != yyssa)
+        YYSTACK_FREE(yyss);
+#endif
+#if YYERROR_VERBOSE
+    if (yymsg != yymsgbuf)
+        YYSTACK_FREE(yymsg);
+#endif
+    /* Make sure YYID is used.  */
+    return YYID(yyresult);
+}
+
+#line 86 "src/sdl/debugger-expr.y"
+
+bool dexp_eval(char* expr, uint32_t* result)
+{
+    extern void dexp_flush();
+    extern char* dexprString;
+    extern int dexprCol;
+
+    dexp_flush();
+
+    dexprString = expr;
+    dexprCol = 0;
+
+    if (!dexp_parse()) {
+        *result = dexp_result;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+int dexp_error(char* s)
+{
+    return 0;
+}
+
+void dexp_setVar(char* name, uint32_t value)
+{
+    std::string a(name);
+    dexp_vars[a] = value;
+}
+
+void dexp_listVars()
+{
+    std::map<std::string, uint32_t>::iterator iter;
+
+    for (iter = dexp_vars.begin(); iter != dexp_vars.end(); iter++) {
+        printf("%s = %08X\n", iter->first.c_str(), iter->second);
+    }
+}
+
+void dexp_saveVars(char* file)
+{
+    std::map<std::string, uint32_t>::iterator iter;
+
+    FILE* f = fopen(file, "w");
+    if (!f) {
+        printf("Could not open file %s\n", file);
+        return;
+    }
+
+    for (iter = dexp_vars.begin(); iter != dexp_vars.end(); iter++) {
+        fprintf(f, "%s = %08X\n", iter->first.c_str(), iter->second);
+    }
+    fclose(f);
+}
+
+void dexp_loadVars(char* file)
+{
+    std::map<std::string, uint32_t>::iterator iter;
+    char buffer[500];
+    char name[500];
+    uint32_t val;
+
+    FILE* f = fopen(file, "r");
+    if (!f) {
+        printf("Could not open file %s\n", file);
+        return;
+    }
+
+    while (fgets(buffer, 500, f) != NULL) {
+        if (sscanf(buffer, "%s = %x", name, &val) == 2) {
+            dexp_setVar(name, val);
+        }
+    }
+}
diff --git a/src/gba/ereader.cpp b/src/gba/ereader.cpp
index e7e35e1e..4f1ad7b2 100644
--- a/src/gba/ereader.cpp
+++ b/src/gba/ereader.cpp
@@ -1,584 +1,585 @@
-#include <locale>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "GBA.h"
-#include "GBAinline.h"
-#include "Globals.h"
-#include "ereader.h"
-
-char US_Ereader[19] = "CARDE READERPSAE01";
-char JAP_Ereader[19] = "CARDE READERPEAJ01";
-char JAP_Ereader_plus[19] = "CARDEREADER+PSAJ01";
-char rom_info[19];
-
-char Signature[0x29] = "E-Reader Dotcode -Created- by CaitSith2";
-
-unsigned char ShortDotCodeHeader[0x30] = {
-    0x00, 0x30, 0x01, 0x01,
-    0x00, 0x01, 0x05, 0x10,
-    0x00, 0x00, 0x10, 0x12, //Constant data
-
-    0x00, 0x00, //Header First 2 bytes
-
-    0x02, 0x00, //Constant data
-
-    0x00, 0x00, //Header Second 2 bytes
-
-    0x10, 0x47, 0xEF, //Global Checksum 1
-
-    0x19, 0x00, 0x00, 0x00, 0x08, 0x4E, 0x49,
-    0x4E, 0x54, 0x45, 0x4E, 0x44, 0x4F, 0x00, 0x22,
-    0x00, 0x09, //Constant data
-
-    0x00, 0x00, //Header, last 8 bytes
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00,
-    0x00, //Header Checksum
-    0x57 //Global Checksum 2
-};
-
-unsigned char LongDotCodeHeader[0x30] = {
-    0x00, 0x30, 0x01, 0x02,
-    0x00, 0x01, 0x08, 0x10,
-    0x00, 0x00, 0x10, 0x12, //Constant Data
-
-    0x00, 0x00, //Header, first 2 bytes
-
-    0x01, 0x00, //Constant data
-
-    0x00, 0x00, //Header, second 2 bytes
-    0x10, 0x9A, 0x99, //Global Checksum 1
-
-    0x19, 0x00, 0x00, 0x00, 0x08, 0x4E, 0x49,
-    0x4E, 0x54, 0x45, 0x4E, 0x44, 0x4F, 0x00, 0x22,
-    0x00, 0x09, //Constant data
-
-    0x00, 0x00, //Header, last 8 bytes
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00,
-    0x00, //Header Checksum
-    0x57 //Global Checksum 2
-};
-
-unsigned char shortheader[0x18] = {
-    0x00, 0x02, 0x00, 0x01, 0x40, 0x10, 0x00, 0x1C,
-    0x10, 0x6F, 0x40, 0xDA, 0x39, 0x25, 0x8E, 0xE0,
-    0x7B, 0xB5, 0x98, 0xB6, 0x5B, 0xCF, 0x7F, 0x72
-};
-unsigned char longheader[0x18] = {
-    0x00, 0x03, 0x00, 0x19, 0x40, 0x10, 0x00, 0x2C,
-    0x0E, 0x88, 0xED, 0x82, 0x50, 0x67, 0xFB, 0xD1,
-    0x43, 0xEE, 0x03, 0xC6, 0xC6, 0x2B, 0x2C, 0x93
-};
-
-unsigned char dotcodeheader[0x48];
-unsigned char dotcodedata[0xB38];
-unsigned char dotcodetemp[0xB00];
-int dotcodepointer;
-int dotcodeinterleave;
-int decodestate;
-
-uint32_t GFpow;
-
-unsigned char* DotCodeData;
-char filebuffer[2048];
-
-int dotcodesize;
-
-#if (defined __WIN32__ || defined _WIN32)
-#define strcasecmp _stricmp
-#endif
-
-int CheckEReaderRegion(void) //US = 1, JAP = 2, JAP+ = 3
-{
-    int i;
-    for (i = 0; i < 18; i++)
-        rom_info[i] = rom[0xA0 + i];
-    rom_info[i] = 0;
-
-    if (!strcasecmp(rom_info, US_Ereader))
-        return 1;
-    if (!strcasecmp(rom_info, JAP_Ereader))
-        return 2;
-    if (!strcasecmp(rom_info, JAP_Ereader_plus))
-        return 3;
-
-    return 0;
-}
-
-int LoadDotCodeData(int size, uint32_t* DCdata, unsigned long MEM1, unsigned long MEM2, int loadraw)
-{
-    uint32_t temp1;
-    int i, j;
-
-    unsigned char scanmap[28];
-    int scantotal = 0;
-
-    for (i = 0; i < 28; i++)
-        scanmap[i] = 0;
-
-    unsigned char longdotcodescan[28] = {
-        0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
-        0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
-        0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
-        0xF1, 0xF2, 0xB1, 0xB1
-    };
-
-    temp1 = CPUReadMemory(MEM1 - 4);
-    for (i = 0; i < 0x60; i += 4)
-        CPUWriteMemory((MEM2 - 8) + i, 0);
-    for (i = 0; i < 0x1860; i += 4)
-        CPUWriteMemory(temp1 + i, 0);
-    if (DCdata != NULL) {
-        if (size == 0xB60) {
-            for (i = 0; i < 28; i++) {
-                for (j = 0, scantotal = 0; j < 0x68; j += 4) {
-                    scantotal += DCdata[((i * 0x68) + j) >> 2];
-                }
-                if (scantotal)
-                    scanmap[i] = longdotcodescan[i];
-            }
-            for (i = 0; i < size; i += 4) {
-                CPUWriteMemory(temp1 + i + 0x9C0, DCdata[i >> 2]);
-            }
-        } else if (size == 0x750) {
-            for (i = 0; i < 18; i++) {
-                if ((DCdata[0] == 0x02011394) && (DCdata[1] == 0x0203E110) && (i == 0))
-                    continue;
-                for (j = 0, scantotal = 0; j < 0x68; j += 4) {
-                    scantotal += DCdata[((i * 0x68) + j) >> 2];
-                }
-                if (scantotal)
-                    scanmap[i] = longdotcodescan[i];
-            }
-            for (i = 0; i < size; i += 4) {
-                CPUWriteMemory(temp1 + i, DCdata[i >> 2]);
-            }
-        }
-    }
-    CPUWriteMemory(MEM2 - 8, 0x1860);
-    CPUWriteMemory(MEM2 - 4, temp1);
-
-    if (size == 0xB60) {
-        if (loadraw) {
-            for (i = 0; i < 28; i++)
-                CPUWriteByte(MEM2 + 0x18 + i, scanmap[i]);
-        } else {
-            CPUWriteMemory(MEM2 + 0x18, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 0x18 + 4, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 0x18 + 8, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 0x18 + 12, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 0x18 + 16, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 0x18 + 20, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 0x18 + 24, 0xB1B1F2F1);
-        }
-        CPUWriteMemory(MEM2 + 0x40, 0x19);
-        CPUWriteMemory(MEM2 + 0x44, 0x34);
-    } else if (size == 0x750) {
-        if (loadraw) {
-            for (i = 0; i < 18; i++)
-                CPUWriteByte(MEM2 + i, scanmap[i]);
-        } else {
-            CPUWriteMemory(MEM2, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 4, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 8, 0xF1F1F1F1);
-            CPUWriteMemory(MEM2 + 12, 0xF2F1F1F1);
-            CPUWriteMemory(MEM2 + 16, 0xB1B1);
-        }
-        CPUWriteMemory(MEM2 + 0x40, 0x01);
-        CPUWriteMemory(MEM2 + 0x44, 0x12);
-    }
-    CPUWriteMemory(MEM2 + 0x48, 0x3C);
-    CPUWriteMemory(MEM2 + 0x4C, MEM2);
-
-    return 0;
-}
-
-void EReaderWriteMemory(uint32_t address, uint32_t value)
-{
-    switch (address >> 24) {
-    case 2:
-        WRITE32LE(((uint32_t*)&workRAM[address & 0x3FFFF]), value);
-        break;
-    case 3:
-        WRITE32LE(((uint32_t*)&internalRAM[address & 0x7FFF]), value);
-        break;
-    default:
-        WRITE32LE(((uint32_t*)&rom[address & 0x1FFFFFF]), value);
-        //rom[address & 0x1FFFFFF] = data;
-        break;
-    }
-}
-
-void BIOS_EReader_ScanCard(int swi_num)
-{
-
-    int i, j, k;
-    int dotcodetype;
-
-    int global1, global2;
-
-    FILE* f;
-
-    //Open dotcode bin/raw
-
-    if (swi_num == 0xE0) {
-        dotcodepointer = 0;
-        dotcodeinterleave = 0;
-        decodestate = 0;
-
-        const char* loadDotCodeFile = GetLoadDotCodeFile();
-
-        if (loadDotCodeFile == 0) {
-            reg[0].I = 0x301;
-            return;
-        }
-        f = fopen(loadDotCodeFile, "rb");
-        //f=fopen(filebuffer,"rb");
-        //f=fopen("dotcode4.raw","rb");
-        if (f == NULL) {
-            reg[0].I = 0x303;
-            return;
-        }
-        fseek(f, 0, SEEK_END);
-        i = ftell(f);
-        fseek(f, 0, SEEK_SET);
-        if ((i == 0xB60) || (i == 0x750)) {
-            dotcodetype = 0;
-        } else if ((i == 0x81C) || (i == 0x51C)) {
-            dotcodetype = 1;
-        } else {
-            fclose(f);
-            reg[0].I = 0x303;
-            return;
-        }
-        DotCodeData = (unsigned char*)malloc(i);
-        if (DotCodeData == NULL) {
-            reg[0].I = 0x303;
-            return;
-        }
-        fread(DotCodeData, 1, i, f);
-        fclose(f);
-
-        if (dotcodetype == 0) {
-
-            switch (CheckEReaderRegion()) {
-            case 1: //US
-                LoadDotCodeData(i, (uint32_t*)DotCodeData, 0x2032D14, 0x2028B28, 1);
-                EReaderWriteMemory(0x80091BA, 0x46C0DFE2);
-                break;
-            case 2:
-                LoadDotCodeData(i, (uint32_t*)DotCodeData, 0x2006EC4, 0x2002478, 1);
-                EReaderWriteMemory(0x8008B12, 0x46C0DFE2);
-                break;
-            case 3:
-                LoadDotCodeData(i, (uint32_t*)DotCodeData, 0x202F8A4, 0x2031034, 1);
-                EReaderWriteMemory(0x800922E, 0x46C0DFE2);
-                break;
-            }
-            reg[0].I = 0;
-            free(DotCodeData);
-        } else {
-            //dotcodesize = i;
-            if (i == 0x81C)
-                dotcodesize = 0xB60;
-            else
-                dotcodesize = 0x750;
-
-            switch (CheckEReaderRegion()) {
-            case 1: //US
-                LoadDotCodeData(dotcodesize, (uint32_t*)NULL, 0x2032D14, 0x2028B28, 0);
-                EReaderWriteMemory(0x80091BA, 0x46C0DFE1);
-                break;
-            case 2:
-                LoadDotCodeData(dotcodesize, (uint32_t*)NULL, 0x2006EC4, 0x2002478, 0);
-                EReaderWriteMemory(0x8008B12, 0x46C0DFE1);
-                break;
-            case 3:
-                LoadDotCodeData(dotcodesize, (uint32_t*)NULL, 0x202F8A4, 0x2031034, 0);
-                EReaderWriteMemory(0x800922E, 0x46C0DFE1);
-                break;
-            }
-            reg[0].I = 0;
-            dotcodesize = i;
-        }
-    } else if (swi_num == 0xE1) {
-
-        switch (CheckEReaderRegion()) {
-        case 1: //US
-            EReaderWriteMemory(0x80091BA, 0xF8A5F03B);
-            EReaderWriteMemory(0x3002F7C, 0xEFE40000); //Beginning of Reed-Solomon decoder
-            EReaderWriteMemory(0x3003144, 0xCA00002F); //Fix required to Correct 16 "Erasures"
-            EReaderWriteMemory(0x300338C, 0xEFE50000); //End of Reed-Solomon decoder
-            GFpow = 0x3000A6C;
-            break;
-        case 2:
-            EReaderWriteMemory(0x8008B12, 0xFB0BF035);
-            EReaderWriteMemory(0x3002F88, 0xEFE40000);
-            EReaderWriteMemory(0x3003150, 0xCA00002F);
-            EReaderWriteMemory(0x3003398, 0xEFE50000);
-            GFpow = 0x3000A78;
-            break;
-        case 3:
-            EReaderWriteMemory(0x800922E, 0xF94BF04B);
-            EReaderWriteMemory(0x3002F7C, 0xEFE40000);
-            EReaderWriteMemory(0x3003144, 0xCA00002F);
-            EReaderWriteMemory(0x300338C, 0xEFE50000);
-            GFpow = 0x3000A6C;
-            break;
-        }
-
-        armNextPC -= 2;
-        reg[15].I -= 2;
-        if (armState)
-            ARM_PREFETCH
-        else
-            THUMB_PREFETCH
-
-        for (i = 0, j = 0; i < 12; i++)
-            j ^= DotCodeData[i];
-        if (dotcodesize == 0x81C) {
-            LongDotCodeHeader[0x2E] = j;
-            LongDotCodeHeader[0x0D] = DotCodeData[0];
-            LongDotCodeHeader[0x0C] = DotCodeData[1];
-            LongDotCodeHeader[0x11] = DotCodeData[2];
-            LongDotCodeHeader[0x10] = DotCodeData[3];
-
-            LongDotCodeHeader[0x26] = DotCodeData[4];
-            LongDotCodeHeader[0x27] = DotCodeData[5];
-            LongDotCodeHeader[0x28] = DotCodeData[6];
-            LongDotCodeHeader[0x29] = DotCodeData[7];
-            LongDotCodeHeader[0x2A] = DotCodeData[8];
-            LongDotCodeHeader[0x2B] = DotCodeData[9];
-            LongDotCodeHeader[0x2C] = DotCodeData[10];
-            LongDotCodeHeader[0x2D] = DotCodeData[11];
-
-            LongDotCodeHeader[0x12] = 0x10; //calculate Global Checksum 1
-            LongDotCodeHeader[0x02] = 1; //Do not calculate Global Checksum 2
-
-            for (i = 0x0C, j = 0; i < 0x81C; i++) {
-                if (i & 1)
-                    j += DotCodeData[i];
-                else
-                    j += (DotCodeData[i] << 8);
-            }
-            j &= 0xFFFF;
-            j ^= 0xFFFF;
-            LongDotCodeHeader[0x13] = (j & 0xFF00) >> 8;
-            LongDotCodeHeader[0x14] = (j & 0x00FF);
-
-            for (i = 0, j = 0; i < 0x2F; i++)
-                j += LongDotCodeHeader[i];
-            j &= 0xFF;
-            for (i = 1, global2 = 0; i < 0x2C; i++) {
-                for (k = 0, global1 = 0; k < 0x30; k++) {
-                    global1 ^= DotCodeData[((i - 1) * 0x30) + k + 0x0C];
-                }
-                global2 += global1;
-            }
-            global2 += j;
-            global2 &= 0xFF;
-            global2 ^= 0xFF;
-            LongDotCodeHeader[0x2F] = global2;
-
-        } else {
-            ShortDotCodeHeader[0x2E] = j;
-            ShortDotCodeHeader[0x0D] = DotCodeData[0];
-            ShortDotCodeHeader[0x0C] = DotCodeData[1];
-            ShortDotCodeHeader[0x11] = DotCodeData[2];
-            ShortDotCodeHeader[0x10] = DotCodeData[3];
-
-            ShortDotCodeHeader[0x26] = DotCodeData[4];
-            ShortDotCodeHeader[0x27] = DotCodeData[5];
-            ShortDotCodeHeader[0x28] = DotCodeData[6];
-            ShortDotCodeHeader[0x29] = DotCodeData[7];
-            ShortDotCodeHeader[0x2A] = DotCodeData[8];
-            ShortDotCodeHeader[0x2B] = DotCodeData[9];
-            ShortDotCodeHeader[0x2C] = DotCodeData[10];
-            ShortDotCodeHeader[0x2D] = DotCodeData[11];
-
-            ShortDotCodeHeader[0x12] = 0x10; //calculate Global Checksum 1
-            ShortDotCodeHeader[0x02] = 1; //Do not calculate Global Checksum 2
-
-            for (i = 0x0C, j = 0; i < 0x51C; i++) {
-                if (i & 1)
-                    j += DotCodeData[i];
-                else
-                    j += (DotCodeData[i] << 8);
-            }
-            j &= 0xFFFF;
-            j ^= 0xFFFF;
-            ShortDotCodeHeader[0x13] = (j & 0xFF00) >> 8;
-            ShortDotCodeHeader[0x14] = (j & 0x00FF);
-
-            for (i = 0, j = 0; i < 0x2F; i++)
-                j += ShortDotCodeHeader[i];
-            j &= 0xFF;
-            for (i = 1, global2 = 0; i < 0x1C; i++) {
-                for (k = 0, global1 = 0; k < 0x30; k++) {
-                    global1 ^= DotCodeData[((i - 1) * 0x30) + k + 0x0C];
-                }
-                global2 += global1;
-            }
-            global2 += j;
-            global2 &= 0xFF;
-            global2 ^= 0xFF;
-            ShortDotCodeHeader[0x2F] = global2;
-        }
-
-    } else if (swi_num == 0xE2) //Header
-    {
-        switch (CheckEReaderRegion()) {
-        case 1: //US
-            EReaderWriteMemory(0x80091BA, 0xF8A5F03B);
-            EReaderWriteMemory(0x300338C, 0xEFE30000);
-            GFpow = 0x3000A6C;
-            break;
-        case 2:
-            EReaderWriteMemory(0x8008B12, 0xFB0BF035);
-            EReaderWriteMemory(0x3003398, 0xEFE30000);
-            GFpow = 0x3000A78;
-            break;
-        case 3:
-            EReaderWriteMemory(0x800922E, 0xF94BF04B);
-            EReaderWriteMemory(0x300338C, 0xEFE30000);
-            GFpow = 0x3000A6C;
-            break;
-        }
-        armNextPC -= 2;
-        reg[15].I -= 2;
-        if (armState)
-            ARM_PREFETCH
-        else
-            THUMB_PREFETCH
-    } else if ((swi_num == 0xE3) || (swi_num == 0xE5)) //Dotcode data
-    {
-        if ((reg[0].I >= 0) && (reg[0].I <= 0x10)) {
-            if (decodestate == 0) {
-                for (i = 0x17; i >= 0; i--) {
-                    if ((0x17 - i) < 8)
-                        j = CPUReadByte(GFpow + CPUReadByte(GFpow + 0x200 + i));
-                    else
-                        j = CPUReadByte(GFpow + CPUReadByte(GFpow + 0x200 + i)) ^ 0xFF;
-
-                    dotcodeheader[(0x17 - i)] = j;
-                    dotcodeheader[(0x17 - i) + 0x18] = j;
-                    dotcodeheader[(0x17 - i) + 0x30] = j;
-                }
-                for (i = 0; i < 28; i++)
-                    for (j = 0; j < 2; j++)
-                        dotcodedata[(i * 0x68) + j] = dotcodeheader[(i * 2) + j];
-                dotcodeinterleave = dotcodeheader[7];
-                decodestate = 1;
-            } else {
-                for (i = 0x3F; i >= 0; i--) {
-                    if ((0x3F - i) < 0x30)
-                        j = CPUReadByte(GFpow + CPUReadByte(GFpow + 0x200 + i));
-                    else
-                        j = CPUReadByte(GFpow + CPUReadByte(GFpow + 0x200 + i)) ^ 0xFF;
-                    dotcodetemp[((0x3F - i) * dotcodeinterleave) + dotcodepointer] = j;
-                }
-                dotcodepointer++;
-
-                if (dotcodepointer == dotcodeinterleave) {
-                    switch (dotcodeinterleave) {
-                    case 0x1C:
-                        j = 0x724;
-                        k = 0x750 - j;
-                        break;
-                    case 0x2C:
-                        j = 0xB38;
-                        k = 0xB60 - j;
-                        break;
-                    }
-                    dotcodepointer = 0;
-                    for (i = 2; i < j; i++) {
-                        if ((i % 0x68) == 0)
-                            i += 2;
-                        dotcodedata[i] = dotcodetemp[dotcodepointer++];
-                    }
-                    if (swi_num == 0xE3) {
-                        const char* loadDotCodeFile = GetLoadDotCodeFile();
-                        f = fopen(loadDotCodeFile, "rb+");
-                        if (f != NULL) {
-                            fwrite(dotcodedata, 1, j, f);
-                            fclose(f);
-                        }
-                    } else {
-                        const char* saveDotCodeFile = GetSaveDotCodeFile();
-                        if (saveDotCodeFile) {
-                            f = fopen(saveDotCodeFile, "wb");
-                            if (f != NULL) {
-                                fwrite(dotcodedata, 1, j, f);
-                                fwrite(Signature, 1, 0x28, f);
-                                if (j == 0x724) {
-                                    fputc(0x65, f);
-                                    fputc(0x02, f);
-                                    fputc(0x71, f);
-                                    fputc(0x10, f);
-                                }
-                                fclose(f);
-                            }
-                        }
-                        free(DotCodeData);
-                    }
-                }
-            }
-        }
-
-        int base = 14;
-        armState = reg[base].I & 1 ? false : true;
-        if (armState) {
-            reg[15].I = reg[base].I & 0xFFFFFFFC;
-            armNextPC = reg[15].I;
-            reg[15].I += 4;
-            ARM_PREFETCH
-        } else {
-            reg[15].I = reg[base].I & 0xFFFFFFFE;
-            armNextPC = reg[15].I;
-            reg[15].I += 2;
-            THUMB_PREFETCH
-        }
-    } else if (swi_num == 0xE4) {
-        reg[12].I = reg[13].I;
-        if (decodestate == 0) {
-            for (i = 0; i < 0x18; i++) {
-                if (dotcodesize == 0x81C)
-                    j = longheader[i];
-                else
-                    j = shortheader[i];
-
-                if (i < 8)
-                    j = CPUReadByte(GFpow + 0x100 + j);
-                else
-                    j = CPUReadByte(GFpow + 0x100 + (j ^ 0xFF));
-
-                CPUWriteByte(GFpow + 0x200 + (0x17 - i), j);
-            }
-        } else {
-            if (dotcodepointer == 0) {
-                for (i = 0; i < 0x30; i++) {
-                    if (dotcodesize == 0x81C)
-                        j = LongDotCodeHeader[i];
-                    else
-                        j = ShortDotCodeHeader[i];
-
-                    j = CPUReadByte(GFpow + 0x100 + j);
-                    CPUWriteByte(GFpow + 0x200 + (0x3F - i), j);
-                }
-
-            } else {
-                for (i = 0; i < 0x30; i++) {
-
-                    j = DotCodeData[((dotcodepointer - 1) * 0x30) + 0x0C + i];
-                    j = CPUReadByte(GFpow + 0x100 + j);
-                    CPUWriteByte(GFpow + 0x200 + (0x3F - i), j);
-                }
-            }
-            for (i = 0; i < 16; i++)
-                CPUWriteByte(GFpow + 0x258 + i, 1); //16 Erasures on the parity bytes, to have them calculated.
-        }
-    }
-}
+#include <locale>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "GBA.h"
+#include "GBAinline.h"
+#include "Globals.h"
+#include "ereader.h"
+
+char US_Ereader[19] = "CARDE READERPSAE01";
+char JAP_Ereader[19] = "CARDE READERPEAJ01";
+char JAP_Ereader_plus[19] = "CARDEREADER+PSAJ01";
+char rom_info[19];
+
+char Signature[0x29] = "E-Reader Dotcode -Created- by CaitSith2";
+
+unsigned char ShortDotCodeHeader[0x30] = {
+    0x00, 0x30, 0x01, 0x01,
+    0x00, 0x01, 0x05, 0x10,
+    0x00, 0x00, 0x10, 0x12, //Constant data
+
+    0x00, 0x00, //Header First 2 bytes
+
+    0x02, 0x00, //Constant data
+
+    0x00, 0x00, //Header Second 2 bytes
+
+    0x10, 0x47, 0xEF, //Global Checksum 1
+
+    0x19, 0x00, 0x00, 0x00, 0x08, 0x4E, 0x49,
+    0x4E, 0x54, 0x45, 0x4E, 0x44, 0x4F, 0x00, 0x22,
+    0x00, 0x09, //Constant data
+
+    0x00, 0x00, //Header, last 8 bytes
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+    0x00, //Header Checksum
+    0x57 //Global Checksum 2
+};
+
+unsigned char LongDotCodeHeader[0x30] = {
+    0x00, 0x30, 0x01, 0x02,
+    0x00, 0x01, 0x08, 0x10,
+    0x00, 0x00, 0x10, 0x12, //Constant Data
+
+    0x00, 0x00, //Header, first 2 bytes
+
+    0x01, 0x00, //Constant data
+
+    0x00, 0x00, //Header, second 2 bytes
+    0x10, 0x9A, 0x99, //Global Checksum 1
+
+    0x19, 0x00, 0x00, 0x00, 0x08, 0x4E, 0x49,
+    0x4E, 0x54, 0x45, 0x4E, 0x44, 0x4F, 0x00, 0x22,
+    0x00, 0x09, //Constant data
+
+    0x00, 0x00, //Header, last 8 bytes
+    0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00,
+    0x00, //Header Checksum
+    0x57 //Global Checksum 2
+};
+
+unsigned char shortheader[0x18] = {
+    0x00, 0x02, 0x00, 0x01, 0x40, 0x10, 0x00, 0x1C,
+    0x10, 0x6F, 0x40, 0xDA, 0x39, 0x25, 0x8E, 0xE0,
+    0x7B, 0xB5, 0x98, 0xB6, 0x5B, 0xCF, 0x7F, 0x72
+};
+unsigned char longheader[0x18] = {
+    0x00, 0x03, 0x00, 0x19, 0x40, 0x10, 0x00, 0x2C,
+    0x0E, 0x88, 0xED, 0x82, 0x50, 0x67, 0xFB, 0xD1,
+    0x43, 0xEE, 0x03, 0xC6, 0xC6, 0x2B, 0x2C, 0x93
+};
+
+unsigned char dotcodeheader[0x48];
+unsigned char dotcodedata[0xB38];
+unsigned char dotcodetemp[0xB00];
+int dotcodepointer;
+int dotcodeinterleave;
+int decodestate;
+
+uint32_t GFpow;
+
+unsigned char* DotCodeData;
+char filebuffer[2048];
+
+int dotcodesize;
+
+#if (defined __WIN32__ || defined _WIN32)
+#define strcasecmp _stricmp
+#endif
+
+int CheckEReaderRegion(void) //US = 1, JAP = 2, JAP+ = 3
+{
+    int i;
+    for (i = 0; i < 18; i++)
+        rom_info[i] = rom[0xA0 + i];
+    rom_info[i] = 0;
+
+    if (!strcasecmp(rom_info, US_Ereader))
+        return 1;
+    if (!strcasecmp(rom_info, JAP_Ereader))
+        return 2;
+    if (!strcasecmp(rom_info, JAP_Ereader_plus))
+        return 3;
+
+    return 0;
+}
+
+int LoadDotCodeData(int size, uint32_t* DCdata, unsigned long MEM1, unsigned long MEM2, int loadraw)
+{
+    uint32_t temp1;
+    int i, j;
+
+    unsigned char scanmap[28];
+    int scantotal = 0;
+
+    for (i = 0; i < 28; i++)
+        scanmap[i] = 0;
+
+    unsigned char longdotcodescan[28] = {
+        0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
+        0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
+        0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1, 0xF1,
+        0xF1, 0xF2, 0xB1, 0xB1
+    };
+
+    temp1 = CPUReadMemory(MEM1 - 4);
+    for (i = 0; i < 0x60; i += 4)
+        CPUWriteMemory((MEM2 - 8) + i, 0);
+    for (i = 0; i < 0x1860; i += 4)
+        CPUWriteMemory(temp1 + i, 0);
+    if (DCdata != NULL) {
+        if (size == 0xB60) {
+            for (i = 0; i < 28; i++) {
+                for (j = 0, scantotal = 0; j < 0x68; j += 4) {
+                    scantotal += DCdata[((i * 0x68) + j) >> 2];
+                }
+                if (scantotal)
+                    scanmap[i] = longdotcodescan[i];
+            }
+            for (i = 0; i < size; i += 4) {
+                CPUWriteMemory(temp1 + i + 0x9C0, DCdata[i >> 2]);
+            }
+        } else if (size == 0x750) {
+            for (i = 0; i < 18; i++) {
+                if ((DCdata[0] == 0x02011394) && (DCdata[1] == 0x0203E110) && (i == 0))
+                    continue;
+                for (j = 0, scantotal = 0; j < 0x68; j += 4) {
+                    scantotal += DCdata[((i * 0x68) + j) >> 2];
+                }
+                if (scantotal)
+                    scanmap[i] = longdotcodescan[i];
+            }
+            for (i = 0; i < size; i += 4) {
+                CPUWriteMemory(temp1 + i, DCdata[i >> 2]);
+            }
+        }
+    }
+    CPUWriteMemory(MEM2 - 8, 0x1860);
+    CPUWriteMemory(MEM2 - 4, temp1);
+
+    if (size == 0xB60) {
+        if (loadraw) {
+            for (i = 0; i < 28; i++)
+                CPUWriteByte(MEM2 + 0x18 + i, scanmap[i]);
+        } else {
+            CPUWriteMemory(MEM2 + 0x18, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 0x18 + 4, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 0x18 + 8, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 0x18 + 12, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 0x18 + 16, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 0x18 + 20, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 0x18 + 24, 0xB1B1F2F1);
+        }
+        CPUWriteMemory(MEM2 + 0x40, 0x19);
+        CPUWriteMemory(MEM2 + 0x44, 0x34);
+    } else if (size == 0x750) {
+        if (loadraw) {
+            for (i = 0; i < 18; i++)
+                CPUWriteByte(MEM2 + i, scanmap[i]);
+        } else {
+            CPUWriteMemory(MEM2, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 4, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 8, 0xF1F1F1F1);
+            CPUWriteMemory(MEM2 + 12, 0xF2F1F1F1);
+            CPUWriteMemory(MEM2 + 16, 0xB1B1);
+        }
+        CPUWriteMemory(MEM2 + 0x40, 0x01);
+        CPUWriteMemory(MEM2 + 0x44, 0x12);
+    }
+    CPUWriteMemory(MEM2 + 0x48, 0x3C);
+    CPUWriteMemory(MEM2 + 0x4C, MEM2);
+
+    return 0;
+}
+
+void EReaderWriteMemory(uint32_t address, uint32_t value)
+{
+    switch (address >> 24) {
+    case 2:
+        WRITE32LE(((uint32_t*)&workRAM[address & 0x3FFFF]), value);
+        break;
+    case 3:
+        WRITE32LE(((uint32_t*)&internalRAM[address & 0x7FFF]), value);
+        break;
+    default:
+        WRITE32LE(((uint32_t*)&rom[address & 0x1FFFFFF]), value);
+        //rom[address & 0x1FFFFFF] = data;
+        break;
+    }
+}
+
+void BIOS_EReader_ScanCard(int swi_num)
+{
+
+    int i, j, k;
+    int dotcodetype;
+
+    int global1, global2;
+
+    FILE* f;
+
+    i = j = k = 0;
+    //Open dotcode bin/raw
+
+    if (swi_num == 0xE0) {
+        dotcodepointer = 0;
+        dotcodeinterleave = 0;
+        decodestate = 0;
+
+        const char* loadDotCodeFile = GetLoadDotCodeFile();
+
+        if (loadDotCodeFile == 0) {
+            reg[0].I = 0x301;
+            return;
+        }
+        f = fopen(loadDotCodeFile, "rb");
+        //f=fopen(filebuffer,"rb");
+        //f=fopen("dotcode4.raw","rb");
+        if (f == NULL) {
+            reg[0].I = 0x303;
+            return;
+        }
+        fseek(f, 0, SEEK_END);
+        i = ftell(f);
+        fseek(f, 0, SEEK_SET);
+        if ((i == 0xB60) || (i == 0x750)) {
+            dotcodetype = 0;
+        } else if ((i == 0x81C) || (i == 0x51C)) {
+            dotcodetype = 1;
+        } else {
+            fclose(f);
+            reg[0].I = 0x303;
+            return;
+        }
+        DotCodeData = (unsigned char*)malloc(i);
+        if (DotCodeData == NULL) {
+            reg[0].I = 0x303;
+            return;
+        }
+        FREAD_UNCHECKED(DotCodeData, 1, i, f);
+        fclose(f);
+
+        if (dotcodetype == 0) {
+
+            switch (CheckEReaderRegion()) {
+            case 1: //US
+                LoadDotCodeData(i, (uint32_t*)DotCodeData, 0x2032D14, 0x2028B28, 1);
+                EReaderWriteMemory(0x80091BA, 0x46C0DFE2);
+                break;
+            case 2:
+                LoadDotCodeData(i, (uint32_t*)DotCodeData, 0x2006EC4, 0x2002478, 1);
+                EReaderWriteMemory(0x8008B12, 0x46C0DFE2);
+                break;
+            case 3:
+                LoadDotCodeData(i, (uint32_t*)DotCodeData, 0x202F8A4, 0x2031034, 1);
+                EReaderWriteMemory(0x800922E, 0x46C0DFE2);
+                break;
+            }
+            reg[0].I = 0;
+            free(DotCodeData);
+        } else {
+            //dotcodesize = i;
+            if (i == 0x81C)
+                dotcodesize = 0xB60;
+            else
+                dotcodesize = 0x750;
+
+            switch (CheckEReaderRegion()) {
+            case 1: //US
+                LoadDotCodeData(dotcodesize, (uint32_t*)NULL, 0x2032D14, 0x2028B28, 0);
+                EReaderWriteMemory(0x80091BA, 0x46C0DFE1);
+                break;
+            case 2:
+                LoadDotCodeData(dotcodesize, (uint32_t*)NULL, 0x2006EC4, 0x2002478, 0);
+                EReaderWriteMemory(0x8008B12, 0x46C0DFE1);
+                break;
+            case 3:
+                LoadDotCodeData(dotcodesize, (uint32_t*)NULL, 0x202F8A4, 0x2031034, 0);
+                EReaderWriteMemory(0x800922E, 0x46C0DFE1);
+                break;
+            }
+            reg[0].I = 0;
+            dotcodesize = i;
+        }
+    } else if (swi_num == 0xE1) {
+
+        switch (CheckEReaderRegion()) {
+        case 1: //US
+            EReaderWriteMemory(0x80091BA, 0xF8A5F03B);
+            EReaderWriteMemory(0x3002F7C, 0xEFE40000); //Beginning of Reed-Solomon decoder
+            EReaderWriteMemory(0x3003144, 0xCA00002F); //Fix required to Correct 16 "Erasures"
+            EReaderWriteMemory(0x300338C, 0xEFE50000); //End of Reed-Solomon decoder
+            GFpow = 0x3000A6C;
+            break;
+        case 2:
+            EReaderWriteMemory(0x8008B12, 0xFB0BF035);
+            EReaderWriteMemory(0x3002F88, 0xEFE40000);
+            EReaderWriteMemory(0x3003150, 0xCA00002F);
+            EReaderWriteMemory(0x3003398, 0xEFE50000);
+            GFpow = 0x3000A78;
+            break;
+        case 3:
+            EReaderWriteMemory(0x800922E, 0xF94BF04B);
+            EReaderWriteMemory(0x3002F7C, 0xEFE40000);
+            EReaderWriteMemory(0x3003144, 0xCA00002F);
+            EReaderWriteMemory(0x300338C, 0xEFE50000);
+            GFpow = 0x3000A6C;
+            break;
+        }
+
+        armNextPC -= 2;
+        reg[15].I -= 2;
+        if (armState)
+            ARM_PREFETCH
+        else
+            THUMB_PREFETCH
+
+        for (i = 0, j = 0; i < 12; i++)
+            j ^= DotCodeData[i];
+        if (dotcodesize == 0x81C) {
+            LongDotCodeHeader[0x2E] = j;
+            LongDotCodeHeader[0x0D] = DotCodeData[0];
+            LongDotCodeHeader[0x0C] = DotCodeData[1];
+            LongDotCodeHeader[0x11] = DotCodeData[2];
+            LongDotCodeHeader[0x10] = DotCodeData[3];
+
+            LongDotCodeHeader[0x26] = DotCodeData[4];
+            LongDotCodeHeader[0x27] = DotCodeData[5];
+            LongDotCodeHeader[0x28] = DotCodeData[6];
+            LongDotCodeHeader[0x29] = DotCodeData[7];
+            LongDotCodeHeader[0x2A] = DotCodeData[8];
+            LongDotCodeHeader[0x2B] = DotCodeData[9];
+            LongDotCodeHeader[0x2C] = DotCodeData[10];
+            LongDotCodeHeader[0x2D] = DotCodeData[11];
+
+            LongDotCodeHeader[0x12] = 0x10; //calculate Global Checksum 1
+            LongDotCodeHeader[0x02] = 1; //Do not calculate Global Checksum 2
+
+            for (i = 0x0C, j = 0; i < 0x81C; i++) {
+                if (i & 1)
+                    j += DotCodeData[i];
+                else
+                    j += (DotCodeData[i] << 8);
+            }
+            j &= 0xFFFF;
+            j ^= 0xFFFF;
+            LongDotCodeHeader[0x13] = (j & 0xFF00) >> 8;
+            LongDotCodeHeader[0x14] = (j & 0x00FF);
+
+            for (i = 0, j = 0; i < 0x2F; i++)
+                j += LongDotCodeHeader[i];
+            j &= 0xFF;
+            for (i = 1, global2 = 0; i < 0x2C; i++) {
+                for (k = 0, global1 = 0; k < 0x30; k++) {
+                    global1 ^= DotCodeData[((i - 1) * 0x30) + k + 0x0C];
+                }
+                global2 += global1;
+            }
+            global2 += j;
+            global2 &= 0xFF;
+            global2 ^= 0xFF;
+            LongDotCodeHeader[0x2F] = global2;
+
+        } else {
+            ShortDotCodeHeader[0x2E] = j;
+            ShortDotCodeHeader[0x0D] = DotCodeData[0];
+            ShortDotCodeHeader[0x0C] = DotCodeData[1];
+            ShortDotCodeHeader[0x11] = DotCodeData[2];
+            ShortDotCodeHeader[0x10] = DotCodeData[3];
+
+            ShortDotCodeHeader[0x26] = DotCodeData[4];
+            ShortDotCodeHeader[0x27] = DotCodeData[5];
+            ShortDotCodeHeader[0x28] = DotCodeData[6];
+            ShortDotCodeHeader[0x29] = DotCodeData[7];
+            ShortDotCodeHeader[0x2A] = DotCodeData[8];
+            ShortDotCodeHeader[0x2B] = DotCodeData[9];
+            ShortDotCodeHeader[0x2C] = DotCodeData[10];
+            ShortDotCodeHeader[0x2D] = DotCodeData[11];
+
+            ShortDotCodeHeader[0x12] = 0x10; //calculate Global Checksum 1
+            ShortDotCodeHeader[0x02] = 1; //Do not calculate Global Checksum 2
+
+            for (i = 0x0C, j = 0; i < 0x51C; i++) {
+                if (i & 1)
+                    j += DotCodeData[i];
+                else
+                    j += (DotCodeData[i] << 8);
+            }
+            j &= 0xFFFF;
+            j ^= 0xFFFF;
+            ShortDotCodeHeader[0x13] = (j & 0xFF00) >> 8;
+            ShortDotCodeHeader[0x14] = (j & 0x00FF);
+
+            for (i = 0, j = 0; i < 0x2F; i++)
+                j += ShortDotCodeHeader[i];
+            j &= 0xFF;
+            for (i = 1, global2 = 0; i < 0x1C; i++) {
+                for (k = 0, global1 = 0; k < 0x30; k++) {
+                    global1 ^= DotCodeData[((i - 1) * 0x30) + k + 0x0C];
+                }
+                global2 += global1;
+            }
+            global2 += j;
+            global2 &= 0xFF;
+            global2 ^= 0xFF;
+            ShortDotCodeHeader[0x2F] = global2;
+        }
+
+    } else if (swi_num == 0xE2) //Header
+    {
+        switch (CheckEReaderRegion()) {
+        case 1: //US
+            EReaderWriteMemory(0x80091BA, 0xF8A5F03B);
+            EReaderWriteMemory(0x300338C, 0xEFE30000);
+            GFpow = 0x3000A6C;
+            break;
+        case 2:
+            EReaderWriteMemory(0x8008B12, 0xFB0BF035);
+            EReaderWriteMemory(0x3003398, 0xEFE30000);
+            GFpow = 0x3000A78;
+            break;
+        case 3:
+            EReaderWriteMemory(0x800922E, 0xF94BF04B);
+            EReaderWriteMemory(0x300338C, 0xEFE30000);
+            GFpow = 0x3000A6C;
+            break;
+        }
+        armNextPC -= 2;
+        reg[15].I -= 2;
+        if (armState)
+            ARM_PREFETCH
+        else
+            THUMB_PREFETCH
+    } else if ((swi_num == 0xE3) || (swi_num == 0xE5)) //Dotcode data
+    {
+        if ((reg[0].I >= 0) && (reg[0].I <= 0x10)) {
+            if (decodestate == 0) {
+                for (i = 0x17; i >= 0; i--) {
+                    if ((0x17 - i) < 8)
+                        j = CPUReadByte(GFpow + CPUReadByte(GFpow + 0x200 + i));
+                    else
+                        j = CPUReadByte(GFpow + CPUReadByte(GFpow + 0x200 + i)) ^ 0xFF;
+
+                    dotcodeheader[(0x17 - i)] = j;
+                    dotcodeheader[(0x17 - i) + 0x18] = j;
+                    dotcodeheader[(0x17 - i) + 0x30] = j;
+                }
+                for (i = 0; i < 28; i++)
+                    for (j = 0; j < 2; j++)
+                        dotcodedata[(i * 0x68) + j] = dotcodeheader[(i * 2) + j];
+                dotcodeinterleave = dotcodeheader[7];
+                decodestate = 1;
+            } else {
+                for (i = 0x3F; i >= 0; i--) {
+                    if ((0x3F - i) < 0x30)
+                        j = CPUReadByte(GFpow + CPUReadByte(GFpow + 0x200 + i));
+                    else
+                        j = CPUReadByte(GFpow + CPUReadByte(GFpow + 0x200 + i)) ^ 0xFF;
+                    dotcodetemp[((0x3F - i) * dotcodeinterleave) + dotcodepointer] = j;
+                }
+                dotcodepointer++;
+
+                if (dotcodepointer == dotcodeinterleave) {
+                    switch (dotcodeinterleave) {
+                    case 0x1C:
+                        j = 0x724;
+                        k = 0x750 - j;
+                        break;
+                    case 0x2C:
+                        j = 0xB38;
+                        k = 0xB60 - j;
+                        break;
+                    }
+                    dotcodepointer = 0;
+                    for (i = 2; i < j; i++) {
+                        if ((i % 0x68) == 0)
+                            i += 2;
+                        dotcodedata[i] = dotcodetemp[dotcodepointer++];
+                    }
+                    if (swi_num == 0xE3) {
+                        const char* loadDotCodeFile = GetLoadDotCodeFile();
+                        f = fopen(loadDotCodeFile, "rb+");
+                        if (f != NULL) {
+                            fwrite(dotcodedata, 1, j, f);
+                            fclose(f);
+                        }
+                    } else {
+                        const char* saveDotCodeFile = GetSaveDotCodeFile();
+                        if (saveDotCodeFile) {
+                            f = fopen(saveDotCodeFile, "wb");
+                            if (f != NULL) {
+                                fwrite(dotcodedata, 1, j, f);
+                                fwrite(Signature, 1, 0x28, f);
+                                if (j == 0x724) {
+                                    fputc(0x65, f);
+                                    fputc(0x02, f);
+                                    fputc(0x71, f);
+                                    fputc(0x10, f);
+                                }
+                                fclose(f);
+                            }
+                        }
+                        free(DotCodeData);
+                    }
+                }
+            }
+        }
+
+        int base = 14;
+        armState = reg[base].I & 1 ? false : true;
+        if (armState) {
+            reg[15].I = reg[base].I & 0xFFFFFFFC;
+            armNextPC = reg[15].I;
+            reg[15].I += 4;
+            ARM_PREFETCH
+        } else {
+            reg[15].I = reg[base].I & 0xFFFFFFFE;
+            armNextPC = reg[15].I;
+            reg[15].I += 2;
+            THUMB_PREFETCH
+        }
+    } else if (swi_num == 0xE4) {
+        reg[12].I = reg[13].I;
+        if (decodestate == 0) {
+            for (i = 0; i < 0x18; i++) {
+                if (dotcodesize == 0x81C)
+                    j = longheader[i];
+                else
+                    j = shortheader[i];
+
+                if (i < 8)
+                    j = CPUReadByte(GFpow + 0x100 + j);
+                else
+                    j = CPUReadByte(GFpow + 0x100 + (j ^ 0xFF));
+
+                CPUWriteByte(GFpow + 0x200 + (0x17 - i), j);
+            }
+        } else {
+            if (dotcodepointer == 0) {
+                for (i = 0; i < 0x30; i++) {
+                    if (dotcodesize == 0x81C)
+                        j = LongDotCodeHeader[i];
+                    else
+                        j = ShortDotCodeHeader[i];
+
+                    j = CPUReadByte(GFpow + 0x100 + j);
+                    CPUWriteByte(GFpow + 0x200 + (0x3F - i), j);
+                }
+
+            } else {
+                for (i = 0; i < 0x30; i++) {
+
+                    j = DotCodeData[((dotcodepointer - 1) * 0x30) + 0x0C + i];
+                    j = CPUReadByte(GFpow + 0x100 + j);
+                    CPUWriteByte(GFpow + 0x200 + (0x3F - i), j);
+                }
+            }
+            for (i = 0; i < 16; i++)
+                CPUWriteByte(GFpow + 0x258 + i, 1); //16 Erasures on the parity bytes, to have them calculated.
+        }
+    }
+}
diff --git a/src/gba/ereader.h b/src/gba/ereader.h
index 72d8209b..2fa3b8e0 100644
--- a/src/gba/ereader.h
+++ b/src/gba/ereader.h
@@ -1,9 +1,9 @@
-extern unsigned char* DotCodeData;
-extern char filebuffer[];
-
-int OpenDotCodeFile(void);
-int CheckEReaderRegion(void);
-int LoadDotCodeData(int size, uint32_t* DCdata, unsigned long MEM1, unsigned long MEM2);
-void EReaderWriteMemory(uint32_t address, uint32_t value);
-
-void BIOS_EReader_ScanCard(int swi_num);
+extern unsigned char* DotCodeData;
+extern char filebuffer[];
+
+int OpenDotCodeFile(void);
+int CheckEReaderRegion(void);
+int LoadDotCodeData(int size, uint32_t* DCdata, unsigned long MEM1, unsigned long MEM2);
+void EReaderWriteMemory(uint32_t address, uint32_t value);
+
+void BIOS_EReader_ScanCard(int swi_num);
diff --git a/src/gba/remote.cpp b/src/gba/remote.cpp
index d57bc793..587d9821 100644
--- a/src/gba/remote.cpp
+++ b/src/gba/remote.cpp
@@ -349,6 +349,7 @@ void debuggerDontBreak(int n, char** args)
 
 void debuggerDontBreakClear(int n, char** args)
 {
+    (void)args; // unused params
     if (n == 1) {
         debuggerNumOfDontBreak = 0;
         {
@@ -782,7 +783,7 @@ unsigned int AddressToGBA(uint8_t* mem)
 
 void debuggerDoSearch()
 {
-    int count = 0;
+    unsigned int count = 0;
 
     while (true) {
         unsigned int final = SearchStart + SearchLength - 1;
@@ -1882,6 +1883,8 @@ void debuggerSymbols(int argc, char** argv)
 
 void debuggerWhere(int n, char** args)
 {
+    (void)n; // unused params
+    (void)args; // unused params
     void elfPrintCallChain(uint32_t);
     elfPrintCallChain(armNextPC);
 }
@@ -1958,6 +1961,7 @@ void debuggerVar(int n, char** args)
 
 bool debuggerBreakOnExecution(uint32_t address, uint8_t state)
 {
+    (void)state; // unused params
     if (dontBreakNow)
         return false;
     if (debuggerInDB(address))
@@ -1975,6 +1979,7 @@ bool debuggerBreakOnExecution(uint32_t address, uint8_t state)
 
 bool debuggerBreakOnRead(uint32_t address, int size)
 {
+    (void)size; // unused params
     if (dontBreakNow)
         return false;
     if (debuggerInDB(armState ? reg[15].I - 4 : reg[15].I - 2))
@@ -1996,6 +2001,8 @@ bool debuggerBreakOnRead(uint32_t address, int size)
 
 bool debuggerBreakOnWrite(uint32_t address, uint32_t value, int size)
 {
+    (void)value; // unused params
+    (void)size; // unused params
     if (dontBreakNow)
         return false;
     if (debuggerInDB(armState ? reg[15].I - 4 : reg[15].I - 2))
@@ -2019,6 +2026,8 @@ bool debuggerBreakOnWrite(uint32_t address, uint32_t value, int size)
 
 void debuggerBreakOnWrite(uint32_t address, uint32_t oldvalue, uint32_t value, int size, int t)
 {
+    (void)oldvalue; // unused params
+    (void)t; // unused params
     debuggerBreakOnWrite(address, value, size);
     //uint32_t lastValue;
     //dexp_eval("old_value", &lastValue);
@@ -2677,6 +2686,8 @@ void deleteBreak(uint32_t address, uint8_t flags, char** expression, int howToDe
 }
 void clearBreaks(uint32_t address, uint8_t flags, char** expression, int howToClear)
 {
+    (void)address; // unused params
+    (void)expression; // unused params
     if (howToClear == 2) {
         removeConditionalWithFlag(flags, true);
         removeConditionalWithFlag(flags << 4, true);
@@ -2692,6 +2703,7 @@ void clearBreaks(uint32_t address, uint8_t flags, char** expression, int howToCl
 
 void listBreaks(uint32_t address, uint8_t flags, char** expression, int howToList)
 {
+    (void)expression; // unused params
     flags |= (flags << 4);
     if (howToList) {
         printAllFlagConditionalsWithAddress(address, flags, true);
@@ -2896,8 +2908,7 @@ void executeBreakCommands(int n, char** cmd)
         operation(address, flag, cmd + 1, n - 1);
         return;
     }
-
-brkcmd_special_register:
+//brkcmd_special_register:
     switch (command[4]) {
     case 'l':
         debuggerBreakRegisterList((n > 0) && (tolower(cmd[0][0]) == 'v'));
@@ -3528,7 +3539,7 @@ void remotePutPacket(const char* packet)
     const char* hex = "0123456789abcdef";
 
     size_t count = strlen(packet);
-    char buffer[count + 5];
+    char* buffer = new char[count + 5];
 
     unsigned char csum = 0;
 
@@ -3548,10 +3559,15 @@ void remotePutPacket(const char* packet)
     char c = 0;
     while (c != '+') {
         remoteSendFnc(buffer, (int)count + 4);
-        if (remoteRecvFnc(&c, 1) < 0)
+
+        if (remoteRecvFnc(&c, 1) < 0) {
+            delete[] buffer;
             return;
+        }
         //    fprintf(stderr,"sent:%s recieved:%c\n",buffer,c);
     }
+
+    delete[] buffer;
 }
 
 void remoteOutput(const char* s, uint32_t addr)
@@ -3684,7 +3700,7 @@ void remoteMemoryRead(char* p)
     sscanf(p, "%x,%x:", &address, &count);
     //  monprintf("Memory read for %08x %d\n", address, count);
 
-    char buffer[(count*2)+1];
+    char* buffer = new char[(count*2)+1];
 
     char* s = buffer;
     for (int i = 0; i < count; i++) {
@@ -3695,6 +3711,8 @@ void remoteMemoryRead(char* p)
     }
     *s = 0;
     remotePutPacket(buffer);
+
+    delete[] buffer;
 }
 
 void remoteQuery(char* p)
@@ -3779,7 +3797,7 @@ void remoteSetBreakPoint(char* p)
 
 void remoteClearBreakPoint(char* p)
 {
-    int result;
+    int result = 0;
     uint32_t address;
     int count;
     sscanf(p, ",%x,%x#", &address, &count);
@@ -3968,6 +3986,7 @@ void remoteReadRegister(char* p)
 
 void remoteReadRegisters(char* p)
 {
+    (void)p; // unused params
     char buffer[1024];
 
     char* s = buffer;
@@ -4226,6 +4245,7 @@ void remoteStubMain()
 
 void remoteStubSignal(int sig, int number)
 {
+    (void)number; // unused params
     remoteSignal = sig;
     remoteResumed = false;
     remoteSendStatus();
diff --git a/src/gba/remote.h b/src/gba/remote.h
index b42084f0..d71ed02f 100644
--- a/src/gba/remote.h
+++ b/src/gba/remote.h
@@ -1,79 +1,79 @@
-#ifndef REMOTE_H
-#define REMOTE_H
-
-#include "GBA.h"
-
-#define BitSet(array, bit) ((uint8_t*)(array))[(bit) >> 3] |= (1 << ((bit)&7))
-
-#define BitClear(array, bit) ((uint8_t*)(array))[(bit) >> 3] &= ~(1 << ((bit)&7))
-
-#define BitGet(array, bit) ((uint8_t)((array)[(bit) >> 3]) & (uint8_t)(1 << ((bit)&7)))
-
-#define BreakSet(array, addr, flag) \
-    ((uint8_t*)(array))[(addr) >> 1] |= ((addr & 1) ? (flag << 4) : (flag & 0xf))
-
-#define BreakClear(array, addr, flag) \
-    ((uint8_t*)(array))[(addr) >> 1] &= ~((addr & 1) ? (flag << 4) : (flag & 0xf))
-
-// check
-#define BreakThumbCheck(array, addr) ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? 0x80 : 0x8)
-
-#define BreakARMCheck(array, addr) ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? 0x40 : 0x4)
-
-#define BreakReadCheck(array, addr) ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? 0x20 : 0x2)
-
-#define BreakWriteCheck(array, addr) ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? 0x10 : 0x1)
-
-#define BreakCheck(array, addr, flag) \
-    ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? (flag << 4) : (flag & 0xf))
-
-extern bool debugger;
-
-extern bool dexp_eval(char*, uint32_t*);
-extern void dexp_setVar(char*, uint32_t);
-extern void dexp_listVars();
-extern void dexp_saveVars(char*);
-extern void dexp_loadVars(char*);
-
-void debuggerOutput(const char* s, uint32_t addr);
-
-bool debuggerBreakOnExecution(uint32_t address, uint8_t state);
-bool debuggerBreakOnWrite(uint32_t address, uint32_t value, int size);
-void debuggerBreakOnWrite(uint32_t address, uint32_t oldvalue, uint32_t value, int size, int t);
-bool debuggerBreakOnRead(uint32_t address, int size);
-
-struct regBreak {
-    // uint8_t regNum; /No longer needed
-    // bit 0 = equal
-    // bit 1 = greater
-    // bit 2 = smaller
-    // bit 3 = signed
-    uint8_t flags;
-    uint32_t intVal;
-    struct regBreak* next;
-};
-extern uint8_t lowRegBreakCounter[4]; //(r0-r3)
-extern uint8_t medRegBreakCounter[4]; //(r4-r7)
-extern uint8_t highRegBreakCounter[4]; //(r8-r11)
-extern uint8_t statusRegBreakCounter[4]; //(r12-r15)
-
-extern bool enableRegBreak;
-extern regBreak* breakRegList[16];
-extern void breakReg_check(int i);
-
-struct regBreak* getFromBreakRegList(uint8_t regnum, int location);
-
-void clearBreakRegList();
-void clearParticularRegListBreaks(int reg);
-void deleteFromBreakRegList(uint8_t regnum, int location);
-
-void addBreakRegToList(uint8_t regnum, uint8_t flags, uint32_t value);
-void printBreakRegList(bool verbose);
-
-void remoteStubMain();
-void remoteStubSignal(int sig, int number);
-void remoteOutput(const char* s, uint32_t addr);
-void remoteSetProtocol(int p);
-void remoteSetPort(int port);
-
-#endif // REMOTE_H
+#ifndef REMOTE_H
+#define REMOTE_H
+
+#include "GBA.h"
+
+#define BitSet(array, bit) ((uint8_t*)(array))[(bit) >> 3] |= (1 << ((bit)&7))
+
+#define BitClear(array, bit) ((uint8_t*)(array))[(bit) >> 3] &= ~(1 << ((bit)&7))
+
+#define BitGet(array, bit) ((uint8_t)((array)[(bit) >> 3]) & (uint8_t)(1 << ((bit)&7)))
+
+#define BreakSet(array, addr, flag) \
+    ((uint8_t*)(array))[(addr) >> 1] |= ((addr & 1) ? (flag << 4) : (flag & 0xf))
+
+#define BreakClear(array, addr, flag) \
+    ((uint8_t*)(array))[(addr) >> 1] &= ~((addr & 1) ? (flag << 4) : (flag & 0xf))
+
+// check
+#define BreakThumbCheck(array, addr) ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? 0x80 : 0x8)
+
+#define BreakARMCheck(array, addr) ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? 0x40 : 0x4)
+
+#define BreakReadCheck(array, addr) ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? 0x20 : 0x2)
+
+#define BreakWriteCheck(array, addr) ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? 0x10 : 0x1)
+
+#define BreakCheck(array, addr, flag) \
+    ((uint8_t*)(array))[(addr) >> 1] & ((addr & 1) ? (flag << 4) : (flag & 0xf))
+
+extern bool debugger;
+
+extern bool dexp_eval(char*, uint32_t*);
+extern void dexp_setVar(char*, uint32_t);
+extern void dexp_listVars();
+extern void dexp_saveVars(char*);
+extern void dexp_loadVars(char*);
+
+void debuggerOutput(const char* s, uint32_t addr);
+
+bool debuggerBreakOnExecution(uint32_t address, uint8_t state);
+bool debuggerBreakOnWrite(uint32_t address, uint32_t value, int size);
+void debuggerBreakOnWrite(uint32_t address, uint32_t oldvalue, uint32_t value, int size, int t);
+bool debuggerBreakOnRead(uint32_t address, int size);
+
+struct regBreak {
+    // uint8_t regNum; /No longer needed
+    // bit 0 = equal
+    // bit 1 = greater
+    // bit 2 = smaller
+    // bit 3 = signed
+    uint8_t flags;
+    uint32_t intVal;
+    struct regBreak* next;
+};
+extern uint8_t lowRegBreakCounter[4]; //(r0-r3)
+extern uint8_t medRegBreakCounter[4]; //(r4-r7)
+extern uint8_t highRegBreakCounter[4]; //(r8-r11)
+extern uint8_t statusRegBreakCounter[4]; //(r12-r15)
+
+extern bool enableRegBreak;
+extern regBreak* breakRegList[16];
+extern void breakReg_check(int i);
+
+struct regBreak* getFromBreakRegList(uint8_t regnum, int location);
+
+void clearBreakRegList();
+void clearParticularRegListBreaks(int reg);
+void deleteFromBreakRegList(uint8_t regnum, int location);
+
+void addBreakRegToList(uint8_t regnum, uint8_t flags, uint32_t value);
+void printBreakRegList(bool verbose);
+
+void remoteStubMain();
+void remoteStubSignal(int sig, int number);
+void remoteOutput(const char* s, uint32_t addr);
+void remoteSetProtocol(int p);
+void remoteSetPort(int port);
+
+#endif // REMOTE_H
diff --git a/src/libretro/SoundRetro.cpp b/src/libretro/SoundRetro.cpp
index a71a4b47..f4093fbb 100644
--- a/src/libretro/SoundRetro.cpp
+++ b/src/libretro/SoundRetro.cpp
@@ -33,6 +33,7 @@ void SoundRetro::write(uint16_t* finalWave, int length)
 
 bool SoundRetro::init(long sampleRate)
 {
+    (void)sampleRate; // unused param
     return true;
 }
 
@@ -51,3 +52,8 @@ void SoundRetro::resume()
 void SoundRetro::reset()
 {
 }
+
+void SoundRetro::setThrottle(unsigned short throttle)
+{
+    (void)throttle; // unused param
+}
diff --git a/src/libretro/SoundRetro.h b/src/libretro/SoundRetro.h
index 53236ed3..43ef5403 100644
--- a/src/libretro/SoundRetro.h
+++ b/src/libretro/SoundRetro.h
@@ -30,6 +30,7 @@ public:
     virtual void reset();
     virtual void resume();
     virtual void write(uint16_t* finalWave, int length);
+    virtual void setThrottle(unsigned short throttle);
 };
 
 #endif // __VBA_SOUND_RETRO_H__
diff --git a/src/libretro/UtilRetro.cpp b/src/libretro/UtilRetro.cpp
index 00bbc560..2c1afdea 100644
--- a/src/libretro/UtilRetro.cpp
+++ b/src/libretro/UtilRetro.cpp
@@ -192,7 +192,7 @@ uint8_t *utilLoad(const char *file, bool (*accept)(const char *), uint8_t *data,
 		}
 	}
 
-   fread(image, 1, size, fp); // read into buffer
+        FREAD_UNCHECKED(image, 1, size, fp); // read into buffer
 	fclose(fp);
 	return image;
 }
diff --git a/src/libretro/libretro.cpp b/src/libretro/libretro.cpp
index 4d7ed4b9..908ba7c6 100644
--- a/src/libretro/libretro.cpp
+++ b/src/libretro/libretro.cpp
@@ -31,6 +31,8 @@
 #include "../gb/gbSGB.h"
 #include "../gb/gbSound.h"
 
+#define VBA_CURRENT_VERSION "2.1.1"
+
 static retro_log_printf_t log_cb;
 static retro_video_refresh_t video_cb;
 static retro_input_poll_t poll_cb;
@@ -536,9 +538,9 @@ void retro_get_system_info(struct retro_system_info *info)
    info->need_fullpath = false;
    info->valid_extensions = "dmg|gb|gbc|cgb|sgb|gba";
 #ifdef GIT_VERSION
-   info->library_version = "2.1.0" GIT_VERSION;
+   info->library_version = VBA_CURRENT_VERSION GIT_VERSION;
 #else
-   info->library_version = "2.1.0-GIT";
+   info->library_version = VBA_CURRENT_VERSION;
 #endif
    info->library_name = "VBA-M";
    info->block_extract = false;
diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp
index 5add3508..86d86201 100644
--- a/src/sdl/SDL.cpp
+++ b/src/sdl/SDL.cpp
@@ -64,13 +64,27 @@
 #include "inputSDL.h"
 #include "text.h"
 
+// from: https://stackoverflow.com/questions/7608714/why-is-my-pointer-not-null-after-free
+#define freeSafe(ptr) free(ptr); ptr = NULL;
+
 #ifndef _WIN32
 #include <unistd.h>
 #define GETCWD getcwd
 #else // _WIN32
 #include <direct.h>
+#include <io.h>
 #define GETCWD _getcwd
 #define snprintf sprintf
+#define stat _stat
+#define access _access
+#ifndef W_OK
+    #define W_OK 2
+#endif
+#define mkdir(X,Y) (_mkdir(X))
+// from: https://www.linuxquestions.org/questions/programming-9/porting-to-win32-429334/
+#ifndef S_ISDIR
+    #define S_ISDIR(mode)  (((mode) & _S_IFMT) == _S_IFDIR)
+#endif
 #endif // _WIN32
 
 #ifndef __GNUC__
@@ -202,6 +216,8 @@ int sdlMirroringEnable = 1;
 void systemConsoleMessage(const char*);
 
 char* home;
+char homeConfigDir[1024];
+char homeDataDir[1024];
 
 char screenMessageBuffer[21];
 uint32_t screenMessageTime = 0;
@@ -246,7 +262,7 @@ void StartLirc(void)
         fprintf(stdout, "Success\n");
         //read the config file
         char LIRCConfigLoc[2048];
-        sprintf(LIRCConfigLoc, "%s/%s/%s", homeDir, DOT_DIR, "lircrc");
+        sprintf(LIRCConfigLoc, "%s%c%s", homeConfigDir, FILE_SEP, "lircrc");
         fprintf(stdout, "LIRC Config file:");
         if (lirc_readconfig(LIRCConfigLoc, &LIRCConfigInfo, NULL) == 0) {
             //check vbam dir for lircrc
@@ -284,59 +300,47 @@ void StopLirc(void)
 
 bool sdlCheckDirectory(const char* dir)
 {
-    bool res = false;
-
-    if (!dir || !dir[0]) {
-        return false;
-    }
-
     struct stat buf;
 
-    int len = strlen(dir);
+    if (!dir || !dir[0])
+        return false;
 
-    char* p = (char*)dir + len - 1;
-
-    while (p != dir && (*p == '/' || *p == '\\')) {
-        *p = 0;
-        p--;
+    if (stat(dir, &buf) == 0)
+    {
+	if (!(buf.st_mode & S_IFDIR))
+	{
+	    fprintf(stderr, "Error: %s is not a directory\n", dir);
+	    return false;
+	}
+	return true;
     }
-
-    if (stat(dir, &buf) == 0) {
-        if (!(buf.st_mode & S_IFDIR)) {
-            fprintf(stderr, "Error: %s is not a directory\n", dir);
-        }
-        res = true;
-    } else {
-        fprintf(stderr, "Error: %s does not exist\n", dir);
+    else
+    {
+	fprintf(stderr, "Error: %s does not exist\n", dir);
+	return false;
     }
-
-    return res;
 }
 
 char* sdlGetFilename(char* name)
 {
-    static char filebuffer[2048];
-
-    int len = strlen(name);
-
-    char* p = name + len - 1;
-
-    while (true) {
-        if (*p == '/' || *p == '\\') {
-            p++;
-            break;
-        }
-        len--;
-        p--;
-        if (len == 0)
-            break;
-    }
-
-    if (len == 0)
-        strcpy(filebuffer, name);
+    char path[1024] = ""; // avoid warning about uninitialised value
+    char *filename = strrchr(name, FILE_SEP);
+    if (filename)
+        strncpy(path, filename + 1, strlen(filename));
     else
-        strcpy(filebuffer, p);
-    return filebuffer;
+        sprintf(path, "%s", name);
+    return strdup(path);
+}
+
+char* sdlGetFilePath(char* name)
+{
+    char path[1024] = ""; // avoid warning about uninitialised value
+    char *filename = strrchr(name, FILE_SEP);
+    if (filename)
+        strncpy(path, name, strlen(name) - strlen(filename));
+    else
+        sprintf(path, "%c%c", '.', FILE_SEP);
+    return strdup(path);
 }
 
 FILE* sdlFindFile(const char* name)
@@ -366,8 +370,8 @@ FILE* sdlFindFile(const char* name)
     }
 
     if (homeDir) {
-        fprintf(stdout, "Searching home directory: %s%c%s\n", homeDir, FILE_SEP, DOT_DIR);
-        sprintf(path, "%s%c%s%c%s", homeDir, FILE_SEP, DOT_DIR, FILE_SEP, name);
+        fprintf(stdout, "Searching home directory: %s\n", homeDataDir);
+        sprintf(path, "%s%c%s", homeDataDir, FILE_SEP, name);
         f = fopen(path, "r");
         if (f != NULL)
             return f;
@@ -488,7 +492,8 @@ static void sdlOpenGLVideoResize()
 
 void sdlOpenGLInit(int w, int h)
 {
-
+    (void)w; // unused params
+    (void)h; // unused params
 #if 0
   float screenAspect = (float) sizeX / sizeY,
         windowAspect = (float) w / h;
@@ -654,15 +659,18 @@ static int sdlCalculateShift(uint32_t mask)
 static char* sdlStateName(int num)
 {
     static char stateName[2048];
+    char *gameDir = sdlGetFilePath(filename);
+    char *gameFile = sdlGetFilename(filename);
 
     if (saveDir)
-        sprintf(stateName, "%s/%s%d.sgm", saveDir, sdlGetFilename(filename),
-            num + 1);
-    else if (homeDir)
-        sprintf(stateName, "%s/%s/%s%d.sgm", homeDir, DOT_DIR, sdlGetFilename(filename), num + 1);
+        sprintf(stateName, "%s%c%s%d.sgm", saveDir, FILE_SEP, gameFile, num + 1);
+    else if (access(gameDir, W_OK) == 0)
+        sprintf(stateName, "%s%c%s%d.sgm", gameDir, FILE_SEP, gameFile, num + 1);
     else
-        sprintf(stateName, "%s%d.sgm", filename, num + 1);
+        sprintf(stateName, "%s%c%s%d.sgm", homeDataDir, FILE_SEP, gameFile, num + 1);
 
+    freeSafe(gameDir);
+    freeSafe(gameFile);
     return stateName;
 }
 
@@ -753,37 +761,46 @@ void sdlWriteBackupStateExchange(int from, int to, int backup)
 
 void sdlWriteBattery()
 {
-    char buffer[1048];
+    char buffer[2048];
+    char *gameDir = sdlGetFilePath(filename);
+    char *gameFile = sdlGetFilename(filename);
 
     if (batteryDir)
-        sprintf(buffer, "%s/%s.sav", batteryDir, sdlGetFilename(filename));
-    else if (homeDir)
-        sprintf(buffer, "%s/%s/%s.sav", homeDir, DOT_DIR, sdlGetFilename(filename));
+        sprintf(buffer, "%s%c%s.sav", batteryDir, FILE_SEP, gameFile);
+    else if (access(gameDir, W_OK) == 0)
+        sprintf(buffer, "%s%c%s.sav", gameDir, FILE_SEP, gameFile);
     else
-        sprintf(buffer, "%s.sav", filename);
+        sprintf(buffer, "%s%c%s.sav", homeDataDir, FILE_SEP, gameFile);
 
-    emulator.emuWriteBattery(buffer);
+    bool result = emulator.emuWriteBattery(buffer);
 
-    systemScreenMessage("Wrote battery");
+    if (result)
+	systemMessage(0, "Wrote battery '%s'", buffer);
+
+    freeSafe(gameFile);
+    freeSafe(gameDir);
 }
 
 void sdlReadBattery()
 {
-    char buffer[1048];
+    char buffer[2048];
+    char *gameDir = sdlGetFilePath(filename);
+    char *gameFile = sdlGetFilename(filename);
 
     if (batteryDir)
-        sprintf(buffer, "%s/%s.sav", batteryDir, sdlGetFilename(filename));
-    else if (homeDir)
-        sprintf(buffer, "%s/%s/%s.sav", homeDir, DOT_DIR, sdlGetFilename(filename));
+        sprintf(buffer, "%s%c%s.sav", batteryDir, FILE_SEP, gameFile);
+    else if (access(gameDir, W_OK) == 0)
+        sprintf(buffer, "%s%c%s.sav", gameDir, FILE_SEP, gameFile);
     else
-        sprintf(buffer, "%s.sav", filename);
+        sprintf(buffer, "%s%c%s.sav", homeDataDir, FILE_SEP, gameFile);
 
-    bool res = false;
+    bool result = emulator.emuReadBattery(buffer);
 
-    res = emulator.emuReadBattery(buffer);
+    if (result)
+        systemMessage(0, "Loaded battery '%s'", buffer);
 
-    if (res)
-        systemScreenMessage("Loaded battery");
+    freeSafe(gameFile);
+    freeSafe(gameDir);
 }
 
 void sdlReadDesktopVideoMode()
@@ -1637,12 +1654,30 @@ void handleRewinds()
     }
 }
 
+void SetHomeConfigDir()
+{
+    sprintf(homeConfigDir, "%s%s", get_xdg_user_config_home().c_str(), DOT_DIR);
+    struct stat s;
+    if (stat(homeDataDir, &s) == -1 || !S_ISDIR(s.st_mode))
+	mkdir(homeDataDir, 0755);
+}
+
+void SetHomeDataDir()
+{
+    sprintf(homeDataDir, "%s%s", get_xdg_user_data_home().c_str(), DOT_DIR);
+    struct stat s;
+    if (stat(homeDataDir, &s) == -1 || !S_ISDIR(s.st_mode))
+	mkdir(homeDataDir, 0755);
+}
+
 int main(int argc, char** argv)
 {
     fprintf(stdout, "%s\n", VBA_NAME_AND_SUBVERSION);
 
     home = argv[0];
     SetHome(home);
+    SetHomeConfigDir();
+    SetHomeDataDir();
 
     frameSkip = 2;
     gbBorderOn = 0;
@@ -2024,6 +2059,7 @@ int main(int argc, char** argv)
 
 void systemMessage(int num, const char* msg, ...)
 {
+    (void)num; // unused params
     va_list valist;
 
     va_start(valist, msg);
@@ -2208,27 +2244,35 @@ void system10Frames(int rate)
 void systemScreenCapture(int a)
 {
     char buffer[2048];
+    bool result = false;
+    char *gameDir = sdlGetFilePath(filename);
+    char *gameFile = sdlGetFilename(filename);
 
     if (captureFormat) {
         if (screenShotDir)
-            sprintf(buffer, "%s/%s%02d.bmp", screenShotDir, sdlGetFilename(filename), a);
-        else if (homeDir)
-            sprintf(buffer, "%s/%s/%s%02d.bmp", homeDir, DOT_DIR, sdlGetFilename(filename), a);
+            sprintf(buffer, "%s%c%s%02d.bmp", screenShotDir, FILE_SEP, gameFile, a);
+        else if (access(gameDir, W_OK) == 0)
+            sprintf(buffer, "%s%c%s%02d.bmp", gameDir, FILE_SEP, gameFile, a);
         else
-            sprintf(buffer, "%s%02d.bmp", filename, a);
+            sprintf(buffer, "%s%c%s%02d.bmp", homeDataDir, FILE_SEP, gameFile, a);
 
-        emulator.emuWriteBMP(buffer);
+        result = emulator.emuWriteBMP(buffer);
     } else {
         if (screenShotDir)
-            sprintf(buffer, "%s/%s%02d.png", screenShotDir, sdlGetFilename(filename), a);
-        else if (homeDir)
-            sprintf(buffer, "%s/%s/%s%02d.png", homeDir, DOT_DIR, sdlGetFilename(filename), a);
+            sprintf(buffer, "%s%c%s%02d.png", screenShotDir, FILE_SEP, gameFile, a);
+        else if (access(gameDir, W_OK) == 0)
+            sprintf(buffer, "%s%c%s%02d.png", gameDir, FILE_SEP, gameFile, a);
         else
-            sprintf(buffer, "%s%02d.png", filename, a);
-        emulator.emuWritePNG(buffer);
+            sprintf(buffer, "%s%c%s%02d.png", homeDataDir, FILE_SEP, gameFile, a);
+
+        result = emulator.emuWritePNG(buffer);
     }
 
-    systemScreenMessage("Screen capture");
+    if (result)
+	systemScreenMessage("Screen capture");
+
+    freeSafe(gameFile);
+    freeSafe(gameDir);
 }
 
 void systemSaveOldest()
@@ -2248,6 +2292,12 @@ uint32_t systemGetClock()
 
 void systemGbPrint(uint8_t* data, int len, int pages, int feed, int palette, int contrast)
 {
+    (void)data; // unused params
+    (void)len; // unused params
+    (void)pages; // unused params
+    (void)feed; // unused params
+    (void)palette; // unused params
+    (void)contrast; // unused params
 }
 
 /* xKiv: added timestamp */
@@ -2370,6 +2420,8 @@ void systemOnSoundShutdown()
 
 void systemOnWriteDataToSoundBuffer(const uint16_t* finalWave, int length)
 {
+    (void)finalWave; // unused params
+    (void)length; // unused params
 }
 
 void log(const char* defaultMsg, ...)
diff --git a/src/sdl/expr-lex.cpp b/src/sdl/expr-lex.cpp
index 54f323a3..516e4d51 100644
--- a/src/sdl/expr-lex.cpp
+++ b/src/sdl/expr-lex.cpp
@@ -634,9 +634,9 @@ extern int yylex(void);
  */
 YY_DECL
 {
-    register yy_state_type yy_current_state;
-    register char *yy_cp, *yy_bp;
-    register int yy_act;
+    yy_state_type yy_current_state;
+    char *yy_cp, *yy_bp;
+    int yy_act;
 
 #line 33 "expr.l"
 
@@ -681,7 +681,7 @@ YY_DECL
         yy_current_state = (yy_start);
     yy_match:
         do {
-            register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+            YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
             if (yy_accept[yy_current_state]) {
                 (yy_last_accepting_state) = yy_current_state;
                 (yy_last_accepting_cpos) = yy_cp;
@@ -912,9 +912,9 @@ YY_DECL
  */
 static int yy_get_next_buffer(void)
 {
-    register char* dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-    register char* source = (yytext_ptr);
-    register int number_to_move, i;
+    char* dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+    char* source = (yytext_ptr);
+    int number_to_move, i;
     int ret_val;
 
     if ((yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1])
@@ -1031,13 +1031,13 @@ static int yy_get_next_buffer(void)
 
 static yy_state_type yy_get_previous_state(void)
 {
-    register yy_state_type yy_current_state;
-    register char* yy_cp;
+    yy_state_type yy_current_state;
+    char* yy_cp;
 
     yy_current_state = (yy_start);
 
     for (yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp) {
-        register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+        YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
         if (yy_accept[yy_current_state]) {
             (yy_last_accepting_state) = yy_current_state;
             (yy_last_accepting_cpos) = yy_cp;
@@ -1060,10 +1060,10 @@ static yy_state_type yy_get_previous_state(void)
  */
 static yy_state_type yy_try_NUL_trans(yy_state_type yy_current_state)
 {
-    register int yy_is_jam;
-    register char* yy_cp = (yy_c_buf_p);
+    int yy_is_jam;
+    char* yy_cp = (yy_c_buf_p);
 
-    register YY_CHAR yy_c = 1;
+    YY_CHAR yy_c = 1;
     if (yy_accept[yy_current_state]) {
         (yy_last_accepting_state) = yy_current_state;
         (yy_last_accepting_cpos) = yy_cp;
@@ -1655,7 +1655,7 @@ int yylex_destroy(void)
 #ifndef yytext_ptr
 static void yy_flex_strncpy(char* s1, yyconst char* s2, int n)
 {
-    register int i;
+    int i;
     for (i = 0; i < n; ++i)
         s1[i] = s2[i];
 }
@@ -1664,7 +1664,7 @@ static void yy_flex_strncpy(char* s1, yyconst char* s2, int n)
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen(yyconst char* s)
 {
-    register int n;
+    int n;
     for (n = 0; s[n]; ++n)
         ;
 
diff --git a/src/sdl/expr.cpp b/src/sdl/expr.cpp
index 4a489581..0b8cc978 100644
--- a/src/sdl/expr.cpp
+++ b/src/sdl/expr.cpp
@@ -1530,6 +1530,7 @@ yyreturn:
 
 int yyerror(const char* s)
 {
+    (void)s; // unused params
     return 0;
 }
 
diff --git a/src/sdl/exprNode.cpp b/src/sdl/exprNode.cpp
index d1bee523..b78c9578 100644
--- a/src/sdl/exprNode.cpp
+++ b/src/sdl/exprNode.cpp
@@ -97,6 +97,9 @@ Node* exprNodeNumber()
 
 bool exprNodeNumberResolve(Node* n, Function* f, CompileUnit* u)
 {
+    (void)n; // unused params
+    (void)f; // unused params
+    (void)u; // unused params
     return true;
 }
 
diff --git a/src/sdl/filters.cpp b/src/sdl/filters.cpp
index f3d02499..6489bbe4 100644
--- a/src/sdl/filters.cpp
+++ b/src/sdl/filters.cpp
@@ -605,6 +605,7 @@ void (*sdlStretcher24[4])(uint8_t*, uint8_t*, int) = {
 
 bool sdlStretchInit(int colorDepth, int sizeMultiplier, int srcWidth)
 {
+    (void)srcWidth; // unused params
 #ifndef C_CORE
     sdlMakeStretcher(srcWidth, sizeMultiplier);
 #else
diff --git a/src/sdl/getopt.c b/src/sdl/getopt.c
index efd3d888..c9bb7d78 100644
--- a/src/sdl/getopt.c
+++ b/src/sdl/getopt.c
@@ -340,7 +340,7 @@ static void exchange(argv) char** argv;
         if (top - middle > middle - bottom) {
             /* Bottom segment is the short one.  */
             int len = middle - bottom;
-            register int i;
+            int i;
 
             /* Swap it with the top part of the top segment.  */
             for (i = 0; i < len; i++) {
@@ -354,7 +354,7 @@ static void exchange(argv) char** argv;
         } else {
             /* Top segment is the short one.  */
             int len = top - middle;
-            register int i;
+            int i;
 
             /* Swap it with the bottom part of the bottom segment.  */
             for (i = 0; i < len; i++) {
diff --git a/src/wx/CMakeLists.txt b/src/wx/CMakeLists.txt
index 09fa7895..65711cfd 100644
--- a/src/wx/CMakeLists.txt
+++ b/src/wx/CMakeLists.txt
@@ -1,48 +1,61 @@
-#Do not use this file directly.  Always use the top level CMakeLists.txt file
-# This build is much easier if we just do it here.
+# Do not use this file directly.  Always use the top level CMakeLists.txt file
 
-IF(NOT CMAKE_VERSION VERSION_LESS 3.0)
-    cmake_policy(SET CMP0043 NEW) # for wxWidgets
-ENDIF()
+if(COMMAND cmake_policy)
+    cmake_policy(SET CMP0003 NEW) # link to full path of libs
+    cmake_policy(SET CMP0005 NEW) # escapes in add_definitions
+
+    if(POLICY CMP0077)
+        cmake_policy(SET CMP0077 NEW) # use vars for options
+    endif()
+
+    if(NOT CMAKE_VERSION VERSION_LESS 3.0)
+        cmake_policy(SET CMP0043 NEW) # for wxWidgets, use generator expressions
+    endif()
+endif()
 
 include(VbamFunctions)
 
-if( WIN32 )
-  # not yet implemented
-  option( ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" ON )
-  option( ENABLE_XAUDIO2 "Enable xaudio2 sound output for the wxWidgets port" ON )
-endif( WIN32 )
+if(WIN32)
+    # not yet implemented
+    option(ENABLE_DIRECT3D "Enable Direct3D rendering for the wxWidgets port" OFF)
+
+    if(NOT CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
+        option(ENABLE_XAUDIO2 "Enable xaudio2 sound output for the wxWidgets port" ON)
+    else()
+        option(ENABLE_XAUDIO2 "Enable xaudio2 sound output for the wxWidgets port" OFF)
+    endif()
+endif()
 
 option(ENABLE_FAUDIO "Enable FAudio sound output for the wxWidgets port" OFF)
 
 option(ENABLE_OPENAL "Enable OpenAL for the wxWidgets port" OFF)
 
-IF(APPLE)
-    ADD_DEFINITIONS(-DwxMAC_USE_CORE_GRAPHICS)
-ENDIF(APPLE)
+if(APPLE)
+    add_definitions(-DwxMAC_USE_CORE_GRAPHICS)
+endif()
 
-if( NOT ENABLE_XAUDIO2 )
-    ADD_DEFINITIONS (-DNO_XAUDIO2)
-endif( NOT ENABLE_XAUDIO2 )
+if(NOT ENABLE_XAUDIO2)
+    add_definitions(-DNO_XAUDIO2)
+endif()
 
-if( NOT ENABLE_FAUDIO )
-    ADD_DEFINITIONS (-DNO_FAUDIO)
-endif( NOT ENABLE_FAUDIO )
+if(NOT ENABLE_FAUDIO)
+    add_definitions(-DNO_FAUDIO)
+endif()
 
 if(NOT ENABLE_DIRECT3D)
-   ADD_DEFINITIONS(-DNO_D3D)
-endif(NOT ENABLE_DIRECT3D)
+    add_definitions(-DNO_D3D)
+endif()
 
 if(ENABLE_OPENAL)
-    FIND_PACKAGE(OpenAL REQUIRED)
-    INCLUDE_DIRECTORIES(${OPENAL_INCLUDE_DIR})
+    find_package(OpenAL REQUIRED)
+    include_directories(${OPENAL_INCLUDE_DIR})
 
-    IF(OPENAL_STATIC OR (WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe)))
-        ADD_DEFINITIONS(-DAL_LIBTYPE_STATIC)
-    ENDIF()
+    if(OPENAL_STATIC OR (WIN32 AND ((NOT (MINGW AND MSYS)) OR CMAKE_TOOLCHAIN_FILE MATCHES mxe)))
+        add_definitions(-DAL_LIBTYPE_STATIC)
+    endif()
 else(ENABLE_OPENAL)
-    ADD_DEFINITIONS (-DNO_OAL)
-endif(ENABLE_OPENAL)
+    add_definitions(-DNO_OAL)
+endif()
 
 unset(FAUDIO_LIBS)
 if(ENABLE_FAUDIO)
@@ -50,139 +63,264 @@ if(ENABLE_FAUDIO)
     set(FAUDIO_LIBS FAudio)
 endif()
 
-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    SET(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
-ENDIF()
+# on VS with vcpkg we can't use FindwxWidgets, we have to set everything up
+# manually because the package is broken
+if(WIN32 AND CMAKE_TOOLCHAIN_FILE MATCHES vcpkg AND (X86_32 OR AMD64))
+    # set up wxwidgets stuff
+    add_definitions(-D_UNICODE -DUNICODE -DWXUSINGDLL -DwxUSE_GUI=1 -D__WXMSW__)
+    if(CMAKE_BUILD_TYPE MATCHES Debug)
+        add_definitions(-D_DEBUG)
+        include_directories(${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/debug/lib/mswud)
+        include_directories(${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/include)
+        set(wxWidgets_LIB_DIR ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/debug/lib)
+        set(wxWidgets_LIBRARIES
+            ${wxWidgets_LIB_DIR}/wxbase31ud_net.lib
+            ${wxWidgets_LIB_DIR}/wxbase31ud_xml.lib
+            ${wxWidgets_LIB_DIR}/wxmsw31ud_core.lib
+            ${wxWidgets_LIB_DIR}/wxmsw31ud_gl.lib
+            ${wxWidgets_LIB_DIR}/wxmsw31ud_xrc.lib
+            ${wxWidgets_LIB_DIR}/wxbase31ud.lib
+            winmm comctl32 oleacc rpcrt4 shlwapi version wsock32 opengl32
+        )
 
-# on e.g. msys2 add a couple of libraries wx needs
-#if(WIN32 AND (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang))
-#    set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -luuid -lwinspool")
-#endif()
+        file(COPY ${_VCPKG_ROOT_DIR}/buildtrees/wxwidgets/${WINARCH}-windows-dbg/lib/wxrc.exe DESTINATION ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/debug/bin)
+        set(WXRC ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/debug/bin/wxrc.exe)
+    elseif("${CMAKE_BUILD_TYPE}" MATCHES "Release")
+        include_directories(${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/lib/mswu)
+        include_directories(${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/include)
+        set(wxWidgets_LIB_DIR ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/lib)
+        set(wxWidgets_LIBRARIES
+            ${wxWidgets_LIB_DIR}/wxbase31u_net.lib
+            ${wxWidgets_LIB_DIR}/wxbase31u_xml.lib
+            ${wxWidgets_LIB_DIR}/wxmsw31u_core.lib
+            ${wxWidgets_LIB_DIR}/wxmsw31u_gl.lib
+            ${wxWidgets_LIB_DIR}/wxmsw31ud_xrc.lib
+            ${wxWidgets_LIB_DIR}/wxbase31u.lib
+            winmm comctl32 oleacc rpcrt4 shlwapi version wsock32 opengl32
+        )
 
-# convert msys paths like /c/foo to windows paths like c:/foo
-# for variables set by FindWxWidgets
-function(normalize_wx_paths)
-    if(MSYS)
-        unset(new_paths)
-        foreach(p ${wxWidgets_LIBRARY_DIRS})
-            execute_process(COMMAND cygpath -m "${p}" OUTPUT_VARIABLE p_win OUTPUT_STRIP_TRAILING_WHITESPACE)
-            list(APPEND new_paths "${p_win}")
+        file(COPY ${_VCPKG_ROOT_DIR}/buildtrees/wxwidgets/${WINARCH}-windows-rel/lib/wxrc.exe DESTINATION ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/bin)
+        set(WXRC ${_VCPKG_INSTALLED_DIR}/${WINARCH}-windows/bin/wxrc.exe)
+    endif()
+
+    if(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/zip.exe)
+        # get zip binary for wxrc
+        file(DOWNLOAD "https://www.willus.com/archive/zip64/infozip_binaries_win32.zip" ${CMAKE_CURRENT_BINARY_DIR}/infozip_binaries_win32.zip)
+        # unzip it
+        execute_process(
+            COMMAND powershell.exe -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('${CMAKE_CURRENT_BINARY_DIR}/infozip_binaries_win32.zip', '${CMAKE_CURRENT_BINARY_DIR}'); }"
+        )
+    endif()
+
+    # SDL2.dll does not get copied to build dir
+    if(NOT EXISTS ${CMAKE_BINARY_DIR}/SDL2.dll)
+        file(COPY ${_VCPKG_ROOT_DIR}/installed/${WINARCH}-windows/bin/SDL2.dll DESTINATION ${CMAKE_BINARY_DIR})
+    endif()
+else()
+    if(CMAKE_BUILD_TYPE MATCHES Debug)
+        set(wxWidgets_USE_DEBUG ON) # noop if wx is compiled with --disable-debug, like in Mac Homebrew atm
+    endif()
+
+    # on e.g. msys2 add a couple of libraries wx needs
+    #if(WIN32 AND (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang))
+    #    set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -luuid -lwinspool")
+    #endif()
+
+    # convert msys paths like /c/foo to windows paths like c:/foo
+    # for variables set by FindWxWidgets
+    function(normalize_wx_paths)
+        if(MSYS)
+            unset(new_paths)
+            foreach(p ${wxWidgets_LIBRARY_DIRS})
+                execute_process(COMMAND cygpath -m "${p}" OUTPUT_VARIABLE p_win OUTPUT_STRIP_TRAILING_WHITESPACE)
+                list(APPEND new_paths "${p_win}")
+            endforeach()
+
+            set(wxWidgets_LIBRARY_DIRS ${new_paths} PARENT_SCOPE)
+
+            string(REGEX REPLACE "((^| )[^/]*)/([a-zA-Z])/" "\\1\\3:/" new_libs "${wxWidgets_LIBRARIES}")
+
+            set(wxWidgets_LIBRARIES ${new_libs} PARENT_SCOPE)
+        endif()
+    endfunction()
+
+    macro(cleanup_wx_vars)
+        if(wxWidgets_CXX_FLAGS)
+            list(REMOVE_ITEM wxWidgets_CXX_FLAGS -fpermissive)
+        endif()
+    endmacro()
+
+    if(CMAKE_PREFIX_PATH)
+        set(wxWidgets_CONFIG_OPTIONS "--prefix=${CMAKE_PREFIX_PATH}")
+    endif()
+
+    set(wxWidgets_USE_UNICODE ON)
+
+    function(cygpath var path)
+        execute_process(
+            COMMAND cygpath -m ${path}
+            OUTPUT_VARIABLE cyg_path
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            ERROR_QUIET
+        )
+        set(${var} ${cyg_path} PARENT_SCOPE)
+    endfunction()
+
+    function(check_clean_exit var)
+        execute_process(
+            COMMAND ${ARGN}
+            RESULT_VARIABLE exit_status
+            OUTPUT_QUIET
+            ERROR_QUIET
+        )
+
+        if(NOT ${exit_status} EQUAL 0)
+            # special case for msys2, where programs might complain about
+            # not being win32 programs
+            unset(cmd_str)
+            foreach(param IN LISTS ARGN)
+                set(cmd_str "${cmd_str} ${param}")
+            endforeach()
+            string(STRIP "${cmd_str}" cmd_str)
+
+            execute_process(
+                COMMAND sh -c "${cmd_str}"
+                RESULT_VARIABLE exit_status
+                OUTPUT_QUIET
+                ERROR_QUIET
+            )
+        endif()
+
+        set(${var} ${exit_status} PARENT_SCOPE)
+    endfunction()
+
+    function(find_wx_util var util)
+        # on win32, including cross builds we prefer the plain utility name first from PATH
+        if(WIN32)
+            set(conf_suffixes  "" gtk4 gtk3)
+            set(major_versions "" 4 3 2)
+        else()
+            set(conf_suffixes  gtk4 gtk3 "")
+            set(major_versions 4 3 2 "")
+        endif()
+
+        foreach(conf_suffix IN LISTS conf_suffixes)
+            foreach(major_version IN LISTS major_versions)
+                foreach(minor_version RANGE 100 0 -1)
+                    unset(suffix)
+                    if(conf_suffix)
+                        set(suffix "-${conf_suffix}")
+                    endif()
+                    if(major_version)
+                        set(suffix "${suffix}-${major_version}")
+
+                        if(NOT minor_version EQUAL 0)
+                            set(suffix "${suffix}.${minor_version}")
+                        endif()
+                    endif()
+
+                    # find_program caches the result
+                    set(exe NOTFOUND CACHE INTERNAL "" FORCE)
+                    find_program(exe NAMES "${util}${suffix}")
+
+                    if(EXISTS ${exe})
+                        # check that the utility can be executed cleanly
+                        # in case we find e.g. the wrong architecture binary
+                        # when cross-compiling
+                        check_clean_exit(exit_status ${exe} --help)
+
+                        if(exit_status EQUAL 0)
+                            set(${var} ${exe} PARENT_SCOPE)
+                            return()
+                        endif()
+                    endif()
+
+                    # don't iterate over minor versions for empty major version
+                    if(major_version STREQUAL "")
+                        break()
+                    endif()
+                endforeach()
+            endforeach()
+
+            # default to util name if not found, so the error is more clear
+            set(${var} ${util} PARENT_SCOPE)
         endforeach()
+    endfunction()
 
-        set(wxWidgets_LIBRARY_DIRS ${new_paths} PARENT_SCOPE)
-
-        string(REGEX REPLACE "((^| )[^/]*)/([a-zA-Z])/" "\\1\\3:/" new_libs "${wxWidgets_LIBRARIES}")
-
-        set(wxWidgets_LIBRARIES ${new_libs} PARENT_SCOPE)
+    # Check for gtk4 then gtk3 packages first, some dists like arch rename the
+    # wx-config utility for these packages to e.g. wx-config-gtk3
+    #
+    # Do not do the check if the WX_CONFIG env var is set or the cmake variable
+    # is set
+    if(NOT wxWidgets_CONFIG_EXECUTABLE)
+        if(DEFINED ENV{WX_CONFIG})
+            separate_arguments(wxWidgets_CONFIG_EXECUTABLE UNIX_COMMAND $ENV{WX_CONFIG})
+        else()
+            find_wx_util(wxWidgets_CONFIG_EXECUTABLE wx-config)
+        endif()
     endif()
-endfunction()
 
-macro(cleanup_wx_vars)
-    if(wxWidgets_CXX_FLAGS)
-        list(REMOVE_ITEM wxWidgets_CXX_FLAGS -fpermissive)
+    # adv is for wxAboutBox
+    # xml, html is for xrc
+    # the gl lib may not be available, and if it looks like it is we still have to
+    # do a compile test later
+    find_package(wxWidgets COMPONENTS xrc xml html adv net core base gl)
+
+    if(NOT wxWidgets_FOUND)
+        set(WX_HAS_OPENGL FALSE)
+        find_package(wxWidgets COMPONENTS xrc xml html adv net core base REQUIRED)
     endif()
-endmacro()
 
-if(CMAKE_PREFIX_PATH)
-    set(wxWidgets_CONFIG_OPTIONS "--prefix=${CMAKE_PREFIX_PATH}")
-endif()
-
-SET(wxWidgets_USE_UNICODE ON)
-# adv is for wxAboutBox
-# xml, html is for xrc
-# do not include gl at first
-set(wxWidgets_USE_LIBS xrc xml html adv net core base)
-#list(APPEND wxWidgets_CONFIG_OPTIONS --version=2.8)
-
-# Check for gtk4 then gtk3 packages first, some dists like arch rename the
-# wx-config utility for these packages to e.g. wx-config-gtk3
-#
-# Do not do the check if the WX_CONFIG env var is set.
-if(NOT WIN32 AND NOT APPLE AND "$ENV{WX_CONFIG}" STREQUAL "")
-    find_program(wxWidgets_CONFIG_EXECUTABLE NAMES wx-config-gtk4 wx-config-gtk3 wx-config)
-endif()
-
-# the gl lib may not be available, and if it looks like it is we still have to
-# do a compile test later
-list(APPEND wxWidgets_USE_LIBS gl)
-find_package(wxWidgets QUIET)
-cleanup_wx_vars()
-normalize_wx_paths()
-
-SET(CHECK_WX_OPENGL FALSE)
-
-IF(wxWidgets_FOUND)
-    SET(CHECK_WX_OPENGL TRUE)
-ELSE()
-    SET(WX_HAS_OPENGL   FALSE)
-    # the requirement check is later after the opengl compile test
-ENDIF()
-
-INCLUDE_DIRECTORIES(${wxWidgets_INCLUDE_DIRS})
-
-IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    # tell wx to enable debug mode if possible, if the cmake module did not do it for us
-    EXECUTE_PROCESS(COMMAND "${wxWidgets_CONFIG_EXECUTABLE} --debug=yes" RESULT_VARIABLE WX_CONFIG_DEBUG OUTPUT_QUIET ERROR_QUIET)
-
-    IF(WX_CONFIG_DEBUG EQUAL 0)
-        ADD_DEFINITIONS(-DwxDEBUG_LEVEL=1)
-    ENDIF()
-
-    # this one should be safe in non-debug builds too
-    ADD_DEFINITIONS(-DWXDEBUG)
-ENDIF()
-
-FOREACH(DEF ${wxWidgets_DEFINITIONS})
-    ADD_DEFINITIONS("-D${DEF}")
-ENDFOREACH()
-
-# check if this build of wx actually has OpenGL support
-
-SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${MY_CXX_FLAGS} ${MY_C_FLAGS} ${MY_CXX_LINKER_FLAGS} ${MY_C_LINKER_FLAGS} ${wxWidgets_LIBRARIES})
-SET(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${wxWidgets_CXX_FLAGS} ${MY_CXX_FLAGS} ${MY_C_FLAGS})
-
-IF(WIN32)
-    SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} "-Wl,--subsystem,console")
-    SET(CMAKE_REQUIRED_LIBRARIES   ${CMAKE_REQUIRED_LIBRARIES}   "-Wl,--subsystem,console")
-ENDIF()
-
-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${wxWidgets_INCLUDE_DIRS})
-
-FOREACH(DEF ${wxWidgets_DEFINITIONS})
-    SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} "-D${DEF}")
-ENDFOREACH()
-
-# CheckCXXSourceCompiles ignores compiler flags, so we have to stuff them into the definitions
-SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_FLAGS} ${CMAKE_REQUIRED_DEFINITIONS})
-
-INCLUDE(CheckCXXSourceCompiles)
-
-IF(CHECK_WX_OPENGL)
-    CHECK_CXX_SOURCE_COMPILES("
-#include <wx/wxprec.h>
-#include <wx/config.h>
-#include <wx/glcanvas.h>
-
-int main(int argc, char** argv) {
-    wxGLCanvas canvas(NULL, wxID_ANY, NULL, wxPoint(0, 0), wxSize(300, 300), 0);
-    return 0;
-}" WX_HAS_OPENGL)
-ENDIF()
-
-IF(NOT WX_HAS_OPENGL)
-    ADD_DEFINITIONS(-DNO_OGL)
-    LIST(REMOVE_ITEM wxWidgets_USE_LIBS gl)
-    find_package(wxWidgets REQUIRED)
-    normalize_wx_paths()
     cleanup_wx_vars()
-ENDIF()
+    normalize_wx_paths()
 
-IF(CMAKE_COMPILER_IS_GNUCXX AND NOT CMAKE_CROSSCOMPILING)
-    SET(WX_ABI_FOUND_MATCH FALSE)
+    include_directories(${wxWidgets_INCLUDE_DIRS})
 
-    INCLUDE(CheckCXXSourceRuns)
+    if(CMAKE_BUILD_TYPE MATCHES Debug)
+        # tell wx to enable debug mode if possible, if the cmake module did not do it for us
+        execute_process(COMMAND "${wxWidgets_CONFIG_EXECUTABLE} --debug=yes" RESULT_VARIABLE WX_CONFIG_DEBUG OUTPUT_QUIET ERROR_QUIET)
 
-    SET(WX_TEST_CONSOLE_APP "
+        if(WX_CONFIG_DEBUG EQUAL 0)
+            add_definitions(-DwxDEBUG_LEVEL=1)
+        endif()
+
+        # this one should be safe in non-debug builds too
+        add_definitions(-DWXDEBUG)
+    endif()
+
+    foreach(DEF ${wxWidgets_DEFINITIONS})
+        add_definitions("-D${DEF}")
+    endforeach()
+
+    foreach(CXX_COMPILE_FLAG ${wxWidgets_CXX_FLAGS})
+        add_compile_options(${CXX_COMPILE_FLAG})
+    endforeach()
+
+    # set up variables for some compile/run checks for wxWidgets
+    set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${MY_CXX_FLAGS} ${MY_C_FLAGS} ${MY_CXX_LINKER_FLAGS} ${MY_C_LINKER_FLAGS} ${wxWidgets_LIBRARIES})
+    set(CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} ${wxWidgets_CXX_FLAGS} ${MY_CXX_FLAGS} ${MY_C_FLAGS})
+
+    if(WIN32)
+        set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} "-Wl,--subsystem,console")
+        set(CMAKE_REQUIRED_LIBRARIES   ${CMAKE_REQUIRED_LIBRARIES}   "-Wl,--subsystem,console")
+    endif()
+
+    set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${wxWidgets_INCLUDE_DIRS})
+
+    foreach(DEF ${wxWidgets_DEFINITIONS})
+        set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} "-D${DEF}")
+    endforeach()
+
+    # CheckCXXSourceCompiles ignores compiler flags, so we have to stuff them into the definitions
+    set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_FLAGS} ${CMAKE_REQUIRED_DEFINITIONS})
+
+    # find the right C++ ABI version for wxWidgets, this is also necessary for the OpenGL check following
+    if((CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID STREQUAL Clang) AND NOT CMAKE_CROSSCOMPILING)
+        set(WX_ABI_FOUND_MATCH FALSE)
+
+        include(CheckCXXSourceRuns)
+
+        set(WX_TEST_CONSOLE_APP "
 #include <cstdlib>
 #include <iostream>
 #include <wx/wxprec.h>
@@ -215,13 +353,19 @@ int WINAPI DetourMessageBoxA(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uT
 class MyApp : public wxAppConsole {
 public:
     virtual bool OnInit();
+    // this is necessary for 2.8 to make the class non-abstract
+    virtual int OnRun() { return 0; }
 };
 
 bool MyApp::OnInit() {
     exit(0);
 }
 
+#if wxCHECK_VERSION(2, 9, 0)
 wxIMPLEMENT_APP_NO_MAIN(MyApp);
+#else
+IMPLEMENT_APP_NO_MAIN(MyApp);
+#endif
 
 int main(int argc, char** argv)
 {
@@ -251,140 +395,171 @@ int main(int argc, char** argv)
 }
 ")
 
-    # on windows we need the trampoline library from dependencies
-    IF(WIN32)
-        # minhook requires -fpermissive unfortunately
-        set(CMAKE_REQUIRED_FLAGS       ${CMAKE_REQUIRED_FLAGS}       -fpermissive)
-        SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -fpermissive -w "-I${CMAKE_SOURCE_DIR}/dependencies/minhook/include")
-        SET(CMAKE_REQUIRED_LIBRARIES   ${CMAKE_REQUIRED_LIBRARIES}   -Wl,--subsystem,console)
+        # on windows we need the trampoline library from dependencies
+        if(WIN32)
+            # minhook requires -fpermissive unfortunately
+            set(CMAKE_REQUIRED_FLAGS       ${CMAKE_REQUIRED_FLAGS}       -fpermissive)
+            set(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -fpermissive -w "-I${CMAKE_SOURCE_DIR}/dependencies/minhook/include")
+            set(CMAKE_REQUIRED_LIBRARIES   ${CMAKE_REQUIRED_LIBRARIES}   -Wl,--subsystem,console)
 
-        IF(AMD64)
-            SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} "${CMAKE_SOURCE_DIR}/dependencies/minhook/libMinHook_64.a")
-        ELSE() # assume 32 bit windows
-            SET(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} "${CMAKE_SOURCE_DIR}/dependencies/minhook/libMinHook.a")
-        ENDIF()
-    ENDIF()
+            if(AMD64)
+                set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} "${CMAKE_SOURCE_DIR}/dependencies/minhook/libMinHook_64.a")
+            else() # assume 32 bit windows
+                set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} "${CMAKE_SOURCE_DIR}/dependencies/minhook/libMinHook.a")
+            endif()
+        endif()
 
-    CHECK_CXX_SOURCE_RUNS("${WX_TEST_CONSOLE_APP}" WX_DEFAULT_ABI_VERSION_COMPATIBLE)
+        check_cxx_source_runs("${WX_TEST_CONSOLE_APP}" WX_DEFAULT_ABI_VERSION_COMPATIBLE)
 
-    # remove -fpermissive set for minhook
-    list(REMOVE_ITEM CMAKE_REQUIRED_FLAGS       -fpermissive)
-    list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -fpermissive)
+        # remove -fpermissive set for minhook
+        list(REMOVE_ITEM CMAKE_REQUIRED_FLAGS       -fpermissive)
+        list(REMOVE_ITEM CMAKE_REQUIRED_DEFINITIONS -fpermissive)
 
-    IF(NOT WX_DEFAULT_ABI_VERSION_COMPATIBLE)
-        # currently goes up to 11 with gcc7, but we give it some room
-        SET(WX_ABI_VERSION 15)
+        if(NOT WX_DEFAULT_ABI_VERSION_COMPATIBLE)
+            # currently goes up to 11 with gcc7, but we give it some room
+            set(WX_ABI_VERSION 15)
 
-        SET(CURRENT_DEFS ${CMAKE_REQUIRED_DEFINITIONS})
-        SET(CURRENT_LIBS ${CMAKE_REQUIRED_LIBRARIES})
+            set(CURRENT_DEFS ${CMAKE_REQUIRED_DEFINITIONS})
+            set(CURRENT_LIBS ${CMAKE_REQUIRED_LIBRARIES})
 
-        WHILE(NOT WX_ABI_VERSION EQUAL -1)
-            SET(CMAKE_REQUIRED_DEFINITIONS ${CURRENT_DEFS} "-fabi-version=${WX_ABI_VERSION}")
-            SET(CMAKE_REQUIRED_LIBRARIES   ${CURRENT_LIBS} "-fabi-version=${WX_ABI_VERSION}")
+            while(NOT WX_ABI_VERSION EQUAL -1)
+                if(CMAKE_COMPILER_IS_GNUCXX)
+                    set(CMAKE_REQUIRED_DEFINITIONS ${CURRENT_DEFS} "-fabi-version=${WX_ABI_VERSION}")
+                    set(CMAKE_REQUIRED_LIBRARIES   ${CURRENT_LIBS} "-fabi-version=${WX_ABI_VERSION}")
+                elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+                    set(CMAKE_REQUIRED_DEFINITIONS ${CURRENT_DEFS} "-D__GXX_ABI_VERSION=10${WX_ABI_VERSION}")
+                    set(CMAKE_REQUIRED_LIBRARIES   ${CURRENT_LIBS} "-D__GXX_ABI_VERSION=10${WX_ABI_VERSION}")
+                endif()
 
-            SET(WX_ABI_VAR "WX_ABI_VERSION_${WX_ABI_VERSION}")
+                set(WX_ABI_VAR "WX_ABI_VERSION_${WX_ABI_VERSION}")
 
-            CHECK_CXX_SOURCE_RUNS("${WX_TEST_CONSOLE_APP}" ${WX_ABI_VAR})
+                check_cxx_source_runs("${WX_TEST_CONSOLE_APP}" ${WX_ABI_VAR})
 
-            IF(${${WX_ABI_VAR}})
-                SET(WX_ABI_FOUND_MATCH TRUE)
-                BREAK()
-            ENDIF()
+                if(${${WX_ABI_VAR}})
+                    set(WX_ABI_FOUND_MATCH TRUE)
+                    break()
+                endif()
 
-            MATH(EXPR WX_ABI_VERSION "${WX_ABI_VERSION} - 1")
-        ENDWHILE()
+                math(EXPR WX_ABI_VERSION "${WX_ABI_VERSION} - 1")
+            endwhile()
 
-        SET(CMAKE_REQUIRED_DEFINITIONS ${CURRENT_DEFS})
-        SET(CMAKE_REQUIRED_LIBRARIES   ${CURRENT_LIBS})
-    ENDIF()
+            set(CMAKE_REQUIRED_DEFINITIONS ${CURRENT_DEFS})
+            set(CMAKE_REQUIRED_LIBRARIES   ${CURRENT_LIBS})
+        endif()
 
-    IF(WX_ABI_FOUND_MATCH)
-        # add C++ flags
-        STRING(REGEX REPLACE "<FLAGS>" "<FLAGS> -fabi-version=${WX_ABI_VERSION} " CMAKE_CXX_COMPILE_OBJECT ${CMAKE_CXX_COMPILE_OBJECT})
-        SET(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -fabi-version=${WX_ABI_VERSION}")
-    ENDIF()
-ENDIF()
+        if(WX_ABI_FOUND_MATCH)
+            # add C++ flags
+            if(CMAKE_COMPILER_IS_GNUCXX)
+                string(REGEX REPLACE "<FLAGS>" "<FLAGS> -fabi-version=${WX_ABI_VERSION} " CMAKE_CXX_COMPILE_OBJECT ${CMAKE_CXX_COMPILE_OBJECT})
+                set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -fabi-version=${WX_ABI_VERSION}")
+            elseif(CMAKE_CXX_COMPILER_ID STREQUAL Clang)
+                string(REGEX REPLACE "<FLAGS>" "<FLAGS> -D__GXX_ABI_VERSION=10${WX_ABI_VERSION} " CMAKE_CXX_COMPILE_OBJECT ${CMAKE_CXX_COMPILE_OBJECT})
+                set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -D__GXX_ABI_VERSION=10${WX_ABI_VERSION}")
+            endif()
+        endif()
+    endif()
 
-# end of wx compile checks
+    # now check for OpenGL
+    include(CheckCXXSourceCompiles)
 
-FOREACH(CXX_COMPILE_FLAG ${wxWidgets_CXX_FLAGS})
-    ADD_COMPILE_OPTIONS(${CXX_COMPILE_FLAG})
-ENDFOREACH()
+    if(NOT DEFINED WX_HAS_OPENGL)
+        check_cxx_source_compiles("
+#include <wx/wxprec.h>
+#include <wx/config.h>
+#include <wx/glcanvas.h>
 
-#EXECUTE_PROCESS(COMMAND sh "${wxWidgets_CONFIG_EXECUTABLE}" --cxxflags)
-INCLUDE( ${wxWidgets_USE_FILE} )
-FIND_PACKAGE ( Gettext REQUIRED )
-FIND_PROGRAM(XGETTEXT xgettext)
-FIND_PROGRAM(MSGINIT msginit)
-if(ENABLE_NLS AND (NOT XGETTEXT OR NOT MSGINIT))
-   message(SEND_ERROR "Cannot find gettext ${XGETTEXT} ${MSGINIT}")
-endif(ENABLE_NLS AND (NOT XGETTEXT OR NOT MSGINIT))
-IF(WIN32 AND ENABLE_DIRECTX)
-    FIND_PACKGE ( DirectX REQUIRED )
-ENDIF(WIN32 AND ENABLE_DIRECTX)
+int main(int argc, char** argv) {
+    wxGLCanvas canvas(NULL, wxID_ANY, NULL, wxPoint(0, 0), wxSize(300, 300), 0);
+    return 0;
+}" WX_HAS_OPENGL)
+    endif()
 
-# we make some direct gtk/gdk calls on linux and such
-# so need to link the gtk that wx was built with
-IF(NOT WIN32 AND NOT APPLE)
-    FIND_PACKAGE(PkgConfig REQUIRED)
+    if(NOT WX_HAS_OPENGL)
+        add_definitions(-DNO_OGL)
+    endif()
 
-    FIND_PATH(WX_CONFIG_H NAMES wx/config.h PATHS ${wxWidgets_INCLUDE_DIRS})
-    IF(NOT WX_CONFIG_H)
-        MESSAGE(FATAL_ERROR "Could not find wx/config.h in ${wxWidgets_INCLUDE_DIRS}")
-    ENDIF()
-    SET(WX_CONFIG_H "${WX_CONFIG_H}/wx/config.h")
+    # end of wx compile checks
 
-    INCLUDE(CheckCXXSymbolExists)
-    CHECK_CXX_SYMBOL_EXISTS(__WXGTK4__ ${WX_CONFIG_H} WX_USING_GTK4)
-    CHECK_CXX_SYMBOL_EXISTS(__WXGTK3__ ${WX_CONFIG_H} WX_USING_GTK3)
-    IF(WX_USING_GTK4)
-        PKG_CHECK_MODULES(GTK4 REQUIRED gtk+-4.0)
-        IF(NOT GTK4_INCLUDE_DIRS)
-            MESSAGE(FATAL_ERROR "Could not find gtk4")
-        ENDIF()
-        INCLUDE_DIRECTORIES(${GTK4_INCLUDE_DIRS})
-        LINK_DIRECTORIES(${GTK4_LIBRARY_DIRS})
-        ADD_COMPILE_OPTIONS(${GTK4_CFLAGS_OTHER})
-        SET(GTK_LIBRARIES ${GTK4_LIBRARIES})
-    ELSEIF(WX_USING_GTK3)
-        PKG_CHECK_MODULES(GTK3 REQUIRED gtk+-3.0)
-        IF(NOT GTK3_INCLUDE_DIRS)
-            MESSAGE(FATAL_ERROR "Could not find gtk3")
-        ENDIF()
-        INCLUDE_DIRECTORIES(${GTK3_INCLUDE_DIRS})
-        LINK_DIRECTORIES(${GTK3_LIBRARY_DIRS})
-        ADD_COMPILE_OPTIONS(${GTK3_CFLAGS_OTHER})
-        SET(GTK_LIBRARIES ${GTK3_LIBRARIES})
-    ELSE()
-        CHECK_CXX_SYMBOL_EXISTS(__WXGTK20__ ${WX_CONFIG_H} WX_USING_GTK2)
-        IF(WX_USING_GTK2)
-            # try to use pkg-config to find gtk2 first
-            PKG_CHECK_MODULES(GTK2 REQUIRED gtk+-2.0)
-            IF(GTK2_INCLUDE_DIRS)
-                INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
-                LINK_DIRECTORIES(${GTK2_LIBRARY_DIRS})
-                ADD_COMPILE_OPTIONS(${GTK2_CFLAGS_OTHER})
-                SET(GTK_LIBRARIES ${GTK2_LIBRARIES})
-            ELSE()
-                # and if that fails, use the cmake module
-                FIND_PACKAGE(GTK2 REQUIRED gtk)
-                IF(NOT GTK2_INCLUDE_DIRS)
-                    MESSAGE(FATAL_ERROR "Could not find gtk2")
-                ENDIF()
-                INCLUDE_DIRECTORIES(${GTK2_INCLUDE_DIRS})
-                ADD_COMPILE_OPTIONS(${GTK2_DEFINITIONS})
-                SET(GTK_LIBRARIES ${GTK2_LIBRARIES})
-            ENDIF()
-        ELSE()
-            FIND_PACKAGE(GTK REQUIRED gtk)
-            IF(NOT GTK_INCLUDE_DIRS)
-                MESSAGE(FATAL_ERROR "Could not find gtk")
-            ENDIF()
-            INCLUDE_DIRECTORIES(${GTK_INCLUDE_DIRS})
-            ADD_COMPILE_OPTIONS(${GTK_DEFINITIONS})
-        ENDIF()
-    ENDIF()
-ENDIF()
+    # we make some direct gtk/gdk calls on linux and such
+    # so need to link the gtk that wx was built with
+    if(NOT WIN32 AND NOT APPLE)
+        find_package(PkgConfig REQUIRED)
+
+        find_path(WX_CONFIG_H NAMES wx/config.h PATHS ${wxWidgets_INCLUDE_DIRS})
+        if(NOT WX_CONFIG_H)
+            message(FATAL_ERROR "Could not find wx/config.h in ${wxWidgets_INCLUDE_DIRS}")
+        endif()
+        set(WX_CONFIG_H "${WX_CONFIG_H}/wx/config.h")
+
+        include(CheckCXXSymbolExists)
+        check_cxx_symbol_exists(__WXGTK4__ ${WX_CONFIG_H} WX_USING_GTK4)
+        check_cxx_symbol_exists(__WXGTK3__ ${WX_CONFIG_H} WX_USING_GTK3)
+        if(WX_USING_GTK4)
+            pkg_check_modules(GTK4 REQUIRED gtk+-4.0)
+            if(NOT GTK4_INCLUDE_DIRS)
+                message(FATAL_ERROR "Could not find gtk4")
+            endif()
+            include_directories(${GTK4_INCLUDE_DIRS})
+            link_directories(${GTK4_LIBRARY_DIRS})
+            add_compile_options(${GTK4_CFLAGS_OTHER})
+            set(GTK_LIBRARIES ${GTK4_LIBRARIES})
+        elseif(WX_USING_GTK3)
+            pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+            if(NOT GTK3_INCLUDE_DIRS)
+                message(FATAL_ERROR "Could not find gtk3")
+            endif()
+            include_directories(${GTK3_INCLUDE_DIRS})
+            link_directories(${GTK3_LIBRARY_DIRS})
+            add_compile_options(${GTK3_CFLAGS_OTHER})
+            set(GTK_LIBRARIES ${GTK3_LIBRARIES})
+        else()
+            check_cxx_symbol_exists(__WXGTK20__ ${WX_CONFIG_H} WX_USING_GTK2)
+            if(WX_USING_GTK2)
+                # try to use pkg-config to find gtk2 first
+                pkg_check_modules(GTK2 REQUIRED gtk+-2.0)
+                if(GTK2_INCLUDE_DIRS)
+                    include_directories(${GTK2_INCLUDE_DIRS})
+                    link_directories(${GTK2_LIBRARY_DIRS})
+                    add_compile_options(${GTK2_CFLAGS_OTHER})
+                    set(GTK_LIBRARIES ${GTK2_LIBRARIES})
+                else()
+                    # and if that fails, use the cmake module
+                    find_package(GTK2 REQUIRED gtk)
+                    if(NOT GTK2_INCLUDE_DIRS)
+                        message(FATAL_ERROR "Could not find gtk2")
+                    endif()
+                    include_directories(${GTK2_INCLUDE_DIRS})
+                    add_compile_options(${GTK2_DEFINITIONS})
+                    set(GTK_LIBRARIES ${GTK2_LIBRARIES})
+                endif()
+            else()
+                find_package(GTK REQUIRED gtk)
+                if(NOT GTK_INCLUDE_DIRS)
+                    message(FATAL_ERROR "Could not find gtk")
+                endif()
+                include_directories(${GTK_INCLUDE_DIRS})
+                add_compile_options(${GTK_DEFINITIONS})
+            endif()
+        endif()
+    endif()
+
+    if(wxWidgets_USE_FILE)
+        include(${wxWidgets_USE_FILE})
+    endif()
+endif() # wxWidgets checks
+
+if(CMAKE_TOOLCHAIN_FILE MATCHES vcpkg)
+    find_package(unofficial-gettext REQUIRED)
+else()
+    find_package(Gettext REQUIRED)
+
+    find_program(XGETTEXT xgettext)
+    find_program(MSGINIT msginit)
+
+    if(ENABLE_NLS AND (NOT XGETTEXT OR NOT MSGINIT))
+       message(SEND_ERROR "Cannot find gettext ${XGETTEXT} ${MSGINIT}")
+    endif()
+endif()
 
 # contrib widgets
 include_directories(widgets)
@@ -393,7 +568,7 @@ include_directories(widgets)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-SET(XRC_SOURCES
+set(XRC_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/xrc/AccelConfig.xrc
     ${CMAKE_CURRENT_SOURCE_DIR}/xrc/CheatAdd.xrc
     ${CMAKE_CURRENT_SOURCE_DIR}/xrc/CheatCreate.xrc
@@ -433,26 +608,72 @@ SET(XRC_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/xrc/SoundConfig.xrc
     ${CMAKE_CURRENT_SOURCE_DIR}/xrc/TileViewer.xrc
     ${CMAKE_CURRENT_SOURCE_DIR}/xrc/SpeedupConfig.xrc
-)
+    )
 
 # wxrc does not support xrs files in -c output (> 10x compression)
 # we do it using the bin2c.c utility
 
-SET(BIN2C ${CMAKE_BINARY_DIR}/bin2c)
+set(BIN2C ${CMAKE_BINARY_DIR}/bin2c)
 
-INCLUDE(HostCompile)
+include(HostCompile)
 
-HOST_COMPILE(${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c ${BIN2C})
+host_compile(${CMAKE_CURRENT_SOURCE_DIR}/bin2c.c ${BIN2C})
 
 if(WXRC)
-    separate_arguments(WXRC UNIX_COMMAND "${WXRC}")
-else()
+    separate_arguments(WXRC UNIX_COMMAND ${WXRC})
+elseif(DEFINED ENV{WXRC})
+    separate_arguments(WXRC UNIX_COMMAND $ENV{WXRC})
+elseif(wxWidgets_CONFIG_EXECUTABLE)
+    execute_process(
+        COMMAND ${wxWidgets_CONFIG_EXECUTABLE} --utility=wxrc
+        OUTPUT_VARIABLE wxrc
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+    )
+
+    # this is necessary on msys2
+    if(NOT wxrc)
+        execute_process(
+            COMMAND sh -c "${wxWidgets_CONFIG_EXECUTABLE} --utility=wxrc"
+            OUTPUT_VARIABLE wxrc
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            ERROR_QUIET
+        )
+    endif()
+
+    # check if the path from wx-config is good
+    # and not e.g. an incompatible binary when cross-compiling
+    if(EXISTS ${wxrc})
+        check_clean_exit(exit_status ${wxrc} --help)
+
+        if(exit_status EQUAL 0)
+            set(WXRC ${wxrc})
+        endif()
+    elseif(wxrc)
+        # this is necessary on msys2
+        cygpath(cyg_path ${wxrc})
+
+        if(EXISTS ${cyg_path})
+            check_clean_exit(exit_status ${cyg_path} --help)
+
+            if(exit_status EQUAL 0)
+                set(WXRC ${cyg_path})
+            endif()
+        endif()
+    endif()
+endif()
+
+if(NOT WXRC)
+    find_wx_util(WXRC wxrc)
+endif()
+
+if(NOT WXRC)
+    message(WARNING "could not find your wxrc executable")
     set(WXRC wxrc)
 endif()
 
 if(CMAKE_HOST_SYSTEM_NAME STREQUAL CYGWIN)
     # pass xrc sources through cygpath in case we only have native wxrc
-
     set(new_xrc_sources)
 
     foreach(xrc ${XRC_SOURCES})
@@ -463,137 +684,157 @@ if(CMAKE_HOST_SYSTEM_NAME STREQUAL CYGWIN)
     set(XRC_SOURCES ${new_xrc_sources})
 endif()
 
-ADD_CUSTOM_COMMAND(OUTPUT wxvbam.xrs
-                   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-                   COMMAND ${WXRC} ${XRC_SOURCES} "--output=wxvbam.xrs"
-                   DEPENDS ${XRC_SOURCES})
+add_custom_command(
+    OUTPUT wxvbam.xrs
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    COMMAND ${WXRC} ${XRC_SOURCES} "--output=wxvbam.xrs"
+    DEPENDS ${XRC_SOURCES}
+)
 
-ADD_CUSTOM_COMMAND(OUTPUT builtin-xrc.h
-                   COMMAND ${BIN2C} wxvbam.xrs builtin-xrc.h builtin_xrs
-                   DEPENDS wxvbam.xrs)
+add_custom_command(
+    OUTPUT builtin-xrc.h
+    COMMAND ${BIN2C} wxvbam.xrs builtin-xrc.h builtin_xrs
+    DEPENDS wxvbam.xrs
+)
 
 # use a built-in vba-over.ini if no config file present
-ADD_CUSTOM_COMMAND(OUTPUT builtin-over.h
-                   COMMAND ${BIN2C} ${CMAKE_CURRENT_SOURCE_DIR}/../vba-over.ini builtin-over.h builtin_over
-                   DEPENDS ../vba-over.ini)
+add_custom_command(
+    OUTPUT builtin-over.h
+    COMMAND ${BIN2C} ${CMAKE_CURRENT_SOURCE_DIR}/../vba-over.ini builtin-over.h builtin_over
+    DEPENDS ../vba-over.ini
+)
 
 # I don't like duplicating/triplicating code, so I only declare
 # event handlers once, and copy them in other places they are needed
 # all using portable cmake code
-ADD_CUSTOM_COMMAND(OUTPUT cmdtab.cpp cmdhandlers.h cmd-evtable.h
-                   COMMAND
-		      ${CMAKE_COMMAND} -D OUTDIR=${CMAKE_CURRENT_BINARY_DIR} -P copy-events.cmake
-		   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-		   DEPENDS cmdevents.cpp)
+add_custom_command(
+    OUTPUT cmdtab.cpp cmdhandlers.h cmd-evtable.h
+    COMMAND ${CMAKE_COMMAND} -D OUTDIR=${CMAKE_CURRENT_BINARY_DIR} -P copy-events.cmake
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    DEPENDS cmdevents.cpp
+)
+
 
-#
 # the following should be in the main file for consistency with
 # other front ends, but can't due to cmake issues
 # then again, the main file should be split up into separate dirs anyway
-#
 
-SET( SRC_WX
-   wxvbam.cpp
-   guiinit.cpp
-   viewers.cpp
-   gfxviewers.cpp
-   cmdevents.cpp
-   opts.cpp
-   sys.cpp
-   panel.cpp
-   viewsupt.cpp
-   wayland.cpp
-   strutils.cpp
-   widgets/keyedit.cpp
-   widgets/joyedit.cpp
-   widgets/sdljoy.cpp
-   widgets/wxmisc.cpp
-   # probably ought to be in common
-   ../sdl/text.cpp
-   # from external source with minor modifications
-   widgets/checkedlistctrl.cpp
-   # generated
-   cmdtab.cpp
-   # generated includes must be explicitly listed
-   builtin-xrc.h
-   builtin-over.h
-   cmdhandlers.h
-   cmd-evtable.h
-   #Icon File
-   xrc/vbam.xpm
+set(
+    SRC_WX
+    wxvbam.cpp
+    guiinit.cpp
+    viewers.cpp
+    gfxviewers.cpp
+    cmdevents.cpp
+    opts.cpp
+    sys.cpp
+    panel.cpp
+    viewsupt.cpp
+    wayland.cpp
+    strutils.cpp
+    widgets/keyedit.cpp
+    widgets/joyedit.cpp
+    widgets/sdljoy.cpp
+    widgets/wxmisc.cpp
+    # probably ought to be in common
+    ../sdl/text.cpp
+    # from external source with minor modifications
+    widgets/checkedlistctrl.cpp
+    # generated
+    cmdtab.cpp
+    # generated includes must be explicitly listed
+    builtin-xrc.h
+    builtin-over.h
+    cmdhandlers.h
+    cmd-evtable.h
+    # icon File
+    xrc/vbam.xpm
 )
 
-IF(APPLE)
-    SET(SRC_WX ${SRC_WX} macsupport.mm)
-ENDIF(APPLE)
+if(APPLE)
+    set(SRC_WX ${SRC_WX} macsupport.mm)
+endif()
 
-SET( HDR_WX
-   wxvbam.h
-   drawing.h
-   filters.h
-   ioregs.h
-   opts.h
-   viewsupt.h
-   wxhead.h
-   wayland.h
-   widgets/wx/keyedit.h
-   widgets/wx/joyedit.h
-   widgets/wx/sdljoy.h
-   widgets/wx/webupdatedef.h
-   widgets/wx/wxmisc.h
-   # probably ought to be in common
-   ../sdl/text.h
-   # from external source with minor modifications
-   widgets/wx/checkedlistctrl.h
+set(
+    HDR_WX
+    wxvbam.h
+    drawing.h
+    filters.h
+    ioregs.h
+    opts.h
+    viewsupt.h
+    wxhead.h
+    wayland.h
+    widgets/wx/keyedit.h
+    widgets/wx/joyedit.h
+    widgets/wx/sdljoy.h
+    widgets/wx/webupdatedef.h
+    widgets/wx/wxmisc.h
+    # probably ought to be in common
+    ../sdl/text.h
+    # from external source with minor modifications
+    widgets/wx/checkedlistctrl.h
 )
 
-SET( RES_WX
+set(
+    RES_WX
     ${XRC_SOURCES}
     ../vba-over.ini
 )
 
-SET( CM_STUFF
+set(
+    CM_STUFF
     copy-events.cmake
 )
 
-IF(ENABLE_OPENAL)
-    SET( SRC_WX ${SRC_WX} openal.cpp )
-    SET( HDR_WX ${HDR_WX} openal.h )
-ENDIF(ENABLE_OPENAL)
+if(ENABLE_OPENAL)
+    set(SRC_WX ${SRC_WX} openal.cpp)
+    set(HDR_WX ${HDR_WX} openal.h)
+endif()
 
-IF(ENABLE_XAUDIO2)
-	SET( SRC_WX ${SRC_WX} xaudio2.cpp )
-ENDIF(ENABLE_XAUDIO2)
+if(ENABLE_XAUDIO2)
+    set(SRC_WX ${SRC_WX} xaudio2.cpp)
+endif()
 
-IF(ENABLE_FAUDIO)
-	SET( SRC_WX ${SRC_WX} faudio.cpp )
-ENDIF(ENABLE_FAUDIO)
+if(ENABLE_FAUDIO)
+    set(SRC_WX ${SRC_WX} faudio.cpp)
+endif()
 
-IF( WIN32 )
-    SET( SRC_WX ${SRC_WX} wxvbam.rc dsound.cpp )
-    SET(DIRECTX_LIBRARIES dxguid dsound ws2_32)
-    IF(MSVC)
+if(WIN32)
+    set(SRC_WX ${SRC_WX} wxvbam.rc dsound.cpp)
+    set(DIRECTX_LIBRARIES dxguid dsound ws2_32)
+    if(MSVC)
         # workaround for some symbols needed by static SDL2.lib
-        SET(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} imm32 version)
-    ENDIF(MSVC)
+        set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} imm32 version)
+    endif()
     # not strictly directx, but win32-related
-    IF(ENABLE_DEBUGGER)
-        SET(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} wsock32)
-    ENDIF(ENABLE_DEBUGGER)
-ENDIF( WIN32 )
+    if(ENABLE_DEBUGGER)
+        set(DIRECTX_LIBRARIES ${DIRECTX_LIBRARIES} wsock32)
+    endif()
+endif()
 
-link_directories( ${CMAKE_BINARY_DIR} )
+if(NOT WIN32 AND NOT APPLE)
+    find_package(X11)
 
-SET(VBAM_ICON vbam.icns)
+    if(X11_X11_LIB AND X11_Xscreensaver_LIB)
+        include_directories(${X11_INCLUDE_DIR})
+        set(EXTRA_X11_LIBS ${X11_X11_LIB} ${X11_Xscreensaver_LIB})
+        add_definitions(-DHAVE_XSS)
+    endif()
+endif()
 
-SET(VBAM_ICON_PATH ${CMAKE_CURRENT_SOURCE_DIR}/icons/${VBAM_ICON})
+link_directories(${CMAKE_BINARY_DIR})
 
-IF(APPLE)
-    SET(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
-    SET(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
-ENDIF(APPLE)
+set(VBAM_ICON vbam.icns)
 
-ADD_EXECUTABLE (
+set(VBAM_ICON_PATH ${CMAKE_CURRENT_SOURCE_DIR}/icons/${VBAM_ICON})
+
+if(APPLE)
+    set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
+    set(CMAKE_INSTALL_RPATH "@loader_path/../Frameworks")
+endif()
+
+add_executable(
     visualboyadvance-m
     WIN32
     MACOSX_BUNDLE
@@ -605,7 +846,7 @@ ADD_EXECUTABLE (
 )
 
 
-TARGET_LINK_LIBRARIES (
+target_link_libraries(
     visualboyadvance-m
     ${VBAMCORE_LIBS}
     ${wxWidgets_LIBRARIES}
@@ -614,6 +855,7 @@ TARGET_LINK_LIBRARIES (
     ${GTK_LIBRARIES}
     ${OPENAL_LIBRARY}
     ${FAUDIO_LIBS}
+    ${EXTRA_X11_LIBS}
 )
 
 if(ENABLE_FFMPEG)
@@ -630,7 +872,7 @@ endif()
 if(CMAKE_COMPILER_IS_GNUCXX)
     if(WIN32)
         # Build a console app in debug mode on Windows
-        if(CMAKE_BUILD_TYPE STREQUAL Debug)
+        if(CMAKE_BUILD_TYPE MATCHES Debug)
             set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -Wl,--subsystem,console")
         else()
             set(CMAKE_CXX_LINK_EXECUTABLE "${CMAKE_CXX_LINK_EXECUTABLE} -Wl,--subsystem,windows")
@@ -657,33 +899,36 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     endif()
 endif()
 
-IF(WIN32)
-    INSTALL(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_BINARY_DIR})
-ENDIF(WIN32)
-IF(NOT WIN32 AND NOT APPLE)
-    INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
-ENDIF(NOT WIN32 AND NOT APPLE)
+if(WIN32)
+    install(PROGRAMS ${PROJECT_BINARY_DIR}/visualboyadvance-m${CMAKE_EXECUTABLE_SUFFIX} DESTINATION ${CMAKE_BINARY_DIR})
+endif()
+
+if(NOT WIN32 AND NOT APPLE)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/wxvbam.desktop DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+endif()
 
 if(APPLE)
     # this should set ROM file types correctly
-    SET_PROPERTY(TARGET visualboyadvance-m APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
-    SET(MACOSX_BUNDLE_ICON_FILE ${VBAM_ICON})
-    SET_SOURCE_FILES_PROPERTIES(${VBAM_ICON_PATH} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    set_property(TARGET visualboyadvance-m APPEND PROPERTY MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/wxplist.in)
+    set(MACOSX_BUNDLE_ICON_FILE ${VBAM_ICON})
+    set_source_files_properties(${VBAM_ICON_PATH} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
     # bundle dylibs and relink them for releasing .app
     # also install translations into the .app
     # but only in Release mode
-    IF(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
-        ADD_CUSTOM_COMMAND(TARGET visualboyadvance-m POST_BUILD
+    if(NOT CMAKE_BUILD_TYPE MATCHES Debug)
+        add_custom_command(
+            TARGET visualboyadvance-m POST_BUILD
             COMMAND ${CMAKE_SOURCE_DIR}/tools/osx/third_party_libs_tool ./visualboyadvance-m.app
             WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
         )
 
-        add_custom_command(TARGET visualboyadvance-m POST_BUILD
+        add_custom_command(
+            TARGET visualboyadvance-m POST_BUILD
             COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/mac-translations.cmake
             WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
         )
-    ENDIF()
-endif(APPLE)
+    endif()
+endif()
 
-SET(WX_EXE_NAME visualboyadvance-m-wx${CMAKE_EXECUTABLE_SUFFIX})
+set(WX_EXE_NAME visualboyadvance-m-wx${CMAKE_EXECUTABLE_SUFFIX})
diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index 416962a1..5923b3bf 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -50,7 +50,7 @@ void MainFrame::GetMenuOptionBool(const char* menuName, bool& field)
     field = !field;
     int id = wxXmlResource::GetXRCID(wxString(menuName, wxConvUTF8));
 
-    for (int i = 0; i < checkable_mi.size(); i++) {
+    for (size_t i = 0; i < checkable_mi.size(); i++) {
         if (checkable_mi[i].cmd != id)
             continue;
 
@@ -65,7 +65,7 @@ void MainFrame::GetMenuOptionInt(const char* menuName, int& field, int mask)
     bool is_checked = ((field) & (mask)) != (value);
     int id = wxXmlResource::GetXRCID(wxString(menuName, wxConvUTF8));
 
-    for (int i = 0; i < checkable_mi.size(); i++) {
+    for (size_t i = 0; i < checkable_mi.size(); i++) {
         if (checkable_mi[i].cmd != id)
             continue;
 
@@ -80,7 +80,7 @@ void MainFrame::SetMenuOption(const char* menuName, int value)
 {
     int id = wxXmlResource::GetXRCID(wxString(menuName, wxConvUTF8));
 
-    for (int i = 0; i < checkable_mi.size(); i++) {
+    for (size_t i = 0; i < checkable_mi.size(); i++) {
         if (checkable_mi[i].cmd != id)
             continue;
 
@@ -506,6 +506,7 @@ static bool maker_lt(const rom_maker& r1, const rom_maker& r2)
 
 void SetDialogLabel(wxDialog* dlg, const wxString& id, wxString ts, size_t l)
 {
+    (void)l; // unused params
     ts.Replace(wxT("&"), wxT("&&"), true);
     (dynamic_cast<wxControl*>((*dlg).FindWindow(wxXmlResource::GetXRCID(id))))->SetLabel(ts);
 }
@@ -527,7 +528,7 @@ EVT_HANDLER_MASK(RomInformation, "ROM information...", CMDEN_GB | CMDEN_GBA)
     } while (0)
 #define setblabs(id, b, ts)                              \
     do {                                                 \
-        s.Printf(wxT("%02x (%s)"), (unsigned int)b, ts); \
+        s.Printf(wxT("%02x (%s)"), (unsigned int)b, ts.c_str()); \
         setlab(id);                                      \
     } while (0)
 #define setlabs(id, ts, l)                               \
@@ -548,7 +549,7 @@ EVT_HANDLER_MASK(RomInformation, "ROM information...", CMDEN_GB | CMDEN_GBA)
             s.Printf(wxT("%02x"), gbRom[0x14b]);
 
         setlab("MakerCode");
-        const rom_maker m = { s }, *rm;
+        const rom_maker m = { s, wxString() }, *rm;
         rm = std::lower_bound(&makers[0], &makers[num_makers], m, maker_lt);
 
         if (rm < &makers[num_makers] && !wxStrcmp(m.code, rm->code))
@@ -776,7 +777,7 @@ EVT_HANDLER_MASK(RomInformation, "ROM information...", CMDEN_GB | CMDEN_GBA)
         SetDialogLabel(dlg, wxT("CRC32"), rom_crc32, 8);
         setlabs("GameCode", rom[0xac], 4);
         setlabs("MakerCode", rom[0xb0], 2);
-        const rom_maker m = { s }, *rm;
+        const rom_maker m = { s, wxString() }, *rm;
         rm = std::lower_bound(&makers[0], &makers[num_makers], m, maker_lt);
 
         if (rm < &makers[num_makers] && !wxStrcmp(m.code, rm->code))
@@ -804,6 +805,9 @@ EVT_HANDLER_MASK(RomInformation, "ROM information...", CMDEN_GB | CMDEN_GBA)
         dlg->Fit();
         ShowModal(dlg);
     } break;
+
+    default:
+	break;
     }
 }
 
@@ -865,9 +869,9 @@ EVT_HANDLER_MASK(ImportBatteryFile, "Import battery file...", CMDEN_GB | CMDEN_G
         wxString msg;
 
         if (panel->emusys->emuReadBattery(fn.mb_fn_str()))
-            msg.Printf(_("Loaded battery %s"), fn.mb_str());
+            msg.Printf(_("Loaded battery %s"), fn.c_str());
         else
-            msg.Printf(_("Error loading battery %s"), fn.mb_str());
+            msg.Printf(_("Error loading battery %s"), fn.c_str());
 
         systemScreenMessage(msg);
     }
@@ -903,7 +907,7 @@ EVT_HANDLER_MASK(ImportGamesharkCodeFile, "Import GameShark code file...", CMDEN
             wxFFile f(fn, wxT("rb"));
 
             if (!f.IsOpened()) {
-                wxLogError(_("Cannot open file %s"), fn.mb_str());
+                wxLogError(_("Cannot open file %s"), fn.c_str());
                 return;
             }
 
@@ -913,7 +917,7 @@ EVT_HANDLER_MASK(ImportGamesharkCodeFile, "Import GameShark code file...", CMDEN
             char buf[14];
 
             if (f.Read(&len, sizeof(len)) != sizeof(len) || wxUINT32_SWAP_ON_BE(len) != 14 || f.Read(buf, 14) != 14 || memcmp(buf, "SharkPortCODES", 14)) {
-                wxLogError(_("Unsupported code file %s"), fn.mb_str());
+                wxLogError(_("Unsupported code file %s"), fn.c_str());
                 return;
             }
 
@@ -971,7 +975,7 @@ EVT_HANDLER_MASK(ImportGamesharkCodeFile, "Import GameShark code file...", CMDEN
 
                 game = lst->GetSelection();
 
-                if (game == wxNOT_FOUND)
+                if ((int)game == wxNOT_FOUND)
                     game = 0;
             }
 
@@ -983,9 +987,9 @@ EVT_HANDLER_MASK(ImportGamesharkCodeFile, "Import GameShark code file...", CMDEN
         }
 
         if (res)
-            msg.Printf(_("Loaded code file %s"), fn.mb_str());
+            msg.Printf(_("Loaded code file %s"), fn.c_str());
         else
-            msg.Printf(_("Error loading code file %s"), fn.mb_str());
+            msg.Printf(_("Error loading code file %s"), fn.c_str());
 
         systemScreenMessage(msg);
     }
@@ -1031,9 +1035,9 @@ EVT_HANDLER_MASK(ImportGamesharkActionReplaySnapshot,
         }
 
         if (res)
-            msg.Printf(_("Loaded snapshot file %s"), fn.mb_str());
+            msg.Printf(_("Loaded snapshot file %s"), fn.c_str());
         else
-            msg.Printf(_("Error loading snapshot file %s"), fn.mb_str());
+            msg.Printf(_("Error loading snapshot file %s"), fn.c_str());
 
         systemScreenMessage(msg);
     }
@@ -1056,9 +1060,9 @@ EVT_HANDLER_MASK(ExportBatteryFile, "Export battery file...", CMDEN_GB | CMDEN_G
     wxString msg;
 
     if (panel->emusys->emuWriteBattery(fn.mb_fn_str()))
-        msg.Printf(_("Wrote battery %s"), fn.mb_str());
+        msg.Printf(_("Wrote battery %s"), fn.c_str());
     else
-        msg.Printf(_("Error writing battery %s"), fn.mb_str());
+        msg.Printf(_("Error writing battery %s"), fn.c_str());
 
     systemScreenMessage(msg);
 }
@@ -1097,11 +1101,11 @@ EVT_HANDLER_MASK(ExportGamesharkSnapshot, "Export GameShark snapshot...", CMDEN_
     // FIXME: this will fail on big-endian machines if file format is
     // little-endian
     // fix in GBA.cpp
-    if (CPUWriteGSASnapshot(fn.mb_str(), tit->GetValue().mb_str(),
-            dsc->GetValue().mb_str(), n->GetValue().mb_str()))
-        msg.Printf(_("Saved snapshot file %s"), fn.mb_str());
+    if (CPUWriteGSASnapshot(fn.utf8_str(), tit->GetValue().utf8_str(),
+            dsc->GetValue().utf8_str(), n->GetValue().utf8_str()))
+        msg.Printf(_("Saved snapshot file %s"), fn.c_str());
     else
-        msg.Printf(_("Error saving snapshot file %s"), fn.mb_str());
+        msg.Printf(_("Error saving snapshot file %s"), fn.c_str());
 
     systemScreenMessage(msg);
 }
@@ -1141,7 +1145,7 @@ EVT_HANDLER_MASK(ScreenCapture, "Screen capture...", CMDEN_GB | CMDEN_GBA)
         panel->emusys->emuWriteBMP(fn.mb_fn_str());
 
     wxString msg;
-    msg.Printf(_("Wrote snapshot %s"), fn.mb_str());
+    msg.Printf(_("Wrote snapshot %s"), fn.c_str());
     systemScreenMessage(msg);
 }
 
@@ -1606,7 +1610,7 @@ EVT_HANDLER_MASK(Rewind, "Rewind", CMDEN_REWIND)
     // if within 5 seconds of last one, and > 1 state, delete last state & move back
     // FIXME: 5 should actually be user-configurable
     // maybe instead of 5, 10% of rewind_interval
-    if (panel->num_rewind_states > 1 && (gopts.rewind_interval <= 5 || panel->rewind_time / 6 > gopts.rewind_interval - 5)) {
+    if (panel->num_rewind_states > 1 && (gopts.rewind_interval <= 5 || (int)panel->rewind_time / 6 > gopts.rewind_interval - 5)) {
         --panel->num_rewind_states;
         panel->next_rewind_state = rew_st;
 
@@ -1713,7 +1717,7 @@ EVT_HANDLER_MASK(VideoLayersReset, "Show all video layers", CMDEN_GB | CMDEN_GBA
 #define set_vl(s)                                     \
     do {                                              \
         int id = XRCID(s);                            \
-        for (int i = 0; i < checkable_mi.size(); i++) \
+        for (size_t i = 0; i < checkable_mi.size(); i++) \
             if (checkable_mi[i].cmd == id) {          \
                 checkable_mi[i].mi->Check(true);      \
                 break;                                \
@@ -1937,7 +1941,7 @@ void MainFrame::GDBBreak()
                 if (!debugOpenPty())
                     return;
 
-                msg.Printf(_("Waiting for connection at %s"), debugGetSlavePty().mb_str());
+                msg.Printf(_("Waiting for connection at %s"), debugGetSlavePty().c_str());
             } else
 #endif
             {
@@ -2242,7 +2246,7 @@ EVT_HANDLER(GameBoyAdvanceConfigure, "Game Boy Advance options...")
             vba_over.append(wxTextFile::GetEOL());
             fn.Mkdir(0777, wxPATH_MKDIR_FULL);
             wxTempFileOutputStream fos(fn.GetFullPath());
-            fos.Write(vba_over.mb_str(), vba_over.size());
+            fos.Write(vba_over.c_str(), vba_over.size());
             fos.Commit();
         }
     }
@@ -2291,7 +2295,7 @@ EVT_HANDLER_MASK(ChangeFilter, "Change Pixel Filter", CMDEN_NREC_ANY)
 {
     int filt = gopts.filter;
 
-    if (filt == FF_PLUGIN || ++gopts.filter == FF_PLUGIN && gopts.filter_plugin.empty()) {
+    if ((filt == FF_PLUGIN || ++gopts.filter == FF_PLUGIN) && gopts.filter_plugin.empty()) {
         gopts.filter = 0;
     }
 
diff --git a/src/wx/copy-events.cmake b/src/wx/copy-events.cmake
index 06b30de7..252a5b88 100644
--- a/src/wx/copy-events.cmake
+++ b/src/wx/copy-events.cmake
@@ -18,7 +18,7 @@ SET(EVLINES )
 FOREACH(EV ${MW})
     # stripping the wxID_ makes it look better, but it's still all-caps
     STRING(REGEX REPLACE "^[^\"]*\\((wxID_|)([^,]*),[^\"]*(\"[^\"]*\")[^,)]*(,[^)]*|).*"
-                         "    {wxT(\"\\2\"), wxTRANSLATE(\\3), XRCID(\"\\1\\2\")\\4 }"
+                         "    new_cmditem(wxT(\"\\2\"), wxTRANSLATE(\\3), XRCID(\"\\1\\2\")\\4 )"
 			 EV "${EV}")
     STRING(REGEX REPLACE "XRCID\\(\"(wxID_[^\"]*)\"\\)" "\\1" EV ${EV})
     LIST(APPEND EVLINES "${EV},\n")
diff --git a/src/wx/faudio.cpp b/src/wx/faudio.cpp
index 3c9cc462..f54e8397 100644
--- a/src/wx/faudio.cpp
+++ b/src/wx/faudio.cpp
@@ -69,7 +69,7 @@ bool GetFADevices(wxArrayString& names, wxArrayString& ids)
     }
 
     GetFADevices(fa, &names, &ids, NULL);
-    //fa->Release();
+    //fa->Release();
     FAudio_Release(fa);
     return true;
 }
@@ -371,7 +371,7 @@ bool FAudio_Output::init(long sampleRate)
     wfx.nBlockAlign = wfx.nChannels * (wfx.wBitsPerSample / 8);
     wfx.nAvgBytesPerSec = wfx.nSamplesPerSec * wfx.nBlockAlign;
     // create sound receiver
-    hr = FAudio_CreateMasteringVoice(
+    hr = FAudio_CreateMasteringVoice(
         faud,
         &mVoice,
         FAUDIO_DEFAULT_CHANNELS,
@@ -386,9 +386,9 @@ bool FAudio_Output::init(long sampleRate)
         return false;
     }
 
-    // create sound emitter
+    // create sound emitter
     //This should be  FAudio_CreateSourceVoice()
-    //hr = faud->CreateSourceVoice(&sVoice, &wfx, 0, 4.0f, &notify);
+    //hr = faud->CreateSourceVoice(&sVoice, &wfx, 0, 4.0f, &notify);
      hr = FAudio_CreateSourceVoice(faud, &sVoice, (const FAudioWaveFormatEx*)&wfx, 0, 4.0f, &notify, NULL, NULL);
 
     if (hr != S_OK) {
@@ -516,7 +516,7 @@ bool FAudio_Output::init(long sampleRate)
 }
 
 void FAudio_Output::write(uint16_t* finalWave, int length)
-{
+{
     UINT32 flags = 0;
     if (!initialized || failed)
         return;
diff --git a/src/wx/gfxviewers.cpp b/src/wx/gfxviewers.cpp
index a90280be..1a6284f9 100644
--- a/src/wx/gfxviewers.cpp
+++ b/src/wx/gfxviewers.cpp
@@ -229,7 +229,7 @@ public:
             s.Printf(wxT("0x%08X"), address);
             addr->SetLabel(s);
 
-            if (!mode || (mode < 3 || mode > 5) && bg < 2) {
+            if ((!mode || (mode < 3 || mode > 5)) && bg < 2) {
                 uint16_t value = *((uint16_t*)&vram[address - 0x6000000]);
                 s.Printf(wxT("%d"), value & 1023);
                 tile->SetLabel(s);
@@ -738,6 +738,10 @@ void MainFrame::MapViewer()
     case IMAGE_GB:
         LoadXRCViewer(GBMap);
         break;
+
+    case IMAGE_UNKNOWN:
+	// do nothing
+	break;
     }
 }
 
@@ -1113,6 +1117,10 @@ void MainFrame::OAMViewer()
     case IMAGE_GB:
         LoadXRCViewer(GBOAM);
         break;
+
+    case IMAGE_UNKNOWN:
+	// do nothing
+	break;
     }
 }
 
@@ -1233,11 +1241,13 @@ public:
     }
     void SelBG(wxMouseEvent& ev)
     {
+	(void)ev; // unused params
         spv->SetSel(-1, -1, false);
         ShowSel();
     }
     void SelSprite(wxMouseEvent& ev)
     {
+	(void)ev; // unused params
         bpv->SetSel(-1, -1, false);
         ShowSel();
     }
@@ -1273,14 +1283,17 @@ public:
     }
     void SaveBG(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         savepal(this, colbmp, 16 * 16, wxT("bg"));
     }
     void SaveOBJ(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         savepal(this, colbmp + 16 * 16 * 3, 16 * 16, wxT("obj"));
     }
     void ChangeBackdrop(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         // FIXME: this should really be a preference
         // should also have some way of indicating selection
         // perhaps replace w/ checkbox + colorpickerctrl
@@ -1294,7 +1307,7 @@ public:
             *cd = dlg.GetColourData();
             wxColour c = cd->GetColour();
             //Binary or the upper 5 bits of each color choice
-            customBackdropColor = (c.Red() >> 3) || ((c.Green() >> 3) << 5) || ((c.Blue() >> 3) << 10);
+            customBackdropColor = ((c.Red() >> 3) != 0) || (((c.Green() >> 3) << 5) != 0) || (((c.Blue() >> 3) << 10) != 0);
         } else
             // kind of an unintuitive way to turn it off...
             customBackdropColor = -1;
@@ -1347,11 +1360,13 @@ public:
     }
     void SelBG(wxMouseEvent& ev)
     {
+	(void)ev; // unused params
         spv->SetSel(-1, -1, false);
         ShowSel();
     }
     void SelSprite(wxMouseEvent& ev)
     {
+	(void)ev; // unused params
         bpv->SetSel(-1, -1, false);
         ShowSel();
     }
@@ -1386,10 +1401,12 @@ public:
     }
     void SaveBG(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         savepal(this, colbmp, 4 * 8, wxT("bg"));
     }
     void SaveOBJ(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         savepal(this, colbmp + 4 * 8 * 3, 4 * 8, wxT("obj"));
     }
 
@@ -1419,6 +1436,10 @@ void MainFrame::PaletteViewer()
     case IMAGE_GB:
         LoadXRCViewer(GBPalette);
         break;
+
+    case IMAGE_UNKNOWN:
+	// do nothing
+	break;
     }
 }
 
@@ -1687,5 +1708,9 @@ void MainFrame::TileViewer()
     case IMAGE_GB:
         LoadXRCViewer(GBTile);
         break;
+
+    case IMAGE_UNKNOWN:
+	// do nothing
+	break;
     }
 }
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index 87906f8a..02ac5213 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -17,7 +17,6 @@
 #include <wx/filepicker.h>
 #include <wx/progdlg.h>
 #include <wx/spinctrl.h>
-#include <wx/valnum.h>
 #include <wx/stockitem.h>
 #include <wx/tokenzr.h>
 #include <wx/txtstrm.h>
@@ -73,10 +72,12 @@ public:
     wxButton* okb;
     void ServerOKButton(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         okb->SetLabel(_("Start!"));
     }
     void ClientOKButton(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         okb->SetLabel(_("Connect"));
     }
     // attached to OK, so skip when OK
@@ -88,7 +89,7 @@ public:
             return;
 
         if (!server) {
-            bool valid = SetLinkServerHost(gopts.link_host.mb_str());
+            bool valid = SetLinkServerHost(gopts.link_host.c_str());
 
             if (!valid) {
                 wxMessageBox(_("You must enter a valid host name"),
@@ -111,10 +112,10 @@ public:
             char host[length];
             GetLinkServerHost(host, length);
             title.Printf(_("Waiting for clients..."));
-            connmsg.Printf(_("Server IP address is: %s\n"), wxString(host, wxConvLibc).mb_str());
+            connmsg.Printf(_("Server IP address is: %s\n"), wxString(host, wxConvLibc).c_str());
         } else {
             title.Printf(_("Waiting for connection..."));
-            connmsg.Printf(_("Connecting to %s\n"), gopts.link_host.mb_str());
+            connmsg.Printf(_("Connecting to %s\n"), gopts.link_host.c_str());
         }
 
         // Init link
@@ -306,7 +307,7 @@ public:
         } break;
 
         case wxID_REMOVE: {
-            bool asked = false, restore;
+            bool asked = false, restore = false;
 
             for (int i = list->GetItemCount() - 1; i >= 0; i--)
                 if (list->GetItemState(i, wxLIST_STATE_SELECTED)) {
@@ -436,9 +437,9 @@ public:
 
             if (isgb) {
                 if (!ce_type)
-                    gbAddGsCheat(tok.mb_str(), ce_desc.mb_str());
+                    gbAddGsCheat(tok.utf8_str(), ce_desc.utf8_str());
                 else
-                    gbAddGgCheat(tok.mb_str(), ce_desc.mb_str());
+                    gbAddGgCheat(tok.utf8_str(), ce_desc.utf8_str());
             } else {
                 // Flashcart CHT format
                 if (tok.Contains(wxT("="))) {
@@ -446,16 +447,16 @@ public:
                 }
                 // Generic Code
                 else if (tok.Contains(wxT(":")))
-                    cheatsAddCheatCode(tok.mb_str(), ce_desc.mb_str());
+                    cheatsAddCheatCode(tok.utf8_str(), ce_desc.utf8_str());
                 // following determination of type by lengths is
                 // same used by win32 and gtk code
                 // and like win32/gtk code, user-chosen fmt is ignored
                 else if (tok.size() == 12) {
                     tok = tok.substr(0, 8) + wxT(' ') + tok.substr(8);
-                    cheatsAddCBACode(tok.mb_str(), ce_desc.mb_str());
+                    cheatsAddCBACode(tok.utf8_str(), ce_desc.utf8_str());
                 } else if (tok.size() == 16)
                     // not sure why 1-tok is !v3 and 2-tok is v3..
-                    cheatsAddGSACode(tok.mb_str(), ce_desc.mb_str(), false);
+                    cheatsAddGSACode(tok.utf8_str(), ce_desc.utf8_str(), false);
                 // CBA codes are assumed to be N+4, and anything else
                 // is assumed to be GSA v3 (although I assume the
                 // actual formats should be 8+4 and 8+8)
@@ -463,18 +464,18 @@ public:
                     if (!tk.HasMoreTokens()) {
                         // throw an error appropriate to chosen type
                         if (ce_type == 1) // GSA
-                            cheatsAddGSACode(tok.mb_str(), ce_desc.mb_str(), false);
+                            cheatsAddGSACode(tok.utf8_str(), ce_desc.utf8_str(), false);
                         else
-                            cheatsAddCBACode(tok.mb_str(), ce_desc.mb_str());
+                            cheatsAddCBACode(tok.utf8_str(), ce_desc.utf8_str());
                     } else {
                         wxString tok2 = tk.GetNextToken();
 
                         if (tok2.size() == 4) {
                             tok += wxT(' ') + tok2;
-                            cheatsAddCBACode(tok.mb_str(), ce_desc.mb_str());
+                            cheatsAddCBACode(tok.utf8_str(), ce_desc.utf8_str());
                         } else {
                             tok += tok2;
-                            cheatsAddGSACode(tok.mb_str(), ce_desc.mb_str(), true);
+                            cheatsAddGSACode(tok.utf8_str(), ce_desc.utf8_str(), true);
                         }
                     }
                 }
@@ -624,7 +625,7 @@ public:
         } else if (ce_desc != odesc) {
             *dirty = true;
             char* p = isgb ? gbCheatList[id].cheatDesc : cheatsList[id].desc;
-            strncpy(p, ce_desc.mb_str(), sizeof(cheatsList[0].desc));
+            strncpy(p, ce_desc.utf8_str(), sizeof(cheatsList[0].desc));
             p[sizeof(cheatsList[0].desc) - 1] = 0;
             item1.SetId(id);
             item1.SetText(wxString(p, wxConvUTF8));
@@ -674,7 +675,7 @@ void CheatList_t::ParseChtLine(wxString desc, wxString tok)
         wxString cheat_value;
         uint32_t address = 0;
         uint32_t value = 0;
-        sscanf(cheat_addr.mb_str(), "%8x", &address);
+        sscanf(cheat_addr.utf8_str(), "%8x", &address);
 
         if (address < 0x40000)
             address += 0x2000000;
@@ -685,11 +686,11 @@ void CheatList_t::ParseChtLine(wxString desc, wxString tok)
 
         while (value_tk.HasMoreTokens()) {
             wxString value_token = value_tk.GetNextToken();
-            sscanf(value_token.mb_str(), "%2x", &value);
+            sscanf(value_token.utf8_str(), "%2x", &value);
             cheat_line.Printf(wxT("%08X"), address);
             cheat_value.Printf(wxT("%02X"), value);
             cheat_line = cheat_line + wxT(":") + cheat_value;
-            cheatsAddCheatCode(cheat_line.mb_str(), cheat_desc.mb_str());
+            cheatsAddCheatCode(cheat_line.utf8_str(), cheat_desc.utf8_str());
             address++;
         }
     }
@@ -705,10 +706,14 @@ public:
     CheatListFill(const CheatListFill& e)
         : wxValidator()
     {
+	(void)e; // unused params
     }
     wxObject* Clone() const { return new CheatListFill(*this); }
     bool TransferFromWindow() { return true; }
-    bool Validate(wxWindow* p) { return true; }
+    bool Validate(wxWindow* p) {
+	(void)p; // unused params
+	return true;
+    }
     bool TransferToWindow()
     {
         CheatList_t& clh = cheat_list_handler;
@@ -886,6 +891,7 @@ public:
 
     void UpdateVals(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         if (cheatSearchData.count) {
             cheatSearchUpdateValues(&cheatSearchData);
 
@@ -898,6 +904,7 @@ public:
 
     void ResetSearch(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         if (!cheatSearchData.count) {
             CheatSearchBlock* block = cheatSearchData.blocks;
 
@@ -989,6 +996,7 @@ public:
 
     void AddCheatB(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         int idx = list->GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 
         if (idx >= 0)
@@ -1070,7 +1078,7 @@ public:
             for (int i = 0; i < (1 << size); i++) {
                 addr_s.Printf(wxT("%02X%02X%02X%02X"), bank, val & 0xff,
                     addr & 0xff, addr >> 8);
-                gbAddGsCheat(addr_s.mb_str(), ca_desc.mb_str());
+                gbAddGsCheat(addr_s.utf8_str(), ca_desc.utf8_str());
                 val >>= 8;
                 addr++;
             }
@@ -1092,7 +1100,7 @@ public:
             }
 
             addr_s.append(s);
-            cheatsAddCheatCode(addr_s.mb_str(), ca_desc.mb_str());
+            cheatsAddCheatCode(addr_s.utf8_str(), ca_desc.utf8_str());
         }
     }
 
@@ -1195,6 +1203,7 @@ public:
 
     void UpdateView(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         dlg->TransferDataFromWindow();
 
         if (ofmt != fmt && !val_s.empty()) {
@@ -1283,10 +1292,14 @@ public:
     CheatFindFill(const CheatFindFill& e)
         : wxValidator()
     {
+	(void)e; // unused params
     }
     wxObject* Clone() const { return new CheatFindFill(*this); }
     bool TransferFromWindow() { return true; }
-    bool Validate(wxWindow* p) { return true; }
+    bool Validate(wxWindow* p) {
+	(void)p; // unused params
+	return true;
+    }
     bool TransferToWindow()
     {
         CheatFind_t& cfh = cheat_find_handler;
@@ -1314,7 +1327,7 @@ wxString CheatListCtrl::OnGetItemText(long item, long column) const
         off = (item & ((1 << (cap_size - size)) - 1)) << size;
         item >>= cap_size - size;
     } else if (cap_size < size) {
-        for (int i = 0; i < addrs.size(); i++) {
+        for (size_t i = 0; i < addrs.size(); i++) {
             if (!(addrs[i] & ((1 << size) - 1)) && !item--) {
                 item = i;
                 break;
@@ -1419,6 +1432,7 @@ public:
     }
     void ColorReset(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         const uint16_t* color = &systemGbPalette[pno * 8];
 
         for (int i = 0; i < 8; i++, color++)
@@ -1429,6 +1443,7 @@ public:
 
     void ColorButton(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         c->SetSelection(0);
     }
 } GBColorConfigHandler[3];
@@ -1443,10 +1458,14 @@ public:
     GBACtrlEnabler(const GBACtrlEnabler& e)
         : wxValidator()
     {
+	(void)e; // unused params
     }
     wxObject* Clone() const { return new GBACtrlEnabler(*this); }
     bool TransferFromWindow() { return true; }
-    bool Validate(wxWindow* p) { return true; }
+    bool Validate(wxWindow* p) {
+	(void)p; // unused params
+	return true;
+    }
     bool TransferToWindow()
     {
         GetWindow()->Enable(wxGetApp().frame->GetPanel()->game_type() == IMAGE_GBA);
@@ -1465,6 +1484,7 @@ public:
     }
     void Detect(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         uint32_t sz = wxGetApp().frame->GetPanel()->game_size();
         utilGBAFindSave(sz);
         type->SetSelection(saveType);
@@ -1490,6 +1510,7 @@ public:
 
     void FullVol(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         vol->SetValue(100);
     }
     void AdjustFrames(int count)
@@ -1500,6 +1521,7 @@ public:
     }
     void AdjustFramesEv(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         AdjustFrames(bufs->GetValue());
     }
 
@@ -1549,7 +1571,7 @@ public:
 
         dev->SetSelection(0);
 
-        for (int i = 0; i < names.size(); i++) {
+        for (size_t i = 0; i < names.size(); i++) {
             dev->Append(names[i]);
 
             if (api == gopts.audio_api && gopts.audio_dev == dev_ids[i])
@@ -1572,7 +1594,7 @@ public:
         if (newapi == lastapi)
             return;
 
-        gopts.audio_dev = "";
+        gopts.audio_dev = wxT("");
         FillDev(newapi);
     }
 } sound_config_handler;
@@ -1587,9 +1609,13 @@ public:
     SoundConfigLoad(const SoundConfigLoad& e)
         : wxValidator()
     {
+	(void)e; // unused params
     }
     wxObject* Clone() const { return new SoundConfigLoad(*this); }
-    bool Validate(wxWindow* p) { return true; }
+    bool Validate(wxWindow* p) {
+	(void)p; // unused params
+	return true;
+    }
     bool TransferToWindow()
     {
         SoundConfig_t& sch = sound_config_handler;
@@ -1650,9 +1676,13 @@ public:
     ScreenModeList(const ScreenModeList& e)
         : wxValidator()
     {
+	(void)e; // unused params
     }
     wxObject* Clone() const { return new ScreenModeList(*this); }
-    bool Validate(wxWindow* p) { return true; }
+    bool Validate(wxWindow* p) {
+	(void)p; // unused params
+	return true;
+    }
     bool TransferToWindow()
     {
         wxChoice* c = wxStaticCast(GetWindow(), wxChoice);
@@ -1666,7 +1696,7 @@ public:
         vm = d.GetModes();
         wxString s;
 
-        for (int i = 0; i < vm.size(); i++) {
+        for (size_t i = 0; i < vm.size(); i++) {
             s.Printf(_("%d x %d - %dbpp @ %dHz"), vm[i].w, vm[i].h, vm[i].bpp, vm[i].refresh);
             c->Append(s);
 
@@ -1724,10 +1754,14 @@ public:
     PluginEnabler(const PluginEnabler& e)
         : wxValidator()
     {
+	(void)e; // unused params
     }
     wxObject* Clone() const { return new PluginEnabler(*this); }
     bool TransferFromWindow() { return true; }
-    bool Validate(wxWindow* p) { return true; }
+    bool Validate(wxWindow* p) {
+	(void)p; // unused params
+	return true;
+    }
     bool TransferToWindow()
     {
         GetWindow()->Enable(gopts.filter == FF_PLUGIN);
@@ -1752,22 +1786,25 @@ class PluginListFiller : public PluginEnabler {
 public:
     PluginListFiller(wxDialog* parent, wxControl* lab, wxChoice* ch)
         : PluginEnabler()
+	, dlg(parent)
         , txt(lab)
-        , dlg(parent)
-        , plugins()
         , filtch(ch)
+        , plugins()
     {
     }
     PluginListFiller(const PluginListFiller& e)
         : PluginEnabler()
+	, dlg(e.dlg)
         , txt(e.txt)
-        , dlg(e.dlg)
-        , plugins(e.plugins)
         , filtch(e.filtch)
+        , plugins(e.plugins)
     {
     }
     wxObject* Clone() const { return new PluginListFiller(*this); }
-    bool Validate(wxWindow* p) { return true; }
+    bool Validate(wxWindow* p) {
+	(void)p; // unused params
+	return true;
+    }
     bool TransferToWindow()
     {
         PluginEnabler::TransferToWindow();
@@ -1775,13 +1812,13 @@ public:
         ch->Clear();
         ch->Append(_("None"));
         plugins.clear();
-        const wxString& plpath = wxStandardPaths::Get().GetPluginsDir();
-        wxDir::GetAllFiles(plpath, &plugins, wxT("*.rpi"));
+        const wxString plpath = wxGetApp().GetPluginsDir();
+        wxDir::GetAllFiles(plpath, &plugins, wxT("*.rpi"), wxDIR_FILES | wxDIR_DIRS);
 
-        for (int i = 0; i < plugins.size(); i++) {
+        for (size_t i = 0; i < plugins.size(); i++) {
             wxDynamicLibrary dl(plugins[i], wxDL_VERBATIM | wxDL_NOW);
             RENDPLUG_GetInfo GetInfo;
-            const RENDER_PLUGIN_INFO* rpi;
+            const RENDER_PLUGIN_INFO* rpi = NULL;
 
             if (dl.IsLoaded() && (GetInfo = (RENDPLUG_GetInfo)dl.GetSymbol(wxT("RenderPluginGetInfo"))) &&
                 // note that in actual kega fusion plugins, rpi->Output is
@@ -1798,13 +1835,15 @@ public:
                 s += wxT(": ");
                 s += wxString(rpi->Name, wxConvUTF8, sizeof(rpi->Name));
                 fn.MakeRelativeTo(plpath);
-                plugins[i] = fn.GetFullName();
+                plugins[i] = fn.GetFullPath();
                 ch->Append(s);
 
                 if (plugins[i] == gopts.filter_plugin)
                     ch->SetSelection(i + 1);
-            } else
+            }
+	    else {
                 plugins.RemoveAt(i--);
+	    }
         }
 
         if (ch->GetCount() == 1) {
@@ -1812,7 +1851,7 @@ public:
             // to put the plugins...  it depends on where program was
             // installed, and of course OS
             wxString msg;
-            msg.Printf(_("No usable rpi plugins found in %s"), plpath.mb_str());
+            msg.Printf(_("No usable rpi plugins found in %s"), plpath.c_str());
             systemScreenMessage(msg);
             ch->Hide();
             txt->Hide();
@@ -1994,7 +2033,7 @@ public:
         asb->Enable(!key->GetValue().empty());
         int cmd = id->val;
 
-        for (int i = 0; i < accels.size(); i++)
+        for (size_t i = 0; i < accels.size(); i++)
             if (accels[i].GetCommand() == cmdtab[cmd].cmd_id)
                 lb->Append(wxKeyTextCtrl::ToString(accels[i].GetFlags(),
                     accels[i].GetKeyCode()));
@@ -2003,12 +2042,14 @@ public:
     // after selecting a key in key list, enable Remove button
     void KeySel(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         remb->Enable(lb->GetSelection() != wxNOT_FOUND);
     }
 
     // remove selected binding
     void Remove(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         int lsel = lb->GetSelection();
 
         if (lsel == wxNOT_FOUND)
@@ -2039,7 +2080,7 @@ public:
         // if it's a system accel, disable by assigning to NOOP
         wxAcceleratorEntry_v& sys_accels = wxGetApp().frame->sys_accels;
 
-        for (int i = 0; i < sys_accels.size(); i++)
+        for (size_t i = 0; i < sys_accels.size(); i++)
             if (sys_accels[i].GetFlags() == selmod && sys_accels[i].GetKeyCode() == selkey) {
                 wxAcceleratorEntry ne(selmod, selkey, XRCID("NOOP"));
                 user_accels.push_back(ne);
@@ -2057,6 +2098,7 @@ public:
     // wipe out all user bindings
     void ResetAll(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         if (user_accels.empty() || wxMessageBox(_("This will clear all user-defined accelerators.  Are you sure?"), _("Confirm"), wxYES_NO) != wxYES)
             return;
 
@@ -2072,6 +2114,7 @@ public:
     // remove old key binding, add new key binding, and update GUI
     void Assign(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         wxTreeItemId csel = tc->GetSelection();
         wxString accel = key->GetValue();
 
@@ -2083,7 +2126,7 @@ public:
         if (!wxKeyTextCtrl::FromString(accel, acmod, ackey))
             return; // this should never happen
 
-        for (int i = 0; i < lb->GetCount(); i++)
+        for (unsigned int i = 0; i < lb->GetCount(); i++)
             if (lb->GetString(i) == accel)
                 return; // ignore attempts to add twice
 
@@ -2112,6 +2155,7 @@ public:
     // update curas and maybe enable asb
     void CheckKey(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         wxString nkey = key->GetValue();
 
         if (nkey.empty()) {
@@ -2132,7 +2176,7 @@ public:
         asb->Enable(tc->GetSelection().IsOk());
         int cmd = -1;
 
-        for (int i = 0; i < accels.size(); i++)
+        for (size_t i = 0; i < accels.size(); i++)
             if (accels[i].GetFlags() == acmod && accels[i].GetKeyCode() == ackey) {
                 int cmdid = accels[i].GetCommand();
 
@@ -2219,6 +2263,7 @@ public:
     // set thrsel from thr
     void SetThrottleSel(wxSpinEvent& evt)
     {
+	(void)evt; // unused params
         DoSetThrottleSel(thr->GetValue());
     }
 
@@ -2233,6 +2278,7 @@ public:
     // set thr from thrsel
     void SetThrottle(wxCommandEvent& evt)
     {
+	(void)evt; // unused params
         uint32_t val = thrsel->GetSelection() * 25;
 
         if (val <= 600)
@@ -2272,6 +2318,7 @@ public:
     // set speedup_throttle_sel from speedup_throttle
     void SetSpeedupThrottleSel(wxSpinEvent& evt)
     {
+	(void)evt; // unused params
         DoSetSpeedupThrottleSel(speedup_throttle_spin->GetValue());
     }
 
@@ -2290,6 +2337,7 @@ public:
     // set speedup_throttle from speedup_throttle_sel
     void SetSpeedupThrottle(wxCommandEvent& evt)
     {
+	(void)evt; // unused params
         uint32_t val = speedup_throttle_sel->GetSelection() * 25;
 
         if (val > 0 && val <= 600) {
@@ -2312,6 +2360,7 @@ public:
 // set speedup_frame_skip_sel from speedup_frame_skip
 void SpeedupFrameSkipCtrl_t::SetSpeedupFrameSkipSel(wxSpinEvent& evt)
 {
+    (void)evt; // unused params
     DoSetSpeedupFrameSkipSel(speedup_frame_skip_spin->GetValue());
 }
 
@@ -2330,6 +2379,7 @@ void SpeedupFrameSkipCtrl_t::DoSetSpeedupFrameSkipSel(uint32_t val)
 // set speedup_frame_skip from speedup_frame_skip_sel
 void SpeedupFrameSkipCtrl_t::SetSpeedupFrameSkip(wxCommandEvent& evt)
 {
+    (void)evt; // unused params
     uint32_t val = speedup_frame_skip_sel->GetSelection();
 
     if (val > 0 && val <= 30) {
@@ -2357,7 +2407,7 @@ void CheckThrowXRCError(T pointer, const wxString& name)
         std::string errormessage = "Unable to load a \"";
         errormessage += typeid(pointer).name();
         errormessage += "\" from the builtin xrc file: ";
-        errormessage += name.mb_str();
+        errormessage += name.utf8_str();
         throw std::runtime_error(errormessage);
     }
 }
@@ -2451,7 +2501,7 @@ wxAcceleratorEntry_v MainFrame::get_accels(wxAcceleratorEntry_v user_accels)
     // then user overrides
     // silently keep only last defined binding
     // same horribly inefficent O(n*m) search for duplicates as above..
-    for (int i = 0; i < user_accels.size(); i++) {
+    for (size_t i = 0; i < user_accels.size(); i++) {
         const wxAcceleratorEntry& ae = user_accels[i];
 
         for (wxAcceleratorEntry_v::iterator e = accels.begin(); e < accels.end(); ++e)
@@ -2477,7 +2527,7 @@ void MainFrame::set_global_accels()
     // the menus will be added now
 
     // first, zero out menu item on all accels
-    for (int i = 0; i < accels.size(); i++)
+    for (size_t i = 0; i < accels.size(); i++)
         accels[i].Set(accels[i].GetFlags(), accels[i].GetKeyCode(),
             accels[i].GetCommand());
 
@@ -2495,7 +2545,7 @@ void MainFrame::set_global_accels()
         int cmd = cmdtab[i].cmd_id;
         int last_accel = -1;
 
-        for (int j = 0; j < accels.size(); j++)
+        for (size_t j = 0; j < accels.size(); j++)
             if (cmd == accels[j].GetCommand())
                 last_accel = j;
 
@@ -2512,14 +2562,14 @@ void MainFrame::set_global_accels()
     // Finally, install a global accelerator table for any non-menu accels
     int len = 0;
 
-    for (int i = 0; i < accels.size(); i++)
+    for (size_t i = 0; i < accels.size(); i++)
         if (!accels[i].GetMenuItem())
             len++;
 
     if (len) {
         wxAcceleratorEntry tab[1000];
 
-        for (int i = 0, j = 0; i < accels.size(); i++)
+        for (size_t i = 0, j = 0; i < accels.size(); i++)
             if (!accels[i].GetMenuItem())
                 tab[j++] = accels[i];
 
@@ -2534,7 +2584,7 @@ void MainFrame::set_global_accels()
     for (int i = 0; i < 10; i++)
         recent_accel[i] = wxAcceleratorEntry();
 
-    for (int i = 0; i < accels.size(); i++)
+    for (size_t i = 0; i < accels.size(); i++)
         if (accels[i].GetCommand() >= wxID_FILE1 && accels[i].GetCommand() <= wxID_FILE10)
             recent_accel[accels[i].GetCommand() - wxID_FILE1] = accels[i];
 
@@ -2545,7 +2595,7 @@ void MainFrame::MenuOptionBool(const char* menuName, bool& field)
 {
     int id = wxXmlResource::GetXRCID(wxString(menuName, wxConvUTF8));
 
-    for (int i = 0; i < checkable_mi.size(); i++) {
+    for (size_t i = 0; i < checkable_mi.size(); i++) {
         if (checkable_mi[i].cmd != id)
             continue;
 
@@ -2560,7 +2610,7 @@ void MainFrame::MenuOptionIntMask(const char* menuName, int& field, int mask)
     int id = wxXmlResource::GetXRCID(wxString(menuName, wxConvUTF8));
     int value = mask;
 
-    for (int i = 0; i < checkable_mi.size(); i++) {
+    for (size_t i = 0; i < checkable_mi.size(); i++) {
         if (checkable_mi[i].cmd != id)
             continue;
 
@@ -2576,7 +2626,7 @@ void MainFrame::MenuOptionIntRadioValue(const char* menuName, int& field, int va
 {
     int id = wxXmlResource::GetXRCID(wxString(menuName, wxConvUTF8));
 
-    for (int i = 0; i < checkable_mi.size(); i++) {
+    for (size_t i = 0; i < checkable_mi.size(); i++) {
         if (checkable_mi[i].cmd != id)
             continue;
 
@@ -2760,9 +2810,9 @@ bool MainFrame::BindControls()
                         if (a->GetFlags() == e->GetFlags() && a->GetKeyCode() == e->GetKeyCode()) {
                             if (e->GetMenuItem()) {
                                 wxLogInfo(_("Duplicate menu accelerator: %s for %s and %s; keeping first"),
-                                    wxKeyTextCtrl::ToString(a->GetFlags(), a->GetKeyCode()).mb_str(),
-                                    e->GetMenuItem()->GetItemLabelText().mb_str(),
-                                    mi->GetItemLabelText().mb_str());
+                                    wxKeyTextCtrl::ToString(a->GetFlags(), a->GetKeyCode()).c_str(),
+                                    e->GetMenuItem()->GetItemLabelText().c_str(),
+                                    mi->GetItemLabelText().c_str());
                                 delete a;
                                 a = 0;
                             } else {
@@ -2774,9 +2824,9 @@ bool MainFrame::BindControls()
                                             break;
 
                                     wxLogInfo(_("Menu accelerator %s for %s overrides default for %s ; keeping menu"),
-                                        wxKeyTextCtrl::ToString(a->GetFlags(), a->GetKeyCode()).mb_str(),
-                                        mi->GetItemLabelText().mb_str(),
-                                        cmdtab[cmd].cmd);
+                                        wxKeyTextCtrl::ToString(a->GetFlags(), a->GetKeyCode()).c_str(),
+                                        mi->GetItemLabelText().c_str(),
+                                        cmdtab[cmd].cmd.c_str());
                                 }
 
                                 sys_accels.erase(e);
@@ -2794,7 +2844,7 @@ bool MainFrame::BindControls()
 
                 // store checkable items
                 if (mi->IsCheckable()) {
-                    checkable_mi_t cmi = { cmdtab[i].cmd_id, mi };
+                    checkable_mi_t cmi = { cmdtab[i].cmd_id, mi, NULL, NULL, 0, 0 };
                     checkable_mi.push_back(cmi);
 
                     for (int j = 0; j < num_opts; j++) {
@@ -2877,10 +2927,10 @@ bool MainFrame::BindControls()
         MenuOptionIntRadioValue("LinkType4Gameboy", gopts.gba_link_type, 4);
     }
 
-    for (int i = 0; i < checkable_mi.size(); i++)
+    for (size_t i = 0; i < checkable_mi.size(); i++)
         if (!checkable_mi[i].boolopt && !checkable_mi[i].intopt) {
             wxLogError(_("Invalid menu item %s; removing"),
-                checkable_mi[i].mi->GetItemLabelText().mb_str());
+                checkable_mi[i].mi->GetItemLabelText().c_str());
             checkable_mi[i].mi->GetMenu()->Remove(checkable_mi[i].mi);
             checkable_mi[i].mi = NULL;
         }
@@ -3314,6 +3364,7 @@ bool MainFrame::BindControls()
         }
 #define getcbbe(n, o) getbe(n, o, cb, wxCheckBox, CB)
         wxBoolIntEnValidator* bienval;
+	(void)bienval; // not used yet
 #define getbie(n, o, v, cv, t, wt)                                        \
     do {                                                                  \
         cv = SafeXRCCTRL<t>(d, n);                                        \
@@ -3656,7 +3707,7 @@ bool MainFrame::BindControls()
             if (menubar) {
                 wxTreeItemId mid = tc->AppendItem(rid, _("Menu commands"));
 
-                for (int i = 0; i < menubar->GetMenuCount(); i++) {
+                for (size_t i = 0; i < menubar->GetMenuCount(); i++) {
 #if wxCHECK_VERSION(2, 8, 8)
                     wxTreeItemId id = tc->AppendItem(mid, menubar->GetMenuLabelText(i));
 #else
@@ -3784,7 +3835,7 @@ bool MainFrame::BindControls()
         bool isv = !gopts.link_host.empty();
 
         if (isv) {
-            isv = SetLinkServerHost(gopts.link_host.mb_str());
+            isv = SetLinkServerHost(gopts.link_host.c_str());
         }
 
         if (!isv) {
diff --git a/src/wx/openal.cpp b/src/wx/openal.cpp
index c3a4393a..3c88fa02 100644
--- a/src/wx/openal.cpp
+++ b/src/wx/openal.cpp
@@ -27,7 +27,8 @@
 #ifdef winlog
 #undef winlog
 #endif
-#define winlog //
+// https://stackoverflow.com/a/1306690/262458
+#define winlog(x,...) do {} while(0)
 #define debugState() //
 #endif
 
@@ -133,6 +134,7 @@ void OpenAL::debugState()
         break;
     }
 
+
     alGetSourcei(source, AL_BUFFERS_QUEUED, &value);
     ASSERT_SUCCESS;
     winlog("  Buffers in queue: %i\n", value);
@@ -148,7 +150,7 @@ bool OpenAL::init(long sampleRate)
     assert(initialized == false);
 
     if (!gopts.audio_dev.empty()) {
-        device = alcOpenDevice(gopts.audio_dev.mb_str());
+        device = alcOpenDevice(gopts.audio_dev.utf8_str());
     } else {
         device = alcOpenDevice(NULL);
     }
@@ -252,6 +254,7 @@ void OpenAL::reset()
 
 void OpenAL::write(uint16_t* finalWave, int length)
 {
+    (void)length; // unused param
     if (!initialized)
         return;
 
diff --git a/src/wx/opts.cpp b/src/wx/opts.cpp
index 48c561d7..9eb6b66d 100644
--- a/src/wx/opts.cpp
+++ b/src/wx/opts.cpp
@@ -13,31 +13,30 @@
       -p/--profile=hz
 */
 
+#define WJKB newWxJoyKeyBinding
+
 /* not sure how well other compilers support field-init syntax */
 #define STROPT(c, n, d, v) \
-    {                      \
-        wxT(c), (n), d, &v \
-    }
-#define INTOPT(c, n, d, v, min, max)             \
-    {                                            \
-        wxT(c), (n), d, NULL, &v, wxT(""), min, max \
-    }
-#define DOUBLEOPT(c, n, d, v, min, max)                      \
-    {                                                        \
-        wxT(c), (n), d, NULL, NULL, wxT(""), min, max, NULL, &v \
-    }
-#define UINTOPT(c, n, d, v, min, max)                      \
-    {                                                        \
-        wxT(c), (n), d, NULL, NULL, wxT(""), min, max, NULL, NULL, &v \
-    }
-#define BOOLOPT(c, n, d, v)                        \
-    {                                              \
-        wxT(c), (n), d, NULL, NULL, wxT(""), 0, 0, &v \
-    }
-#define ENUMOPT(c, n, d, v, e)      \
-    {                               \
-        wxT(c), (n), d, NULL, &v, e \
-    }
+    new_opt_desc(wxT(c), (n), d, &v)
+
+#define INTOPT(c, n, d, v, min, max) \
+    new_opt_desc(wxT(c), (n), d, NULL, &v, wxT(""), min, max)
+
+#define DOUBLEOPT(c, n, d, v, min, max) \
+    new_opt_desc(wxT(c), (n), d, NULL, NULL, wxT(""), min, max, NULL, &v)
+
+#define UINTOPT(c, n, d, v, min, max) \
+    new_opt_desc(wxT(c), (n), d, NULL, NULL, wxT(""), min, max, NULL, NULL, &v)
+
+#define BOOLOPT(c, n, d, v) \
+    new_opt_desc(wxT(c), (n), d, NULL, NULL, wxT(""), 0, 0, &v)
+
+#define ENUMOPT(c, n, d, v, e) \
+    new_opt_desc(wxT(c), (n), d, NULL, &v, e)
+
+#define NOOPT(c, n, d) \
+    new_opt_desc(c, (n), d)
+
 
 opts_t gopts;
 
@@ -137,21 +136,34 @@ const wxString joynames[NUM_KEYS] = {
 };
 
 wxJoyKeyBinding defkeys[NUM_KEYS * 2] = {
-    { WXK_UP }, { 1, WXJB_AXIS_MINUS, 1 }, { WXK_DOWN }, { 1, WXJB_AXIS_PLUS, 1 },
-    { WXK_LEFT }, { 0, WXJB_AXIS_MINUS, 1 }, { WXK_RIGHT }, { 0, WXJB_AXIS_PLUS, 1 },
-    { wxT('X') }, { 0, WXJB_BUTTON, 1 }, { wxT('Z') }, { 1, WXJB_BUTTON, 1 },
-    { wxT('A') }, { 2, WXJB_BUTTON, 1 }, { wxT('S') }, { 3, WXJB_BUTTON, 1 },
-    { WXK_BACK }, { 4, WXJB_BUTTON, 1 }, { WXK_RETURN }, { 5, WXJB_BUTTON, 1 },
-    { WXK_NUMPAD_UP }, { 0 }, { WXK_NUMPAD_DOWN }, { 0 },
-    { WXK_NUMPAD_LEFT }, { 0 }, { WXK_NUMPAD_RIGHT }, { 0 },
-    { WXK_NUMPAD_PAGEUP }, { 0 }, { WXK_NUMPAD_PAGEDOWN }, { 0 },
-    { wxT('W') }, { 0 }, { wxT('Q') }, { 0 },
-    { WXK_SPACE }, { 0 }, { 0 }, { 0 },
-    { 0 }, { 0 }
+    WJKB(WXK_UP), WJKB(1, WXJB_AXIS_MINUS, 1), WJKB(WXK_DOWN), WJKB(1, WXJB_AXIS_PLUS, 1),
+    WJKB(WXK_LEFT), WJKB(0, WXJB_AXIS_MINUS, 1), WJKB(WXK_RIGHT), WJKB(0, WXJB_AXIS_PLUS, 1),
+    WJKB(wxT('X')), WJKB(0, WXJB_BUTTON, 1), WJKB(wxT('Z')), WJKB(1, WXJB_BUTTON, 1),
+    WJKB(wxT('A')), WJKB(2, WXJB_BUTTON, 1), WJKB(wxT('S')), WJKB(3, WXJB_BUTTON, 1),
+    WJKB(WXK_BACK), WJKB(4, WXJB_BUTTON, 1), WJKB(WXK_RETURN), WJKB(5, WXJB_BUTTON, 1),
+    WJKB(WXK_NUMPAD_UP), WJKB(0), WJKB(WXK_NUMPAD_DOWN), WJKB(0),
+    WJKB(WXK_NUMPAD_LEFT), WJKB(0), WJKB(WXK_NUMPAD_RIGHT), WJKB(0),
+    WJKB(WXK_NUMPAD_PAGEUP), WJKB(0), WJKB(WXK_NUMPAD_PAGEDOWN), WJKB(0),
+    WJKB(wxT('W')), WJKB(0), WJKB(wxT('Q')), WJKB(0),
+    WJKB(WXK_SPACE), WJKB(0), WJKB(0), WJKB(0),
+    WJKB(0), WJKB(0)
 };
 
 wxAcceleratorEntry_v sys_accels;
 
+// Initializer for struct opt_desc
+opt_desc new_opt_desc(wxString opt, const char* cmd, wxString desc,
+                      wxString* stropt, int* intopt, wxString enumvals,
+                      double min, double max, bool* boolopt,
+                      double* doubleopt, uint32_t* uintopt, wxString curstr,
+                      int curint, double curdouble, uint32_t curuint)
+{
+    struct opt_desc new_opt = {opt, cmd, desc, stropt, intopt, enumvals,
+	                       min, max, boolopt, doubleopt, uintopt,
+			       curstr, curint, curdouble, curuint};
+    return new_opt;
+}
+
 // Note: this table must be sorted in option name order
 // Both for better user display and for (fast) searching by name
 opt_desc opts[] = {
@@ -178,9 +190,9 @@ opt_desc opts[] = {
     /// GB
     STROPT("GB/BiosFile", "", wxTRANSLATE("BIOS file to use for GB, if enabled"), gopts.gb_bios),
     STROPT("GB/GBCBiosFile", "", wxTRANSLATE("BIOS file to use for GBC, if enabled"), gopts.gbc_bios),
-    { wxT("GB/Palette0"), "", wxTRANSLATE("The default palette, as 8 comma-separated 4-digit hex integers (rgb555).") },
-    { wxT("GB/Palette1"), "", wxTRANSLATE("The first user palette, as 8 comma-separated 4-digit hex integers (rgb555).") },
-    { wxT("GB/Palette2"), "", wxTRANSLATE("The second user palette, as 8 comma-separated 4-digit hex integers (rgb555).") },
+    NOOPT(wxT("GB/Palette0"), "", wxTRANSLATE("The default palette, as 8 comma-separated 4-digit hex integers (rgb555).")),
+    NOOPT(wxT("GB/Palette1"), "", wxTRANSLATE("The first user palette, as 8 comma-separated 4-digit hex integers (rgb555).")),
+    NOOPT(wxT("GB/Palette2"), "", wxTRANSLATE("The second user palette, as 8 comma-separated 4-digit hex integers (rgb555).")),
     BOOLOPT("GB/PrintAutoPage", "PrintGather", wxTRANSLATE("Automatically gather a full page before printing"), gopts.print_auto_page),
     BOOLOPT("GB/PrintScreenCap", "PrintSnap", wxTRANSLATE("Automatically save printouts as screen captures with -print suffix"), gopts.print_screen_cap),
     STROPT("GB/ROMDir", "", wxTRANSLATE("Directory to look for ROM files"), gopts.gb_rom_dir),
@@ -210,14 +222,14 @@ opt_desc opts[] = {
     INTOPT("General/StatusBar", "StatusBar", wxTRANSLATE("Enable status bar"), gopts.statusbar, 0, 1),
 
     /// Joypad
-    { wxT("Joypad/*/*"), "", wxTRANSLATE("The parameter Joypad/<n>/<button> contains a comma-separated list of key names which map to joypad #<n> button <button>.  Button is one of Up, Down, Left, Right, A, B, L, R, Select, Start, MotionUp, MotionDown, MotionLeft, MotionRight, AutoA, AutoB, Speed, Capture, GS") },
+    NOOPT(wxT("Joypad/*/*"), "", wxTRANSLATE("The parameter Joypad/<n>/<button> contains a comma-separated list of key names which map to joypad #<n> button <button>.  Button is one of Up, Down, Left, Right, A, B, L, R, Select, Start, MotionUp, MotionDown, MotionLeft, MotionRight, AutoA, AutoB, Speed, Capture, GS")),
     INTOPT("Joypad/AutofireThrottle", "", wxTRANSLATE("The autofire toggle period, in frames (1/60 s)"), gopts.autofire_rate, 1, 1000),
 
     /// Keyboard
     INTOPT("Joypad/Default", "", wxTRANSLATE("The number of the stick to use in single-player mode"), gopts.default_stick, 1, 4),
 
     /// Keyboard
-    { wxT("Keyboard/*"), "", wxTRANSLATE("The parameter Keyboard/<cmd> contains a comma-separated list of key names (e.g. Alt-Shift-F1).  When the named key is pressed, the command <cmd> is executed.") },
+    NOOPT(wxT("Keyboard/*"), "", wxTRANSLATE("The parameter Keyboard/<cmd> contains a comma-separated list of key names (e.g. Alt-Shift-F1).  When the named key is pressed, the command <cmd> is executed.")),
 
     // Core
     INTOPT("preferences/agbPrint", "AGBPrinter", wxTRANSLATE("Enable AGB debug print"), agbPrint, 0, 1),
@@ -239,7 +251,6 @@ opt_desc opts[] = {
     INTOPT("preferences/fsFrequency", "", wxTRANSLATE("Fullscreen mode frequency (0 = any)"), fsFrequency, 0, 999),
     INTOPT("preferences/fsHeight", "", wxTRANSLATE("Fullscreen mode height (0 = desktop)"), fsHeight, 0, 99999),
     INTOPT("preferences/fsWidth", "", wxTRANSLATE("Fullscreen mode width (0 = desktop)"), fsWidth, 0, 99999),
-    INTOPT("preferences/fullScreen", "Fullscreen", wxTRANSLATE("Enter fullscreen mode at startup"), fullScreen, 0, 1),
     INTOPT("preferences/gbPaletteOption", "", wxTRANSLATE("The palette to use"), gbPaletteOption, 0, 2),
     INTOPT("preferences/gbPrinter", "Printer", wxTRANSLATE("Enable printer emulation"), winGbPrinterEnabled, 0, 1),
     INTOPT("preferences/gdbBreakOnLoad", "DebugGDBBreakOnLoad", wxTRANSLATE("Break into GDB after loading the game."), gdbBreakOnLoad, 0, 1),
@@ -264,8 +275,14 @@ opt_desc opts[] = {
     INTOPT("preferences/useBiosGBC", "BootRomGBC", wxTRANSLATE("Use the specified BIOS file for GBC"), useBiosFileGBC, 0, 1),
     INTOPT("preferences/vsync", "VSync", wxTRANSLATE("Wait for vertical sync"), vsync, 0, 1),
 
-/// Sound
+    /// Geometry
+    INTOPT("geometry/fullScreen", "Fullscreen", wxTRANSLATE("Enter fullscreen mode at startup"), fullScreen, 0, 1),
+    UINTOPT("geometry/windowHeight", "Height", wxTRANSLATE("Window height at startup"), windowHeight, 0, 99999),
+    UINTOPT("geometry/windowWidth", "Width", wxTRANSLATE("Window width at startup"), windowWidth, 0, 99999),
+    INTOPT("geometry/windowX", "X", wxTRANSLATE("Window axis X position at startup"), windowPositionX, -1, 99999),
+    INTOPT("geometry/windowY", "Y", wxTRANSLATE("Window axis Y position at startup"), windowPositionY, -1, 99999),
 
+    /// Sound
     ENUMOPT("Sound/AudioAPI", "", wxTRANSLATE("Sound API; if unsupported, default API will be used"), gopts.audio_api, wxTRANSLATE("sdl|openal|directsound|xaudio2|faudio")),
     STROPT("Sound/AudioDevice", "", wxTRANSLATE("Device ID of chosen audio device for chosen driver"), gopts.audio_dev),
     INTOPT("Sound/Buffers", "", wxTRANSLATE("Number of sound buffers"), gopts.audio_buffers, 2, 10),
@@ -339,7 +356,6 @@ bool opt_lt(const opt_desc& opt1, const opt_desc& opt2)
 }
 
 // FIXME: simulate MakeInstanceFilename(vbam.ini) using subkeys (Slave%d/*)
-
 void load_opts()
 {
     // just for sanity...
@@ -369,7 +385,7 @@ void load_opts()
 
     for (cont = cfg->GetFirstEntry(s, grp_idx); cont;
          cont = cfg->GetNextEntry(s, grp_idx)) {
-        //wxLogWarning(_("Invalid option %s present; removing if possible"), s.mb_str());
+        //wxLogWarning(_("Invalid option %s present; removing if possible"), s.c_str());
         item_del.push_back(s);
     }
 
@@ -407,7 +423,7 @@ void load_opts()
                 for (cont = cfg->GetFirstGroup(e, key_idx); cont;
                      cont = cfg->GetNextGroup(e, key_idx)) {
                     s.append(e);
-                    //wxLogWarning(_("Invalid option group %s present; removing if possible"), s.mb_str());
+                    //wxLogWarning(_("Invalid option group %s present; removing if possible"), s.c_str());
                     grp_del.push_back(s);
                     s.resize(poff2);
                 }
@@ -422,7 +438,7 @@ void load_opts()
 
                     if (i == NUM_KEYS) {
                         s.append(e);
-                        //wxLogWarning(_("Invalid option %s present; removing if possible"), s.mb_str());
+                        //wxLogWarning(_("Invalid option %s present; removing if possible"), s.c_str());
                         item_del.push_back(s);
                         s.resize(poff2);
                     }
@@ -434,7 +450,7 @@ void load_opts()
             } else {
                 s.append(wxT('/'));
                 s.append(e);
-                //wxLogWarning(_("Invalid option group %s present; removing if possible"), s.mb_str());
+                //wxLogWarning(_("Invalid option group %s present; removing if possible"), s.c_str());
                 grp_del.push_back(s);
                 s.resize(poff);
             }
@@ -444,23 +460,23 @@ void load_opts()
              cont = cfg->GetNextEntry(e, entry_idx)) {
             // kb options come from a different list
             if (s == wxT("Keyboard")) {
-                const cmditem dummy = { e };
+                const cmditem dummy = new_cmditem(e);
 
                 if (!std::binary_search(&cmdtab[0], &cmdtab[ncmds], dummy, cmditem_lt)) {
                     s.append(wxT('/'));
                     s.append(e);
-                    //wxLogWarning(_("Invalid option %s present; removing if possible"), s.mb_str());
+                    //wxLogWarning(_("Invalid option %s present; removing if possible"), s.c_str());
                     item_del.push_back(s);
                     s.resize(poff);
                 }
             } else {
                 s.append(wxT('/'));
                 s.append(e);
-                const opt_desc dummy = { s };
+                opt_desc dummy = new_opt_desc(s);
                 wxString opt_name(dummy.opt);
 
                 if (!std::binary_search(&opts[0], &opts[num_opts], dummy, opt_lt) && opt_name != wxT("General/LastUpdated") && opt_name != wxT("General/LastUpdatedFileName")) {
-                    //wxLogWarning(_("Invalid option %s present; removing if possible"), s.mb_str());
+                    //wxLogWarning(_("Invalid option %s present; removing if possible"), s.c_str());
                     item_del.push_back(s);
                 }
 
@@ -471,10 +487,10 @@ void load_opts()
         cfg->SetPath(wxT("/"));
     }
 
-    for (int i = 0; i < item_del.size(); i++)
+    for (size_t i = 0; i < item_del.size(); i++)
         cfg->DeleteEntry(item_del[i]);
 
-    for (int i = 0; i < grp_del.size(); i++)
+    for (size_t i = 0; i < grp_del.size(); i++)
         cfg->DeleteGroup(grp_del[i]);
 
     // now read actual values and set to default if unset
@@ -495,7 +511,7 @@ void load_opts()
 
             if (gotit && !s.empty()) {
                 const auto found_pos = vec_find(enum_opts, s);
-                const bool matched   = found_pos != wxNOT_FOUND;
+                const bool matched   = ((int)found_pos != wxNOT_FOUND);
 
                 if (!matched) {
                     opt.curint = 0;
@@ -505,9 +521,9 @@ void load_opts()
                     // technically, the translation for this string could incorproate
                     // the equals sign if necessary instead of doing it this way
                     wxLogWarning(_("Invalid value %s for option %s; valid values are %s%s%s"),
-                        s, opt.opt, ev,
-                        isx ? wxT(" = ") : wxT(""),
-                        isx ? evx : wxT(""));
+                        s.c_str(), opt.opt.c_str(), ev.c_str(),
+                        isx ? wxT(" = ") : wxEmptyString,
+                        isx ? evx.c_str() : wxEmptyString);
                     // write first option
                     cfg->Write(opt.opt, enum_opts[0]);
                 } else
@@ -521,14 +537,14 @@ void load_opts()
             cfg->Read(opt.opt, &opt.curint, *opt.intopt);
 
             if (opt.curint < opt.min || opt.curint > opt.max) {
-                wxLogWarning(_("Invalid value %d for option %s; valid values are %d - %d"), opt.curint, opt.opt, opt.min, opt.max);
+                wxLogWarning(_("Invalid value %d for option %s; valid values are %d - %d"), opt.curint, opt.opt.c_str(), opt.min, opt.max);
             } else
                 *opt.intopt = opt.curint;
         } else if (opt.doubleopt) {
             cfg->Read(opt.opt, &opt.curdouble, *opt.doubleopt);
 
             if (opt.curdouble < opt.min || opt.curdouble > opt.max) {
-                wxLogWarning(_("Invalid value %f for option %s; valid values are %f - %f"), opt.curdouble, opt.opt, opt.min, opt.max);
+                wxLogWarning(_("Invalid value %f for option %s; valid values are %f - %f"), opt.curdouble, opt.opt.c_str(), opt.min, opt.max);
             } else
                 *opt.doubleopt = opt.curdouble;
         } else if (opt.uintopt) {
@@ -537,7 +553,7 @@ void load_opts()
             opt.curuint = val;
 
             if (opt.curuint < opt.min || opt.curuint > opt.max) {
-                wxLogWarning(_("Invalid value %f for option %s; valid values are %f - %f"), opt.curuint, opt.opt, opt.min, opt.max);
+                wxLogWarning(_("Invalid value %f for option %s; valid values are %f - %f"), opt.curuint, opt.opt.c_str(), opt.min, opt.max);
             } else
                 *opt.uintopt = opt.curuint;
         } else if (opt.boolopt) {
@@ -551,7 +567,7 @@ void load_opts()
         wxString optn;
         optn.Printf(wxT("GB/Palette%d"), i);
         wxString val;
-        const opt_desc dummy = { optn };
+        const opt_desc dummy = new_opt_desc(optn);
         opt_desc* opt = std::lower_bound(&opts[0], &opts[num_opts], dummy, opt_lt);
         wxString entry;
 
@@ -569,7 +585,7 @@ void load_opts()
             int start = cpos;
             cpos = val.find(wxT(','), cpos);
 
-            if (cpos == wxString::npos)
+            if ((size_t)cpos == wxString::npos)
                 cpos = val.size();
 
             long ival;
@@ -580,7 +596,7 @@ void load_opts()
             entry.ToLong(&ival, 16);
             systemGbPalette[i * 8 + j] = ival;
 
-            if (cpos != val.size())
+            if ((size_t)cpos != val.size())
                 cpos++;
         }
     }
@@ -589,14 +605,14 @@ void load_opts()
     for (int i = 0; i < 4; i++) {
         for (int j = 0; j < NUM_KEYS; j++) {
             wxString optname;
-            optname.Printf(wxT("Joypad/%d/%s"), i + 1, joynames[j]);
+            optname.Printf(wxT("Joypad/%d/%s"), i + 1, joynames[j].c_str());
             bool gotit = cfg->Read(optname, &s);
 
             if (gotit) {
                 gopts.joykey_bindings[i][j] = wxJoyKeyTextCtrl::FromString(s);
 
                 if (s.size() && !gopts.joykey_bindings[i][j].size())
-                    wxLogWarning(_("Invalid key binding %s for %s"), s.mb_str(), optname.mb_str());
+                    wxLogWarning(_("Invalid key binding %s for %s"), s.c_str(), optname.c_str());
             } else {
                 s = wxJoyKeyTextCtrl::ToString(gopts.joykey_bindings[i][j]);
                 cfg->Write(optname, s);
@@ -617,9 +633,9 @@ void load_opts()
             wxAcceleratorEntry_v val = wxKeyTextCtrl::FromString(s);
 
             if (!val.size())
-                wxLogWarning(_("Invalid key binding %s for %s"), s.mb_str(), kbopt.mb_str());
+                wxLogWarning(_("Invalid key binding %s for %s"), s.c_str(), kbopt.c_str());
             else {
-                for (int j = 0; j < val.size(); j++)
+                for (size_t j = 0; j < val.size(); j++)
                     val[j].Set(val[j].GetFlags(), val[j].GetKeyCode(),
                         cmdtab[i].cmd_id);
 
@@ -665,7 +681,7 @@ void update_opts()
                 cfg->Write(opt.opt, (opt.curdouble = *opt.doubleopt));
         } else if (opt.uintopt) {
             if (*opt.uintopt != opt.curuint)
-                cfg->Write(opt.opt, (opt.curuint = *opt.uintopt));
+                cfg->Write(opt.opt, (long)(opt.curuint = *opt.uintopt));
         } else if (opt.boolopt) {
             if (*opt.boolopt != opt.curbool)
                 cfg->Write(opt.opt, (opt.curbool = *opt.boolopt));
@@ -677,7 +693,7 @@ void update_opts()
     for (int i = 0; i < 3; i++) {
         wxString optn;
         optn.Printf(wxT("GB/Palette%d"), i);
-        const opt_desc dummy = { optn };
+        const opt_desc dummy = new_opt_desc(optn);
         opt_desc* opt = std::lower_bound(&opts[0], &opts[num_opts], dummy, opt_lt);
         wxString val;
         wxString entry;
@@ -703,7 +719,7 @@ void update_opts()
         for (int j = 0; j < NUM_KEYS; j++) {
             wxString s, o;
             wxString optname;
-            optname.Printf(wxT("Joypad/%d/%s"), i + 1, joynames[j]);
+            optname.Printf(wxT("Joypad/%d/%s"), i + 1, joynames[j].c_str());
             s = wxJoyKeyTextCtrl::ToString(gopts.joykey_bindings[i][j]);
             cfg->Read(optname, &o);
 
@@ -721,9 +737,9 @@ void update_opts()
 
         for (bool cont = cfg->GetFirstEntry(s, entry_idx); cont;
              cont = cfg->GetNextEntry(s, entry_idx)) {
-            const cmditem dummy = { s };
+            const cmditem dummy = new_cmditem(s);
             cmditem* cmd = std::lower_bound(&cmdtab[0], &cmdtab[ncmds], dummy, cmditem_lt);
-            int i;
+            size_t i;
 
             for (i = 0; i < gopts.accels.size(); i++)
                 if (gopts.accels[i].GetCommand() == cmd->cmd_id)
@@ -733,7 +749,7 @@ void update_opts()
                 item_del.push_back(s);
         }
 
-        for (int i = 0; i < item_del.size(); i++)
+        for (size_t i = 0; i < item_del.size(); i++)
             cfg->DeleteEntry(item_del[i]);
     }
 
@@ -772,7 +788,7 @@ void update_opts()
 
 bool opt_set(const wxString& name, const wxString& val)
 {
-    const opt_desc dummy = { name };
+    const opt_desc dummy = new_opt_desc(name);
     const opt_desc* opt = std::lower_bound(&opts[0], &opts[num_opts], dummy, opt_lt);
 
     if (!wxStrcmp(name, opt->opt)) {
@@ -781,7 +797,7 @@ bool opt_set(const wxString& name, const wxString& val)
         else if (opt->boolopt) {
             if (!(val == wxT('0') || val == wxT('1')))
                 wxLogWarning(_("Invalid flag option %s - %s ignored"),
-                    name, val);
+                    name.c_str(), val.c_str());
             else
                 *opt->boolopt = val == wxT('1');
         } else if (!opt->enumvals.empty()) {
@@ -790,7 +806,7 @@ bool opt_set(const wxString& name, const wxString& val)
             auto enum_opts = str_split(ev, wxT("|"));
 
             const std::size_t found_pos = vec_find(enum_opts, s);
-            const bool matched          = found_pos != wxNOT_FOUND;
+            const bool matched          = ((int)found_pos != wxNOT_FOUND);
 
             if (!matched) {
                 const wxString evx = wxGetTranslation(opt->enumvals);
@@ -798,9 +814,9 @@ bool opt_set(const wxString& name, const wxString& val)
                 // technically, the translation for this string could incorproate
                 // the equals sign if necessary instead of doing it this way
                 wxLogWarning(_("Invalid value %s for option %s; valid values are %s%s%s"),
-                    s, opt->opt, opt->enumvals,
-                    isx ? wxT(" = ") : wxT(""),
-                    isx ? evx : wxT(""));
+                    s.c_str(), opt->opt.c_str(), opt->enumvals.c_str(),
+                    isx ? wxT(" = ") : wxEmptyString,
+                    isx ? evx.c_str() : wxEmptyString);
             } else {
                 *opt->intopt = found_pos;
             }
@@ -809,7 +825,7 @@ bool opt_set(const wxString& name, const wxString& val)
             long ival;
 
             if (!s.ToLong(&ival) || ival < opt->min || ival > opt->max)
-                wxLogWarning(_("Invalid value %d for option %s; valid values are %d - %d"), ival, name, opt->min, opt->max);
+                wxLogWarning(_("Invalid value %d for option %s; valid values are %d - %d"), ival, name.c_str(), opt->min, opt->max);
             else
                 *opt->intopt = ival;
         } else if (opt->doubleopt) {
@@ -817,7 +833,7 @@ bool opt_set(const wxString& name, const wxString& val)
             double dval;
 
             if (!s.ToDouble(&dval) || dval < opt->min || dval > opt->max)
-                wxLogWarning(_("Invalid value %f for option %s; valid values are %f - %f"), dval, name, opt->min, opt->max);
+                wxLogWarning(_("Invalid value %f for option %s; valid values are %f - %f"), dval, name.c_str(), opt->min, opt->max);
             else
                 *opt->doubleopt = dval;
         } else if (opt->uintopt) {
@@ -825,7 +841,7 @@ bool opt_set(const wxString& name, const wxString& val)
             unsigned long uival;
 
             if (!s.ToULong(&uival) || uival < opt->min || uival > opt->max)
-                wxLogWarning(_("Invalid value %f for option %s; valid values are %f - %f"), uival, name, opt->min, opt->max);
+                wxLogWarning(_("Invalid value %f for option %s; valid values are %f - %f"), uival, name.c_str(), opt->min, opt->max);
             else
                 *opt->uintopt = (uint32_t)uival;
         } else {
@@ -839,7 +855,7 @@ bool opt_set(const wxString& name, const wxString& val)
 
                 wxString vals(val);
 
-                for (int j = 0, cpos = 0; j < 8; j++) {
+                for (size_t j = 0, cpos = 0; j < 8; j++) {
                     int start = cpos;
                     cpos = vals.find(wxT(','), cpos);
 
@@ -868,7 +884,7 @@ bool opt_set(const wxString& name, const wxString& val)
         auto parts = str_split(name, wxT("/"));
 
         if (parts[0] != wxT("Keyboard")) {
-            cmditem* cmd = std::lower_bound(&cmdtab[0], &cmdtab[ncmds], cmditem{parts[1]}, cmditem_lt);
+            cmditem* cmd = std::lower_bound(&cmdtab[0], &cmdtab[ncmds], cmditem{parts[1],wxString(),0,0,NULL}, cmditem_lt);
 
             if (cmd == &cmdtab[ncmds] || wxStrcmp(parts[1], cmd->cmd))
                 return false;
@@ -889,12 +905,12 @@ bool opt_set(const wxString& name, const wxString& val)
             if (!val.empty()) {
                 auto aval = wxKeyTextCtrl::FromString(val);
 
-                for (int i = 0; i < aval.size(); i++)
+                for (size_t i = 0; i < aval.size(); i++)
                     aval[i].Set(aval[i].GetFlags(), aval[i].GetKeyCode(),
                         cmd->cmd_id);
 
                 if (!aval.size())
-                    wxLogWarning(_("Invalid key binding %s for %s"), val, name);
+                    wxLogWarning(_("Invalid key binding %s for %s"), val.c_str(), name.c_str());
                 else
                     gopts.accels.insert(gopts.accels.end(), aval.begin(), aval.end());
             }
@@ -920,7 +936,7 @@ bool opt_set(const wxString& name, const wxString& val)
                 auto b = wxJoyKeyTextCtrl::FromString(val);
 
                 if (!b.size())
-                    wxLogWarning(_("Invalid key binding %s for %s"), val, name);
+                    wxLogWarning(_("Invalid key binding %s for %s"), val.c_str(), name.c_str());
                 else
                     gopts.joykey_bindings[jno][kno] = b;
             }
diff --git a/src/wx/opts.h b/src/wx/opts.h
index 6deaf014..b28c4365 100644
--- a/src/wx/opts.h
+++ b/src/wx/opts.h
@@ -101,6 +101,14 @@ extern struct opt_desc {
     uint32_t curuint;
 #define curbool curint
 } opts[];
+
+// Initializer for struct opt_desc
+opt_desc new_opt_desc(wxString opt = "", const char* cmd = NULL, wxString desc = "",
+                      wxString* stropt = NULL, int* intopt = NULL, wxString enumvals = "",
+                      double min = 0, double max = 0, bool* boolopt = NULL,
+                      double* doubleopt = NULL, uint32_t* uintopt = NULL, wxString curstr = "",
+                      int curint = 0, double curdouble = 0, uint32_t curuint = 0);
+
 extern const int num_opts;
 
 extern const wxAcceleratorEntry default_accels[];
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index c9acce93..78c88abc 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -22,17 +22,17 @@ IMPLEMENT_DYNAMIC_CLASS(GameArea, wxPanel)
 
 GameArea::GameArea()
     : wxPanel()
-    , loaded(IMAGE_UNKNOWN)
     , panel(NULL)
     , emusys(NULL)
-    , basic_width(GBAWidth)
-    , basic_height(GBAHeight)
-    , fullscreen(false)
-    , paused(false)
     , was_paused(false)
     , rewind_time(0)
     , do_rewind(false)
     , rewind_mem(0)
+    , loaded(IMAGE_UNKNOWN)
+    , basic_width(GBAWidth)
+    , basic_height(GBAHeight)
+    , fullscreen(false)
+    , paused(false)
     , pointer_blanked(false)
     , mouse_active_time(0)
 {
@@ -83,7 +83,7 @@ void GameArea::LoadGame(const wxString& name)
 
     if (t == IMAGE_UNKNOWN) {
         wxString s;
-        s.Printf(_("%s is not a valid ROM file"), name.mb_str());
+        s.Printf(_("%s is not a valid ROM file"), name.c_str());
         wxMessageDialog dlg(GetParent(), s, _("Problem loading file"), wxOK | wxICON_ERROR);
         dlg.ShowModal();
         return;
@@ -140,7 +140,7 @@ void GameArea::LoadGame(const wxString& name)
     if (t == IMAGE_GB) {
         if (!gbLoadRom(fn)) {
             wxString s;
-            s.Printf(_("Unable to load Game Boy ROM %s"), name.mb_str());
+            s.Printf(_("Unable to load Game Boy ROM %s"), name.c_str());
             wxMessageDialog dlg(GetParent(), s, _("Problem loading file"), wxOK | wxICON_ERROR);
             dlg.ShowModal();
             return;
@@ -155,7 +155,7 @@ void GameArea::LoadGame(const wxString& name)
             wxCharBuffer pfnb(pfn.GetFullPath().mb_fn_str());
             applyPatch(pfnb.data(), &gbRom, &size);
 
-            if (size != rom_size)
+            if (size != (int)rom_size)
                 gbUpdateSizes();
 
             rom_size = size;
@@ -192,7 +192,7 @@ void GameArea::LoadGame(const wxString& name)
         gbCPUInit(fn, use_bios);
 
         if (use_bios && !useBios) {
-            wxLogError(_("Could not load BIOS %s"), (gbCgbMode ? gopts.gbc_bios : gopts.gb_bios).mb_str());
+            wxLogError(_("Could not load BIOS %s"), (gbCgbMode ? gopts.gbc_bios : gopts.gb_bios).c_str());
             // could clear use flag & file name now, but better to force
             // user to do it
         }
@@ -215,7 +215,7 @@ void GameArea::LoadGame(const wxString& name)
     {
         if (!(rom_size = CPULoadRom(fn))) {
             wxString s;
-            s.Printf(_("Unable to load Game Boy Advance ROM %s"), name.mb_str());
+            s.Printf(_("Unable to load Game Boy Advance ROM %s"), name.c_str());
             wxMessageDialog dlg(GetParent(), s, _("Problem loading file"), wxOK | wxICON_ERROR);
             dlg.ShowModal();
             return;
@@ -285,7 +285,7 @@ void GameArea::LoadGame(const wxString& name)
         CPUInit(gopts.gba_bios.mb_fn_str(), useBiosFileGBA);
 
         if (useBiosFileGBA && !useBios) {
-            wxLogError(_("Could not load BIOS %s"), gopts.gba_bios.mb_str());
+            wxLogError(_("Could not load BIOS %s"), gopts.gba_bios.c_str());
             // could clear use flag & file name now, but better to force
             // user to do it
         }
@@ -302,7 +302,8 @@ void GameArea::LoadGame(const wxString& name)
     loaded = t;
     SetFrameTitle();
     SetFocus();
-    AdjustSize(true);
+    // Use custom geometry
+    AdjustSize(false);
     emulating = true;
     was_paused = true;
     MainFrame* mf = wxGetApp().frame;
@@ -354,7 +355,7 @@ void GameArea::LoadGame(const wxString& name)
 
         if (emusys->emuReadBattery(fnb.data())) {
             wxString msg;
-            msg.Printf(_("Loaded battery %s"), bat.GetFullPath().mb_str());
+            msg.Printf(_("Loaded battery %s"), bat.GetFullPath().c_str());
             systemScreenMessage(msg);
 
             if (cpuSaveType == 0 && ovSaveType == 0 && t == IMAGE_GBA) {
@@ -371,6 +372,7 @@ void GameArea::LoadGame(const wxString& name)
                 case 0x10000:
                     if (saveType == GBA_SAVE_EEPROM || saveType == GBA_SAVE_SRAM)
                         break;
+                    break;
 
                 case 0x20000:
                     saveType = GBA_SAVE_FLASH;
@@ -461,6 +463,10 @@ void GameArea::recompute_dirs()
         batdir = wxGetApp().GetAbsolutePath(gopts.battery_dir);
     }
 
+    if (!wxIsWritable(batdir)) {
+        batdir = wxGetApp().GetDataDir();
+    }
+
     statedir = gopts.state_dir;
 
     if (!statedir.size()) {
@@ -469,11 +475,9 @@ void GameArea::recompute_dirs()
         statedir = wxGetApp().GetAbsolutePath(gopts.state_dir);
     }
 
-    if (!wxIsWritable(batdir))
-        batdir = wxGetApp().GetConfigurationPath();
-
-    if (!wxIsWritable(statedir))
-        statedir = wxGetApp().GetConfigurationPath();
+    if (!wxIsWritable(statedir)) {
+        statedir = wxGetApp().GetDataDir();
+    }
 }
 
 void GameArea::UnloadGame(bool destruct)
@@ -570,7 +574,7 @@ bool GameArea::LoadState()
 bool GameArea::LoadState(int slot)
 {
     wxString fname;
-    fname.Printf(SAVESLOT_FMT, game_name().mb_str(), slot);
+    fname.Printf(SAVESLOT_FMT, game_name().c_str(), slot);
     return LoadState(wxFileName(statedir, fname));
 }
 
@@ -604,7 +608,7 @@ bool GameArea::LoadState(const wxFileName& fname)
 
     wxString msg;
     msg.Printf(ret ? _("Loaded state %s") : _("Error loading state %s"),
-        fname.GetFullPath().mb_str());
+        fname.GetFullPath().c_str());
     systemScreenMessage(msg);
     return ret;
 }
@@ -617,7 +621,7 @@ bool GameArea::SaveState()
 bool GameArea::SaveState(int slot)
 {
     wxString fname;
-    fname.Printf(SAVESLOT_FMT, game_name().mb_str(), slot);
+    fname.Printf(SAVESLOT_FMT, game_name().c_str(), slot);
     return SaveState(wxFileName(statedir, fname));
 }
 
@@ -628,7 +632,7 @@ bool GameArea::SaveState(const wxFileName& fname)
     wxGetApp().frame->update_state_ts(true);
     wxString msg;
     msg.Printf(ret ? _("Saved state %s") : _("Error saving state %s"),
-        fname.GetFullPath().mb_str());
+        fname.GetFullPath().c_str());
     systemScreenMessage(msg);
     return ret;
 }
@@ -658,7 +662,7 @@ void GameArea::SaveBattery()
     // of course some games just write battery way too often for such
     // a thing to be useful
     if (!emusys->emuWriteBattery(fnb.data()))
-        wxLogError(_("Error writing battery %s"), fn);
+        wxLogError(_("Error writing battery %s"), fn.c_str());
 
     systemSaveUpdateCounter = SYSTEM_SAVE_NOT_UPDATED;
 }
@@ -840,7 +844,7 @@ void GameArea::ShowFullScreen(bool full)
                 // in particular, unix does Matches() in wrong direction
                 wxArrayVideoModes vm = d.GetModes();
                 int best_mode = -1;
-                int i;
+                size_t i;
 
                 for (i = 0; i < vm.size(); i++) {
                     if (vm[i].w != gopts.fs_mode.w || vm[i].h != gopts.fs_mode.h)
@@ -997,7 +1001,7 @@ void GameArea::OnIdle(wxIdleEvent& event)
             panel = new GLDrawingPanel(this, basic_width, basic_height);
             break;
 #endif
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(NO_D3D)
         case RND_DIRECT3D:
             panel = new DXDrawingPanel(this, basic_width, basic_height);
             break;
@@ -1016,7 +1020,6 @@ void GameArea::OnIdle(wxIdleEvent& event)
 
         // set userdata so we know it's the panel and not the frame being resized
         // the userdata is freed on disconnect/destruction
-        w->Connect(wxEVT_SIZE,             wxSizeEventHandler(GameArea::OnSize),           new wxObject, this);
         this->Connect(wxEVT_SIZE,          wxSizeEventHandler(GameArea::OnSize),           NULL, this);
 
         w->SetBackgroundStyle(wxBG_STYLE_CUSTOM);
@@ -1030,10 +1033,28 @@ void GameArea::OnIdle(wxIdleEvent& event)
         AdjustMinSize();
         AdjustSize(false);
 
+        unsigned frame_priority = 0;
+
         // add spacers on top and bottom to center panel vertically
+        // but not on 2.8 which does not handle this correctly
+#if wxCHECK_VERSION(2, 9, 0)
         GetSizer()->Add(0, 0, 1, wxEXPAND);
-        GetSizer()->Add(w,    0, gopts.retain_aspect ? (wxSHAPED | wxALIGN_CENTER | wxEXPAND) : wxEXPAND);
+#else
+        frame_priority = 1;
+#endif
+
+        // On windows with the vcpkg version of wxWidgets which is 3.1.2, the
+        // wxEXPAND flag throws an XRC error, but it is necessary on earlier versions of wxWidgets
+#if defined(__WXMSW__) && wxCHECK_VERSION(3, 1, 2)
+        GetSizer()->Add(w,    frame_priority, gopts.retain_aspect ? (wxSHAPED | wxALIGN_CENTER_HORIZONTAL) : wxEXPAND);
+#else
+        GetSizer()->Add(w,    frame_priority, gopts.retain_aspect ? (wxSHAPED | wxALIGN_CENTER_HORIZONTAL | wxEXPAND) : wxEXPAND);
+#endif
+
+#if wxCHECK_VERSION(2, 9, 0)
         GetSizer()->Add(0, 0, 1, wxEXPAND);
+#endif
+
         Layout();
 
         if (pointer_blanked)
@@ -1136,9 +1157,9 @@ static std::vector<game_key>* game_keys_pressed(int key, int mod, int joy)
         for (int key_num = 0; key_num < NUM_KEYS; key_num++) {
             wxJoyKeyBinding_v& b = gopts.joykey_bindings[player][key_num];
 
-            for (int bind_num = 0; bind_num < b.size(); bind_num++)
+            for (size_t bind_num = 0; bind_num < b.size(); bind_num++)
                 if (b[bind_num].key == key && b[bind_num].mod == mod && b[bind_num].joy == joy)
-                    vec->push_back({player, key_num, bind_num, b});
+                    vec->push_back({player, key_num, (int)bind_num, b});
         }
 
     return vec;
@@ -1166,7 +1187,7 @@ static bool process_key_press(bool down, int key, int mod, int joy = 0)
     }
 
     // check if key is already pressed
-    int kpno;
+    size_t kpno;
 
     for (kpno = 0; kpno < keys_pressed.size(); kpno++)
         if (keys_pressed[kpno].key == key && keys_pressed[kpno].mod == mod && keys_pressed[kpno].joy == joy)
@@ -1199,11 +1220,11 @@ static bool process_key_press(bool down, int key, int mod, int joy = 0)
         }
         else {
             // only release if no others pressed
-            int bind2;
+            size_t bind2;
             auto b = game_key.b;
 
             for (bind2 = 0; bind2 < game_key.b.size(); bind2++) {
-                if (game_key.bind_num == bind2 || (b[bind2].key == key && b[bind2].mod == mod && b[bind2].joy == joy))
+                if ((size_t)game_key.bind_num == bind2 || (b[bind2].key == key && b[bind2].mod == mod && b[bind2].joy == joy))
                     continue;
 
                 for (kpno = 0; kpno < keys_pressed.size(); kpno++)
@@ -1269,10 +1290,8 @@ void GameArea::EraseBackground(wxEraseEvent& ev)
 
 void GameArea::OnSize(wxSizeEvent& ev)
 {
-    if (!ev.GetEventUserData()) { // is frame
-        draw_black_background(this);
-        Layout();
-    }
+    draw_black_background(this);
+    Layout();
 
     // panel may resize
     if (panel)
@@ -1281,6 +1300,14 @@ void GameArea::OnSize(wxSizeEvent& ev)
     ev.Skip(true);
 }
 
+#if defined(__WXGTK__) && defined(HAVE_XSS)
+    #include <X11/Xlib.h>
+    #define Status int
+    #include <X11/extensions/scrnsaver.h>
+    #include <gdk/gdkx.h>
+    #include <gtk/gtk.h>
+#endif
+
 void GameArea::OnSDLJoy(wxSDLJoyEvent& ev)
 {
     int key = ev.GetControlIndex();
@@ -1302,6 +1329,16 @@ void GameArea::OnSDLJoy(wxSDLJoyEvent& ev)
         process_key_press(value & SDL_HAT_LEFT, key, WXJB_HAT_W, joy);
     } else
         process_key_press(ev.GetControlValue() != 0, key, mod, joy);
+
+    // tell Linux to turn off the screensaver/screen-blank if joystick button was pressed
+    // this shouldn't be necessary of course
+#if defined(__WXGTK__) && defined(HAVE_XSS)
+    if (!wxGetApp().UsingWayland()) {
+        Display* display = GDK_WINDOW_XDISPLAY(gtk_widget_get_window(wxGetApp().frame->GetHandle()));
+        XResetScreenSaver(display);
+        XFlush(display);
+    }
+#endif
 }
 
 BEGIN_EVENT_TABLE(GameArea, wxPanel)
@@ -1320,8 +1357,8 @@ DrawingPanelBase::DrawingPanelBase(int _width, int _height)
     , todraw(0)
     , pixbuf1(0)
     , pixbuf2(0)
-    , rpi(0)
     , nthreads(0)
+    , rpi(0)
 {
     memset(delta, 0xff, sizeof(delta));
 
@@ -1336,7 +1373,7 @@ DrawingPanelBase::DrawingPanelBase(int _width, int _height)
                 break;
 
             wxFileName fpn(gopts.filter_plugin);
-            fpn.MakeAbsolute(wxStandardPaths::Get().GetPluginsDir());
+            fpn.MakeAbsolute(wxGetApp().GetPluginsDir());
 
             if (!filt_plugin.Load(fpn.GetFullPath(), wxDL_VERBATIM | wxDL_NOW))
                 break;
@@ -1417,6 +1454,7 @@ void DrawingPanelBase::DrawingPanelInit()
 
 void DrawingPanelBase::PaintEv(wxPaintEvent& ev)
 {
+    (void)ev; // unused params
     wxPaintDC dc(GetWindow());
 
     if (!todraw) {
@@ -1434,6 +1472,7 @@ void DrawingPanelBase::PaintEv(wxPaintEvent& ev)
 
 void DrawingPanelBase::EraseBackground(wxEraseEvent& ev)
 {
+    (void)ev; // unused params
     // do nothing, do not allow propagation
 }
 
@@ -1783,7 +1822,7 @@ void DrawingPanelBase::DrawArea(uint8_t** data)
 
         if (panel->osdstat.size())
             drawText(todraw + outstride * (systemColorDepth != 24), outstride,
-                10, 20, panel->osdstat.mb_str(), showSpeedTransparent);
+                10, 20, panel->osdstat.utf8_str(), showSpeedTransparent);
 
         if (!disableStatusMessages && !panel->osdtext.empty()) {
             if (systemGetClock() - panel->osdtime < OSD_TIME) {
@@ -1791,7 +1830,7 @@ void DrawingPanelBase::DrawArea(uint8_t** data)
                 int linelen = std::ceil(width * scale - 20) / 8;
                 int nlines = (message.size() + linelen - 1) / linelen;
                 int cury = height - 14 - nlines * 10;
-                char* buf = strdup(message.mb_str());
+                char* buf = strdup(message.utf8_str());
                 char* ptr = buf;
 
                 while (nlines > 1) {
@@ -1875,7 +1914,7 @@ void DrawingPanelBase::DrawOSD(wxWindowDC& dc)
             // find amt of text that will fit on a line is to search
             wxArrayInt llen; // length of each line, in chars
 
-            for (int off = 0; off < msg.size();) {
+            for (size_t off = 0; off < msg.size();) {
 // One way would be to bsearch on GetTextExtent() looking for
 // best fit.
 // Another would be to use GetPartialTextExtents and search
@@ -2202,6 +2241,7 @@ void GLDrawingPanel::AdjustViewport()
 
 void GLDrawingPanel::DrawArea(wxWindowDC& dc)
 {
+    (void)dc; // unused params
 #ifndef wxGL_IMPLICIT_CONTEXT
     SetCurrent(*ctx);
 #else
@@ -2294,7 +2334,7 @@ void GameArea::StartVidRecording(const wxString& fname)
     if ((ret = vid_rec.Record(fnb.data(), basic_width, basic_height,
              systemColorDepth))
         != MRET_OK)
-        wxLogError(_("Unable to begin recording to %s (%s)"), fname.mb_str(),
+        wxLogError(_("Unable to begin recording to %s (%s)"), fname.c_str(),
             media_err(ret));
     else {
         MainFrame* mf = wxGetApp().frame;
@@ -2325,7 +2365,7 @@ void GameArea::StartSoundRecording(const wxString& fname)
     MediaRet ret;
 
     if ((ret = snd_rec.Record(fnb.data())) != MRET_OK)
-        wxLogError(_("Unable to begin recording to %s (%s)"), fname.mb_str(),
+        wxLogError(_("Unable to begin recording to %s (%s)"), fname.c_str(),
             media_err(ret));
     else {
         MainFrame* mf = wxGetApp().frame;
diff --git a/src/wx/strutils.cpp b/src/wx/strutils.cpp
index 8cf25700..726d2e3b 100644
--- a/src/wx/strutils.cpp
+++ b/src/wx/strutils.cpp
@@ -1,36 +1,26 @@
-#include <algorithm>
-#include <wx/string.h>
-#include <string>
-#include <vector>
 #include "strutils.h"
 
 // From: https://stackoverflow.com/a/7408245/262458
 //
 // modified to ignore empty tokens
-std::vector<wxString> str_split(const wxString& text, const wxString& sep) {
-    std::vector<wxString> tokens;
-    std::size_t start = 0, end = 0;
+wxArrayString str_split(const wxString& text, const wxString& sep) {
+    wxArrayString tokens;
+    size_t start = 0, end = 0;
 
     while ((end = text.find(sep, start)) != std::string::npos) {
         wxString token = text.substr(start, end - start);
 
         if (token.length())
-	    tokens.push_back(token);
+	    tokens.Add(token);
 
 	start = end + 1;
     }
 
-    tokens.push_back(text.substr(start));
+    tokens.Add(text.substr(start));
 
     return tokens;
 }
 
-// From: https://stackoverflow.com/a/15099743/262458
-std::size_t vec_find(std::vector<wxString>& opts, const wxString& val) {
-    auto it = std::find(opts.begin(), opts.end(), val);
-
-    if (it == opts.end())
-        return wxNOT_FOUND;
-
-    return std::distance(opts.begin(), it);
+size_t vec_find(wxArrayString& opts, const wxString& val) {
+    return opts.Index(val);
 }
diff --git a/src/wx/strutils.h b/src/wx/strutils.h
index 5669154e..4bf865a7 100644
--- a/src/wx/strutils.h
+++ b/src/wx/strutils.h
@@ -1,15 +1,13 @@
 #ifndef STRUTILS_H
 #define STRUTILS_H
 
-#include <algorithm>
 #include <wx/string.h>
-#include <string>
-#include <vector>
+#include <wx/arrstr.h>
 
 // From: https://stackoverflow.com/a/7408245/262458
-std::vector<wxString> str_split(const wxString& text, const wxString& sep);
+wxArrayString str_split(const wxString& text, const wxString& sep);
 
 // From: https://stackoverflow.com/a/15099743/262458
-std::size_t vec_find(std::vector<wxString>& opts, const wxString& val);
+size_t vec_find(wxArrayString& opts, const wxString& val);
 
 #endif
diff --git a/src/wx/sys.cpp b/src/wx/sys.cpp
index 271adeb7..c7b474e5 100644
--- a/src/wx/sys.cpp
+++ b/src/wx/sys.cpp
@@ -39,12 +39,13 @@ bool soundBufferLow;
 
 void systemMessage(int id, const char* fmt, ...)
 {
+    (void)id; // unused params
     static char* buf = NULL;
     static int buflen = 80;
     va_list args;
     // auto-conversion of wxCharBuffer to const char * seems broken
     // so save underlying wxCharBuffer (or create one of none is used)
-    wxCharBuffer _fmt(wxString(wxGetTranslation(wxString(fmt, wxConvLibc))).mb_str());
+    wxCharBuffer _fmt(wxString(wxGetTranslation(wxString(fmt, wxConvLibc))).utf8_str());
 
     if (!buf) {
         buf = (char*)malloc(buflen);
@@ -71,7 +72,7 @@ void systemMessage(int id, const char* fmt, ...)
             exit(1);
     }
 
-    wxLogError(wxT("%s"), wxString(buf, wxConvLibc).mb_str());
+    wxLogError(wxT("%s"), wxString(buf, wxConvLibc).c_str());
 }
 
 static int frames = 0;
@@ -129,7 +130,7 @@ void systemStartGameRecording(const wxString& fname)
     uint32_t version = 1;
 
     if (!game_file.Open(fn, wxT("wb")) || game_file.Write(&version, sizeof(version)) != sizeof(version)) {
-        wxLogError(_("Cannot open output file %s"), fname.mb_str());
+        wxLogError(_("Cannot open output file %s"), fname.c_str());
         return;
     }
 
@@ -190,7 +191,7 @@ void systemStartGamePlayback(const wxString& fname)
     uint32_t version;
 
     if (!game_file.Open(fn, wxT("rb")) || game_file.Read(&version, sizeof(version)) != sizeof(version) || wxUINT32_SWAP_ON_BE(version) != 1) {
-        wxLogError(_("Cannot open recording file %s"), fname.mb_str());
+        wxLogError(_("Cannot open recording file %s"), fname.c_str());
         return;
     }
 
@@ -359,7 +360,7 @@ void system10Frames(int rate)
         static int speedadj = 0;
         uint32_t t = systemGetClock();
 
-        if (!panel->was_paused && prevclock && (t - prevclock) != 10000 / rate) {
+        if (!panel->was_paused && prevclock && (t - prevclock) != (uint32_t)(10000 / rate)) {
             int speed = t == prevclock ? 100 * 10000 / rate - (t - prevclock) : 100;
 
             // why 98??
@@ -415,7 +416,7 @@ void systemScreenCapture(int num)
 
     do {
         wxString bfn;
-        bfn.Printf(wxT("%s%02d"), panel->game_name().mb_str(),
+        bfn.Printf(wxT("%s%02d"), panel->game_name().c_str(),
             num++);
 
         if (captureFormat == 0)
@@ -434,7 +435,7 @@ void systemScreenCapture(int num)
         panel->emusys->emuWriteBMP(fn.GetFullPath().mb_fn_str());
 
     wxString msg;
-    msg.Printf(_("Wrote snapshot %s"), fn.GetFullPath().mb_str());
+    msg.Printf(_("Wrote snapshot %s"), fn.GetFullPath().c_str());
     systemScreenMessage(msg);
 }
 
@@ -691,11 +692,11 @@ private:
 
 IMPLEMENT_CLASS(PrintDialog, wxEvtHandler)
 
-PrintDialog::PrintDialog(const uint16_t* data, int lines, bool cont)
-    : img(160, lines)
-    , npw(1)
-    , nph(1)
-    , wxPrintout(wxGetApp().frame->GetPanel()->game_name() + wxT(" Printout"))
+PrintDialog::PrintDialog(const uint16_t* data, int lines, bool cont):
+    wxPrintout(wxGetApp().frame->GetPanel()->game_name() + wxT(" Printout")),
+    img(160, lines),
+    npw(1),
+    nph(1)
 {
     dlg = wxStaticCast(wxGetApp().frame->FindWindow(XRCID("GBPrinter")), wxDialog);
     p = XRCCTRL(*dlg, "Preview", wxPanel);
@@ -769,6 +770,7 @@ void PrintDialog::ShowImg(wxPaintEvent& evt)
 
 void PrintDialog::ChangeMag(wxCommandEvent& evt)
 {
+    (void)evt; // unused params
     int m = mag->GetSelection() + 1;
     wxScrolledWindow* pp = wxStaticCast(p->GetParent(), wxScrolledWindow);
     wxSize sz(m * 160, m * img.GetHeight());
@@ -805,7 +807,7 @@ void PrintDialog::DoSave(wxCommandEvent&)
 
     if (scimg.SaveFile(of)) {
         wxString msg;
-        msg.Printf(_("Wrote printer output to %s"), of.mb_str());
+        msg.Printf(_("Wrote printer output to %s"), of.c_str());
         systemScreenMessage(msg);
         wxButton* cb = wxStaticCast(dlg->FindWindow(wxID_CANCEL), wxButton);
 
@@ -891,6 +893,8 @@ void PrintDialog::DoPrint(wxCommandEvent&)
 
 void systemGbPrint(uint8_t* data, int len, int pages, int feed, int pal, int cont)
 {
+    (void)pages; // unused params
+    (void)cont; // unused params
     ModalPause mp; // this might take a while, so signal a pause
     GameArea* panel = wxGetApp().frame->GetPanel();
     static uint16_t* accum_prdata;
@@ -963,7 +967,7 @@ void systemGbPrint(uint8_t* data, int len, int pages, int feed, int pal, int con
 
         do {
             wxString bfn;
-            bfn.Printf(wxT("%s-print%02d"), panel->game_name().mb_str(),
+            bfn.Printf(wxT("%s-print%02d"), panel->game_name().c_str(),
                 num++);
 
             if (captureFormat == 0)
@@ -986,7 +990,7 @@ void systemGbPrint(uint8_t* data, int len, int pages, int feed, int pal, int con
 
         if (ret) {
             wxString msg;
-            msg.Printf(_("Wrote printer output to %s"), of.mb_str());
+            msg.Printf(_("Wrote printer output to %s"), of.c_str());
             systemScreenMessage(msg);
         }
 
@@ -1111,6 +1115,8 @@ SoundDriver* systemSoundInit()
 
 void systemOnWriteDataToSoundBuffer(const uint16_t* finalWave, int length)
 {
+    (void)finalWave; // unused params
+    (void)length; // unused params
 #ifndef NO_FFMPEG
     GameArea* panel = wxGetApp().frame->GetPanel();
 
@@ -1174,7 +1180,7 @@ bool debugOpenPty()
     if ((pty_master = posix_openpt(O_RDWR | O_NOCTTY)) < 0 || grantpt(pty_master) < 0 || unlockpt(pty_master) < 0 || !(slave_name = ptsname(pty_master))) {
         wxLogError(_("Error opening pseudo tty: %s"), wxString(strerror(errno),
                                                           wxConvLibc)
-                                                          .mb_str());
+                                                          .c_str());
 
         if (pty_master >= 0) {
             close(pty_master);
@@ -1311,7 +1317,7 @@ void log(const char* defaultMsg, ...)
     if (out == NULL) {
         // FIXME: this should be an option
         wxFileName trace_log(wxGetApp().GetConfigurationPath(), wxT("trace.log"));
-        out = fopen(trace_log.GetFullPath().mb_str(), "w");
+        out = fopen(trace_log.GetFullPath().utf8_str(), "w");
 
         if (!out)
             return;
diff --git a/src/wx/viewers.cpp b/src/wx/viewers.cpp
index b476439d..1a98d6f0 100644
--- a/src/wx/viewers.cpp
+++ b/src/wx/viewers.cpp
@@ -82,11 +82,13 @@ public:
     }
     void Next(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         CPULoop(1);
         GotoPC();
     }
     void Goto(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         wxString as = goto_addr->GetValue();
 
         if (!as.size())
@@ -100,6 +102,7 @@ public:
     // wx-2.8.4 or MacOSX compiler can't resolve overloads in evt table
     void GotoPCEv(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         GotoPC();
     }
     void GotoPC()
@@ -120,6 +123,7 @@ public:
     }
     void RefreshCmd(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         UpdateDis();
     }
     void UpdateDis()
@@ -143,6 +147,7 @@ public:
 
     void RefillListEv(wxCommandEvent& ev)
     {
+        (void)ev; // unused params
         // what an unsafe calling convention
         // examination of disArm shows that max len is 69 chars
         // (e.g. 0x081cb6db), and I assume disThumb is shorter
@@ -221,11 +226,13 @@ public:
     }
     void Next(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         gbEmulate(1);
         GotoPC();
     }
     void Goto(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         wxString as = goto_addr->GetValue();
 
         if (!as.size())
@@ -239,6 +246,7 @@ public:
     // wx-2.8.4 or MacOSX compiler can't resolve overloads in evt table
     void GotoPCEv(wxCommandEvent& ev)
     {
+        (void)ev; // unused params
         GotoPC();
     }
     void GotoPC()
@@ -248,6 +256,7 @@ public:
     }
     void RefreshCmd(wxCommandEvent& ev)
     {
+        (void)ev; // unused params
         UpdateDis();
     }
     void UpdateDis()
@@ -278,6 +287,7 @@ public:
 
     void RefillListEv(wxCommandEvent& ev)
     {
+        (void)ev; // unused params
         // what an unsafe calling convention
         // examination of gbDis shows that max len is 26 chars
         // (e.g. 0xe2)
@@ -322,6 +332,10 @@ void MainFrame::Disassemble(void)
     case IMAGE_GB:
         LoadXRCViewer(GBDisassemble);
         break;
+
+    case IMAGE_UNKNOWN:
+        // do nothing
+        break;
     }
 }
 
@@ -357,7 +371,7 @@ public:
         wxString longline = lline;
         int lwidth = 0;
 
-        for (int i = 0; i < NUM_IOREGS; i++) {
+        for (long unsigned int i = 0; i < NUM_IOREGS; i++) {
             addr->Append(wxGetTranslation(ioregs[i].name));
 
             // find longest label
@@ -391,6 +405,7 @@ public:
 
     void SelectEv(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         Select(addr->GetSelection());
     }
 
@@ -450,11 +465,13 @@ public:
 
     void RefreshEv(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         Update();
     }
 
     void Apply(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         int sel = addr->GetSelection();
         uint16_t* addr = ioregs[sel].address ? ioregs[sel].address : (uint16_t*)&ioMem[ioregs[sel].offset];
         uint16_t mask, reg = *addr;
@@ -534,6 +551,7 @@ void LogDialog::Update()
 
 void LogDialog::Save(wxCommandEvent& ev)
 {
+    (void)ev; // unused params
     static wxString logdir = wxEmptyString, def_name = wxEmptyString;
 
     if (def_name.empty())
@@ -560,6 +578,7 @@ void LogDialog::Save(wxCommandEvent& ev)
 
 void LogDialog::Clear(wxCommandEvent& ev)
 {
+    (void)ev; // unused params
     wxGetApp().log.clear();
     Update();
 }
@@ -641,12 +660,14 @@ public:
     }
     void BlockStart(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         unsigned long l;
         bs->GetStringSelection().ToULong(&l, 0);
         Goto(l);
     }
     void GotoEv(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         unsigned long l;
         wxString v = goto_addr->GetValue();
 
@@ -662,6 +683,7 @@ public:
     }
     void RefreshCmd(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         Update();
     }
 
@@ -669,6 +691,7 @@ public:
 
     void Load(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         if (memsave_fn.empty())
             memsave_fn = wxGetApp().frame->GetPanel()->game_name() + wxT(".dmp");
 
@@ -686,7 +709,7 @@ public:
         wxFileName fn(memsave_fn);
 
         if (!fn.IsFileReadable()) {
-            wxLogError(wxT("Can't open file %s"), memsave_fn.mb_str());
+            wxLogError(wxT("Can't open file %s"), memsave_fn.c_str());
             return;
         }
 
@@ -720,6 +743,7 @@ public:
 
     void Save(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         wxString s;
         s.Printf(addrlen == 4 ? wxT("%04X") : wxT("%08X"), mv->GetAddr());
         selreg_addr->SetValue(s);
@@ -802,6 +826,7 @@ public:
     // wx-2.8.4 or MacOSX compiler can't resolve overloads in evt table
     void RefillListEv(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         Update();
     }
 
@@ -823,6 +848,7 @@ public:
 
     void WriteVal(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         switch (mv->fmt) {
         case 0:
             CPUWriteByteQuick(mv->writeaddr, mv->writeval);
@@ -849,7 +875,7 @@ public:
         while (len > 0) {
             memoryMap m = map[addr >> 24];
             uint32_t off = addr & m.mask;
-            uint32_t wlen = (off + len) > m.mask ? m.mask + 1 - off : len;
+            int wlen = (off + len) > m.mask ? m.mask + 1 - off : len;
             wlen = f.Read(m.address + off, wlen);
 
             if (wlen < 0)
@@ -871,7 +897,7 @@ public:
         while (len > 0) {
             memoryMap m = map[addr >> 24];
             uint32_t off = addr & m.mask;
-            uint32_t wlen = (off + len) > m.mask ? m.mask + 1 - off : len;
+            int wlen = (off + len) > m.mask ? m.mask + 1 - off : len;
             wlen = f.Write(m.address + off, wlen);
 
             if (wlen < 0)
@@ -910,6 +936,7 @@ public:
     // wx-2.8.4 or MacOSX compiler can't resolve overloads in evt table
     void RefillListEv(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         Update();
     }
 
@@ -931,6 +958,7 @@ public:
 
     void WriteVal(wxCommandEvent& ev)
     {
+	(void)ev; // unused params
         switch (mv->fmt) {
         case 0:
             GBWriteByteQuick(mv->writeaddr, mv->writeval);
@@ -957,7 +985,7 @@ public:
         while (len > 0) {
             uint8_t* maddr = gbMemoryMap[addr >> 12];
             uint32_t off = addr & 0xfff;
-            uint32_t wlen = (off + len) > 0xfff ? 0x1000 - off : len;
+            int wlen = (off + len) > 0xfff ? 0x1000 - off : len;
             wlen = f.Read(maddr + off, wlen);
 
             if (wlen < 0)
@@ -979,7 +1007,7 @@ public:
         while (len > 0) {
             uint8_t* maddr = gbMemoryMap[addr >> 12];
             uint32_t off = addr & 0xfff;
-            uint32_t wlen = (off + len) > 0xfff ? 0x1000 - off : len;
+            int wlen = (off + len) > 0xfff ? 0x1000 - off : len;
             wlen = f.Write(maddr + off, wlen);
 
             if (wlen < 0)
@@ -1009,5 +1037,8 @@ void MainFrame::MemViewer()
     case IMAGE_GB:
         LoadXRCViewer(GBMem);
         break;
+
+    default:
+        break;
     }
 }
diff --git a/src/wx/viewsupt.cpp b/src/wx/viewsupt.cpp
index c958a400..7015c739 100644
--- a/src/wx/viewsupt.cpp
+++ b/src/wx/viewsupt.cpp
@@ -5,6 +5,7 @@
 namespace Viewers {
 void Viewer::CloseDlg(wxCloseEvent& ev)
 {
+    (void)ev; // unused params
     // stop tracking dialog
     MainFrame* f = wxGetApp().frame;
 
@@ -76,12 +77,12 @@ IMPLEMENT_DYNAMIC_CLASS(DisList, wxPanel)
 
 DisList::DisList()
     : wxPanel()
+    , nlines(0)
+    , topaddr(0)
     , tc()
     , sb()
     , didinit(false)
-    , nlines(0)
     , issel(false)
-    , topaddr(0)
 {
 }
 
@@ -191,7 +192,7 @@ void DisList::Refill()
     MoveSB();
     wxString val;
 
-    for (int i = 0; i < nlines && i < strings.size(); i++) {
+    for (size_t i = 0; i < (size_t)nlines && i < strings.size(); i++) {
         val += strings[i];
         val += wxT('\n');
     }
@@ -203,6 +204,7 @@ void DisList::Refill()
 // on resize, recompute shown lines and refill if necessary
 void DisList::Resize(wxSizeEvent& ev)
 {
+    (void)ev; // unused params
     if (!didinit) // prevent crash on win32
         return;
 
@@ -215,10 +217,10 @@ void DisList::Resize(wxSizeEvent& ev)
     wxString val;
     tc.SetSize(sz.GetWidth(), (nlines + 1) * lineheight + extraheight);
 
-    if (nlines > strings.size())
+    if ((size_t)nlines > strings.size())
         RefillNeeded();
     else {
-        for (int i = 0; i < nlines && i < strings.size(); i++) {
+        for (size_t i = 0; i < (size_t)nlines && i < strings.size(); i++) {
             val += strings[i];
             val += wxT('\n');
         }
@@ -236,7 +238,7 @@ void DisList::SetSel()
     if (!issel)
         return;
 
-    if (nlines > addrs.size() || (uint32_t)addrs[0] > seladdr || (uint32_t)addrs[nlines - 1] <= seladdr)
+    if ((size_t)nlines > addrs.size() || (uint32_t)addrs[0] > seladdr || (uint32_t)addrs[nlines - 1] <= seladdr)
         return;
 
     for (int i = 0, start = 0; i < nlines; i++) {
@@ -262,7 +264,7 @@ void DisList::SetSel(uint32_t addr)
     seladdr = addr;
     issel = true;
 
-    if (addrs.size() < 4 || addrs.size() < nlines || topaddr > addr || (uint32_t)addrs[addrs.size() - 4] < addr) {
+    if (addrs.size() < 4 || addrs.size() < (size_t)nlines || topaddr > addr || (uint32_t)addrs[addrs.size() - 4] < addr) {
         topaddr = addr;
         strings.clear();
         addrs.clear();
@@ -282,13 +284,13 @@ IMPLEMENT_DYNAMIC_CLASS(MemView, wxPanel)
 
 MemView::MemView()
     : wxPanel()
+    , nlines(0)
+    , topaddr(0)
+    , addrlab(0)
     , disp()
     , sb()
     , didinit(false)
-    , nlines(0)
     , selnib(-1)
-    , topaddr(0)
-    , addrlab(0)
 {
 }
 
@@ -370,7 +372,7 @@ void MemView::MouseEvent(wxMouseEvent& ev)
 
 void MemView::ShowCaret()
 {
-    if (seladdr < topaddr || seladdr >= topaddr + nlines * 16)
+    if (seladdr < (int)topaddr || seladdr >= (int)topaddr + nlines * 16)
         selnib = -1;
 
     if (selnib < 0) {
@@ -429,7 +431,7 @@ void MemView::KeyEvent(wxKeyEvent& ev)
             selnib--;
 
         if (selnib >= 32) {
-            if (seladdr == maxaddr - 16)
+            if (seladdr == (int)maxaddr - 16)
                 selnib = 32 - nnib;
             else {
                 selnib -= 32;
@@ -461,7 +463,7 @@ void MemView::KeyEvent(wxKeyEvent& ev)
 
     case WXK_DOWN:
     case WXK_NUMPAD_DOWN:
-        if (seladdr < maxaddr - 16)
+        if (seladdr < (int)maxaddr - 16)
             seladdr += 16;
 
         break;
@@ -493,7 +495,7 @@ void MemView::KeyEvent(wxKeyEvent& ev)
             selnib--;
 
         if (selnib >= 32) {
-            if (seladdr == maxaddr - 16)
+            if (seladdr == (int)maxaddr - 16)
                 selnib = 32 - nnib;
             else {
                 selnib -= 32;
@@ -507,7 +509,7 @@ void MemView::KeyEvent(wxKeyEvent& ev)
             mask = 0xff << bno * 8;
             val = k << bno * 8;
         } else {
-            mask = 0xf << bno * 8 + nibno * 4;
+            mask = 8 * (0xf << bno) + 4 * nibno;
             val = isdigit(k) ? k - '0' : tolower(k) + 10 - 'a';
             val <<= bno * 8 + nibno * 4;
         }
@@ -515,7 +517,7 @@ void MemView::KeyEvent(wxKeyEvent& ev)
         if ((words[wno] & mask) == val)
             break;
 
-        words[wno] = words[wno] & ~mask | val;
+        words[wno] = ((words[wno] & ~mask) | val);
         writeaddr = topaddr + 4 * wno;
         val = words[wno];
 
@@ -631,6 +633,7 @@ void MemView::Repaint()
 
 void MemView::RepaintEv(wxPaintEvent& ev)
 {
+    (void)ev; // unused params
     wxPaintDC dc(&disp);
     dc.SetBackgroundMode(wxSOLID);
     Refill(dc);
@@ -644,7 +647,7 @@ void MemView::Refill(wxDC& dc)
     // doesn't seem to inherit font properly
     dc.SetFont(GetFont());
 
-    for (int i = 0; i < nlines && i < words.size() / 4; i++) {
+    for (size_t i = 0; i < (size_t)nlines && i < words.size() / 4; i++) {
         wxString line, word;
         line.Printf(maxaddr > 0xffff ? wxT("%08X   ") : wxT("%04X   "), topaddr + i * 16);
 
@@ -693,6 +696,7 @@ void MemView::Refill(wxDC& dc)
 // on resize, recompute shown lines and refill if necessary
 void MemView::Resize(wxSizeEvent& ev)
 {
+    (void)ev; // unused params
     if (!didinit) // prevent crash on win32
         return;
 
@@ -705,7 +709,7 @@ void MemView::Resize(wxSizeEvent& ev)
     wxString val;
     disp.SetSize(sz.GetWidth(), (nlines + 1) * charheight);
 
-    if (nlines > words.size() / 4) {
+    if ((size_t)nlines > words.size() / 4) {
         if (topaddr + nlines * 16 > maxaddr)
             topaddr = maxaddr - nlines * 16 + 1;
 
@@ -889,6 +893,7 @@ void PixView::SetSel(int x, int y, bool desel_cview_update)
 
 void PixView::Redraw(wxPaintEvent& ev)
 {
+    (void)ev; // unused params
     if (!bm)
         return;
 
@@ -988,6 +993,7 @@ void PixViewEvt::click()
 IMPLEMENT_DYNAMIC_CLASS(GfxPanel, wxPanel)
 void GfxPanel::DrawBitmap(wxPaintEvent& ev)
 {
+    (void)ev; // unused params
     if (!bm)
         return;
 
@@ -1122,6 +1128,7 @@ void GfxViewer::BMPSize(int w, int h)
 
 void GfxViewer::StretchTog(wxCommandEvent& ev)
 {
+    (void)ev; // unused params
     wxSize sz;
 
     if (str->GetValue()) {
@@ -1138,6 +1145,7 @@ void GfxViewer::StretchTog(wxCommandEvent& ev)
 
 void GfxViewer::SaveBMP(wxCommandEvent& ev)
 {
+    (void)ev; // unused params
     GameArea* panel = wxGetApp().frame->GetPanel();
     bmp_save_dir = wxGetApp().frame->GetGamePath(gopts.scrshot_dir);
     // no attempt is made here to translate the dialog type name
@@ -1175,6 +1183,7 @@ void GfxViewer::SaveBMP(wxCommandEvent& ev)
 
 void GfxViewer::RefreshEv(wxCommandEvent& ev)
 {
+    (void)ev; // unused params
     Update();
 }
 
diff --git a/src/wx/viewsupt.h b/src/wx/viewsupt.h
index 1a69c943..1d9d01d7 100644
--- a/src/wx/viewsupt.h
+++ b/src/wx/viewsupt.h
@@ -58,7 +58,7 @@ protected:
 // on errors, abort program
 #define baddialog()                                                      \
     do {                                                                 \
-        wxLogError(_("Unable to load dialog %s from resources"), dname); \
+        wxLogError(_("Unable to load dialog %s from resources"), dname.c_str()); \
         wxGetApp().frame->Close(true);                                   \
         return;                                                          \
     } while (0)
@@ -141,6 +141,7 @@ protected:
     // assigned to textctrl to avoid mouse input
     void MouseEvent(wxMouseEvent& ev)
     {
+	(void)ev; // unused param
     }
     // the subwidgets
     wxTextCtrl tc;
@@ -412,6 +413,7 @@ public:
     }
     void MouseEvent(wxMouseEvent& ev)
     {
+	(void)ev; // unused param
     }
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(DispCheckBox)
diff --git a/src/wx/widgets/joyedit.cpp b/src/wx/widgets/joyedit.cpp
index d5f9e695..00eaea3f 100644
--- a/src/wx/widgets/joyedit.cpp
+++ b/src/wx/widgets/joyedit.cpp
@@ -8,6 +8,13 @@ BEGIN_EVENT_TABLE(wxJoyKeyTextCtrl, wxKeyTextCtrl)
 EVT_SDLJOY(wxJoyKeyTextCtrl::OnJoy)
 END_EVENT_TABLE()
 
+// Initializer for struct wxJoyKeyBinding
+wxJoyKeyBinding newWxJoyKeyBinding(int key, int mod, int joy)
+{
+    struct wxJoyKeyBinding tmp = {key, mod, joy};
+    return tmp;
+}
+
 int wxJoyKeyTextCtrl::DigitalButton(wxSDLJoyEvent& event)
 {
     int sdlval = event.GetControlValue();
@@ -151,7 +158,7 @@ wxString wxJoyKeyTextCtrl::ToString(wxJoyKeyBinding_v keys, wxChar sep)
 {
     wxString ret;
 
-    for (int i = 0; i < keys.size(); i++) {
+    for (size_t i = 0; i < keys.size(); i++) {
         if (i > 0)
             ret += sep;
 
@@ -213,7 +220,7 @@ static bool ParseJoy(const wxString& s, int len, int& mod, int& key, int& joy)
         return false;
 
     const wxString p = s.Mid(l);
-    int alen = len - l;
+    size_t alen = len - l;
     joyre.GetMatch(&b, &l, 1);
     joy = simple_atoi(s.Mid(b), l);
 #define is_ctrl(re) re.Matches(p) && re.GetMatch(&b, &l) && l == alen && !b
@@ -268,12 +275,12 @@ wxJoyKeyBinding_v wxJoyKeyTextCtrl::FromString(const wxString& s, wxChar sep)
 {
     wxJoyKeyBinding_v ret, empty;
     int mod, key, joy;
-    int len = s.size();
+    size_t len = s.size();
 
     if (!len)
         return empty;
 
-    for (int lastkey = len - 1; (lastkey = s.rfind(sep, lastkey)) != wxString::npos; lastkey--) {
+    for (size_t lastkey = len - 1; (lastkey = s.rfind(sep, lastkey)) != wxString::npos; lastkey--) {
         if (lastkey == len - 1) {
             // sep as accel
             if (!lastkey)
diff --git a/src/wx/widgets/keyedit.cpp b/src/wx/widgets/keyedit.cpp
index 2e5e94a0..0fb0994a 100644
--- a/src/wx/widgets/keyedit.cpp
+++ b/src/wx/widgets/keyedit.cpp
@@ -16,6 +16,7 @@ void wxKeyTextCtrl::OnKeyDown(wxKeyEvent& event)
 
 void wxKeyTextCtrl::OnKeyUp(wxKeyEvent& event)
 {
+    (void)event; // unused param
     int mod = lastmod;
     int key = lastkey;
     lastmod = lastkey = 0;
@@ -30,7 +31,7 @@ void wxKeyTextCtrl::OnKeyUp(wxKeyEvent& event)
     // if blank or backspace is modified, add normally instead
     if (clearable && !mod && key == WXK_BACK && !GetValue().empty()) {
         wxString val = GetValue();
-        int lastkey = val.rfind(multikey);
+        size_t lastkey = val.rfind(multikey);
 
         if (lastkey && lastkey != wxString::npos) {
             // if this was actually a ,-accel, delete instead
@@ -79,7 +80,7 @@ wxString wxKeyTextCtrl::ToString(int mod, int key)
     wxString s = ae.ToString();
 
     if (char_override || mod_override) {
-        int l = s.rfind(wxT('-'));
+        size_t l = s.rfind(wxT('-'));
 
         if (l == wxString::npos)
             l = 0;
@@ -150,7 +151,7 @@ wxString wxKeyTextCtrl::ToString(wxAcceleratorEntry_v keys, wxChar sep)
 {
     wxString ret;
 
-    for (int i = 0; i < keys.size(); i++) {
+    for (size_t i = 0; i < keys.size(); i++) {
         if (i > 0)
             ret += sep;
 
@@ -176,16 +177,16 @@ bool wxKeyTextCtrl::ParseString(const wxString& s, int len, int& mod, int& key)
     a.Append(s.Left(len));
     wxAcceleratorEntry ae;
 #ifndef __WXMAC__
-#define check_meta(str)                                                     \
-    do {                                                                    \
-        wxString meta = str;                                                \
-        for (int ml = 0; (ml = a.find(meta, ml)) != wxString::npos; ml++) { \
-            if (!ml || a[ml - 1] == wxT('-') || a[ml - 1] == wxT('+')) {    \
-                mod |= wxMOD_META;                                          \
-                a.erase(ml, meta.size());                                   \
-                ml = -1;                                                    \
-            }                                                               \
-        }                                                                   \
+#define check_meta(str)                                                        \
+    do {                                                                       \
+        wxString meta = str;                                                   \
+        for (size_t ml = 0; (ml = a.find(meta, ml)) != wxString::npos; ml++) { \
+            if (!ml || a[ml - 1] == wxT('-') || a[ml - 1] == wxT('+')) {       \
+                mod |= wxMOD_META;                                             \
+                a.erase(ml, meta.size());                                      \
+                ml = -1;                                                       \
+            }                                                                  \
+        }                                                                      \
     } while (0)
     check_meta(wxT("Meta-"));
     check_meta(wxT("Meta+"));
@@ -252,9 +253,9 @@ wxAcceleratorEntry_v wxKeyTextCtrl::FromString(const wxString& s, wxChar sep)
 {
     wxAcceleratorEntry_v ret, empty;
     int mod, key;
-    int len = s.size();
+    size_t len = s.size();
 
-    for (int lastkey = len - 1; (lastkey = s.rfind(sep, lastkey)) != wxString::npos; lastkey--) {
+    for (size_t lastkey = len - 1; (lastkey = s.rfind(sep, lastkey)) != wxString::npos; lastkey--) {
         if (lastkey == len - 1) {
             // sep as accel
             if (!lastkey)
diff --git a/src/wx/widgets/sdljoy.cpp b/src/wx/widgets/sdljoy.cpp
index aafc2696..163cc8bc 100644
--- a/src/wx/widgets/sdljoy.cpp
+++ b/src/wx/widgets/sdljoy.cpp
@@ -14,13 +14,19 @@ struct wxSDLJoyState {
         if (dev)
             SDL_JoystickClose(dev);
     }
+    wxSDLJoyState()
+    {
+	dev = NULL;
+	nax = nhat = nbut = 0;
+	curval = NULL;
+    }
 };
 
 wxSDLJoy::wxSDLJoy(bool analog)
     : wxTimer()
     , digital(!analog)
-    , evthandler(0)
     , joystate(0)
+    , evthandler(0)
     , nosticks(true)
 {
     // Start up joystick if not already started
@@ -36,8 +42,7 @@ wxSDLJoy::wxSDLJoy(bool analog)
     if (!njoy)
         return;
 
-    joystate = new wxSDLJoyState_t[njoy];
-    memset(joystate, 0, njoy * sizeof(*joystate));
+    joystate = new wxSDLJoyState[njoy];
 
     for (int i = 0; i < njoy; i++) {
         SDL_Joystick* dev = joystate[i].dev = SDL_JoystickOpen(i);
@@ -45,7 +50,17 @@ wxSDLJoy::wxSDLJoy(bool analog)
         nctrl += joystate[i].nax = SDL_JoystickNumAxes(dev);
         nctrl += joystate[i].nhat = SDL_JoystickNumHats(dev);
         nctrl += joystate[i].nbut = SDL_JoystickNumButtons(dev);
-        joystate[i].curval = new short[nctrl];
+        joystate[i].curval = new short[nctrl]{0};
+
+        // initialize axis previous value to initial state
+#if SDL_VERSION_ATLEAST(2, 0, 6)
+        for (int j = 0; j < joystate[i].nax; j++) {
+            int16_t initial_state = 0;
+            SDL_JoystickGetAxisInitialState(dev, j, &initial_state);
+            joystate[i].curval[j] = initial_state;
+        }
+#endif
+
         memset(joystate[i].curval, 0, sizeof(short) * nctrl);
     }
 }
@@ -134,13 +149,6 @@ void wxSDLJoy::Notify()
             for (int j = 0; j < nax; j++) {
                 val = SDL_JoystickGetAxis(dev, j);
 
-                // trigger axes always return max negative value, we ignore these
-#if SDL_VERSION_ATLEAST(2, 0, 6)
-                int16_t initial_state;
-                if (SDL_JoystickGetAxisInitialState(dev, j, &initial_state) && val == initial_state)
-                    continue;
-#endif
-
                 if (digital) {
                     if (val > 0x3fff)
                         val = 0x7fff;
diff --git a/src/wx/widgets/wx/joyedit.h b/src/wx/widgets/wx/joyedit.h
index 20891fe3..5cece169 100644
--- a/src/wx/widgets/wx/joyedit.h
+++ b/src/wx/widgets/wx/joyedit.h
@@ -15,6 +15,9 @@ typedef struct wxJoyKeyBinding {
     // if joy is non-0, key = control number, and mod = control type
 } wxJoyKeyBinding;
 
+// Initializer for struct wxJoyKeyBinding
+wxJoyKeyBinding newWxJoyKeyBinding(int key = 0, int mod = 0, int joy = 0);
+
 typedef std::vector<wxJoyKeyBinding> wxJoyKeyBinding_v;
 
 // joystick control types
@@ -87,6 +90,7 @@ public:
     bool TransferFromWindow();
     bool Validate(wxWindow* p)
     {
+        (void)p; // unused params
         return true;
     }
 
diff --git a/src/wx/widgets/wx/keyedit.h b/src/wx/widgets/wx/keyedit.h
index db265fd5..be8435f0 100644
--- a/src/wx/widgets/wx/keyedit.h
+++ b/src/wx/widgets/wx/keyedit.h
@@ -99,6 +99,7 @@ public:
     bool TransferFromWindow();
     bool Validate(wxWindow* p)
     {
+        (void)p; // unused params
         return true;
     }
 
diff --git a/src/wx/widgets/wx/sdljoy.h b/src/wx/widgets/wx/sdljoy.h
index bdc7b194..9fcd3cef 100644
--- a/src/wx/widgets/wx/sdljoy.h
+++ b/src/wx/widgets/wx/sdljoy.h
@@ -13,7 +13,7 @@
 #include <wx/event.h>
 #include <wx/timer.h>
 
-typedef struct wxSDLJoyState wxSDLJoyState_t;
+struct wxSDLJoyState;
 
 class wxSDLJoy : public wxTimer {
 public:
@@ -61,7 +61,7 @@ public:
 protected:
     bool digital;
     int njoy;
-    wxSDLJoyState_t* joystate;
+    wxSDLJoyState* joystate;
     wxEvtHandler* evthandler;
     bool nosticks;
     void Notify();
diff --git a/src/wx/widgets/wx/wxmisc.h b/src/wx/widgets/wx/wxmisc.h
index 383d7e13..ee0be8b6 100644
--- a/src/wx/widgets/wx/wxmisc.h
+++ b/src/wx/widgets/wx/wxmisc.h
@@ -33,16 +33,16 @@ class wxBoolIntValidator : public wxValidator {
 public:
     wxBoolIntValidator(int* _vptr, int _val, int _mask = ~0)
         : wxValidator()
-        , vptr(_vptr)
         , val(_val)
         , mask(_mask)
+        , vptr(_vptr)
     {
     }
     wxBoolIntValidator(const wxBoolIntValidator& v)
         : wxValidator()
-        , vptr(v.vptr)
         , val(v.val)
         , mask(v.mask)
+        , vptr(v.vptr)
     {
     }
     wxObject* Clone() const
@@ -53,6 +53,7 @@ public:
     bool TransferFromWindow();
     bool Validate(wxWindow* p)
     {
+        (void)p; // unused params
         return true;
     }
 
@@ -105,6 +106,7 @@ public:
     bool TransferFromWindow();
     bool Validate(wxWindow* p)
     {
+        (void)p; // unused params
         return true;
     }
 
@@ -133,6 +135,7 @@ public:
     bool TransferFromWindow();
     bool Validate(wxWindow* p)
     {
+        (void)p; // unused params
         return true;
     }
 
@@ -156,8 +159,8 @@ public:
     }
     wxColorValidator(uint16_t* vptr)
         : wxValidator()
-        , ptr16(vptr)
         , ptr32(0)
+        , ptr16(vptr)
     {
     }
     wxColorValidator(const wxColorValidator& v)
@@ -174,6 +177,7 @@ public:
     bool TransferFromWindow();
     bool Validate(wxWindow* p)
     {
+        (void)p; // unused params
         return true;
     }
 
diff --git a/src/wx/widgets/wxmisc.cpp b/src/wx/widgets/wxmisc.cpp
index a2d779a4..e9cc0a00 100644
--- a/src/wx/widgets/wxmisc.cpp
+++ b/src/wx/widgets/wxmisc.cpp
@@ -289,7 +289,7 @@ bool wxColorValidator::TransferFromWindow()
 
 static void enable(wxWindow_v controls, std::vector<int> reverse, bool en)
 {
-    for (int i = 0; i < controls.size(); i++)
+    for (size_t i = 0; i < controls.size(); i++)
         controls[i]->Enable(reverse.size() <= i || !reverse[i] ? en : !en);
 }
 
@@ -461,6 +461,7 @@ bool wxUIntValidator::TransferFromWindow()
 
 bool wxUIntValidator::Validate(wxWindow* parent)
 {
+    (void)parent; // unused params
     wxSpinCtrl* ctrl = wxDynamicCast(GetWindow(), wxSpinCtrl);
 
     if (ctrl) {
diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp
index e6db8bb1..64e2b881 100644
--- a/src/wx/wxvbam.cpp
+++ b/src/wx/wxvbam.cpp
@@ -32,24 +32,12 @@
 IMPLEMENT_APP(wxvbamApp)
 IMPLEMENT_DYNAMIC_CLASS(MainFrame, wxFrame)
 
-// Get XDG_CONFIG_HOME dir manually
-// only native support for XDG config when wxWidgets >= 3.1
-static wxString get_xdg_user_config_home()
+// Initializer for struct cmditem
+cmditem new_cmditem(const wxString cmd, const wxString name, int cmd_id,
+                    int mask_flags, wxMenuItem* mi)
 {
-    wxString path;
-    char *xdg_config_home = getenv("XDG_CONFIG_HOME");
-    // Default for XDG_CONFIG_HOME is '$HOME/.config'
-    if (!xdg_config_home || !*xdg_config_home)
-    {
-	wxString xdg_default(getenv("HOME"));
-	xdg_default += "/.config";
-	path = xdg_default;
-    }
-    else
-    {
-	path = xdg_config_home;
-    }
-    return path + "/";
+    struct cmditem tmp = {cmd, name, cmd_id, mask_flags, mi};
+    return tmp;
 }
 
 // generate config file path
@@ -68,38 +56,48 @@ static void get_config_path(wxPathList& path, bool exists = true)
         if ((wxDirExists(s) && wxIsWritable(s)) || ((!exists || !wxDirExists(s)) && parent.IsDirWritable())) \
             path.Add(s);                                                                                     \
     } while (0)
+#define add_nonstandard_path(p)                                                                                          \
+    do {                                                                                                     \
+        const wxString& s = p;                                                                          \
+        wxFileName parent = wxFileName::DirName(s + wxT("//.."));                                            \
+        parent.MakeAbsolute();                                                                               \
+        if ((wxDirExists(s) && wxIsWritable(s)) || ((!exists || !wxDirExists(s)) && parent.IsDirWritable())) \
+            path.Add(s);                                                                                     \
+    } while (0)
 
     static bool debug_dumped = false;
 
     if (!debug_dumped) {
-        wxLogDebug(wxT("GetUserLocalDataDir(): %s"), stdp.GetUserLocalDataDir().mb_str());
-        wxLogDebug(wxT("GetUserDataDir(): %s"), stdp.GetUserDataDir().mb_str());
-        wxLogDebug(wxT("GetLocalizedResourcesDir(wxGetApp().locale.GetCanonicalName()): %s"), stdp.GetLocalizedResourcesDir(wxGetApp().locale.GetCanonicalName()).mb_str());
-        wxLogDebug(wxT("GetResourcesDir(): %s"), stdp.GetResourcesDir().mb_str());
-        wxLogDebug(wxT("GetDataDir(): %s"), stdp.GetDataDir().mb_str());
-        wxLogDebug(wxT("GetLocalDataDir(): %s"), stdp.GetLocalDataDir().mb_str());
-        wxLogDebug(wxT("GetPluginsDir(): %s"), stdp.GetPluginsDir().mb_str());
-#if defined(__LINUX__)
-        wxLogDebug(wxT("XdgConfigDir: %s"), get_xdg_user_config_home() + current_app_name);
-#endif
+        wxLogDebug(wxT("GetUserLocalDataDir(): %s"), stdp.GetUserLocalDataDir().c_str());
+        wxLogDebug(wxT("GetUserDataDir(): %s"), stdp.GetUserDataDir().c_str());
+        wxLogDebug(wxT("GetLocalizedResourcesDir(wxGetApp().locale.GetCanonicalName()): %s"), stdp.GetLocalizedResourcesDir(wxGetApp().locale.GetCanonicalName()).c_str());
+        wxLogDebug(wxT("GetResourcesDir(): %s"), stdp.GetResourcesDir().c_str());
+        wxLogDebug(wxT("GetDataDir(): %s"), stdp.GetDataDir().c_str());
+        wxLogDebug(wxT("GetLocalDataDir(): %s"), stdp.GetLocalDataDir().c_str());
+        wxLogDebug(wxT("plugins_dir: %s"), wxGetApp().GetPluginsDir().c_str());
+        wxLogDebug(wxT("XdgConfigDir: %s"), (wxString(get_xdg_user_config_home().c_str(), wxConvLibc) + current_app_name).c_str());
         debug_dumped = true;
     }
 
 // When native support for XDG dirs is available (wxWidgets >= 3.1),
 // this will be no longer necessary
-#if defined(__LINUX__)
+#if defined(__WXGTK__)
     // XDG spec manual support
     // ${XDG_CONFIG_HOME:-$HOME/.config}/`appname`
-    wxString old_config = wxString(getenv("HOME")) + "/.vbam";
-    wxString new_config = get_xdg_user_config_home();
+    wxString old_config = wxString(getenv("HOME"), wxConvLibc) + wxT(FILE_SEP) + wxT(".vbam");
+    wxString new_config(get_xdg_user_config_home().c_str(), wxConvLibc);
     if (!wxDirExists(old_config) && wxIsWritable(new_config))
     {
-        path.Add(new_config + current_app_name);
+        wxFileName new_path(new_config, wxEmptyString);
+        new_path.AppendDir(current_app_name);
+        new_path.MakeAbsolute();
+
+        add_nonstandard_path(new_path.GetFullPath());
     }
     else
     {
-	// config is in $HOME/.vbam/vbam.conf
-	path.Add(old_config);
+	// config is in $HOME/.vbam/
+	add_nonstandard_path(old_config);
     }
 #endif
 
@@ -110,7 +108,7 @@ static void get_config_path(wxPathList& path, bool exists = true)
     add_path(GetResourcesDir());
     add_path(GetDataDir());
     add_path(GetLocalDataDir());
-    add_path(GetPluginsDir());
+    add_nonstandard_path(wxGetApp().GetPluginsDir());
 }
 
 static void tack_full_path(wxString& s, const wxString& app = wxEmptyString)
@@ -119,17 +117,18 @@ static void tack_full_path(wxString& s, const wxString& app = wxEmptyString)
     wxPathList full_config_path;
     get_config_path(full_config_path, false);
 
-    for (int i = 0; i < full_config_path.size(); i++)
+    for (size_t i = 0; i < full_config_path.size(); i++)
         s += wxT("\n\t") + full_config_path[i] + app;
 }
 
+const wxString wxvbamApp::GetPluginsDir()
+{
+    return wxStandardPaths::Get().GetPluginsDir();
+}
+
 wxString wxvbamApp::GetConfigurationPath()
 {
-#if defined(__WXMSW__) || defined(__APPLE__)
-    wxString config("vbam.ini");
-#else
-    wxString config("vbam.conf");
-#endif
+    wxString config(wxT("vbam.ini"));
     // first check if config files exists in reverse order
     // (from system paths to more local paths.)
     if (data_path.empty()) {
@@ -149,7 +148,7 @@ wxString wxvbamApp::GetConfigurationPath()
     // dir or parent to create it in in OnInit in normal order
     // (from user paths to system paths.)
     if (data_path.empty()) {
-        for (int i = 0; i < config_path.size(); i++) {
+        for (size_t i = 0; i < config_path.size(); i++) {
             // Check if path is writeable
             if (wxIsWritable(config_path[i])) {
                 data_path = config_path[i];
@@ -215,6 +214,9 @@ bool wxvbamApp::OnInit()
     if (!wxApp::OnInit())
         return false;
 
+    if (console_mode)
+	return true;
+
     // prepare for loading xrc files
     wxXmlResource* xr = wxXmlResource::Get();
     // note: if linking statically, next 2 pull in lot of unused code
@@ -227,7 +229,7 @@ bool wxvbamApp::OnInit()
     // 2.9 has LoadAllFiles(), but this is 2.8, so we'll do it manually
     wxString cwd = wxGetCwd();
 
-    for (int i = 0; i < config_path.size(); i++)
+    for (size_t i = 0; i < config_path.size(); i++)
         if (wxDirExists(config_path[i]) && wxSetWorkingDirectory(config_path[i])) {
             // *.xr[cs] doesn't work (double the number of scans)
             // 2.9 gives errors for no files found, so manual precheck needed
@@ -253,12 +255,22 @@ bool wxvbamApp::OnInit()
 // this needs to be in a subdir to support other config as well
 // but subdir flag behaves differently 2.8 vs. 2.9.  Oh well.
 // NOTE: this does not support XDG (freedesktop.org) paths
-#if defined(__WXMSW__) || defined(__APPLE__)
-    wxString confname("vbam.ini");
-#else
-    wxString confname("vbam.conf");
-#endif
+    wxString confname(wxT("vbam.ini"));
     wxFileName vbamconf(GetConfigurationPath(), confname);
+// /MIGRATION
+// migrate from 'vbam.{cfg,conf}' to 'vbam.ini' to manage a single config
+// file for all platforms.
+#if !defined(__WXMSW__) && !defined(__APPLE__)
+    wxString oldConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.conf"));
+#else
+    wxString oldConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.cfg"));
+#endif
+    wxString newConf(GetConfigurationPath() + wxT(FILE_SEP) + wxT("vbam.ini"));
+    if (wxFileExists(oldConf))
+    {
+	wxRenameFile(oldConf, newConf, false);
+    }
+// /END_MIGRATION
     cfg = new wxFileConfig(wxT("vbam"), wxEmptyString,
         vbamconf.GetFullPath(),
         wxEmptyString, wxCONFIG_USE_LOCAL_FILE);
@@ -295,7 +307,7 @@ bool wxvbamApp::OnInit()
     }
 
     // process command-line options
-    for (int i = 0; i < pending_optset.size(); i++) {
+    for (size_t i = 0; i < pending_optset.size(); i++) {
         auto parts = str_split(pending_optset[i], wxT('='));
         opt_set(parts[0], parts[1]);
     }
@@ -395,6 +407,11 @@ bool wxvbamApp::OnInit()
     }
 
     // create the main window
+    int x = windowPositionX;
+    int y = windowPositionY;
+    int width = windowWidth;
+    int height = windowHeight;
+    int isFullscreen = fullScreen;
     frame = wxDynamicCast(xr->LoadFrame(NULL, wxT("MainFrame")), MainFrame);
 
     if (!frame) {
@@ -406,10 +423,43 @@ bool wxvbamApp::OnInit()
     if (!frame->BindControls())
         return false;
 
+    if (x >= 0 && y >= 0 && width > 0 && height > 0)
+	frame->SetSize(x, y, width, height);
+
+    if (isFullscreen && wxGetApp().pending_load != wxEmptyString)
+	frame->ShowFullScreen(isFullscreen);
     frame->Show(true);
     return true;
 }
 
+int wxvbamApp::OnRun()
+{
+    if (console_mode)
+    {
+	// we could check for our own error codes here...
+	return console_status;
+    }
+    else
+    {
+	return wxApp::OnRun();
+    }
+}
+
+bool wxvbamApp::OnCmdLineHelp(wxCmdLineParser& parser)
+{
+    wxApp::OnCmdLineHelp(parser);
+    console_mode = true;
+    return true;
+}
+
+bool wxvbamApp::OnCmdLineError(wxCmdLineParser& parser)
+{
+    wxApp::OnCmdLineError(parser);
+    console_mode = true;
+    console_status = 1;
+    return true;
+}
+
 void wxvbamApp::OnInitCmdLine(wxCmdLineParser& cl)
 {
     wxApp::OnInitCmdLine(cl);
@@ -428,28 +478,33 @@ void wxvbamApp::OnInitCmdLine(wxCmdLineParser& cl)
     // locale
     static wxCmdLineEntryDesc opttab[] = {
         { wxCMD_LINE_OPTION, NULL, t("save-xrc"),
-            N_("Save built-in XRC file and exit") },
+            N_("Save built-in XRC file and exit"),
+	    wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
         { wxCMD_LINE_OPTION, NULL, t("save-over"),
-            N_("Save built-in vba-over.ini and exit") },
+            N_("Save built-in vba-over.ini and exit"),
+	    wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
         { wxCMD_LINE_SWITCH, NULL, t("print-cfg-path"),
-            N_("Print configuration path and exit") },
+            N_("Print configuration path and exit"),
+	    wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
         { wxCMD_LINE_SWITCH, t("f"), t("fullscreen"),
-            N_("Start in full-screen mode") },
+            N_("Start in full-screen mode"), 
+	    wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
 #if !defined(NO_LINK) && !defined(__WXMSW__)
         { wxCMD_LINE_SWITCH, t("s"), t("delete-shared-state"),
-            N_("Delete shared link state first, if it exists") },
+            N_("Delete shared link state first, if it exists"),
+	    wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
 #endif
         // stupid wx cmd line parser doesn't support duplicate options
         //	{ wxCMD_LINE_OPTION, t("o"),  t("option"),
         //		_("Set configuration option; <opt>=<value> or help for list"),
-        {
-            wxCMD_LINE_SWITCH, t("o"), t("list-options"),
-            N_("List all settable options and exit") },
+        { wxCMD_LINE_SWITCH, t("o"), t("list-options"),
+            N_("List all settable options and exit"),
+	    wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE },
         { wxCMD_LINE_PARAM, NULL, NULL,
             N_("ROM file"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },
         { wxCMD_LINE_PARAM, NULL, NULL,
             N_("<config>=<value>"), wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_MULTIPLE | wxCMD_LINE_PARAM_OPTIONAL },
-        { wxCMD_LINE_NONE }
+        { wxCMD_LINE_NONE, NULL, NULL, NULL, wxCMD_LINE_VAL_NONE, wxCMD_LINE_VAL_NONE }
     };
 // 2.9 automatically translates desc, but 2.8 doesn't
 #if !wxCHECK_VERSION(2, 9, 0)
@@ -491,10 +546,11 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
                     "To override, remove all but changed root node(s).  "
                     "First found root node of correct name in any .xrc or "
                     ".xrs files in following search path overrides built-in:"),
-            s.mb_str());
+            s.c_str());
         tack_full_path(lm);
         wxLogMessage(lm);
-        return false;
+        console_mode = true;
+        return true;
     }
 
     if (cl.Found(wxT("print-cfg-path"))) {
@@ -504,7 +560,8 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
         wxString lm(_("Configuration is read from, in order:"));
         tack_full_path(lm);
         wxLogMessage(lm);
-        return false;
+        console_mode = true;
+        return true;
     }
 
     if (cl.Found(wxT("save-over"), &s)) {
@@ -516,13 +573,14 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
         wxString lm;
         lm.Printf(_("Wrote built-in override file to %s\n"
                     "To override, delete all but changed section.  First found section is used from search path:"),
-            s.mb_str());
+            s.c_str());
         wxString oi = wxFileName::GetPathSeparator();
         oi += wxT("vba-over.ini");
         tack_full_path(lm, oi);
         lm.append(_("\n\tbuilt-in"));
         wxLogMessage(lm);
-        return false;
+        console_mode = true;
+        return true;
     }
 
     if (cl.Found(wxT("f"))) {
@@ -535,17 +593,17 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
                    "For flag options, true and false are specified as 1 and 0, respectively.\n\n"));
 
         for (int i = 0; i < num_opts; i++) {
-            wxPrintf(wxT("%s (%s"), opts[i].opt,
-                opts[i].boolopt ? wxT("flag") : opts[i].stropt ? wxT("string") : !opts[i].enumvals.empty() ? opts[i].enumvals : (wxString)(opts[i].intopt ? wxT("int") : opts[i].doubleopt ? wxT("decimal") : wxT("string")));
+            wxPrintf(wxT("%s (%s"), opts[i].opt.c_str(),
+                opts[i].boolopt ? wxT("flag") : opts[i].stropt ? wxT("string") : !opts[i].enumvals.empty() ? opts[i].enumvals.c_str() : (opts[i].intopt ? wxT("int") : opts[i].doubleopt ? wxT("decimal") : wxT("string")));
 
             if (!opts[i].enumvals.empty()) {
                 const wxString evx = wxGetTranslation(opts[i].enumvals);
 
                 if (wxStrcmp(evx, opts[i].enumvals))
-                    wxPrintf(wxT(" = %s"), evx);
+                    wxPrintf(wxT(" = %s"), evx.c_str());
             }
 
-            wxPrintf(wxT(")\n\t%s\n\n"), opts[i].desc);
+            wxPrintf(wxT(")\n\t%s\n\n"), opts[i].desc.c_str());
 
             if (!opts[i].enumvals.empty())
                 opts[i].enumvals = wxGetTranslation(opts[i].enumvals);
@@ -554,9 +612,10 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
         wxPrintf(_("The commands available for the Keyboard/* option are:\n\n"));
 
         for (int i = 0; i < ncmds; i++)
-            wxPrintf(wxT("%s (%s)\n"), cmdtab[i].cmd, cmdtab[i].name);
+            wxPrintf(wxT("%s (%s)\n"), cmdtab[i].cmd.c_str(), cmdtab[i].name.c_str());
 
-        return false;
+        console_mode = true;
+        return true;
     }
 
 #if !defined(NO_LINK) && !defined(__WXMSW__)
@@ -585,11 +644,11 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
             } else {
                 if (!complained) {
                     wxFprintf(stderr, _("Bad configuration option or multiple ROM files given:\n"));
-                    wxFprintf(stderr, wxT("%s\n"), pending_load.mb_str());
+                    wxFprintf(stderr, wxT("%s\n"), pending_load.c_str());
                     complained = true;
                 }
 
-                wxFprintf(stderr, wxT("%s\n"), p);
+                wxFprintf(stderr, wxT("%s\n"), p.c_str());
             }
         }
     }
@@ -601,16 +660,30 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
     return true;
 }
 
+wxString wxvbamApp::GetConfigDir()
+{
+    return GetAbsolutePath(wxString((get_xdg_user_config_home() + DOT_DIR).c_str(), wxConvLibc));
+}
+
+wxString wxvbamApp::GetDataDir()
+{
+    return GetAbsolutePath(wxString((get_xdg_user_data_home() + DOT_DIR).c_str(), wxConvLibc));
+}
+
 wxvbamApp::~wxvbamApp() {
-    free(home);
+    if (home != NULL)
+    {
+	free(home);
+	home = NULL;
+    }
 }
 
 MainFrame::MainFrame()
     : wxFrame()
-    , focused(false)
     , paused(false)
     , menus_opened(0)
     , dialog_opened(0)
+    , focused(false)
 {
 }
 
@@ -629,6 +702,9 @@ EVT_ACTIVATE(MainFrame::OnActivate)
 // requires DragAcceptFiles(true); even then may not do anything
 EVT_DROP_FILES(MainFrame::OnDropFile)
 
+// for window geometry
+EVT_MOVE(MainFrame::OnMove)
+EVT_SIZE(MainFrame::OnSize)
 // pause game if menu pops up
 //
 // This is a feature most people don't like, and it causes problems with
@@ -684,6 +760,40 @@ void MainFrame::OnMenu(wxContextMenuEvent& event)
     }
 }
 
+void MainFrame::OnMove(wxMoveEvent& event)
+{
+    (void)event; // unused params
+    wxRect pos = GetRect();
+    int x = pos.GetX(), y = pos.GetY();
+    if (x >= 0 && y >= 0 && !IsFullScreen())
+    {
+	windowPositionX = x;
+	windowPositionY = y;
+	update_opts();
+    }
+}
+
+void MainFrame::OnSize(wxSizeEvent& event)
+{
+    wxFrame::OnSize(event);
+    wxRect pos = GetRect();
+    int height = pos.GetHeight(), width = pos.GetWidth();
+    int x = pos.GetX(), y = pos.GetY();
+    bool isFullscreen = IsFullScreen();
+    if (height > 0 && width > 0 && !isFullscreen)
+    {
+	windowHeight = height;
+	windowWidth = width;
+    }
+    if (x >= 0 && y >= 0 && !isFullscreen)
+    {
+	windowPositionX = x;
+	windowPositionY = y;
+    }
+    fullScreen = isFullscreen;
+    update_opts();
+}
+
 wxString MainFrame::GetGamePath(wxString path)
 {
     wxString game_path = path;
@@ -699,7 +809,10 @@ wxString MainFrame::GetGamePath(wxString path)
         game_path = wxFileName::GetCwd();
 
     if (!wxIsWritable(game_path))
-        game_path = wxGetApp().GetConfigurationPath();
+    {
+	game_path = wxGetApp().GetAbsolutePath(wxString((get_xdg_user_data_home() + DOT_DIR).c_str(), wxConvLibc));
+	wxFileName::Mkdir(game_path, 0777, wxPATH_MKDIR_FULL);
+    }
 
     return game_path;
 }
@@ -716,7 +829,7 @@ void MainFrame::SetJoystick()
         for (int j = 0; j < NUM_KEYS; j++) {
             wxJoyKeyBinding_v b = gopts.joykey_bindings[i][j];
 
-            for (int k = 0; k < b.size(); k++) {
+            for (size_t k = 0; k < b.size(); k++) {
                 int jn = b[k].joy;
 
                 if (jn) {
@@ -766,7 +879,7 @@ void MainFrame::update_state_ts(bool force)
 
         if (panel->game_type() != IMAGE_UNKNOWN) {
             wxString fn;
-            fn.Printf(SAVESLOT_FMT, panel->game_name().mb_str(), i + 1);
+            fn.Printf(SAVESLOT_FMT, panel->game_name().c_str(), i + 1);
             wxFileName fp(panel->state_dir(), fn);
             wxDateTime ts; // = wxInvalidDateTime
 
@@ -785,7 +898,7 @@ void MainFrame::update_state_ts(bool force)
                 wxString df = fts.Format(wxT("0&0 %x %X"));
 
                 if (!ts.IsValid())
-                    for (int j = 0; j < df.size(); j++)
+                    for (size_t j = 0; j < df.size(); j++)
                         if (wxIsdigit(df[j]))
                             df[j] = wxT('-');
 
diff --git a/src/wx/wxvbam.h b/src/wx/wxvbam.h
index fbefca0d..23fc725e 100644
--- a/src/wx/wxvbam.h
+++ b/src/wx/wxvbam.h
@@ -83,10 +83,16 @@ public:
     {
     }
     virtual bool OnInit();
+    virtual int OnRun();
+    virtual bool OnCmdLineHelp(wxCmdLineParser&);
+    virtual bool OnCmdLineError(wxCmdLineParser&);
     virtual bool UsingWayland() { return using_wayland; }
     virtual void OnInitCmdLine(wxCmdLineParser&);
     virtual bool OnCmdLineParsed(wxCmdLineParser&);
+    virtual wxString GetConfigDir();
+    virtual wxString GetDataDir();
     wxString GetConfigurationPath();
+    const wxString GetPluginsDir();
     wxString GetAbsolutePath(wxString path);
     // name of a file to load at earliest opportunity
     wxString pending_load;
@@ -139,10 +145,12 @@ public:
 
 protected:
     bool using_wayland;
+    bool console_mode = false;
+    int console_status = 0;
 
 private:
     wxPathList config_path;
-    char* home;
+    char* home = NULL;
 };
 
 DECLARE_APP(wxvbamApp);
@@ -355,6 +363,9 @@ private:
     void OnDropFile(wxDropFilesEvent&);
     // pop up menu in fullscreen mode
     void OnMenu(wxContextMenuEvent&);
+    // window geometry
+    void OnMove(wxMoveEvent& event);
+    void OnSize(wxSizeEvent& event);
     // Load a named wxDialog from the XRC file
     wxDialog* LoadXRCDialog(const char* name);
     // Load a named wxDialog from the XRC file
@@ -645,6 +656,11 @@ extern struct cmditem {
     wxMenuItem* mi; // the menu item to invoke command, if present
 } cmdtab[];
 extern const int ncmds;
+
+// Initializer for struct cmditem
+cmditem new_cmditem(const wxString cmd = "", const wxString name = "",
+                    int cmd_id = 0, int mask_flags = 0, wxMenuItem* mi = NULL);
+
 // for binary search
 extern bool cmditem_lt(const struct cmditem& cmd1, const struct cmditem& cmd2);
 
diff --git a/src/wx/xrc/AccelConfig.xrc b/src/wx/xrc/AccelConfig.xrc
index 607214b8..53aa82ed 100644
--- a/src/wx/xrc/AccelConfig.xrc
+++ b/src/wx/xrc/AccelConfig.xrc
@@ -1,128 +1,128 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="AccelConfig">
-    <title>Key Shortcuts</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Co_mmands:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTreeCtrl" name="Commands">
-                  <style>wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_FULL_ROW_HIGHLIGHT|wxTR_HIDE_ROOT</style>
-                  <size>300,300</size>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Current Keys:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxListBox" name="Current"/>
-                <option>1</option>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxButton" name="Assign">
-                  <label>_Assign</label>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxButton" name="Remove">
-                  <label>_Remove</label>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxButton" name="ResetAll">
-                  <label>Re_set All</label>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <cols>3</cols>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Currently assigned to:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="AlreadyThere"/>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Shortcut Key:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTextCtrl" name="Shortcut" subclass="wxKeyTextCtrl">
-                  <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="AccelConfig">
+    <title>Key Shortcuts</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Co_mmands:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxTreeCtrl" name="Commands">
+                  <style>wxTR_HAS_BUTTONS|wxTR_NO_LINES|wxTR_FULL_ROW_HIGHLIGHT|wxTR_HIDE_ROOT</style>
+                  <size>300,300</size>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Current Keys:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxListBox" name="Current"/>
+                <option>1</option>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxButton" name="Assign">
+                  <label>_Assign</label>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxButton" name="Remove">
+                  <label>_Remove</label>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxButton" name="ResetAll">
+                  <label>Re_set All</label>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <cols>3</cols>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Currently assigned to:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="AlreadyThere"/>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Shortcut Key:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxTextCtrl" name="Shortcut" subclass="wxKeyTextCtrl">
+                  <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/CheatAdd.xrc b/src/wx/xrc/CheatAdd.xrc
index 224142b1..a217a6ab 100644
--- a/src/wx/xrc/CheatAdd.xrc
+++ b/src/wx/xrc/CheatAdd.xrc
@@ -1,113 +1,113 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="CheatAdd">
-    <title>Add Cheat</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>_Description</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Desc"/>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>Address</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Address"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxVERTICAL</orient>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>_Value</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <option>1</option>
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Value"/>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>Format</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Format"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxVERTICAL</orient>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK">
-              <default>1</default>
-            </object>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="CheatAdd">
+    <title>Add Cheat</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>_Description</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Desc"/>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>Address</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Address"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxVERTICAL</orient>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>_Value</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <option>1</option>
+        <object class="wxBoxSizer">
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Value"/>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>Format</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Format"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxVERTICAL</orient>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK">
+              <default>1</default>
+            </object>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/CheatCreate.xrc b/src/wx/xrc/CheatCreate.xrc
index 31e8b8be..ebe163e1 100644
--- a/src/wx/xrc/CheatCreate.xrc
+++ b/src/wx/xrc/CheatCreate.xrc
@@ -1,218 +1,218 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="CheatCreate">
-    <title>Cheat Search</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxListCtrl" name="CheatList" subclass="CheatListCtrl">
-          <style>wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VIRTUAL</style>
-        </object>
-        <option>1</option>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <minsize>-1,200</minsize>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="EQ">
-                  <label>E_qual</label>
-                  <style>wxRB_GROUP</style>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="NE">
-                  <label>_Not equal</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="LT">
-                  <label>_Less than</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="LE">
-                  <label>L_ess or equal</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="GT">
-                  <label>_Greater than</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="GE">
-                  <label>G_reater or equal</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <label>Compare type</label>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Signed">
-                      <label>S_igned</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Unsigned">
-                      <label>_Unsigned</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Hexadecimal">
-                      <label>_Hexadecimal</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <label>Signed/Unsigned</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Size8">
-                      <label>_8 bits</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Size16">
-                      <label>_16 bits</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Size32">
-                      <label>_32 bits</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <label>Data size</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <option>1</option>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="OldValue">
-                      <label>Ol_d value</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="SpecificValue">
-                      <label>Specific _value</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxTextCtrl" name="Value"/>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <label>Search value</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <option>1</option>
-            <flag>wxEXPAND</flag>
-          </object>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Search">
-              <label>_Search</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Update">
-              <label>U_pdate Old</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Clear">
-              <label>_Clear</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="AddCheat">
-              <label>_Add cheat</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_OK"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxALIGN_CENTRE</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="CheatCreate">
+    <title>Cheat Search</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxListCtrl" name="CheatList" subclass="CheatListCtrl">
+          <style>wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VIRTUAL</style>
+        </object>
+        <option>1</option>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <minsize>-1,200</minsize>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="EQ">
+                  <label>E_qual</label>
+                  <style>wxRB_GROUP</style>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="NE">
+                  <label>_Not equal</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="LT">
+                  <label>_Less than</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="LE">
+                  <label>L_ess or equal</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="GT">
+                  <label>_Greater than</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="GE">
+                  <label>G_reater or equal</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <label>Compare type</label>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Signed">
+                      <label>S_igned</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Unsigned">
+                      <label>_Unsigned</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Hexadecimal">
+                      <label>_Hexadecimal</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <label>Signed/Unsigned</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Size8">
+                      <label>_8 bits</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Size16">
+                      <label>_16 bits</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Size32">
+                      <label>_32 bits</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <label>Data size</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <option>1</option>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="OldValue">
+                      <label>Ol_d value</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="SpecificValue">
+                      <label>Specific _value</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxTextCtrl" name="Value"/>
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <label>Search value</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <option>1</option>
+            <flag>wxEXPAND</flag>
+          </object>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Search">
+              <label>_Search</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Update">
+              <label>U_pdate Old</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Clear">
+              <label>_Clear</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="AddCheat">
+              <label>_Add cheat</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_OK"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxALIGN_CENTRE</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/CheatEdit.xrc b/src/wx/xrc/CheatEdit.xrc
index 4c4db2ee..a62fc32f 100644
--- a/src/wx/xrc/CheatEdit.xrc
+++ b/src/wx/xrc/CheatEdit.xrc
@@ -1,93 +1,93 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="CheatEdit">
-    <title>Edit Cheat</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>_Description</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Desc"/>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>_Type</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxChoice" name="Type"/>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <orient>wxVERTICAL</orient>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>C_odes</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <option>1</option>
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Codes">
-              <style>wxTE_MULTILINE|wxTE_DONTWRAP</style>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK">
-              <default>1</default>
-            </object>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="CheatEdit">
+    <title>Edit Cheat</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>_Description</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Desc"/>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>_Type</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxChoice" name="Type"/>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <orient>wxVERTICAL</orient>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>C_odes</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <option>1</option>
+        <object class="wxBoxSizer">
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Codes">
+              <style>wxTE_MULTILINE|wxTE_DONTWRAP</style>
+            </object>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK">
+              <default>1</default>
+            </object>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/CheatList.xrc b/src/wx/xrc/CheatList.xrc
index 9b497423..a2f41deb 100644
--- a/src/wx/xrc/CheatList.xrc
+++ b/src/wx/xrc/CheatList.xrc
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="CheatList">
-    <title>Cheat List</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxToolBar">
-          <object class="tool" name="wxID_OPEN">
-            <bitmap stock_id="wxART_FILE_OPEN"/>
-            <tooltip>Open cheat list</tooltip>
-          </object>
-          <object class="tool" name="wxID_SAVE">
-            <bitmap stock_id="wxART_FILE_SAVE"/>
-            <tooltip>Save cheat list</tooltip>
-          </object>
-          <object class="separator"/>
-          <object class="tool" name="wxID_ADD">
-            <bitmap stock_id="wxART_ADD_BOOKMARK"/>
-            <tooltip>Add new cheat</tooltip>
-          </object>
-          <object class="tool" name="wxID_REMOVE">
-            <bitmap stock_id="wxART_DEL_BOOKMARK"/>
-            <tooltip>Delete selected cheat</tooltip>
-          </object>
-          <object class="tool" name="wxID_CLEAR">
-            <bitmap platform="unix" stock_id="gtk-clear"/>
-            <bitmap stock_id="wxART_DELETE"/>
-            <tooltip>Delete all cheats</tooltip>
-          </object>
-          <object class="separator"/>
-          <object class="tool" name="wxID_SELECTALL">
-            <bitmap platform="unix" stock_id="gtk-select-all"/>
-            <bitmap stock_id="wxART_TICK_MARK"/>
-            <tooltip>Toggle all Cheats</tooltip>
-          </object>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxListCtrl" name="Cheats" subclass="wxCheckedListCtrl">
-          <style>wxLC_REPORT</style>
-        </object>
-        <option>1</option>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <minsize>200,100d</minsize>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK">
-              <default>1</default>
-            </object>
-          </object>
-        </object>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="CheatList">
+    <title>Cheat List</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxToolBar">
+          <object class="tool" name="wxID_OPEN">
+            <bitmap stock_id="wxART_FILE_OPEN"/>
+            <tooltip>Open cheat list</tooltip>
+          </object>
+          <object class="tool" name="wxID_SAVE">
+            <bitmap stock_id="wxART_FILE_SAVE"/>
+            <tooltip>Save cheat list</tooltip>
+          </object>
+          <object class="separator"/>
+          <object class="tool" name="wxID_ADD">
+            <bitmap stock_id="wxART_ADD_BOOKMARK"/>
+            <tooltip>Add new cheat</tooltip>
+          </object>
+          <object class="tool" name="wxID_REMOVE">
+            <bitmap stock_id="wxART_DEL_BOOKMARK"/>
+            <tooltip>Delete selected cheat</tooltip>
+          </object>
+          <object class="tool" name="wxID_CLEAR">
+            <bitmap platform="unix" stock_id="gtk-clear"/>
+            <bitmap stock_id="wxART_DELETE"/>
+            <tooltip>Delete all cheats</tooltip>
+          </object>
+          <object class="separator"/>
+          <object class="tool" name="wxID_SELECTALL">
+            <bitmap platform="unix" stock_id="gtk-select-all"/>
+            <bitmap stock_id="wxART_TICK_MARK"/>
+            <tooltip>Toggle all Cheats</tooltip>
+          </object>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxListCtrl" name="Cheats" subclass="wxCheckedListCtrl">
+          <style>wxLC_REPORT</style>
+        </object>
+        <option>1</option>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <minsize>200,100d</minsize>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK">
+              <default>1</default>
+            </object>
+          </object>
+        </object>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/CodeSelect.xrc b/src/wx/xrc/CodeSelect.xrc
index 0785ddbb..5532b04a 100644
--- a/src/wx/xrc/CodeSelect.xrc
+++ b/src/wx/xrc/CodeSelect.xrc
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="CodeSelect">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxListBox" name="CodeList">
-          <style>wxLB_HSCROLL|wxLB_SORT</style>
-        </object>
-        <option>1</option>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="CodeSelect">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxListBox" name="CodeList">
+          <style>wxLB_HSCROLL|wxLB_SORT</style>
+        </object>
+        <option>1</option>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/DirectoriesConfig.xrc b/src/wx/xrc/DirectoriesConfig.xrc
index dc5c9b20..6cede2cd 100644
--- a/src/wx/xrc/DirectoriesConfig.xrc
+++ b/src/wx/xrc/DirectoriesConfig.xrc
@@ -1,135 +1,135 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="DirectoriesConfig">
-    <title>Directories</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Game Boy Advance ROMs</label>
-            </object>
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxDirPickerCtrl" name="GBARoms">
-              <message>Game Boy Advance ROMs</message>
-              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
-              <size>439,30</size>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Game Boy ROMs</label>
-            </object>
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxDirPickerCtrl" name="GBRoms">
-              <message>Game Boy ROMs</message>
-              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Game Boy Color ROMs</label>
-            </object>
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxDirPickerCtrl" name="GBCRoms">
-              <message>Game Boy Color ROMs</message>
-              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Native Saves</label>
-            </object>
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxDirPickerCtrl" name="BatSaves">
-              <message>Native Saves</message>
-              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Emulator Saves</label>
-            </object>
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxDirPickerCtrl" name="StateSaves">
-              <message>Emulator Saves</message>
-              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Screenshots</label>
-            </object>
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxDirPickerCtrl" name="Screenshots">
-              <message>Screenshots</message>
-              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Recordings</label>
-            </object>
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxDirPickerCtrl" name="Recordings">
-              <message>Recordings</message>
-              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <cols>2</cols>
-          <growablecols>1</growablecols>
-        </object>
-        <option>1</option>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="DirectoriesConfig">
+    <title>Directories</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Game Boy Advance ROMs</label>
+            </object>
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxDirPickerCtrl" name="GBARoms">
+              <message>Game Boy Advance ROMs</message>
+              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
+              <size>439,30</size>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Game Boy ROMs</label>
+            </object>
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxDirPickerCtrl" name="GBRoms">
+              <message>Game Boy ROMs</message>
+              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Game Boy Color ROMs</label>
+            </object>
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxDirPickerCtrl" name="GBCRoms">
+              <message>Game Boy Color ROMs</message>
+              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Native Saves</label>
+            </object>
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxDirPickerCtrl" name="BatSaves">
+              <message>Native Saves</message>
+              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Emulator Saves</label>
+            </object>
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxDirPickerCtrl" name="StateSaves">
+              <message>Emulator Saves</message>
+              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Screenshots</label>
+            </object>
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxDirPickerCtrl" name="Screenshots">
+              <message>Screenshots</message>
+              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Recordings</label>
+            </object>
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxDirPickerCtrl" name="Recordings">
+              <message>Recordings</message>
+              <style>wxDIRP_USE_TEXTCTRL|wxDIRP_DIR_MUST_EXIST</style>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <cols>2</cols>
+          <growablecols>1</growablecols>
+        </object>
+        <option>1</option>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/Disassemble.xrc b/src/wx/xrc/Disassemble.xrc
index f9e566bf..bd401f67 100644
--- a/src/wx/xrc/Disassemble.xrc
+++ b/src/wx/xrc/Disassemble.xrc
@@ -1,482 +1,482 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="Disassemble">
-    <title>Disassemble</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="InsAuto">
-                      <label>_Automatic</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="InsARM">
-                      <label>A_RM</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="InsThumb">
-                      <label>_THUMB</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxTextCtrl" name="GotoAddress">
-                      <style>wxTE_PROCESS_ENTER</style>
-                    </object>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxButton" name="Goto">
-                      <label>_Go</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <orient>wxHORIZONTAL</orient>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxPanel" name="Disassembly" subclass="DisList">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                </object>
-                <option>1</option>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-            </object>
-            <option>1</option>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R0:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R0">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R1:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R1">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R2:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R2">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R3:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R3">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R4:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R4">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R5:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R5">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R6:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R6">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R7:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R7">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R8:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R8">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R9:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R9">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R10:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R10">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R11:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R11">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>R12:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R12">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>SP:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R13">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>LR:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R14">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>PC:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R15">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>CPSR:</label>
-                </object>
-                <flag>wxBOTTOM|wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="R16">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00000000</label>
-                </object>
-                <flag>wxBOTTOM|wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="N" subclass="DispCheckBox">
-                  <label>N</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="I" subclass="DispCheckBox">
-                  <label>I</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="Z" subclass="DispCheckBox">
-                  <label>Z</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="F" subclass="DispCheckBox">
-                  <label>F</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="C" subclass="DispCheckBox">
-                  <label>C</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="T" subclass="DispCheckBox">
-                  <label>T</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="V" subclass="DispCheckBox">
-                  <label>V</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxGridSizer">
-                  <cols>2</cols>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Mode:</label>
-                    </object>
-                    <flag>wxLEFT|wxRIGHT</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Mode">
-                      <font>
-                        <family>modern</family>
-                      </font>
-                      <label>00</label>
-                    </object>
-                    <flag>wxLEFT</flag>
-                    <border>5</border>
-                  </object>
-                </object>
-              </object>
-              <cols>2</cols>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <option>1</option>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxCheckBox" name="AutoUpdate">
-          <label>Automatic _update</label>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <cols>4</cols>
-          <object class="sizeritem">
-            <object class="wxButton" name="GotoPC">
-              <label>G_oto PC</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>Re_fresh</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Next">
-              <label>_Next</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="Disassemble">
+    <title>Disassemble</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="InsAuto">
+                      <label>_Automatic</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="InsARM">
+                      <label>A_RM</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="InsThumb">
+                      <label>_THUMB</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxTextCtrl" name="GotoAddress">
+                      <style>wxTE_PROCESS_ENTER</style>
+                    </object>
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxButton" name="Goto">
+                      <label>_Go</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <orient>wxHORIZONTAL</orient>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxPanel" name="Disassembly" subclass="DisList">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                </object>
+                <option>1</option>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+            </object>
+            <option>1</option>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R0:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R0">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R1:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R1">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R2:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R2">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R3:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R3">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R4:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R4">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R5:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R5">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R6:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R6">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R7:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R7">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R8:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R8">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R9:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R9">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R10:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R10">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R11:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R11">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>R12:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R12">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>SP:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R13">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>LR:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R14">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>PC:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R15">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>CPSR:</label>
+                </object>
+                <flag>wxBOTTOM|wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="R16">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00000000</label>
+                </object>
+                <flag>wxBOTTOM|wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="N" subclass="DispCheckBox">
+                  <label>N</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="I" subclass="DispCheckBox">
+                  <label>I</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="Z" subclass="DispCheckBox">
+                  <label>Z</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="F" subclass="DispCheckBox">
+                  <label>F</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="C" subclass="DispCheckBox">
+                  <label>C</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="T" subclass="DispCheckBox">
+                  <label>T</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="V" subclass="DispCheckBox">
+                  <label>V</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxGridSizer">
+                  <cols>2</cols>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Mode:</label>
+                    </object>
+                    <flag>wxLEFT|wxRIGHT</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Mode">
+                      <font>
+                        <family>modern</family>
+                      </font>
+                      <label>00</label>
+                    </object>
+                    <flag>wxLEFT</flag>
+                    <border>5</border>
+                  </object>
+                </object>
+              </object>
+              <cols>2</cols>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <option>1</option>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxCheckBox" name="AutoUpdate">
+          <label>Automatic _update</label>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <cols>4</cols>
+          <object class="sizeritem">
+            <object class="wxButton" name="GotoPC">
+              <label>G_oto PC</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>Re_fresh</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Next">
+              <label>_Next</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/DisplayConfig.xrc b/src/wx/xrc/DisplayConfig.xrc
index 5a8394fe..3fbcd28f 100644
--- a/src/wx/xrc/DisplayConfig.xrc
+++ b/src/wx/xrc/DisplayConfig.xrc
@@ -1,303 +1,303 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="DisplayConfig">
-    <title>Display settings</title>
-    <object class="wxBoxSizer">
-    <orient>wxVERTICAL</orient>
-    <object class="sizeritem">
-    <object class="wxNotebook">
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Output module</label>
-              <font>
-                <weight>bold</weight>
-              </font>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-            <object class="wxBoxSizer">
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <orient>wxHORIZONTAL</orient>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="OutputSimple">
-                      <label>Simple</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="OutputQuartz2D">
-                      <label>Quartz2D</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="OutputOpenGL">
-                      <label>OpenGL</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="OutputDirect3D">
-                      <label>Direct3D 9</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                </object>
-              </object>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Filters</label>
-              <font>
-                <weight>bold</weight>
-              </font>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <object class="sizeritem">
-                <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-                <object class="wxStaticText">
-                  <label>Display filter :</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="Filter">
-                  <content>
-                    <item>None</item>
-                    <item>2xSaI</item>
-                    <item>Super 2xSaI</item>
-                    <item>Super Eagle</item>
-                    <item>Pixelate</item>
-                    <item>Advance MAME Scale2x</item>
-                    <item>Bilinear</item>
-                    <item>Bilinear Plus</item>
-                    <item>Scanlines</item>
-                    <item>TV Mode</item>
-                    <item>HQ 2x</item>
-                    <item>LQ 2x</item>
-                    <item>Simple 2x</item>
-                    <item>Simple 3x</item>
-                    <item>HQ 3x</item>
-                    <item>Simple 4x</item>
-                    <item>HQ 4x</item>
-                    <item>xBRZ 2x</item>
-                    <item>xBRZ 3x</item>
-                    <item>xBRZ 4x</item>
-                    <item>xBRZ 5x</item>
-                    <item>xBRZ 6x</item>
-                    <item>Plugin</item>
-                  </content>
-                </object>
-				<flag>wxALL|wxEXPAND</flag>
-				<border>5</border>
-              </object>
-			  <object class="sizeritem">
-                <object class="wxStaticText" name="PluginLab">
-                  <label>Plugin :</label>
-                </object>
-				<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-				<border>5</border>
-              </object>
-			  <object class="sizeritem">
-                <object class="wxChoice" name="Plugin"/>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Interframe blending :</label>
-                </object>
-                <flag>wxRIGHT|wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="IFB">
-                  <content>
-                    <item>None</item>
-                    <item>Smart interframe blending</item>
-                    <item>Interframe motion blur</item>
-                  </content>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <cols>2</cols>
-              <growablecols>1</growablecols>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>Basic</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Frame Skip</label>
-              <font>
-                <weight>bold</weight>
-              </font>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-                <object class="wxBoxSizer">
-                  <orient>wxHORIZONTAL</orient>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="FrameSkipLab">
-                      <label>_Number of frames to skip :</label>
-                    </object>
-                    <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxSpinCtrl" name="FrameSkip">
-                      <min>0</min>
-                      <max>9</max>
-                    </object>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                </object>
-              </object>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>Speed</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <flag>wxEXPAND</flag>
-                <object class="wxBoxSizer">
-                  <orient>wxHORIZONTAL</orient>
-                  <object class="sizeritem">
-                    <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                    <border>5</border>
-                    <object class="wxStaticText">
-                      <label>Speed indicator :</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxChoice" name="SpeedIndicator">
-                      <content>
-                        <item>None</item>
-                        <item>Percentage</item>
-                        <item>Detailed</item>
-                      </content>
-                    </object>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                </object>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-          </object>
-        </object>
-      </object>
-      <label>On-Screen Display</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Default magnification :</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTextCtrl" name="DefaultScale">
-                </object>
-                <option>1</option>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <orient>wxHORIZONTAL</orient>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Maximum magnification factor :</label>
-                  <tooltip>0 = no maximum</tooltip>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxSpinCtrl" name="MaxScale">
-                  <tooltip>0 = no limit</tooltip>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-        </object>
-      </object>
-      <label>Zoom</label>
-    </object>
-  </object>
-  </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-             <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-             <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-  </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="DisplayConfig">
+    <title>Display settings</title>
+    <object class="wxBoxSizer">
+    <orient>wxVERTICAL</orient>
+    <object class="sizeritem">
+    <object class="wxNotebook">
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Output module</label>
+              <font>
+                <weight>bold</weight>
+              </font>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+            <object class="wxBoxSizer">
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxBoxSizer">
+                  <orient>wxHORIZONTAL</orient>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="OutputSimple">
+                      <label>Simple</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="OutputQuartz2D">
+                      <label>Quartz2D</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="OutputOpenGL">
+                      <label>OpenGL</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="OutputDirect3D">
+                      <label>Direct3D 9</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Filters</label>
+              <font>
+                <weight>bold</weight>
+              </font>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <object class="sizeritem">
+                <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+                <object class="wxStaticText">
+                  <label>Display filter :</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="Filter">
+                  <content>
+                    <item>None</item>
+                    <item>2xSaI</item>
+                    <item>Super 2xSaI</item>
+                    <item>Super Eagle</item>
+                    <item>Pixelate</item>
+                    <item>Advance MAME Scale2x</item>
+                    <item>Bilinear</item>
+                    <item>Bilinear Plus</item>
+                    <item>Scanlines</item>
+                    <item>TV Mode</item>
+                    <item>HQ 2x</item>
+                    <item>LQ 2x</item>
+                    <item>Simple 2x</item>
+                    <item>Simple 3x</item>
+                    <item>HQ 3x</item>
+                    <item>Simple 4x</item>
+                    <item>HQ 4x</item>
+                    <item>xBRZ 2x</item>
+                    <item>xBRZ 3x</item>
+                    <item>xBRZ 4x</item>
+                    <item>xBRZ 5x</item>
+                    <item>xBRZ 6x</item>
+                    <item>Plugin</item>
+                  </content>
+                </object>
+				<flag>wxALL|wxEXPAND</flag>
+				<border>5</border>
+              </object>
+			  <object class="sizeritem">
+                <object class="wxStaticText" name="PluginLab">
+                  <label>Plugin :</label>
+                </object>
+				<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+				<border>5</border>
+              </object>
+			  <object class="sizeritem">
+                <object class="wxChoice" name="Plugin"/>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Interframe blending :</label>
+                </object>
+                <flag>wxRIGHT|wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="IFB">
+                  <content>
+                    <item>None</item>
+                    <item>Smart interframe blending</item>
+                    <item>Interframe motion blur</item>
+                  </content>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <cols>2</cols>
+              <growablecols>1</growablecols>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>Basic</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Frame Skip</label>
+              <font>
+                <weight>bold</weight>
+              </font>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+                <object class="wxBoxSizer">
+                  <orient>wxHORIZONTAL</orient>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="FrameSkipLab">
+                      <label>_Number of frames to skip :</label>
+                    </object>
+                    <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxSpinCtrl" name="FrameSkip">
+                      <min>0</min>
+                      <max>9</max>
+                    </object>
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                </object>
+              </object>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>Speed</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <flag>wxEXPAND</flag>
+                <object class="wxBoxSizer">
+                  <orient>wxHORIZONTAL</orient>
+                  <object class="sizeritem">
+                    <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                    <border>5</border>
+                    <object class="wxStaticText">
+                      <label>Speed indicator :</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxChoice" name="SpeedIndicator">
+                      <content>
+                        <item>None</item>
+                        <item>Percentage</item>
+                        <item>Detailed</item>
+                      </content>
+                    </object>
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                </object>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+          </object>
+        </object>
+      </object>
+      <label>On-Screen Display</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Default magnification :</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxTextCtrl" name="DefaultScale">
+                </object>
+                <option>1</option>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <orient>wxHORIZONTAL</orient>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Maximum magnification factor :</label>
+                  <tooltip>0 = no maximum</tooltip>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="MaxScale">
+                  <tooltip>0 = no limit</tooltip>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+        </object>
+      </object>
+      <label>Zoom</label>
+    </object>
+  </object>
+  </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+             <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+             <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+  </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/ExportSPS.xrc b/src/wx/xrc/ExportSPS.xrc
index f08efa6f..88daad58 100644
--- a/src/wx/xrc/ExportSPS.xrc
+++ b/src/wx/xrc/ExportSPS.xrc
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="ExportSPS">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Title:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Title"/>
-            <flag>wxEXPAND|wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Description:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Description"/>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Notes:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Notes">
-              <style>wxTE_PROCESS_ENTER|wxTE_MULTILINE|wxHSCROLL</style>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-            <minsize>200,100</minsize>
-          </object>
-          <cols>2</cols>
-          <growablecols>1</growablecols>
-          <growablerows>2</growablerows>
-        </object>
-        <option>1</option>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="ExportSPS">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Title:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Title"/>
+            <flag>wxEXPAND|wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Description:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Description"/>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Notes:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Notes">
+              <style>wxTE_PROCESS_ENTER|wxTE_MULTILINE|wxHSCROLL</style>
+            </object>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+            <minsize>200,100</minsize>
+          </object>
+          <cols>2</cols>
+          <growablecols>1</growablecols>
+          <growablerows>2</growablerows>
+        </object>
+        <option>1</option>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBAROMInfo.xrc b/src/wx/xrc/GBAROMInfo.xrc
index 50e2de76..07558ef7 100644
--- a/src/wx/xrc/GBAROMInfo.xrc
+++ b/src/wx/xrc/GBAROMInfo.xrc
@@ -1,170 +1,170 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GBAROMInfo">
-    <title>Rom Information</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Game title:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Title"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Internal title:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="IntTitle"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Scene Release:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Scene"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Release Number:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Release"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>CRC32:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="CRC32"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Game code:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="GameCode"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Maker code:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="MakerCode"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Maker name:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="MakerName"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Main unit code:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="UnitCode"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Device type:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="DeviceType"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>ROM version:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Version"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>CRC:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="CRC">
-              <label>ROM Information</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <cols>2</cols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GBAROMInfo">
+    <title>Rom Information</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Game title:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Title"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Internal title:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="IntTitle"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Scene Release:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Scene"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Release Number:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Release"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>CRC32:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="CRC32"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Game code:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="GameCode"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Maker code:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="MakerCode"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Maker name:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="MakerName"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Main unit code:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="UnitCode"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Device type:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="DeviceType"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>ROM version:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Version"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>CRC:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="CRC">
+              <label>ROM Information</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <cols>2</cols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBColorPrefPanel.xrc b/src/wx/xrc/GBColorPrefPanel.xrc
index 3887f927..c55e51ed 100644
--- a/src/wx/xrc/GBColorPrefPanel.xrc
+++ b/src/wx/xrc/GBColorPrefPanel.xrc
@@ -1,105 +1,105 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxPanel" name="GBColorPrefPanel">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxChoice" name="ColorSet">
-          <content>
-            <item/>
-            <item>Standard</item>
-            <item>Blue Sea</item>
-            <item>Dark Night</item>
-            <item>Green Forest</item>
-            <item>Hot Desert</item>
-            <item>Pink Dreams</item>
-            <item>Weird Colors</item>
-            <item>Real GB Colors</item>
-            <item>Real 'GB on GBASP' Colors</item>
-          </content>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticBoxSizer">
-          <object class="sizeritem">
-            <object class="wxColourPickerCtrl" name="Color0"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxColourPickerCtrl" name="Color1"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxColourPickerCtrl" name="Color2"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxColourPickerCtrl" name="Color3"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <label>Background</label>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticBoxSizer">
-          <object class="sizeritem">
-            <object class="wxColourPickerCtrl" name="Color4"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxColourPickerCtrl" name="Color5"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxColourPickerCtrl" name="Color6"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxColourPickerCtrl" name="Color7"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <label>Sprites</label>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="UsePalette" subclass="wxFarRadio">
-              <label>Use this palette</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="spacer">
-            <option>1</option>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Reset">
-              <label>Restore</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxPanel" name="GBColorPrefPanel">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxChoice" name="ColorSet">
+          <content>
+            <item/>
+            <item>Standard</item>
+            <item>Blue Sea</item>
+            <item>Dark Night</item>
+            <item>Green Forest</item>
+            <item>Hot Desert</item>
+            <item>Pink Dreams</item>
+            <item>Weird Colors</item>
+            <item>Real GB Colors</item>
+            <item>Real 'GB on GBASP' Colors</item>
+          </content>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticBoxSizer">
+          <object class="sizeritem">
+            <object class="wxColourPickerCtrl" name="Color0"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxColourPickerCtrl" name="Color1"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxColourPickerCtrl" name="Color2"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxColourPickerCtrl" name="Color3"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <label>Background</label>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticBoxSizer">
+          <object class="sizeritem">
+            <object class="wxColourPickerCtrl" name="Color4"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxColourPickerCtrl" name="Color5"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxColourPickerCtrl" name="Color6"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxColourPickerCtrl" name="Color7"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <label>Sprites</label>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="UsePalette" subclass="wxFarRadio">
+              <label>Use this palette</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="spacer">
+            <option>1</option>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Reset">
+              <label>Restore</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBDisassemble.xrc b/src/wx/xrc/GBDisassemble.xrc
index 114cb46b..d4c56165 100644
--- a/src/wx/xrc/GBDisassemble.xrc
+++ b/src/wx/xrc/GBDisassemble.xrc
@@ -1,251 +1,251 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GBDisassemble">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="GotoAddress">
-              <style>wxTE_PROCESS_ENTER</style>
-            </object>
-            <option>0</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Goto">
-              <label>_Go</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxPanel" name="Disassembly" subclass="DisList">
-              <font>
-                <family>modern</family>
-              </font>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>AF:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="AF">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>0000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>BC:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="BC">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>0000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>DE:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="DE">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>0000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>HL:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="HL">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>0000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>SP:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="SP">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>0000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>PC:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="PC">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>0000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>IFF:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="IFF">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>0000</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>LY:</label>
-                </object>
-                <flag>wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="LY">
-                  <font>
-                    <family>modern</family>
-                  </font>
-                  <label>00</label>
-                </object>
-                <flag>wxLEFT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="Z" subclass="DispCheckBox">
-                  <label>Z</label>
-                </object>
-              </object>
-              <object class="spacer"/>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="N" subclass="DispCheckBox">
-                  <label>N</label>
-                </object>
-              </object>
-              <object class="spacer"/>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="H" subclass="DispCheckBox">
-                  <label>H</label>
-                </object>
-              </object>
-              <object class="spacer"/>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="C" subclass="DispCheckBox">
-                  <label>C</label>
-                </object>
-              </object>
-              <cols>2</cols>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <option>1</option>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxCheckBox" name="AutoUpdate">
-          <label>Automatic _update</label>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <cols>4</cols>
-          <object class="sizeritem">
-            <object class="wxButton" name="GotoPC">
-              <label>G_oto PC</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>Re_fresh</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Next">
-              <label>_Next</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GBDisassemble">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="GotoAddress">
+              <style>wxTE_PROCESS_ENTER</style>
+            </object>
+            <option>0</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Goto">
+              <label>_Go</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxPanel" name="Disassembly" subclass="DisList">
+              <font>
+                <family>modern</family>
+              </font>
+            </object>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>AF:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="AF">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>0000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>BC:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="BC">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>0000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>DE:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="DE">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>0000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>HL:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="HL">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>0000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>SP:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="SP">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>0000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>PC:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="PC">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>0000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>IFF:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="IFF">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>0000</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>LY:</label>
+                </object>
+                <flag>wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="LY">
+                  <font>
+                    <family>modern</family>
+                  </font>
+                  <label>00</label>
+                </object>
+                <flag>wxLEFT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="Z" subclass="DispCheckBox">
+                  <label>Z</label>
+                </object>
+              </object>
+              <object class="spacer"/>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="N" subclass="DispCheckBox">
+                  <label>N</label>
+                </object>
+              </object>
+              <object class="spacer"/>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="H" subclass="DispCheckBox">
+                  <label>H</label>
+                </object>
+              </object>
+              <object class="spacer"/>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="C" subclass="DispCheckBox">
+                  <label>C</label>
+                </object>
+              </object>
+              <cols>2</cols>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <option>1</option>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxCheckBox" name="AutoUpdate">
+          <label>Automatic _update</label>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <cols>4</cols>
+          <object class="sizeritem">
+            <object class="wxButton" name="GotoPC">
+              <label>G_oto PC</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>Re_fresh</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Next">
+              <label>_Next</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBMapViewer.xrc b/src/wx/xrc/GBMapViewer.xrc
index 173adbbc..4a5af070 100644
--- a/src/wx/xrc/GBMapViewer.xrc
+++ b/src/wx/xrc/GBMapViewer.xrc
@@ -1,172 +1,172 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GBMapViewer">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase0">
-                      <label>0x8000</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase1">
-                      <label>0x8800</label>
-                    </object>
-                  </object>
-                  <label>Char Base</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="MapBase0">
-                      <label>0x9800</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="MapBase1">
-                      <label>0x9C00</label>
-                    </object>
-                  </object>
-                  <label>Map Base</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxLEFT|wxRIGHT|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="spacer">
-                <option>1</option>
-                <flag>wxEXPAND</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="Stretch">
-                  <label>Stretch to _fit</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="AutoUpdate">
-                  <label>Auto _update</label>
-                </object>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <object class="spacer"/>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Coords"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Address:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Address"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Tile:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Tile"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Flip:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Flip"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Palette:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Palette"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Priority:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Priority"/>
-              </object>
-              <cols>2</cols>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxScrolledWindow">
-              <object class="wxPanel" name="GfxView" subclass="GfxPanel">
-                <size>128,128d</size>
-                <style>wxFULL_REPAINT_ON_RESIZE</style>
-              </object>
-              <size>128,128d</size>
-              <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxPanel" name="Zoom" subclass="PixView">
-              <size>64,64d</size>
-              <style>wxBORDER_SUNKEN</style>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="spacer"/>
-          <object class="sizeritem">
-            <object class="unknown" name="Color"/>
-            <flag>wxALL|wxALIGN_BOTTOM</flag>
-            <border>5</border>
-          </object>
-          <cols>3</cols>
-          <growablecols>1</growablecols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Save">
-              <label>_Save</label>
-            </object>
-            <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALIGN_RIGHT</flag>
-          </object>
-          <cols>3</cols>
-        </object>
-        <flag>wxEXPAND|wxALL</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GBMapViewer">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase0">
+                      <label>0x8000</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase1">
+                      <label>0x8800</label>
+                    </object>
+                  </object>
+                  <label>Char Base</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="MapBase0">
+                      <label>0x9800</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="MapBase1">
+                      <label>0x9C00</label>
+                    </object>
+                  </object>
+                  <label>Map Base</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxLEFT|wxRIGHT|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="spacer">
+                <option>1</option>
+                <flag>wxEXPAND</flag>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="Stretch">
+                  <label>Stretch to _fit</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="AutoUpdate">
+                  <label>Auto _update</label>
+                </object>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <object class="spacer"/>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Coords"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Address:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Address"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Tile:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Tile"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Flip:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Flip"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Palette:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Palette"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Priority:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Priority"/>
+              </object>
+              <cols>2</cols>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxScrolledWindow">
+              <object class="wxPanel" name="GfxView" subclass="GfxPanel">
+                <size>128,128d</size>
+                <style>wxFULL_REPAINT_ON_RESIZE</style>
+              </object>
+              <size>128,128d</size>
+              <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxPanel" name="Zoom" subclass="PixView">
+              <size>64,64d</size>
+              <style>wxBORDER_SUNKEN</style>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="spacer"/>
+          <object class="sizeritem">
+            <object class="unknown" name="Color"/>
+            <flag>wxALL|wxALIGN_BOTTOM</flag>
+            <border>5</border>
+          </object>
+          <cols>3</cols>
+          <growablecols>1</growablecols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Save">
+              <label>_Save</label>
+            </object>
+            <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALIGN_RIGHT</flag>
+          </object>
+          <cols>3</cols>
+        </object>
+        <flag>wxEXPAND|wxALL</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBOAMViewer.xrc b/src/wx/xrc/GBOAMViewer.xrc
index 878f1d74..72337261 100644
--- a/src/wx/xrc/GBOAMViewer.xrc
+++ b/src/wx/xrc/GBOAMViewer.xrc
@@ -1,165 +1,165 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GBOAMViewer">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Sprite:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxSpinCtrl" name="Sprite">
-                  <min>0</min>
-                  <max>39</max>
-                  <style>wxSP_HORIZONTAL|wxSP_ARROW_KEYS</style>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxFlexGridSizer">
-                  <cols>2</cols>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Pos:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Pos"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Tile:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Tile"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Prio:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Priority"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>OAP:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="OAP"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Pal:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Palette"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Flags:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Flags"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Bank:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Bank"/>
-                  </object>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="Stretch">
-                  <label>Stretch to _fit</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="AutoUpdate">
-                  <label>Automatic _update</label>
-                </object>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxScrolledWindow">
-                      <object class="wxPanel" name="GfxView" subclass="GfxPanel">
-                        <size>64,64d</size>
-                        <style>wxFULL_REPAINT_ON_RESIZE</style>
-                      </object>
-                      <size>64,64d</size>
-                      <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxPanel" name="Zoom" subclass="PixView">
-                      <size>64,64d</size>
-                      <style>wxBORDER_SUNKEN</style>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <orient>wxHORIZONTAL</orient>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="unknown" name="Color"/>
-                <flag>wxALL|wxALIGN_BOTTOM</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE">
-              <label>_Save...</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALL|wxALIGN_RIGHT</flag>
-            <border>5</border>
-          </object>
-          <cols>3</cols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GBOAMViewer">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Sprite:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="Sprite">
+                  <min>0</min>
+                  <max>39</max>
+                  <style>wxSP_HORIZONTAL|wxSP_ARROW_KEYS</style>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+              <object class="sizeritem">
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Pos:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Pos"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Tile:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Tile"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Prio:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Priority"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>OAP:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="OAP"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Pal:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Palette"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Flags:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Flags"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Bank:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Bank"/>
+                  </object>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="Stretch">
+                  <label>Stretch to _fit</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="AutoUpdate">
+                  <label>Automatic _update</label>
+                </object>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxScrolledWindow">
+                      <object class="wxPanel" name="GfxView" subclass="GfxPanel">
+                        <size>64,64d</size>
+                        <style>wxFULL_REPAINT_ON_RESIZE</style>
+                      </object>
+                      <size>64,64d</size>
+                      <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxPanel" name="Zoom" subclass="PixView">
+                      <size>64,64d</size>
+                      <style>wxBORDER_SUNKEN</style>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <orient>wxHORIZONTAL</orient>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="unknown" name="Color"/>
+                <flag>wxALL|wxALIGN_BOTTOM</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_SAVE">
+              <label>_Save...</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALL|wxALIGN_RIGHT</flag>
+            <border>5</border>
+          </object>
+          <cols>3</cols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBPaletteViewer.xrc b/src/wx/xrc/GBPaletteViewer.xrc
index 2ad6b34e..fcb660f3 100644
--- a/src/wx/xrc/GBPaletteViewer.xrc
+++ b/src/wx/xrc/GBPaletteViewer.xrc
@@ -1,133 +1,133 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GBPaletteViewer">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>Click on a color for more information</label>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <label>Background</label>
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxPanel" name="Background" subclass="PixViewEvt">
-                  <size>64,64d</size>
-                  <style>wxBORDER_SUNKEN</style>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxButton" name="SaveBG">
-                  <label>Save _BG...</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-                <border>5</border>
-              </object>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <label>Sprite</label>
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxPanel" name="Sprite" subclass="PixViewEvt">
-                  <size>64,64d</size>
-                  <style>wxBORDER_SUNKEN</style>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxButton" name="SaveOBJ">
-                  <label>Save _Sprite...</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-                <border>5</border>
-              </object>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Index:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Index"/>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Value:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Value"/>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <cols>2</cols>
-              <growablecols>1</growablecols>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="unknown" name="Color"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxCheckBox" name="AutoUpdate">
-          <label>Automatic _update</label>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="spacer">
-            <option>1</option>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GBPaletteViewer">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>Click on a color for more information</label>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <label>Background</label>
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxPanel" name="Background" subclass="PixViewEvt">
+                  <size>64,64d</size>
+                  <style>wxBORDER_SUNKEN</style>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxButton" name="SaveBG">
+                  <label>Save _BG...</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+                <border>5</border>
+              </object>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <label>Sprite</label>
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxPanel" name="Sprite" subclass="PixViewEvt">
+                  <size>64,64d</size>
+                  <style>wxBORDER_SUNKEN</style>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxButton" name="SaveOBJ">
+                  <label>Save _Sprite...</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+                <border>5</border>
+              </object>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Index:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Index"/>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Value:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Value"/>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <cols>2</cols>
+              <growablecols>1</growablecols>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="unknown" name="Color"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxCheckBox" name="AutoUpdate">
+          <label>Automatic _update</label>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="spacer">
+            <option>1</option>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBPrinter.xrc b/src/wx/xrc/GBPrinter.xrc
index a66e964f..ee579633 100644
--- a/src/wx/xrc/GBPrinter.xrc
+++ b/src/wx/xrc/GBPrinter.xrc
@@ -1,74 +1,74 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GBPrinter">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxScrolledWindow">
-          <object class="wxPanel" name="Preview">
-            <style>wxFULL_REPAINT_ON_RESIZE</style>
-          </object>
-          <size>320,288</size>
-          <style>wxBORDER_SIMPLE|wxHSCROLL|wxVSCROLL</style>
-        </object>
-        <flag>wxALL|wxALIGN_CENTRE</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Print Si_ze</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxChoice" name="Magnification">
-              <content>
-                <item>1x</item>
-                <item>2x</item>
-                <item>3x</item>
-                <item>4x</item>
-              </content>
-              <selection>1</selection>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_PRINT"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_OK">
-              <label>C_ontinue</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CANCEL">
-              <label>_Discard</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GBPrinter">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxScrolledWindow">
+          <object class="wxPanel" name="Preview">
+            <style>wxFULL_REPAINT_ON_RESIZE</style>
+          </object>
+          <size>320,288</size>
+          <style>wxBORDER_SIMPLE|wxHSCROLL|wxVSCROLL</style>
+        </object>
+        <flag>wxALL|wxALIGN_CENTRE</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Print Si_ze</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxChoice" name="Magnification">
+              <content>
+                <item>1x</item>
+                <item>2x</item>
+                <item>3x</item>
+                <item>4x</item>
+              </content>
+              <selection>1</selection>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_PRINT"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_SAVE"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_OK">
+              <label>C_ontinue</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CANCEL">
+              <label>_Discard</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBROMInfo.xrc b/src/wx/xrc/GBROMInfo.xrc
index bf84a845..8d9c9b72 100644
--- a/src/wx/xrc/GBROMInfo.xrc
+++ b/src/wx/xrc/GBROMInfo.xrc
@@ -1,179 +1,179 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GBROMInfo">
-  <title>Rom Information</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <cols>2</cols>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Game title:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Title"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Maker code:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="MakerCode"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Maker name:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="MakerName"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Unit code:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="UnitCode"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Cartridge type:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="DeviceType"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>ROM version:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Version"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>CRC:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="CRC"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Color:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Color"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>ROM size:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="ROMSize"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>RAM size:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="RAMSize"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Dest. code:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="DestCode"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>License code:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="LicCode"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Checksum:</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Checksum"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GBROMInfo">
+  <title>Rom Information</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <cols>2</cols>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Game title:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Title"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Maker code:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="MakerCode"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Maker name:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="MakerName"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Unit code:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="UnitCode"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Cartridge type:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="DeviceType"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>ROM version:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Version"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>CRC:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="CRC"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Color:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Color"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>ROM size:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="ROMSize"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>RAM size:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="RAMSize"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Dest. code:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="DestCode"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>License code:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="LicCode"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Checksum:</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Checksum"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GBTileViewer.xrc b/src/wx/xrc/GBTileViewer.xrc
index 86ce04a4..6efd7ee8 100644
--- a/src/wx/xrc/GBTileViewer.xrc
+++ b/src/wx/xrc/GBTileViewer.xrc
@@ -1,168 +1,168 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GBTileViewer">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Bank0">
-                      <label>_0</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Bank1">
-                      <label>_1</label>
-                    </object>
-                  </object>
-                  <label>VRAM Bank</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase0">
-                      <label>0x_8000</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase1">
-                      <label>0x_8800</label>
-                    </object>
-                  </object>
-                  <label>Char Base</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Palette:</label>
-                </object>
-                <flag>wxTOP|wxLEFT|wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxSlider" name="Palette">
-                  <min>0</min>
-                  <max>7</max>
-                  <tickfreq>1</tickfreq>
-                  <pagesize>2</pagesize>
-                  <style>wxSL_BOTTOM</style>
-                </object>
-                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="Stretch">
-                  <label>Stretch to _fit</label>
-                </object>
-                <flag>wxTOP|wxLEFT|wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="AutoUpdate">
-                  <label>Automatic _update</label>
-                </object>
-                <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxGridSizer">
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Tile:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Tile"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Address:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Address"/>
-                  </object>
-                  <cols>2</cols>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxPanel" name="Zoom" subclass="PixView">
-                  <size>64,64d</size>
-                  <style>wxBORDER_SUNKEN</style>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="unknown" name="Color"/>
-                <flag>wxALL|wxALIGN_BOTTOM</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxScrolledWindow">
-              <object class="wxPanel" name="GfxView" subclass="GfxPanel">
-                <size>128,128d</size>
-                <style>wxFULL_REPAINT_ON_RESIZE</style>
-              </object>
-              <size>128,128d</size>
-              <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE">
-              <label>_Save...</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALL|wxALIGN_RIGHT</flag>
-            <border>5</border>
-          </object>
-          <cols>3</cols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GBTileViewer">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Bank0">
+                      <label>_0</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Bank1">
+                      <label>_1</label>
+                    </object>
+                  </object>
+                  <label>VRAM Bank</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase0">
+                      <label>0x_8000</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase1">
+                      <label>0x_8800</label>
+                    </object>
+                  </object>
+                  <label>Char Base</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Palette:</label>
+                </object>
+                <flag>wxTOP|wxLEFT|wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSlider" name="Palette">
+                  <min>0</min>
+                  <max>7</max>
+                  <tickfreq>1</tickfreq>
+                  <pagesize>2</pagesize>
+                  <style>wxSL_BOTTOM</style>
+                </object>
+                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="Stretch">
+                  <label>Stretch to _fit</label>
+                </object>
+                <flag>wxTOP|wxLEFT|wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="AutoUpdate">
+                  <label>Automatic _update</label>
+                </object>
+                <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxGridSizer">
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Tile:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Tile"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Address:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Address"/>
+                  </object>
+                  <cols>2</cols>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxPanel" name="Zoom" subclass="PixView">
+                  <size>64,64d</size>
+                  <style>wxBORDER_SUNKEN</style>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="unknown" name="Color"/>
+                <flag>wxALL|wxALIGN_BOTTOM</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxScrolledWindow">
+              <object class="wxPanel" name="GfxView" subclass="GfxPanel">
+                <size>128,128d</size>
+                <style>wxFULL_REPAINT_ON_RESIZE</style>
+              </object>
+              <size>128,128d</size>
+              <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_SAVE">
+              <label>_Save...</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALL|wxALIGN_RIGHT</flag>
+            <border>5</border>
+          </object>
+          <cols>3</cols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GameBoyAdvanceConfig.xrc b/src/wx/xrc/GameBoyAdvanceConfig.xrc
index 93376cc1..6006e907 100644
--- a/src/wx/xrc/GameBoyAdvanceConfig.xrc
+++ b/src/wx/xrc/GameBoyAdvanceConfig.xrc
@@ -1,258 +1,258 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GameBoyAdvanceConfig">
-    <title>Game Boy Advance settings</title>
-    <object class="wxBoxSizer">
-    <orient>wxVERTICAL</orient>
-    <object class="sizeritem">
-    <object class="wxNotebook">
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <object class="sizeritem">
-                <object class="wxFlexGridSizer">
-                  <object class="sizeritem">
-                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                    <border>5</border>
-                    <object class="wxStaticText">
-                      <label>Save type :</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxChoice" name="SaveType">
-                      <content>
-                        <item>Automatic</item>
-                        <item>EEPROM</item>
-                        <item>SRAM</item>
-                        <item>Flash</item>
-                        <item>EEPROM + Sensor</item>
-                        <item>None</item>
-                      </content>
-                    </object>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                    <border>5</border>
-                    <object class="wxStaticText">
-                      <label>Flash size :</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxChoice" name="FlashSize">
-                      <content>
-                        <item>64K</item>
-                        <item>128K</item>
-                      </content>
-                    </object>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <cols>2</cols>
-                  <growablecols>1</growablecols>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxButton" name="Detect">
-                  <label>Detect Now</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE</flag>
-                <border>5</border>
-              </object>
-              <label>Cartridge</label>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>Save type</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-                <object class="wxBoxSizer">
-                  <orient>wxHORIZONTAL</orient>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="BootRomLab">
-                      <label>Bios file :</label>
-                    </object>
-                    <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxFilePickerCtrl" name="BootRom">
-                      <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
-                      <size>527,30</size>
-                    </object>
-                    <option>1</option>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                </object>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>Boot ROM</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel" name="GameSettings">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Game Code</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="GameCode">
-                  <style>wxBORDER_SUNKEN</style>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Comment</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxTextCtrl" name="Comment"/>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Real Time Clock:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="OvRTC">
-                  <content>
-                    <item>Default</item>
-                    <item>Disabled</item>
-                    <item>Enabled</item>
-                  </content>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Save Type:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="OvSaveType">
-                  <content>
-                    <item>Default</item>
-                    <item>Automatic</item>
-                    <item>EEPROM</item>
-                    <item>SRAM</item>
-                    <item>Flash</item>
-                    <item>EEPROM+Sensor</item>
-                    <item>None</item>
-                  </content>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Flash Size:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="OvFlashSize">
-                  <content>
-                    <item>Default</item>
-                    <item>64K</item>
-                    <item>128K</item>
-                  </content>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Mirroring:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="OvMirroring">
-                  <content>
-                    <item>Default</item>
-                    <item>Disabled</item>
-                    <item>Enabled</item>
-                  </content>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <cols>2</cols>
-              <growablecols>1</growablecols>
-            </object>
-            <option>1</option>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Defaults">
-              <label>_Defaults</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>Game Overrides</label>
-    </object>
-  </object>
-  </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-             <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-             <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-  </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GameBoyAdvanceConfig">
+    <title>Game Boy Advance settings</title>
+    <object class="wxBoxSizer">
+    <orient>wxVERTICAL</orient>
+    <object class="sizeritem">
+    <object class="wxNotebook">
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <object class="sizeritem">
+                <object class="wxFlexGridSizer">
+                  <object class="sizeritem">
+                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                    <border>5</border>
+                    <object class="wxStaticText">
+                      <label>Save type :</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxChoice" name="SaveType">
+                      <content>
+                        <item>Automatic</item>
+                        <item>EEPROM</item>
+                        <item>SRAM</item>
+                        <item>Flash</item>
+                        <item>EEPROM + Sensor</item>
+                        <item>None</item>
+                      </content>
+                    </object>
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                    <border>5</border>
+                    <object class="wxStaticText">
+                      <label>Flash size :</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxChoice" name="FlashSize">
+                      <content>
+                        <item>64K</item>
+                        <item>128K</item>
+                      </content>
+                    </object>
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <cols>2</cols>
+                  <growablecols>1</growablecols>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+              <object class="sizeritem">
+                <object class="wxButton" name="Detect">
+                  <label>Detect Now</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE</flag>
+                <border>5</border>
+              </object>
+              <label>Cartridge</label>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>Save type</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+                <object class="wxBoxSizer">
+                  <orient>wxHORIZONTAL</orient>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="BootRomLab">
+                      <label>Bios file :</label>
+                    </object>
+                    <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxFilePickerCtrl" name="BootRom">
+                      <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
+                      <size>527,30</size>
+                    </object>
+                    <option>1</option>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                </object>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>Boot ROM</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel" name="GameSettings">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Game Code</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="GameCode">
+                  <style>wxBORDER_SUNKEN</style>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Comment</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxTextCtrl" name="Comment"/>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Real Time Clock:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="OvRTC">
+                  <content>
+                    <item>Default</item>
+                    <item>Disabled</item>
+                    <item>Enabled</item>
+                  </content>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Save Type:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="OvSaveType">
+                  <content>
+                    <item>Default</item>
+                    <item>Automatic</item>
+                    <item>EEPROM</item>
+                    <item>SRAM</item>
+                    <item>Flash</item>
+                    <item>EEPROM+Sensor</item>
+                    <item>None</item>
+                  </content>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Flash Size:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="OvFlashSize">
+                  <content>
+                    <item>Default</item>
+                    <item>64K</item>
+                    <item>128K</item>
+                  </content>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Mirroring:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="OvMirroring">
+                  <content>
+                    <item>Default</item>
+                    <item>Disabled</item>
+                    <item>Enabled</item>
+                  </content>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <cols>2</cols>
+              <growablecols>1</growablecols>
+            </object>
+            <option>1</option>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Defaults">
+              <label>_Defaults</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>Game Overrides</label>
+    </object>
+  </object>
+  </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+             <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+             <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+  </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GameBoyConfig.xrc b/src/wx/xrc/GameBoyConfig.xrc
index 12611284..c14fa24a 100644
--- a/src/wx/xrc/GameBoyConfig.xrc
+++ b/src/wx/xrc/GameBoyConfig.xrc
@@ -1,174 +1,174 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GameBoyConfig">
-    <title>GameBoy settings</title>
-    <object class="wxBoxSizer">
-    <orient>wxVERTICAL</orient>
-    <object class="sizeritem">
-    <object class="wxNotebook">
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-            <object class="wxBoxSizer">
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Emulated _system :</label>
-                </object>
-                <option>1</option>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="System">
-                  <content>
-                    <item>Automatic</item>
-                    <item>Game Boy Color</item>
-                    <item>Super Game Boy</item>
-                    <item>Game Boy</item>
-                    <item>Game Boy Advance</item>
-                    <item>Super Game Boy 2</item>
-                  </content>
-                </object>
-                <option>1</option>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Display _borders :</label>
-                </object>
-                <option>1</option>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="Borders">
-                  <content>
-                    <item>Never</item>
-                    <item>Always</item>
-                    <item>Automatic</item>
-                  </content>
-                </object>
-                <option>1</option>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>System</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <flag>wxEXPAND</flag>
-            <object class="wxBoxSizer">
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="BootRomLab">
-                  <label>Boot _ROM file :</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxFilePickerCtrl" name="BootRom">
-                  <message>Select A File</message>
-                  <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
-                  <size>472,30</size>
-                </object>
-                <option>1</option>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="CBootRomLab">
-                  <label>GBC Boot ROM _file :</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxFilePickerCtrl" name="CBootRom">
-                  <message>Select A File</message>
-                  <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
-                  <size>472,30</size>
-                </object>
-                <option>1</option>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-        </object>
-      </object>
-      <label>Boot ROM</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxNotebook">
-              <object class="notebookpage">
-                <object_ref name="cp1" ref="GBColorPrefPanel">
-                  <pos>0,0</pos>
-                </object_ref>
-                <label>Default</label>
-              </object>
-              <object class="notebookpage">
-                <object_ref name="cp2" ref="GBColorPrefPanel">
-                  <pos>0,0</pos>
-                </object_ref>
-                <label>User 1</label>
-              </object>
-              <object class="notebookpage">
-                <object_ref name="cp3" ref="GBColorPrefPanel">
-                  <pos>0,0</pos>
-                </object_ref>
-                <label>User 2</label>
-              </object>
-            </object>
-          </object>
-        </object>
-      </object>
-      <label>Custom Colors</label>
-    </object>
-  </object>
-  </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-             <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-             <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-  </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GameBoyConfig">
+    <title>GameBoy settings</title>
+    <object class="wxBoxSizer">
+    <orient>wxVERTICAL</orient>
+    <object class="sizeritem">
+    <object class="wxNotebook">
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+            <object class="wxBoxSizer">
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Emulated _system :</label>
+                </object>
+                <option>1</option>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="System">
+                  <content>
+                    <item>Automatic</item>
+                    <item>Game Boy Color</item>
+                    <item>Super Game Boy</item>
+                    <item>Game Boy</item>
+                    <item>Game Boy Advance</item>
+                    <item>Super Game Boy 2</item>
+                  </content>
+                </object>
+                <option>1</option>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Display _borders :</label>
+                </object>
+                <option>1</option>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="Borders">
+                  <content>
+                    <item>Never</item>
+                    <item>Always</item>
+                    <item>Automatic</item>
+                  </content>
+                </object>
+                <option>1</option>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>System</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <flag>wxEXPAND</flag>
+            <object class="wxBoxSizer">
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="BootRomLab">
+                  <label>Boot _ROM file :</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxFilePickerCtrl" name="BootRom">
+                  <message>Select A File</message>
+                  <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
+                  <size>472,30</size>
+                </object>
+                <option>1</option>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="CBootRomLab">
+                  <label>GBC Boot ROM _file :</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxFilePickerCtrl" name="CBootRom">
+                  <message>Select A File</message>
+                  <wildcard>BIOS files (*.bin;*.rom)|*.bin;*.rom|All files|*</wildcard>
+                  <size>472,30</size>
+                </object>
+                <option>1</option>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+        </object>
+      </object>
+      <label>Boot ROM</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxNotebook">
+              <object class="notebookpage">
+                <object_ref name="cp1" ref="GBColorPrefPanel">
+                  <pos>0,0</pos>
+                </object_ref>
+                <label>Default</label>
+              </object>
+              <object class="notebookpage">
+                <object_ref name="cp2" ref="GBColorPrefPanel">
+                  <pos>0,0</pos>
+                </object_ref>
+                <label>User 1</label>
+              </object>
+              <object class="notebookpage">
+                <object_ref name="cp3" ref="GBColorPrefPanel">
+                  <pos>0,0</pos>
+                </object_ref>
+                <label>User 2</label>
+              </object>
+            </object>
+          </object>
+        </object>
+      </object>
+      <label>Custom Colors</label>
+    </object>
+  </object>
+  </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+             <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+             <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+  </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/GeneralConfig.xrc b/src/wx/xrc/GeneralConfig.xrc
index ddcd8db6..fc8a6cd6 100644
--- a/src/wx/xrc/GeneralConfig.xrc
+++ b/src/wx/xrc/GeneralConfig.xrc
@@ -1,203 +1,203 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="GeneralConfig">
-    <title>General settings</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>General</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Check for updates:</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="UpdateNever">
-                  <label>_Never</label>
-                  <style>wxRB_GROUP</style>
-                </object>
-                <option>1</option>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="UpdateDaily">
-                  <label>_Daily</label>
-                </object>
-                <option>1</option>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="UpdateWeekly">
-                  <label>_Weekly</label>
-                </object>
-                <option>1</option>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <orient>wxHORIZONTAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Screenshot Format:</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="PNG">
-                  <label>_PNG</label>
-                  <style>wxRB_GROUP</style>
-                </object>
-                <option>1</option>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="BMP">
-                  <label>_BMP</label>
-                </object>
-                <option>1</option>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <orient>wxHORIZONTAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>_Rewind interval :</label>
-                  <tooltip>If not empty or 0, enable rewind (seconds)</tooltip>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxSpinCtrl" name="RewindInterval">
-                  <min>0</min>
-                  <max>600</max>
-                  <tooltip>seconds (0-600); 0 = disable</tooltip>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>_Throttle</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-            <object class="wxBoxSizer">
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>% of normal:</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxSpinCtrl" name="Throttle">
-                  <value>0</value>
-                  <min>0</min>
-                  <max>1000</max>
-                  <tooltip>0 = no throttle</tooltip>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="ThrottleSel">
-                  <content>
-                    <item>None</item>
-                    <item>25%</item>
-                    <item>50%</item>
-                    <item>75%</item>
-                    <item>100%</item>
-                    <item>125%</item>
-                    <item>150%</item>
-                    <item>175%</item>
-                    <item>200%</item>
-                    <item>225%</item>
-                    <item>250%</item>
-                    <item>275%</item>
-                    <item>300%</item>
-                    <item>325%</item>
-                    <item>350%</item>
-                    <item>375%</item>
-                    <item>400%</item>
-                    <item>425%</item>
-                    <item>450%</item>
-                    <item>475%</item>
-                    <item>500%</item>
-                    <item>525%</item>
-                    <item>550%</item>
-                    <item>575%</item>
-                    <item>600%</item>
-                  </content>
-                  <size>40,-1d</size>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="GeneralConfig">
+    <title>General settings</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>General</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Check for updates:</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="UpdateNever">
+                  <label>_Never</label>
+                  <style>wxRB_GROUP</style>
+                </object>
+                <option>1</option>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="UpdateDaily">
+                  <label>_Daily</label>
+                </object>
+                <option>1</option>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="UpdateWeekly">
+                  <label>_Weekly</label>
+                </object>
+                <option>1</option>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <orient>wxHORIZONTAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Screenshot Format:</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="PNG">
+                  <label>_PNG</label>
+                  <style>wxRB_GROUP</style>
+                </object>
+                <option>1</option>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="BMP">
+                  <label>_BMP</label>
+                </object>
+                <option>1</option>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <orient>wxHORIZONTAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>_Rewind interval :</label>
+                  <tooltip>If not empty or 0, enable rewind (seconds)</tooltip>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="RewindInterval">
+                  <min>0</min>
+                  <max>600</max>
+                  <tooltip>seconds (0-600); 0 = disable</tooltip>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>_Throttle</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+            <object class="wxBoxSizer">
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>% of normal:</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="Throttle">
+                  <value>0</value>
+                  <min>0</min>
+                  <max>1000</max>
+                  <tooltip>0 = no throttle</tooltip>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="ThrottleSel">
+                  <content>
+                    <item>None</item>
+                    <item>25%</item>
+                    <item>50%</item>
+                    <item>75%</item>
+                    <item>100%</item>
+                    <item>125%</item>
+                    <item>150%</item>
+                    <item>175%</item>
+                    <item>200%</item>
+                    <item>225%</item>
+                    <item>250%</item>
+                    <item>275%</item>
+                    <item>300%</item>
+                    <item>325%</item>
+                    <item>350%</item>
+                    <item>375%</item>
+                    <item>400%</item>
+                    <item>425%</item>
+                    <item>450%</item>
+                    <item>475%</item>
+                    <item>500%</item>
+                    <item>525%</item>
+                    <item>550%</item>
+                    <item>575%</item>
+                    <item>600%</item>
+                  </content>
+                  <size>40,-1d</size>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/IOViewer.xrc b/src/wx/xrc/IOViewer.xrc
index bd3c1ab3..0818d6e1 100644
--- a/src/wx/xrc/IOViewer.xrc
+++ b/src/wx/xrc/IOViewer.xrc
@@ -1,351 +1,351 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="IOViewer">
-    <title>IO Viewer</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxChoice" name="Address">
-          <content>
-            <item>a</item>
-            <item>b</item>
-          </content>
-        </object>
-        <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Value:</label>
-            </object>
-            <flag>wxLEFT|wxRIGHT</flag>
-            <border>5</border>
-          </object>
-          <object class="spacer">
-            <option>1</option>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="Value"/>
-            <flag>wxRIGHT</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B15"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>15 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B15lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B14"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>14 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B14lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B13"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>13 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B13lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B12"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>12 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B12lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B11"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>11 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B11lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B10"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>10 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B10lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B9"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>9 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B9lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B8"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>8 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B8lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B7"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>7 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B7lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B6"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>6 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B6lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B5"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>5 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B5lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B4"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>4 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B4lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B3"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>3 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B3lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B2"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>2 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B2lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B1"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>1 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B1lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="B0"/>
-            <flag>wxLEFT</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>0 </label>
-            </object>
-            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="B0lab"/>
-            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <cols>3</cols>
-          <growablecols>2</growablecols>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxCheckBox" name="AutoUpdate">
-          <label>Automatic _update</label>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-            <option>1</option>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_APPLY"/>
-            <option>1</option>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <option>1</option>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="IOViewer">
+    <title>IO Viewer</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxChoice" name="Address">
+          <content>
+            <item>a</item>
+            <item>b</item>
+          </content>
+        </object>
+        <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Value:</label>
+            </object>
+            <flag>wxLEFT|wxRIGHT</flag>
+            <border>5</border>
+          </object>
+          <object class="spacer">
+            <option>1</option>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="Value"/>
+            <flag>wxRIGHT</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B15"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>15 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B15lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B14"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>14 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B14lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B13"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>13 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B13lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B12"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>12 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B12lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B11"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>11 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B11lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B10"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>10 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B10lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B9"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>9 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B9lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B8"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>8 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B8lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B7"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>7 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B7lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B6"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>6 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B6lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B5"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>5 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B5lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B4"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>4 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B4lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B3"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>3 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B3lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B2"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>2 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B2lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B1"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>1 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B1lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="B0"/>
+            <flag>wxLEFT</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>0 </label>
+            </object>
+            <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="B0lab"/>
+            <flag>wxRIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <cols>3</cols>
+          <growablecols>2</growablecols>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxCheckBox" name="AutoUpdate">
+          <label>Automatic _update</label>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+            <option>1</option>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_APPLY"/>
+            <option>1</option>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <option>1</option>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/JoyPanel.xrc b/src/wx/xrc/JoyPanel.xrc
index d4efcfe8..9d11b18f 100644
--- a/src/wx/xrc/JoyPanel.xrc
+++ b/src/wx/xrc/JoyPanel.xrc
@@ -1,369 +1,369 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxPanel" name="JoyPanel">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxNotebook">
-          <tooltip>Click a field and press a key or move joystick to add.  Press backspace to delete last added key.  Resize window or click inside and move pointer to see entire contents if too small.</tooltip>
-          <object class="notebookpage">
-            <object class="wxPanel">
-              <object class="wxFlexGridSizer">
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Up</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="Up" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>A</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="A" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Down</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="Down" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>B</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="B" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Left</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="Left" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>L</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="L" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Right</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="Right" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>R</label>
-                    <style>wxALIGN_RIGHT</style>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="R" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Select</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="Select" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Start</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="Start" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <option>1</option>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <cols>4</cols>
-                <growablecols>1,3</growablecols>
-              </object>
-            </object>
-            <label>Standard</label>
-          </object>
-          <object class="notebookpage">
-            <object class="wxPanel">
-              <object class="wxFlexGridSizer">
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Motion Up</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="MotionUp" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Autofire A</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="AutoA" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Motion Down</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="MotionDown" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Autofire B</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="AutoB" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Motion Left/Dark</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="MotionLeft" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>GameShark</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="GS" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Motion Right/Light</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="MotionRight" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxGROW</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Speed Up</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="Speed" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Spin Left</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="MotionIn" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="spacer">
-                  <flag>wxEXPAND</flag>
-                </object>
-                <object class="spacer">
-                  <flag>wxEXPAND</flag>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Spin Right</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="MotionOut" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxGROW</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticText">
-                    <label>Screenshot</label>
-                  </object>
-                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxTextCtrl" name="Capture" subclass="wxJoyKeyTextCtrl">
-                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <cols>4</cols>
-                <growablecols>1,3</growablecols>
-              </object>
-            </object>
-            <label>Special</label>
-          </object>
-        </object>
-        <option>1</option>
-        <flag>wxEXPAND|wxALL</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxCheckBox" name="DefaultConfig" subclass="wxFarRadio">
-          <label>Use as default</label>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Defaults">
-              <label>Defaults</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Clear">
-              <label>Clear</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxALIGN_CENTRE</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxPanel" name="JoyPanel">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxNotebook">
+          <tooltip>Click a field and press a key or move joystick to add.  Press backspace to delete last added key.  Resize window or click inside and move pointer to see entire contents if too small.</tooltip>
+          <object class="notebookpage">
+            <object class="wxPanel">
+              <object class="wxFlexGridSizer">
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Up</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="Up" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>A</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="A" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Down</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="Down" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>B</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="B" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Left</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="Left" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>L</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="L" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Right</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="Right" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>R</label>
+                    <style>wxALIGN_RIGHT</style>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="R" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Select</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="Select" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Start</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="Start" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <option>1</option>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <cols>4</cols>
+                <growablecols>1,3</growablecols>
+              </object>
+            </object>
+            <label>Standard</label>
+          </object>
+          <object class="notebookpage">
+            <object class="wxPanel">
+              <object class="wxFlexGridSizer">
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Motion Up</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="MotionUp" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Autofire A</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="AutoA" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Motion Down</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="MotionDown" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Autofire B</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="AutoB" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Motion Left/Dark</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="MotionLeft" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>GameShark</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="GS" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Motion Right/Light</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="MotionRight" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxGROW</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Speed Up</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="Speed" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Spin Left</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="MotionIn" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="spacer">
+                  <flag>wxEXPAND</flag>
+                </object>
+                <object class="spacer">
+                  <flag>wxEXPAND</flag>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Spin Right</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="MotionOut" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxGROW</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticText">
+                    <label>Screenshot</label>
+                  </object>
+                  <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxTextCtrl" name="Capture" subclass="wxJoyKeyTextCtrl">
+                    <style>wxTE_PROCESS_ENTER|wxTE_PROCESS_TAB</style>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <cols>4</cols>
+                <growablecols>1,3</growablecols>
+              </object>
+            </object>
+            <label>Special</label>
+          </object>
+        </object>
+        <option>1</option>
+        <flag>wxEXPAND|wxALL</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxCheckBox" name="DefaultConfig" subclass="wxFarRadio">
+          <label>Use as default</label>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Defaults">
+              <label>Defaults</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Clear">
+              <label>Clear</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxALIGN_CENTRE</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/JoypadConfig.xrc b/src/wx/xrc/JoypadConfig.xrc
index 4f897d1c..df7d314b 100644
--- a/src/wx/xrc/JoypadConfig.xrc
+++ b/src/wx/xrc/JoypadConfig.xrc
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="JoypadConfig">
-<title>Joypad Configuration</title>
-    <object class="wxBoxSizer">
-    <orient>wxVERTICAL</orient>
-    <object class="sizeritem">
-    <object class="wxNotebook">
-    <object class="notebookpage">
-      <object_ref name="joy1" ref="JoyPanel">
-        <pos>0,0</pos>
-      </object_ref>
-      <label>Player 1</label>
-    </object>
-    <object class="notebookpage">
-      <object_ref name="joy2" ref="JoyPanel">
-        <pos>0,0</pos>
-      </object_ref>
-      <label>Player 2</label>
-    </object>
-    <object class="notebookpage">
-      <object_ref name="joy3" ref="JoyPanel">
-        <pos>0,0</pos>
-      </object_ref>
-      <label>Player 3</label>
-    </object>
-    <object class="notebookpage">
-      <object_ref name="joy4" ref="JoyPanel">
-        <pos>0,0</pos>
-      </object_ref>
-      <label>Player 4</label>
-    </object>
-  </object>
-  </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-             <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-             <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-  </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="JoypadConfig">
+<title>Joypad Configuration</title>
+    <object class="wxBoxSizer">
+    <orient>wxVERTICAL</orient>
+    <object class="sizeritem">
+    <object class="wxNotebook">
+    <object class="notebookpage">
+      <object_ref name="joy1" ref="JoyPanel">
+        <pos>0,0</pos>
+      </object_ref>
+      <label>Player 1</label>
+    </object>
+    <object class="notebookpage">
+      <object_ref name="joy2" ref="JoyPanel">
+        <pos>0,0</pos>
+      </object_ref>
+      <label>Player 2</label>
+    </object>
+    <object class="notebookpage">
+      <object_ref name="joy3" ref="JoyPanel">
+        <pos>0,0</pos>
+      </object_ref>
+      <label>Player 3</label>
+    </object>
+    <object class="notebookpage">
+      <object_ref name="joy4" ref="JoyPanel">
+        <pos>0,0</pos>
+      </object_ref>
+      <label>Player 4</label>
+    </object>
+  </object>
+  </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+             <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+             <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+  </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/LinkConfig.xrc b/src/wx/xrc/LinkConfig.xrc
index da1e640f..3e7f9d01 100644
--- a/src/wx/xrc/LinkConfig.xrc
+++ b/src/wx/xrc/LinkConfig.xrc
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="LinkConfig">
-    <title>Link configuration</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText" name="LinkTimeoutLab">
-              <label>Link timeout (in milliseconds)</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxSpinCtrl" name="LinkTimeout">
-              <min>0</min>
-              <max>9999999</max>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="LinkConfig">
+    <title>Link configuration</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText" name="LinkTimeoutLab">
+              <label>Link timeout (in milliseconds)</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxSpinCtrl" name="LinkTimeout">
+              <min>0</min>
+              <max>9999999</max>
+            </object>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/Logging.xrc b/src/wx/xrc/Logging.xrc
index df79021a..2402e6f4 100644
--- a/src/wx/xrc/Logging.xrc
+++ b/src/wx/xrc/Logging.xrc
@@ -1,140 +1,140 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="Logging">
-    <title>Logging</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="SWI">
-                  <label>SW_I</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="UnalignedMemory">
-                  <label>Unaligned _memory</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="IllWrite">
-                  <label>Illegal _write</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="IllRead">
-                  <label>Illegal _read</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="DMA0">
-                  <label>DMA _0</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="DMA1">
-                  <label>DMA _1</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="DMA2">
-                  <label>DMA _2</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="DMA3">
-                  <label>DMA _3</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="UndefInstruction">
-                  <label>_Undefined instruction</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="AGBPrint">
-                  <label>_AGBPrint</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="SoundOut">
-                  <label>Soun_d output</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <label>Verbose</label>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Log">
-              <style>wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL</style>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-            <minsize>400,200</minsize>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <option>1</option>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE">
-              <label>_Save</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Clear">
-              <label>_Clear</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStdDialogButtonSizer">
-              <object class="button">
-                <object class="wxButton" name="wxID_OK"/>
-              </object>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="Logging">
+    <title>Logging</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="SWI">
+                  <label>SW_I</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="UnalignedMemory">
+                  <label>Unaligned _memory</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="IllWrite">
+                  <label>Illegal _write</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="IllRead">
+                  <label>Illegal _read</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="DMA0">
+                  <label>DMA _0</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="DMA1">
+                  <label>DMA _1</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="DMA2">
+                  <label>DMA _2</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="DMA3">
+                  <label>DMA _3</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="UndefInstruction">
+                  <label>_Undefined instruction</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="AGBPrint">
+                  <label>_AGBPrint</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="SoundOut">
+                  <label>Soun_d output</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <label>Verbose</label>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Log">
+              <style>wxTE_MULTILINE|wxTE_READONLY|wxHSCROLL</style>
+            </object>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+            <minsize>400,200</minsize>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <option>1</option>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_SAVE">
+              <label>_Save</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Clear">
+              <label>_Clear</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStdDialogButtonSizer">
+              <object class="button">
+                <object class="wxButton" name="wxID_OK"/>
+              </object>
+            </object>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/MainFrame.xrc b/src/wx/xrc/MainFrame.xrc
index ba4071ee..550bd894 100644
--- a/src/wx/xrc/MainFrame.xrc
+++ b/src/wx/xrc/MainFrame.xrc
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxFrame" name="MainFrame" subclass="MainFrame">
-    <object_ref ref="MainMenu"/>
-    <object class="wxStatusBar">
-      <fields>2</fields>
-      <widths>-3,-1</widths>
-    </object>
-    <object class="wxBoxSizer">
-      <orient>wxHORIZONTAL</orient>
-      <object class="sizeritem">
-        <object class="wxPanel" name="DisplayArea" subclass="GameArea">
-			<bg>#000000</bg>
-          <style>wxCLIP_CHILDREN|wxWANTS_CHARS</style>
-        </object>
-        <option>1</option>
-        <flag>wxEXPAND</flag>
-        <minsize>160,144</minsize>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxFrame" name="MainFrame" subclass="MainFrame">
+    <object_ref ref="MainMenu"/>
+    <object class="wxStatusBar">
+      <fields>2</fields>
+      <widths>-3,-1</widths>
+    </object>
+    <object class="wxBoxSizer">
+      <orient>wxHORIZONTAL</orient>
+      <object class="sizeritem">
+        <object class="wxPanel" name="DisplayArea" subclass="GameArea">
+			<bg>#000000</bg>
+          <style>wxCLIP_CHILDREN|wxWANTS_CHARS</style>
+        </object>
+        <option>1</option>
+        <flag>wxEXPAND</flag>
+        <minsize>160,144</minsize>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/MainIcon.xrc b/src/wx/xrc/MainIcon.xrc
index b8813d45..3709755a 100644
--- a/src/wx/xrc/MainIcon.xrc
+++ b/src/wx/xrc/MainIcon.xrc
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxIcon" name="MainIcon">vbam.xpm</object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxIcon" name="MainIcon">vbam.xpm</object>
+</resource>
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index cd2e515a..c28ce152 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -1,647 +1,649 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxMenuBar" name="MainMenu">
-    <object class="wxMenu">
-      <label>_File</label>
-      <object class="wxMenuItem" name="wxID_OPEN"/>
-      <object class="wxMenuItem" name="OpenGB">
-        <label>Open _GB...</label>
-      </object>
-      <object class="wxMenuItem" name="OpenGBC">
-        <label>Open GB_C...</label>
-      </object>
-      <object class="wxMenu" name="RecentMenu">
-        <label>Open rece_nt</label>
-        <object class="wxMenuItem" name="RecentReset">
-          <label>_Reset recent list</label>
-        </object>
-        <object class="wxMenuItem" name="RecentFreeze">
-          <label>_Freeze recent list</label>
-          <checkable>1</checkable>
-        </object>
-      </object>
-      <object class="wxMenuItem" name="RomInformation">
-        <label>ROM in_formation...</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenu">
-        <label>_e-Reader</label>
-        <object class="wxMenuItem" name="LoadDotCodeFile">
-          <label>_Load Dot Code...</label>
-        </object>
-        <object class="wxMenuItem" name="SaveDotCodeFile">
-          <label>_Save Dot Code...</label>
-        </object>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="LoadGameRecent">
-          <label>Most _recent</label>
-          <accel>Ctrl+L</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGameAutoLoad">
-          <label>_Auto load most recent</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="LoadGame01">
-          <label>_1</label>
-          <accel>F1</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame02">
-          <label>_2</label>
-          <accel>F2</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame03">
-          <label>_3</label>
-          <accel>F3</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame04">
-          <label>_4</label>
-          <accel>F4</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame05">
-          <label>_5</label>
-          <accel>F5</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame06">
-          <label>_6</label>
-          <accel>F6</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame07">
-          <label>_7</label>
-          <accel>F7</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame08">
-          <label>_8</label>
-          <accel>F8</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame09">
-          <label>_9</label>
-          <accel>F9</accel>
-        </object>
-        <object class="wxMenuItem" name="LoadGame10">
-          <label>1_0</label>
-          <accel>F10</accel>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="Load">
-          <label>From _File ...</label>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="KeepSaves">
-          <label>Do not change _battery save</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="KeepCheats">
-          <label>Do not change _cheat list</label>
-          <checkable>1</checkable>
-        </object>
-        <label>_Load state</label>
-      </object>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="SaveGameOldest">
-          <label>_Oldest slot</label>
-          <accel>Ctrl+S</accel>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="SaveGame01">
-          <label>_1</label>
-          <accel>Shift+F1</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame02">
-          <label>_2</label>
-          <accel>Shift+F2</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame03">
-          <label>_3</label>
-          <accel>Shift+F3</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame04">
-          <label>_4</label>
-          <accel>Shift+F4</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame05">
-          <label>_5</label>
-          <accel>Shift+F5</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame06">
-          <label>_6</label>
-          <accel>Shift+F6</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame07">
-          <label>_7</label>
-          <accel>Shift+F7</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame08">
-          <label>_8</label>
-          <accel>Shift+F8</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame09">
-          <label>_9</label>
-          <accel>Shift+F9</accel>
-        </object>
-        <object class="wxMenuItem" name="SaveGame10">
-          <label>1_0</label>
-          <accel>Shift+F10</accel>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="Save">
-          <label>To _File ...</label>
-        </object>
-        <label>_Save state</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="ImportBatteryFile">
-          <label>_Battery file...</label>
-        </object>
-        <object class="wxMenuItem" name="ImportGamesharkCodeFile">
-          <label>Gameshark _code file...</label>
-        </object>
-        <object class="wxMenuItem" name="ImportGamesharkActionReplaySnapshot">
-          <label>_Gameshark snapshot...</label>
-        </object>
-        <label>_Import</label>
-      </object>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="ExportBatteryFile">
-          <label>_Battery file...</label>
-        </object>
-        <object class="wxMenuItem" name="ExportGamesharkSnapshot">
-          <label>_Gameshark snapshot...</label>
-        </object>
-        <label>_Export</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="ScreenCapture">
-        <label>Screen capt_ure...</label>
-      </object>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="RecordSoundStartRecording">
-          <label>Start _sound recording...</label>
-        </object>
-        <object class="wxMenuItem" name="RecordSoundStopRecording">
-          <label>Stop s_ound recording</label>
-        </object>
-        <object class="wxMenuItem" name="RecordAVIStartRecording">
-          <label>Start _video recording...</label>
-        </object>
-        <object class="wxMenuItem" name="RecordAVIStopRecording">
-          <label>Stop v_ideo recording</label>
-        </object>
-        <object class="wxMenuItem" name="RecordMovieStartRecording">
-          <label>Start _game recording...</label>
-        </object>
-        <object class="wxMenuItem" name="RecordMovieStopRecording">
-          <label>Stop g_ame recording</label>
-        </object>
-        <label>_Record</label>
-      </object>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="PlayMovieStartPlaying">
-          <label>Start playing _movie...</label>
-        </object>
-        <object class="wxMenuItem" name="PlayMovieStopPlaying">
-          <label>Stop playing m_ovie</label>
-        </object>
-        <label>_Play</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="wxID_CLOSE"/>
-      <object class="wxMenuItem" name="wxID_EXIT"/>
-    </object>
-    <object class="wxMenu">
-      <label>_Emulation</label>
-      <object class="wxMenuItem" name="Pause">
-        <label>_Pause</label>
-        <accel>Ctrl+P</accel>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="NextFrame">
-        <label>_Next frame</label>
-        <accel>Ctrl+N</accel>
-      </object>
-      <object class="wxMenuItem" name="Rewind">
-        <label>Re_wind</label>
-        <accel>Ctrl+B</accel>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="ToggleFullscreen">
-        <label>Toggle _full screen</label>
-        <bitmap platform="unix" stock_id="gtk-fullscreen"/>
-        <accel platform="win|unix">F11</accel>
-        <accel platform="mac">RawCtrl+Ctrl+F</accel>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="EmulatorSpeedupToggle">
-        <label>_Turbo mode</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="VSync">
-        <label>_VSync</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="FrameSkipAuto">
-        <label>_Auto skip frames</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="SkipIntro">
-        <label>_Skip BIOS</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="ApplyPatches">
-        <label>_Auto IPS/UPS/IPF patch</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="wxMenuItem" name="PauseWhenInactive">
-        <label>_Pause when inactive</label>
-        <checkable>1</checkable>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="Reset">
-        <label>_Reset</label>
-        <accel>Ctrl+R</accel>
-      </object>
-    </object>
-    <object class="wxMenu">
-      <label>_Options</label>
-      <object class="wxMenu">
-        <label>_Link</label>
-        <object class="wxMenuItem" name="LanLink">
-          <label>Start _Network Link ...</label>
-        </object>
-        <object class="wxMenu">
-          <label>_Type</label>
-          <object class="wxMenuItem" name="LinkType0Nothing">
-            <label>_Nothing</label>
-            <checkable>1</checkable>
-          </object>
-          <object class="wxMenuItem" name="LinkType1Cable">
-            <label>_Cable</label>
-            <checkable>1</checkable>
-          </object>
-          <object class="wxMenuItem" name="LinkType2Wireless">
-            <label>_Wireless</label>
-            <checkable>1</checkable>
-          </object>
-          <object class="wxMenuItem" name="LinkType3GameCube">
-            <label>_GameCube</label>
-            <checkable>1</checkable>
-          </object>
-          <object class="wxMenuItem" name="LinkType4Gameboy">
-            <label>_Game Boy</label>
-            <checkable>1</checkable>
-          </object>
-        </object>
-        <object class="wxMenuItem" name="LinkProto">
-          <label>_Local mode</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="LinkAuto">
-          <label>_Link at boot</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="SpeedOn">
-          <label>_Speed hack</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="LinkConfigure">
-          <label>_Configure ...</label>
-        </object>
-      </object>
-      <object class="wxMenu">
-        <label>_Video</label>
-        <object class="wxMenuItem" name="DisplayConfigure">
-          <label>_Configure ...</label>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="Fullscreen">
-          <label>_Start in full screen</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="RetainAspect">
-          <label>_Retain aspect ratio</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="Bilinear">
-          <label>_Bilinear filter</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="Multithread">
-          <label>_Multithread filter</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="KeepOnTop">
-          <label>_Keep window on top</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="StatusBar">
-          <label>_Status bar</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="NoStatusMsg">
-          <label>_Disable on-screen display</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="Transparent">
-          <label>_Transparent on-screen display</label>
-          <checkable>1</checkable>
-        </object>
-      </object>
-      <object class="wxMenu">
-        <label>_Audio</label>
-        <object class="wxMenuItem" name="SoundConfigure">
-          <label>_Configure ...</label>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="GBASoundInterpolation">
-          <label>_GBA sound interpolation</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="separator"/>        
-        <object class="wxMenuItem" name="GBEnhanceSound">
-          <label>_GB sound enhancement</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="GBSurround">
-          <label>_GB surround sound effect</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="GBDeclicking">
-          <label>_GB sound declicking</label>
-          <checkable>1</checkable>
-        </object>
-      </object>
-      <object class="wxMenu">
-        <label>_Input</label>
-        <object class="wxMenuItem" name="JoypadConfigure">
-          <label>_Configure ...</label>
-        </object>
-        <object class="separator"/>        
-        <object class="wxMenu">
-          <label>_Autofire</label>
-          <object class="wxMenuItem" name="JoypadAutofireA">
-            <label>_A</label>
-            <accel>Alt+1</accel>
-            <checkable>1</checkable>
-          </object>
-          <object class="wxMenuItem" name="JoypadAutofireB">
-            <label>_B</label>
-            <accel>Alt+2</accel>
-            <checkable>1</checkable>
-          </object>
-          <object class="wxMenuItem" name="JoypadAutofireL">
-            <label>_L</label>
-            <accel>Alt+3</accel>
-            <checkable>1</checkable>
-          </object>
-          <object class="wxMenuItem" name="JoypadAutofireR">
-            <label>_R</label>
-            <accel>Alt+4</accel>
-            <checkable>1</checkable>
-          </object>
-        </object>
-      </object>
-      <object class="wxMenu">
-        <label>_Game Boy Advance</label>
-        <object class="wxMenuItem" name="GameBoyAdvanceConfigure">
-          <label>Configure ...</label>
-        </object>
-        <object class="separator"/>        
-        <object class="wxMenuItem" name="RTC">
-          <label>_Real-time clock</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="BootRomEn">
-          <label>_Use BIOS file</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="AGBPrinter">
-          <label>_Debug print</label>
-          <checkable>1</checkable>
-        </object>
-      </object>
-      <object class="wxMenu">
-        <label>_Game Boy</label>
-        <object class="wxMenuItem" name="GameBoyConfigure">
-          <label>Configure ...</label>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="Printer">
-          <label>_GB printer</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="PrintGather">
-          <label>_Gather a full page before printing</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="PrintSnap">
-          <label>_Save printouts as screen captures</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="BootRomGB">
-          <label>_Use GB BIOS file</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="BootRomGBC">
-          <label>_Use GBC BIOS file</label>
-          <checkable>1</checkable>
-        </object>
-      </object>
-        <object class="wxMenuItem" name="GeneralConfigure">
-          <label>_General ...</label>
-        </object>
-        <object class="wxMenuItem" name="SpeedupConfigure">
-          <label>_Speedup / Turbo ...</label>
-        </object>
-        <object class="wxMenuItem" name="EmulatorDirectories">
-          <label>D_irectories ...</label>
-        </object>
-        <object class="wxMenuItem" name="Customize">
-          <label>_Key Shortcuts ...</label>
-        </object>
-    </object>
-    <object class="wxMenu">
-      <label>_Tools</label>
-      <object class="wxMenu">
-        <label>_Cheats</label>
-        <object class="wxMenuItem" name="CheatsList">
-          <label>List _cheats ...</label>
-          <accel>Ctrl+C</accel>
-        </object>
-        <object class="wxMenuItem" name="CheatsSearch">
-          <label>Find c_heat ...</label>
-          <accel>Ctrl+F</accel>
-        </object>
-        <object class="separator"/>        
-        <object class="wxMenuItem" name="CheatsAutoSaveLoad">
-          <label>A_utomatically save/load cheats</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="wxMenuItem" name="CheatsEnable">
-          <label>_Enable cheats</label>
-          <checkable>1</checkable>
-        </object>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="DebugGDBBreak">
-          <label>_Break into GDB</label>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="DebugGDBPort">
-          <label>_Configure port...</label>
-        </object>
-        <object class="wxMenuItem" name="DebugGDBBreakOnLoad">
-          <label>_Break on load</label>
-          <checkable>1</checkable>
-        </object>
-        <object class="separator"/>
-        <object class="wxMenuItem" name="DebugGDBDisconnect">
-          <label>_Disconnect</label>
-        </object>
-        <label>_GDB</label>
-      </object>
-      <object class="wxMenuItem" name="Disassemble">
-        <label>_Disassemble...</label>
-      </object>
-      <object class="wxMenuItem" name="Logging">
-        <label>_Logging...</label>
-      </object>
-      <object class="wxMenuItem" name="IOViewer">
-        <label>_IO Viewer...</label>
-      </object>
-      <object class="wxMenuItem" name="MapViewer">
-        <label>&amp;Map Viewer...</label>
-      </object>
-      <object class="wxMenuItem" name="MemoryViewer">
-        <label>M_emory Viewer...</label>
-      </object>
-      <object class="wxMenuItem" name="OAMViewer">
-        <label>_OAM Viewer...</label>
-      </object>
-      <object class="wxMenuItem" name="PaletteViewer">
-        <label>_Palette Viewer...</label>
-      </object>
-      <object class="wxMenuItem" name="TileViewer">
-        <label>_Tile Viewer...</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="VideoLayersBG0">
-          <label>BG _0</label>
-          <accel>Ctrl+1</accel>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="VideoLayersBG1">
-          <label>BG _1</label>
-          <accel>Ctrl+2</accel>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="VideoLayersBG2">
-          <label>BG _2</label>
-          <accel>Ctrl+3</accel>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="VideoLayersBG3">
-          <label>BG _3</label>
-          <accel>Ctrl+4</accel>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="VideoLayersOBJ">
-          <label>_OBJ</label>
-          <accel>Ctrl+5</accel>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="VideoLayersWIN0">
-          <label>_WIN 0</label>
-          <accel>Ctrl+6</accel>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="VideoLayersWIN1">
-          <label>W_IN 1</label>
-          <accel>Ctrl+7</accel>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="VideoLayersOBJWIN">
-          <label>O_BJ WIN</label>
-          <accel>Ctrl+8</accel>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <label>_View Layers</label>
-      </object>
-      <object class="wxMenu">
-        <object class="wxMenuItem" name="SoundChannel1">
-          <label>Channel _1</label>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="SoundChannel2">
-          <label>Channel _2</label>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="SoundChannel3">
-          <label>Channel _3</label>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="SoundChannel4">
-          <label>Channel _4</label>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="DirectSoundA">
-          <label>Direct Sound _A</label>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <object class="wxMenuItem" name="DirectSoundB">
-          <label>Direct Sound _B</label>
-          <checkable>1</checkable>
-          <checked>1</checked>
-        </object>
-        <label>_Sound Channels</label>
-      </object>
-    </object>
-    <object class="wxMenu">
-      <label>_Help</label>
-      <object class="wxMenuItem" name="BugReport">
-        <label>Report _Bugs</label>
-      </object>
-      <object class="wxMenuItem" name="FAQ">
-        <label>VBA-M Support _Forum</label>
-      </object>
-      <object class="wxMenuItem" name="Translate">
-        <label>Translations</label>
-      </object>
-      <!-- FIXME: turn this back on when Sparkle is implemented
-      <object class="wxMenuItem" name="UpdateRDB">
-        <label>Update ROM database</label>
-      </object>
-      <object class="wxMenuItem" name="UpdateEmu">
-        <label>Check for updates</label>
-      </object>
-      -->
-      <object class="wxMenuItem" name="FactoryReset">
-        <label>_Factory Reset...</label>
-      </object>
-      <object class="separator"/>
-      <object class="wxMenuItem" name="wxID_ABOUT"/>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxMenuBar" name="MainMenu">
+    <object class="wxMenu">
+      <label>_File</label>
+      <object class="wxMenuItem" name="wxID_OPEN"/>
+      <object class="wxMenuItem" name="OpenGB">
+        <label>Open _GB...</label>
+      </object>
+      <object class="wxMenuItem" name="OpenGBC">
+        <label>Open GB_C...</label>
+      </object>
+      <object class="wxMenu" name="RecentMenu">
+        <label>Open rece_nt</label>
+        <object class="wxMenuItem" name="RecentReset">
+          <label>_Reset recent list</label>
+        </object>
+        <object class="wxMenuItem" name="RecentFreeze">
+          <label>_Freeze recent list</label>
+          <checkable>1</checkable>
+        </object>
+      </object>
+      <object class="wxMenuItem" name="RomInformation">
+        <label>ROM in_formation...</label>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenu">
+        <label>_e-Reader</label>
+        <object class="wxMenuItem" name="LoadDotCodeFile">
+          <label>_Load Dot Code...</label>
+        </object>
+        <object class="wxMenuItem" name="SaveDotCodeFile">
+          <label>_Save Dot Code...</label>
+        </object>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="LoadGameRecent">
+          <label>Most _recent</label>
+          <accel>Ctrl+L</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGameAutoLoad">
+          <label>_Auto load most recent</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="LoadGame01">
+          <label>_1</label>
+          <accel>F1</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame02">
+          <label>_2</label>
+          <accel>F2</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame03">
+          <label>_3</label>
+          <accel>F3</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame04">
+          <label>_4</label>
+          <accel>F4</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame05">
+          <label>_5</label>
+          <accel>F5</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame06">
+          <label>_6</label>
+          <accel>F6</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame07">
+          <label>_7</label>
+          <accel>F7</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame08">
+          <label>_8</label>
+          <accel>F8</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame09">
+          <label>_9</label>
+          <accel>F9</accel>
+        </object>
+        <object class="wxMenuItem" name="LoadGame10">
+          <label>1_0</label>
+          <accel>F10</accel>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="Load">
+          <label>From _File ...</label>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="KeepSaves">
+          <label>Do not change _battery save</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="KeepCheats">
+          <label>Do not change _cheat list</label>
+          <checkable>1</checkable>
+        </object>
+        <label>_Load state</label>
+      </object>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="SaveGameOldest">
+          <label>_Oldest slot</label>
+          <accel>Ctrl+S</accel>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="SaveGame01">
+          <label>_1</label>
+          <accel>Shift+F1</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame02">
+          <label>_2</label>
+          <accel>Shift+F2</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame03">
+          <label>_3</label>
+          <accel>Shift+F3</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame04">
+          <label>_4</label>
+          <accel>Shift+F4</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame05">
+          <label>_5</label>
+          <accel>Shift+F5</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame06">
+          <label>_6</label>
+          <accel>Shift+F6</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame07">
+          <label>_7</label>
+          <accel>Shift+F7</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame08">
+          <label>_8</label>
+          <accel>Shift+F8</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame09">
+          <label>_9</label>
+          <accel>Shift+F9</accel>
+        </object>
+        <object class="wxMenuItem" name="SaveGame10">
+          <label>1_0</label>
+          <accel>Shift+F10</accel>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="Save">
+          <label>To _File ...</label>
+        </object>
+        <label>_Save state</label>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="ImportBatteryFile">
+          <label>_Battery file...</label>
+        </object>
+        <object class="wxMenuItem" name="ImportGamesharkCodeFile">
+          <label>Gameshark _code file...</label>
+        </object>
+        <object class="wxMenuItem" name="ImportGamesharkActionReplaySnapshot">
+          <label>_Gameshark snapshot...</label>
+        </object>
+        <label>_Import</label>
+      </object>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="ExportBatteryFile">
+          <label>_Battery file...</label>
+        </object>
+        <object class="wxMenuItem" name="ExportGamesharkSnapshot">
+          <label>_Gameshark snapshot...</label>
+        </object>
+        <label>_Export</label>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="ScreenCapture">
+        <label>Screen capt_ure...</label>
+      </object>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="RecordSoundStartRecording">
+          <label>Start _sound recording...</label>
+        </object>
+        <object class="wxMenuItem" name="RecordSoundStopRecording">
+          <label>Stop s_ound recording</label>
+        </object>
+        <object class="wxMenuItem" name="RecordAVIStartRecording">
+          <label>Start _video recording...</label>
+        </object>
+        <object class="wxMenuItem" name="RecordAVIStopRecording">
+          <label>Stop v_ideo recording</label>
+        </object>
+        <object class="wxMenuItem" name="RecordMovieStartRecording">
+          <label>Start _game recording...</label>
+        </object>
+        <object class="wxMenuItem" name="RecordMovieStopRecording">
+          <label>Stop g_ame recording</label>
+        </object>
+        <label>_Record</label>
+      </object>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="PlayMovieStartPlaying">
+          <label>Start playing _movie...</label>
+        </object>
+        <object class="wxMenuItem" name="PlayMovieStopPlaying">
+          <label>Stop playing m_ovie</label>
+        </object>
+        <label>_Play</label>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="wxID_CLOSE"/>
+      <object class="wxMenuItem" name="wxID_EXIT"/>
+    </object>
+    <object class="wxMenu">
+      <label>_Emulation</label>
+      <object class="wxMenuItem" name="Pause">
+        <label>_Pause</label>
+        <accel>Ctrl+P</accel>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="NextFrame">
+        <label>_Next frame</label>
+        <accel>Ctrl+N</accel>
+      </object>
+      <object class="wxMenuItem" name="Rewind">
+        <label>Re_wind</label>
+        <accel>Ctrl+B</accel>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="ToggleFullscreen">
+        <label>Toggle _full screen</label>
+        <bitmap platform="unix" stock_id="gtk-fullscreen"/>
+        <accel platform="win|unix">F11</accel>
+        <accel platform="mac">RawCtrl+Ctrl+F</accel>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="EmulatorSpeedupToggle">
+        <label>_Turbo mode</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="VSync">
+        <label>_VSync</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="FrameSkipAuto">
+        <label>_Auto skip frames</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="SkipIntro">
+        <label>_Skip BIOS</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="ApplyPatches">
+        <label>_Auto IPS/UPS/IPF patch</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="wxMenuItem" name="PauseWhenInactive">
+        <label>_Pause when inactive</label>
+        <checkable>1</checkable>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="Reset">
+        <label>_Reset</label>
+        <accel>Ctrl+R</accel>
+      </object>
+    </object>
+    <object class="wxMenu">
+      <label>_Options</label>
+      <object class="wxMenu">
+        <label>_Link</label>
+        <object class="wxMenuItem" name="LanLink">
+          <label>Start _Network Link ...</label>
+        </object>
+        <object class="wxMenu">
+          <label>_Type</label>
+          <object class="wxMenuItem" name="LinkType0Nothing">
+            <label>_Nothing</label>
+            <checkable>1</checkable>
+          </object>
+          <object class="wxMenuItem" name="LinkType1Cable">
+            <label>_Cable</label>
+            <checkable>1</checkable>
+          </object>
+          <object class="wxMenuItem" name="LinkType2Wireless">
+            <label>_Wireless</label>
+            <checkable>1</checkable>
+          </object>
+          <object class="wxMenuItem" name="LinkType3GameCube">
+            <label>_GameCube</label>
+            <checkable>1</checkable>
+          </object>
+          <object class="wxMenuItem" name="LinkType4Gameboy">
+            <label>_Game Boy</label>
+            <checkable>1</checkable>
+          </object>
+        </object>
+        <object class="wxMenuItem" name="LinkProto">
+          <label>_Local mode</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="LinkAuto">
+          <label>_Link at boot</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="SpeedOn">
+          <label>_Speed hack</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="LinkConfigure">
+          <label>_Configure ...</label>
+        </object>
+      </object>
+      <object class="wxMenu">
+        <label>_Video</label>
+        <object class="wxMenuItem" name="DisplayConfigure">
+          <label>_Configure ...</label>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="Fullscreen">
+          <label>_Start in full screen</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="RetainAspect">
+          <label>_Retain aspect ratio</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="Bilinear">
+          <label>_Bilinear filter</label>
+          <checkable>1</checkable>
+        </object>
+<!--
+        <object class="wxMenuItem" name="Multithread">
+          <label>_Multithread filter</label>
+          <checkable>1</checkable>
+        </object>
+-->
+        <object class="separator"/>
+        <object class="wxMenuItem" name="KeepOnTop">
+          <label>_Keep window on top</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="StatusBar">
+          <label>_Status bar</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="NoStatusMsg">
+          <label>_Disable on-screen display</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="Transparent">
+          <label>_Transparent on-screen display</label>
+          <checkable>1</checkable>
+        </object>
+      </object>
+      <object class="wxMenu">
+        <label>_Audio</label>
+        <object class="wxMenuItem" name="SoundConfigure">
+          <label>_Configure ...</label>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="GBASoundInterpolation">
+          <label>_GBA sound interpolation</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="separator"/>        
+        <object class="wxMenuItem" name="GBEnhanceSound">
+          <label>_GB sound enhancement</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="GBSurround">
+          <label>_GB surround sound effect</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="GBDeclicking">
+          <label>_GB sound declicking</label>
+          <checkable>1</checkable>
+        </object>
+      </object>
+      <object class="wxMenu">
+        <label>_Input</label>
+        <object class="wxMenuItem" name="JoypadConfigure">
+          <label>_Configure ...</label>
+        </object>
+        <object class="separator"/>        
+        <object class="wxMenu">
+          <label>_Autofire</label>
+          <object class="wxMenuItem" name="JoypadAutofireA">
+            <label>_A</label>
+            <accel>Alt+1</accel>
+            <checkable>1</checkable>
+          </object>
+          <object class="wxMenuItem" name="JoypadAutofireB">
+            <label>_B</label>
+            <accel>Alt+2</accel>
+            <checkable>1</checkable>
+          </object>
+          <object class="wxMenuItem" name="JoypadAutofireL">
+            <label>_L</label>
+            <accel>Alt+3</accel>
+            <checkable>1</checkable>
+          </object>
+          <object class="wxMenuItem" name="JoypadAutofireR">
+            <label>_R</label>
+            <accel>Alt+4</accel>
+            <checkable>1</checkable>
+          </object>
+        </object>
+      </object>
+      <object class="wxMenu">
+        <label>_Game Boy Advance</label>
+        <object class="wxMenuItem" name="GameBoyAdvanceConfigure">
+          <label>Configure ...</label>
+        </object>
+        <object class="separator"/>        
+        <object class="wxMenuItem" name="RTC">
+          <label>_Real-time clock</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="BootRomEn">
+          <label>_Use BIOS file</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="AGBPrinter">
+          <label>_Debug print</label>
+          <checkable>1</checkable>
+        </object>
+      </object>
+      <object class="wxMenu">
+        <label>_Game Boy</label>
+        <object class="wxMenuItem" name="GameBoyConfigure">
+          <label>Configure ...</label>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="Printer">
+          <label>_GB printer</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="PrintGather">
+          <label>_Gather a full page before printing</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="PrintSnap">
+          <label>_Save printouts as screen captures</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="BootRomGB">
+          <label>_Use GB BIOS file</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="BootRomGBC">
+          <label>_Use GBC BIOS file</label>
+          <checkable>1</checkable>
+        </object>
+      </object>
+        <object class="wxMenuItem" name="GeneralConfigure">
+          <label>_General ...</label>
+        </object>
+        <object class="wxMenuItem" name="SpeedupConfigure">
+          <label>_Speedup / Turbo ...</label>
+        </object>
+        <object class="wxMenuItem" name="EmulatorDirectories">
+          <label>D_irectories ...</label>
+        </object>
+        <object class="wxMenuItem" name="Customize">
+          <label>_Key Shortcuts ...</label>
+        </object>
+    </object>
+    <object class="wxMenu">
+      <label>_Tools</label>
+      <object class="wxMenu">
+        <label>_Cheats</label>
+        <object class="wxMenuItem" name="CheatsList">
+          <label>List _cheats ...</label>
+          <accel>Ctrl+C</accel>
+        </object>
+        <object class="wxMenuItem" name="CheatsSearch">
+          <label>Find c_heat ...</label>
+          <accel>Ctrl+F</accel>
+        </object>
+        <object class="separator"/>        
+        <object class="wxMenuItem" name="CheatsAutoSaveLoad">
+          <label>A_utomatically save/load cheats</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="wxMenuItem" name="CheatsEnable">
+          <label>_Enable cheats</label>
+          <checkable>1</checkable>
+        </object>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="DebugGDBBreak">
+          <label>_Break into GDB</label>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="DebugGDBPort">
+          <label>_Configure port...</label>
+        </object>
+        <object class="wxMenuItem" name="DebugGDBBreakOnLoad">
+          <label>_Break on load</label>
+          <checkable>1</checkable>
+        </object>
+        <object class="separator"/>
+        <object class="wxMenuItem" name="DebugGDBDisconnect">
+          <label>_Disconnect</label>
+        </object>
+        <label>_GDB</label>
+      </object>
+      <object class="wxMenuItem" name="Disassemble">
+        <label>_Disassemble...</label>
+      </object>
+      <object class="wxMenuItem" name="Logging">
+        <label>_Logging...</label>
+      </object>
+      <object class="wxMenuItem" name="IOViewer">
+        <label>_IO Viewer...</label>
+      </object>
+      <object class="wxMenuItem" name="MapViewer">
+        <label>&amp;Map Viewer...</label>
+      </object>
+      <object class="wxMenuItem" name="MemoryViewer">
+        <label>M_emory Viewer...</label>
+      </object>
+      <object class="wxMenuItem" name="OAMViewer">
+        <label>_OAM Viewer...</label>
+      </object>
+      <object class="wxMenuItem" name="PaletteViewer">
+        <label>_Palette Viewer...</label>
+      </object>
+      <object class="wxMenuItem" name="TileViewer">
+        <label>_Tile Viewer...</label>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="VideoLayersBG0">
+          <label>BG _0</label>
+          <accel>Ctrl+1</accel>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="VideoLayersBG1">
+          <label>BG _1</label>
+          <accel>Ctrl+2</accel>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="VideoLayersBG2">
+          <label>BG _2</label>
+          <accel>Ctrl+3</accel>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="VideoLayersBG3">
+          <label>BG _3</label>
+          <accel>Ctrl+4</accel>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="VideoLayersOBJ">
+          <label>_OBJ</label>
+          <accel>Ctrl+5</accel>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="VideoLayersWIN0">
+          <label>_WIN 0</label>
+          <accel>Ctrl+6</accel>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="VideoLayersWIN1">
+          <label>W_IN 1</label>
+          <accel>Ctrl+7</accel>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="VideoLayersOBJWIN">
+          <label>O_BJ WIN</label>
+          <accel>Ctrl+8</accel>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <label>_View Layers</label>
+      </object>
+      <object class="wxMenu">
+        <object class="wxMenuItem" name="SoundChannel1">
+          <label>Channel _1</label>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="SoundChannel2">
+          <label>Channel _2</label>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="SoundChannel3">
+          <label>Channel _3</label>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="SoundChannel4">
+          <label>Channel _4</label>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="DirectSoundA">
+          <label>Direct Sound _A</label>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <object class="wxMenuItem" name="DirectSoundB">
+          <label>Direct Sound _B</label>
+          <checkable>1</checkable>
+          <checked>1</checked>
+        </object>
+        <label>_Sound Channels</label>
+      </object>
+    </object>
+    <object class="wxMenu">
+      <label>_Help</label>
+      <object class="wxMenuItem" name="BugReport">
+        <label>Report _Bugs</label>
+      </object>
+      <object class="wxMenuItem" name="FAQ">
+        <label>VBA-M Support _Forum</label>
+      </object>
+      <object class="wxMenuItem" name="Translate">
+        <label>Translations</label>
+      </object>
+      <!-- FIXME: turn this back on when Sparkle is implemented
+      <object class="wxMenuItem" name="UpdateRDB">
+        <label>Update ROM database</label>
+      </object>
+      <object class="wxMenuItem" name="UpdateEmu">
+        <label>Check for updates</label>
+      </object>
+      -->
+      <object class="wxMenuItem" name="FactoryReset">
+        <label>_Factory Reset...</label>
+      </object>
+      <object class="separator"/>
+      <object class="wxMenuItem" name="wxID_ABOUT"/>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/MapViewer.xrc b/src/wx/xrc/MapViewer.xrc
index eacf6905..5111071f 100644
--- a/src/wx/xrc/MapViewer.xrc
+++ b/src/wx/xrc/MapViewer.xrc
@@ -1,234 +1,234 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="MapViewer">
-    <title>Map Viewer</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Frame0">
-                      <label>Frame 0</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Frame1">
-                      <label>Frame 1</label>
-                    </object>
-                  </object>
-                  <label>Frame</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="BG0">
-                      <label>BG0</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="BG1">
-                      <label>BG1</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="BG2">
-                      <label>BG2</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="BG3">
-                      <label>BG3</label>
-                    </object>
-                  </object>
-                  <label>Background</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxLEFT|wxRIGHT|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="Stretch">
-                  <label>Stretch to _fit</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="AutoUpdate">
-                  <label>Auto _update</label>
-                </object>
-              </object>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Mode:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Mode"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Map Base:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="MapBase"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Char Base:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="CharBase"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Size:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Size"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Colors:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Colors"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Priority:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Priority"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Mosaic:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Mosaic"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Overflow:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Overflow"/>
-              </object>
-              <object class="spacer"/>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Coords"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Address:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Address"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Tile:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Tile"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Flip:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Flip"/>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Palette:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Palette"/>
-              </object>
-              <cols>2</cols>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxScrolledWindow">
-              <object class="wxPanel" name="GfxView" subclass="GfxPanel">
-                <size>128,128d</size>
-                <style>wxFULL_REPAINT_ON_RESIZE</style>
-              </object>
-              <size>128,128d</size>
-              <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxPanel" name="Zoom" subclass="PixView">
-              <size>64,64d</size>
-              <style>wxBORDER_SUNKEN</style>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="spacer"/>
-          <object class="sizeritem">
-            <object class="unknown" name="Color"/>
-            <flag>wxALL|wxALIGN_BOTTOM</flag>
-            <border>5</border>
-          </object>
-          <cols>3</cols>
-          <growablecols>1</growablecols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Save">
-              <label>_Save</label>
-            </object>
-            <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALIGN_RIGHT</flag>
-          </object>
-          <cols>3</cols>
-        </object>
-        <flag>wxEXPAND|wxALL</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="MapViewer">
+    <title>Map Viewer</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Frame0">
+                      <label>Frame 0</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Frame1">
+                      <label>Frame 1</label>
+                    </object>
+                  </object>
+                  <label>Frame</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="BG0">
+                      <label>BG0</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="BG1">
+                      <label>BG1</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="BG2">
+                      <label>BG2</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="BG3">
+                      <label>BG3</label>
+                    </object>
+                  </object>
+                  <label>Background</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxLEFT|wxRIGHT|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="Stretch">
+                  <label>Stretch to _fit</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="AutoUpdate">
+                  <label>Auto _update</label>
+                </object>
+              </object>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Mode:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Mode"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Map Base:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="MapBase"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Char Base:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="CharBase"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Size:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Size"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Colors:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Colors"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Priority:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Priority"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Mosaic:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Mosaic"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Overflow:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Overflow"/>
+              </object>
+              <object class="spacer"/>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Coords"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Address:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Address"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Tile:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Tile"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Flip:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Flip"/>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Palette:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Palette"/>
+              </object>
+              <cols>2</cols>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxScrolledWindow">
+              <object class="wxPanel" name="GfxView" subclass="GfxPanel">
+                <size>128,128d</size>
+                <style>wxFULL_REPAINT_ON_RESIZE</style>
+              </object>
+              <size>128,128d</size>
+              <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxPanel" name="Zoom" subclass="PixView">
+              <size>64,64d</size>
+              <style>wxBORDER_SUNKEN</style>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="spacer"/>
+          <object class="sizeritem">
+            <object class="unknown" name="Color"/>
+            <flag>wxALL|wxALIGN_BOTTOM</flag>
+            <border>5</border>
+          </object>
+          <cols>3</cols>
+          <growablecols>1</growablecols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Save">
+              <label>_Save</label>
+            </object>
+            <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALIGN_RIGHT</flag>
+          </object>
+          <cols>3</cols>
+        </object>
+        <flag>wxEXPAND|wxALL</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/MemSelRegion.xrc b/src/wx/xrc/MemSelRegion.xrc
index 7ede48e3..134d0f6f 100644
--- a/src/wx/xrc/MemSelRegion.xrc
+++ b/src/wx/xrc/MemSelRegion.xrc
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="MemSelRegion">
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Address:</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Address"/>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="SizeLab">
-              <label>Size:</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="Size"/>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <cols>2</cols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="MemSelRegion">
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Address:</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Address"/>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="SizeLab">
+              <label>Size:</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="Size"/>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <cols>2</cols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/MemViewer.xrc b/src/wx/xrc/MemViewer.xrc
index 4fb45eeb..0f52666a 100644
--- a/src/wx/xrc/MemViewer.xrc
+++ b/src/wx/xrc/MemViewer.xrc
@@ -1,131 +1,131 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="MemViewer">
-    <title>Memory Viewer</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxChoice" name="BlockStart"/>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxRadioButton" name="Fmt8">
-              <label>_8-bit</label>
-              <style>wxRB_GROUP</style>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxRadioButton" name="Fmt16">
-              <label>_16-bit</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxRadioButton" name="Fmt32">
-              <label>_32-bit</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="GotoAddress">
-              <style>wxTE_PROCESS_ENTER</style>
-            </object>
-            <option>1</option>
-            <flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="Goto">
-              <label>_Go</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxPanel" name="MemView" subclass="MemView">
-          <font>
-            <family>modern</family>
-          </font>
-          <style>wxBORDER_SUNKEN</style>
-        </object>
-        <option>1</option>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <minsize>100,200</minsize>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="AutoUpdate">
-              <label>Automatic _update</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="spacer">
-            <option>1</option>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText">
-              <label>Current address:</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="CurAddress"/>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_OPEN">
-              <label>_Load...</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE">
-              <label>_Save...</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALL|wxALIGN_RIGHT</flag>
-            <border>5</border>
-          </object>
-          <cols>4</cols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="MemViewer">
+    <title>Memory Viewer</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxChoice" name="BlockStart"/>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxRadioButton" name="Fmt8">
+              <label>_8-bit</label>
+              <style>wxRB_GROUP</style>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxRadioButton" name="Fmt16">
+              <label>_16-bit</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxRadioButton" name="Fmt32">
+              <label>_32-bit</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="GotoAddress">
+              <style>wxTE_PROCESS_ENTER</style>
+            </object>
+            <option>1</option>
+            <flag>wxTOP|wxBOTTOM|wxLEFT|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="Goto">
+              <label>_Go</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxPanel" name="MemView" subclass="MemView">
+          <font>
+            <family>modern</family>
+          </font>
+          <style>wxBORDER_SUNKEN</style>
+        </object>
+        <option>1</option>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <minsize>100,200</minsize>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="AutoUpdate">
+              <label>Automatic _update</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="spacer">
+            <option>1</option>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText">
+              <label>Current address:</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="CurAddress"/>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_OPEN">
+              <label>_Load...</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_SAVE">
+              <label>_Save...</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALL|wxALIGN_RIGHT</flag>
+            <border>5</border>
+          </object>
+          <cols>4</cols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/NetLink.xrc b/src/wx/xrc/NetLink.xrc
index ac74f0d4..bd74dd4c 100644
--- a/src/wx/xrc/NetLink.xrc
+++ b/src/wx/xrc/NetLink.xrc
@@ -1,98 +1,98 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="NetLink">
-    <title>Start Network Link</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxRadioButton" name="Server">
-              <label>Server</label>
-              <style>wxRB_GROUP</style>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxRadioButton" name="Client">
-              <label>Client</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE</flag>
-            <border>5</border>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <object class="wxStaticText" name="PlayersLab">
-              <label>Players:</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxGridSizer">
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="Link2P">
-                  <label>2</label>
-                  <style>wxRB_GROUP</style>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="Link3P">
-                  <label>3</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxRadioButton" name="Link4P">
-                  <label>4</label>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE</flag>
-                <border>5</border>
-              </object>
-              <cols>3</cols>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticText" name="ServerIPLab">
-              <label>Server:</label>
-              <wrap>200</wrap>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxTextCtrl" name="ServerIP"/>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK">
-              <label>Connect</label>
-            </object>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="NetLink">
+    <title>Start Network Link</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxRadioButton" name="Server">
+              <label>Server</label>
+              <style>wxRB_GROUP</style>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxRadioButton" name="Client">
+              <label>Client</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE</flag>
+            <border>5</border>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <object class="wxStaticText" name="PlayersLab">
+              <label>Players:</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxGridSizer">
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="Link2P">
+                  <label>2</label>
+                  <style>wxRB_GROUP</style>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="Link3P">
+                  <label>3</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxRadioButton" name="Link4P">
+                  <label>4</label>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE</flag>
+                <border>5</border>
+              </object>
+              <cols>3</cols>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticText" name="ServerIPLab">
+              <label>Server:</label>
+              <wrap>200</wrap>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxTextCtrl" name="ServerIP"/>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK">
+              <label>Connect</label>
+            </object>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/OAMViewer.xrc b/src/wx/xrc/OAMViewer.xrc
index 343b573d..915766bb 100644
--- a/src/wx/xrc/OAMViewer.xrc
+++ b/src/wx/xrc/OAMViewer.xrc
@@ -1,178 +1,178 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="OAMViewer">
-    <title>OAM Viewer</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxHORIZONTAL</orient>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Sprite:</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxSpinCtrl" name="Sprite">
-                  <min>0</min>
-                  <max>127</max>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxFlexGridSizer">
-                  <cols>2</cols>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Pos:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Pos"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Mode:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Mode"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Colors:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Colors"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Pal:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Palette"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Tile:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Tile"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Prio:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Priority"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Size:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Size"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Rot.:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Rotation"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Flags:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Flags"/>
-                  </object>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="Stretch">
-                  <label>Stretch to _fit</label>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="AutoUpdate">
-                  <label>Automatic _update</label>
-                </object>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxScrolledWindow">
-                      <object class="wxPanel" name="GfxView" subclass="GfxPanel">
-                        <size>544,496</size>
-                      </object>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxPanel" name="Zoom" subclass="PixView">
-                      <size>64,64d</size>
-                      <style>wxBORDER_SUNKEN</style>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <orient>wxHORIZONTAL</orient>
-                </object>
-              </object>
-              <object class="sizeritem">
-                <object class="unknown" name="Color"/>
-                <flag>wxALL|wxALIGN_BOTTOM</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE">
-              <label>_Save...</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALL|wxALIGN_RIGHT</flag>
-            <border>5</border>
-          </object>
-          <cols>3</cols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="OAMViewer">
+    <title>OAM Viewer</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxHORIZONTAL</orient>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Sprite:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="Sprite">
+                  <min>0</min>
+                  <max>127</max>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+              <object class="sizeritem">
+                <object class="wxFlexGridSizer">
+                  <cols>2</cols>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Pos:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Pos"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Mode:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Mode"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Colors:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Colors"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Pal:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Palette"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Tile:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Tile"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Prio:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Priority"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Size:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Size"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Rot.:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Rotation"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Flags:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Flags"/>
+                  </object>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="Stretch">
+                  <label>Stretch to _fit</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="AutoUpdate">
+                  <label>Automatic _update</label>
+                </object>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxScrolledWindow">
+                      <object class="wxPanel" name="GfxView" subclass="GfxPanel">
+                        <size>544,496</size>
+                      </object>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxPanel" name="Zoom" subclass="PixView">
+                      <size>64,64d</size>
+                      <style>wxBORDER_SUNKEN</style>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <orient>wxHORIZONTAL</orient>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="unknown" name="Color"/>
+                <flag>wxALL|wxALIGN_BOTTOM</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_SAVE">
+              <label>_Save...</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALL|wxALIGN_RIGHT</flag>
+            <border>5</border>
+          </object>
+          <cols>3</cols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/PaletteViewer.xrc b/src/wx/xrc/PaletteViewer.xrc
index f975a24e..e33a6188 100644
--- a/src/wx/xrc/PaletteViewer.xrc
+++ b/src/wx/xrc/PaletteViewer.xrc
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="PaletteViewer">
-    <title>Palette Viewer</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>Click on a color for more information</label>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxFlexGridSizer">
-          <cols>2</cols>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <label>Background</label>
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxPanel" name="Background" subclass="PixViewEvt">
-                  <size>128,128d</size>
-                  <style>wxBORDER_SUNKEN</style>
-                </object>
-              </object>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <label>Sprite</label>
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxPanel" name="Sprite" subclass="PixViewEvt">
-                  <size>128,128d</size>
-                  <style>wxBORDER_SUNKEN</style>
-                </object>
-              </object>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxFlexGridSizer">
-              <cols>2</cols>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Address:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Address"/>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Value:</label>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText" name="Value"/>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="unknown" name="Color"/>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="AutoUpdate">
-              <label>Automatic _update</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="ChangeBackdrop">
-              <label>C_hange backdrop color...</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <cols>4</cols>
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="SaveBG">
-              <label>Save _BG...</label>
-            </object>
-            <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="SaveOBJ">
-              <label>Save _Sprite...</label>
-            </object>
-            <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALIGN_RIGHT</flag>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="PaletteViewer">
+    <title>Palette Viewer</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>Click on a color for more information</label>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxFlexGridSizer">
+          <cols>2</cols>
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <label>Background</label>
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxPanel" name="Background" subclass="PixViewEvt">
+                  <size>128,128d</size>
+                  <style>wxBORDER_SUNKEN</style>
+                </object>
+              </object>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <label>Sprite</label>
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxPanel" name="Sprite" subclass="PixViewEvt">
+                  <size>128,128d</size>
+                  <style>wxBORDER_SUNKEN</style>
+                </object>
+              </object>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxFlexGridSizer">
+              <cols>2</cols>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Address:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Address"/>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Value:</label>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="Value"/>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="unknown" name="Color"/>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="AutoUpdate">
+              <label>Automatic _update</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="ChangeBackdrop">
+              <label>C_hange backdrop color...</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <cols>4</cols>
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="SaveBG">
+              <label>Save _BG...</label>
+            </object>
+            <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="SaveOBJ">
+              <label>Save _Sprite...</label>
+            </object>
+            <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALIGN_RIGHT</flag>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/SoundConfig.xrc b/src/wx/xrc/SoundConfig.xrc
index 732d8e5b..531208d0 100644
--- a/src/wx/xrc/SoundConfig.xrc
+++ b/src/wx/xrc/SoundConfig.xrc
@@ -1,353 +1,353 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="SoundConfig">
-    <title>Sound Settings</title>
-    <object class="wxBoxSizer">
-    <orient>wxVERTICAL</orient>
-    <object class="sizeritem">
-    <object class="wxNotebook">
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxFlexGridSizer">
-          <object class="sizeritem">
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-            <object class="wxStaticText">
-              <label>Volume :</label>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxSlider" name="Volume">
-                  <value>100</value>
-                  <min>0</min>
-                  <max>400</max>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Mute</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="spacer">
-                    <option>1</option>
-                    <flag>wxEXPAND</flag>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxButton" name="Volume100">
-                      <label>100%</label>
-                    </object>
-                  </object>
-                  <object class="spacer">
-                    <option>1</option>
-                    <flag>wxEXPAND</flag>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Maximum</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <orient>wxHORIZONTAL</orient>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
-            <border>5</border>
-            <object class="wxStaticText">
-              <label>Sample rate :</label>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxChoice" name="Rate">
-              <content>
-                <item>48 KHz</item>
-                <item>44.1 KHz</item>
-                <item>22 KHz</item>
-                <item>11 KHz</item>
-              </content>
-            </object>
-            <option>1</option>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <cols>2</cols>
-          <growablecols>1</growablecols>
-        </object>
-      </object>
-      <label>Basic</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="SDL">
-                      <label>SDL</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="OpenAL">
-                      <label>OpenAL</label>
-                    </object>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="DirectSound">
-                      <label>DirectSound</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="XAudio2">
-                      <label>XAudio2</label>
-                    </object>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="FAudio">
-                      <label>FAudio</label>
-                    </object>
-                    <flag>wxALL|wxEXPAND</flag>
-                    <border>5</border>
-                  </object>
-                  <orient>wxHORIZONTAL</orient>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="Device"/>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <label>Device</label>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="Upmix">
-              <label>Enable stereo upmixing</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxCheckBox" name="HWAccel">
-              <label>Enable hardware acceleration</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <object class="sizeritem">
-                <object class="wxSlider" name="Buffers">
-                  <min>2</min>
-                  <max>10</max>
-                  <tickfreq>1</tickfreq>
-                  <style>wxSL_AUTOTICKS|wxSL_BOTH</style>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="BuffersInfo"/>
-                    <flag>wxALL|wxALIGN_CENTRE</flag>
-                    <border>5</border>
-                  </object>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <label>Number of sound buffers:</label>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>Advanced</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxPanel" name="GBEnhanceSoundDep">
-              <object class="wxBoxSizer">
-                <orient>wxVERTICAL</orient>
-                <object class="sizeritem">
-                  <object class="wxStaticBoxSizer">
-                    <object class="sizeritem">
-                      <object class="wxSlider" name="GBEcho"/>
-                      <flag>wxALL|wxEXPAND</flag>
-                      <border>5</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxBoxSizer">
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>None</label>
-                          </object>
-                          <flag>wxALL</flag>
-                          <border>5</border>
-                        </object>
-                        <object class="spacer">
-                          <option>1</option>
-                          <flag>wxEXPAND</flag>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Lots</label>
-                          </object>
-                          <flag>wxALL</flag>
-                          <border>5</border>
-                        </object>
-                        <orient>wxHORIZONTAL</orient>
-                      </object>
-                      <flag>wxEXPAND</flag>
-                    </object>
-                    <label>Echo</label>
-                    <orient>wxVERTICAL</orient>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-                <object class="sizeritem">
-                  <object class="wxStaticBoxSizer">
-                    <label>Stereo</label>
-                    <orient>wxVERTICAL</orient>
-                    <object class="sizeritem">
-                      <object class="wxSlider" name="GBStereo"/>
-                      <flag>wxALL|wxEXPAND</flag>
-                      <border>5</border>
-                    </object>
-                    <object class="sizeritem">
-                      <object class="wxBoxSizer">
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Center</label>
-                          </object>
-                          <flag>wxALL</flag>
-                          <border>5</border>
-                        </object>
-                        <object class="spacer">
-                          <option>1</option>
-                          <flag>wxEXPAND</flag>
-                        </object>
-                        <object class="sizeritem">
-                          <object class="wxStaticText">
-                            <label>Left/Right</label>
-                          </object>
-                          <flag>wxALL</flag>
-                          <border>5</border>
-                        </object>
-                        <orient>wxHORIZONTAL</orient>
-                      </object>
-                      <flag>wxEXPAND</flag>
-                    </object>
-                  </object>
-                  <flag>wxALL|wxEXPAND</flag>
-                  <border>5</border>
-                </object>
-              </object>
-              <style>wxBORDER_NONE</style>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>Game Boy</label>
-    </object>
-    <object class="notebookpage">
-      <object class="wxPanel">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <object class="wxStaticBoxSizer">
-              <label>Sound filtering</label>
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxSlider" name="GBASoundFiltering"/>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>None</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="spacer">
-                    <option>1</option>
-                    <flag>wxEXPAND</flag>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Maximum</label>
-                    </object>
-                    <flag>wxALL</flag>
-                    <border>5</border>
-                  </object>
-                  <orient>wxHORIZONTAL</orient>
-                </object>
-                <flag>wxEXPAND</flag>
-              </object>
-            </object>
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-          </object>
-        </object>
-      </object>
-      <label>Game Boy Advance</label>
-    </object>
-  </object>
-  </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-             <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-             <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-  </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="SoundConfig">
+    <title>Sound Settings</title>
+    <object class="wxBoxSizer">
+    <orient>wxVERTICAL</orient>
+    <object class="sizeritem">
+    <object class="wxNotebook">
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxFlexGridSizer">
+          <object class="sizeritem">
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+            <object class="wxStaticText">
+              <label>Volume :</label>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxSlider" name="Volume">
+                  <value>100</value>
+                  <min>0</min>
+                  <max>400</max>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Mute</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="spacer">
+                    <option>1</option>
+                    <flag>wxEXPAND</flag>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxButton" name="Volume100">
+                      <label>100%</label>
+                    </object>
+                  </object>
+                  <object class="spacer">
+                    <option>1</option>
+                    <flag>wxEXPAND</flag>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Maximum</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <orient>wxHORIZONTAL</orient>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+            <border>5</border>
+            <object class="wxStaticText">
+              <label>Sample rate :</label>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxChoice" name="Rate">
+              <content>
+                <item>48 KHz</item>
+                <item>44.1 KHz</item>
+                <item>22 KHz</item>
+                <item>11 KHz</item>
+              </content>
+            </object>
+            <option>1</option>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <cols>2</cols>
+          <growablecols>1</growablecols>
+        </object>
+      </object>
+      <label>Basic</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <object class="sizeritem">
+                <object class="wxBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="SDL">
+                      <label>SDL</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="OpenAL">
+                      <label>OpenAL</label>
+                    </object>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="DirectSound">
+                      <label>DirectSound</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="XAudio2">
+                      <label>XAudio2</label>
+                    </object>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="FAudio">
+                      <label>FAudio</label>
+                    </object>
+                    <flag>wxALL|wxEXPAND</flag>
+                    <border>5</border>
+                  </object>
+                  <orient>wxHORIZONTAL</orient>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="Device"/>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <label>Device</label>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="Upmix">
+              <label>Enable stereo upmixing</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxCheckBox" name="HWAccel">
+              <label>Enable hardware acceleration</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <object class="sizeritem">
+                <object class="wxSlider" name="Buffers">
+                  <min>2</min>
+                  <max>10</max>
+                  <tickfreq>1</tickfreq>
+                  <style>wxSL_AUTOTICKS|wxSL_BOTH</style>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="BuffersInfo"/>
+                    <flag>wxALL|wxALIGN_CENTRE</flag>
+                    <border>5</border>
+                  </object>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <label>Number of sound buffers:</label>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>Advanced</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxPanel" name="GBEnhanceSoundDep">
+              <object class="wxBoxSizer">
+                <orient>wxVERTICAL</orient>
+                <object class="sizeritem">
+                  <object class="wxStaticBoxSizer">
+                    <object class="sizeritem">
+                      <object class="wxSlider" name="GBEcho"/>
+                      <flag>wxALL|wxEXPAND</flag>
+                      <border>5</border>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxBoxSizer">
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>None</label>
+                          </object>
+                          <flag>wxALL</flag>
+                          <border>5</border>
+                        </object>
+                        <object class="spacer">
+                          <option>1</option>
+                          <flag>wxEXPAND</flag>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Lots</label>
+                          </object>
+                          <flag>wxALL</flag>
+                          <border>5</border>
+                        </object>
+                        <orient>wxHORIZONTAL</orient>
+                      </object>
+                      <flag>wxEXPAND</flag>
+                    </object>
+                    <label>Echo</label>
+                    <orient>wxVERTICAL</orient>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+                <object class="sizeritem">
+                  <object class="wxStaticBoxSizer">
+                    <label>Stereo</label>
+                    <orient>wxVERTICAL</orient>
+                    <object class="sizeritem">
+                      <object class="wxSlider" name="GBStereo"/>
+                      <flag>wxALL|wxEXPAND</flag>
+                      <border>5</border>
+                    </object>
+                    <object class="sizeritem">
+                      <object class="wxBoxSizer">
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Center</label>
+                          </object>
+                          <flag>wxALL</flag>
+                          <border>5</border>
+                        </object>
+                        <object class="spacer">
+                          <option>1</option>
+                          <flag>wxEXPAND</flag>
+                        </object>
+                        <object class="sizeritem">
+                          <object class="wxStaticText">
+                            <label>Left/Right</label>
+                          </object>
+                          <flag>wxALL</flag>
+                          <border>5</border>
+                        </object>
+                        <orient>wxHORIZONTAL</orient>
+                      </object>
+                      <flag>wxEXPAND</flag>
+                    </object>
+                  </object>
+                  <flag>wxALL|wxEXPAND</flag>
+                  <border>5</border>
+                </object>
+              </object>
+              <style>wxBORDER_NONE</style>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>Game Boy</label>
+    </object>
+    <object class="notebookpage">
+      <object class="wxPanel">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <object class="wxStaticBoxSizer">
+              <label>Sound filtering</label>
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxSlider" name="GBASoundFiltering"/>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>None</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <object class="spacer">
+                    <option>1</option>
+                    <flag>wxEXPAND</flag>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Maximum</label>
+                    </object>
+                    <flag>wxALL</flag>
+                    <border>5</border>
+                  </object>
+                  <orient>wxHORIZONTAL</orient>
+                </object>
+                <flag>wxEXPAND</flag>
+              </object>
+            </object>
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+          </object>
+        </object>
+      </object>
+      <label>Game Boy Advance</label>
+    </object>
+  </object>
+  </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+             <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+             <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+  </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/SpeedupConfig.xrc b/src/wx/xrc/SpeedupConfig.xrc
index f7923654..90305f15 100644
--- a/src/wx/xrc/SpeedupConfig.xrc
+++ b/src/wx/xrc/SpeedupConfig.xrc
@@ -1,177 +1,177 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="SpeedupConfig">
-    <title>SpeedUp / Turbo Settings</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>Speedup Throttle</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-            <object class="wxBoxSizer">
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>% of normal:</label>
-                  <size>60,-1d</size>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxSpinCtrl" name="SpeedupThrottle">
-                  <value>0</value>
-                  <min>0</min>
-                  <max>600</max>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="SpeedupThrottleSel">
-                  <content>
-                    <item>None</item>
-                    <item>25%</item>
-                    <item>50%</item>
-                    <item>75%</item>
-                    <item>100%</item>
-                    <item>125%</item>
-                    <item>150%</item>
-                    <item>175%</item>
-                    <item>200%</item>
-                    <item>225%</item>
-                    <item>250%</item>
-                    <item>275%</item>
-                    <item>300%</item>
-                    <item>325%</item>
-                    <item>350%</item>
-                    <item>375%</item>
-                    <item>400%</item>
-                    <item>425%</item>
-                    <item>450%</item>
-                    <item>475%</item>
-                    <item>500%</item>
-                    <item>525%</item>
-                    <item>550%</item>
-                    <item>575%</item>
-                    <item>600%</item>
-                  </content>
-                  <size>40,-1d</size>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxStaticText">
-          <label>Speedup Frame Skip</label>
-          <font>
-            <weight>bold</weight>
-          </font>
-        </object>
-        <flag>wxALL</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <orient>wxVERTICAL</orient>
-          <object class="sizeritem">
-            <flag>wxALL|wxEXPAND</flag>
-            <border>5</border>
-            <object class="wxBoxSizer">
-              <orient>wxHORIZONTAL</orient>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label># of frames:</label>
-                  <size>60,-1d</size>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxSpinCtrl" name="SpeedupFrameSkip">
-                  <value>9</value>
-                  <min>0</min>
-                  <max>30</max>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxChoice" name="SpeedupFrameSkipSel">
-                  <content>
-                    <item>None</item>
-                    <item>1</item>
-                    <item>2</item>
-                    <item>3</item>
-                    <item>4</item>
-                    <item>5</item>
-                    <item>6</item>
-                    <item>7</item>
-                    <item>8</item>
-                    <item>9</item>
-                    <item>10</item>
-                    <item>11</item>
-                    <item>12</item>
-                    <item>13</item>
-                    <item>14</item>
-                    <item>15</item>
-                    <item>16</item>
-                    <item>17</item>
-                    <item>18</item>
-                    <item>19</item>
-                    <item>20</item>
-                    <item>21</item>
-                    <item>22</item>
-                    <item>23</item>
-                    <item>24</item>
-                    <item>25</item>
-                    <item>26</item>
-                    <item>27</item>
-                    <item>28</item>
-                    <item>29</item>
-                    <item>30</item>
-                  </content>
-                  <size>40,-1d</size>
-                </object>
-                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-        </object>
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-      </object>
-      <object class="sizeritem">
-        <flag>wxALL|wxEXPAND</flag>
-        <border>5</border>
-        <object class="wxStdDialogButtonSizer">
-          <object class="button">
-            <object class="wxButton" name="wxID_OK"/>
-          </object>
-          <object class="button">
-            <object class="wxButton" name="wxID_CANCEL"/>
-          </object>
-        </object>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="SpeedupConfig">
+    <title>SpeedUp / Turbo Settings</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>Speedup Throttle</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+            <object class="wxBoxSizer">
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>% of normal:</label>
+                  <size>60,-1d</size>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="SpeedupThrottle">
+                  <value>0</value>
+                  <min>0</min>
+                  <max>600</max>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="SpeedupThrottleSel">
+                  <content>
+                    <item>None</item>
+                    <item>25%</item>
+                    <item>50%</item>
+                    <item>75%</item>
+                    <item>100%</item>
+                    <item>125%</item>
+                    <item>150%</item>
+                    <item>175%</item>
+                    <item>200%</item>
+                    <item>225%</item>
+                    <item>250%</item>
+                    <item>275%</item>
+                    <item>300%</item>
+                    <item>325%</item>
+                    <item>350%</item>
+                    <item>375%</item>
+                    <item>400%</item>
+                    <item>425%</item>
+                    <item>450%</item>
+                    <item>475%</item>
+                    <item>500%</item>
+                    <item>525%</item>
+                    <item>550%</item>
+                    <item>575%</item>
+                    <item>600%</item>
+                  </content>
+                  <size>40,-1d</size>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxStaticText">
+          <label>Speedup Frame Skip</label>
+          <font>
+            <weight>bold</weight>
+          </font>
+        </object>
+        <flag>wxALL</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <orient>wxVERTICAL</orient>
+          <object class="sizeritem">
+            <flag>wxALL|wxEXPAND</flag>
+            <border>5</border>
+            <object class="wxBoxSizer">
+              <orient>wxHORIZONTAL</orient>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label># of frames:</label>
+                  <size>60,-1d</size>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSpinCtrl" name="SpeedupFrameSkip">
+                  <value>9</value>
+                  <min>0</min>
+                  <max>30</max>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxChoice" name="SpeedupFrameSkipSel">
+                  <content>
+                    <item>None</item>
+                    <item>1</item>
+                    <item>2</item>
+                    <item>3</item>
+                    <item>4</item>
+                    <item>5</item>
+                    <item>6</item>
+                    <item>7</item>
+                    <item>8</item>
+                    <item>9</item>
+                    <item>10</item>
+                    <item>11</item>
+                    <item>12</item>
+                    <item>13</item>
+                    <item>14</item>
+                    <item>15</item>
+                    <item>16</item>
+                    <item>17</item>
+                    <item>18</item>
+                    <item>19</item>
+                    <item>20</item>
+                    <item>21</item>
+                    <item>22</item>
+                    <item>23</item>
+                    <item>24</item>
+                    <item>25</item>
+                    <item>26</item>
+                    <item>27</item>
+                    <item>28</item>
+                    <item>29</item>
+                    <item>30</item>
+                  </content>
+                  <size>40,-1d</size>
+                </object>
+                <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+        </object>
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+      </object>
+      <object class="sizeritem">
+        <flag>wxALL|wxEXPAND</flag>
+        <border>5</border>
+        <object class="wxStdDialogButtonSizer">
+          <object class="button">
+            <object class="wxButton" name="wxID_OK"/>
+          </object>
+          <object class="button">
+            <object class="wxButton" name="wxID_CANCEL"/>
+          </object>
+        </object>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/src/wx/xrc/TileViewer.xrc b/src/wx/xrc/TileViewer.xrc
index 9425c98e..3cf89cee 100644
--- a/src/wx/xrc/TileViewer.xrc
+++ b/src/wx/xrc/TileViewer.xrc
@@ -1,184 +1,184 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
-  <object class="wxDialog" name="TileViewer">
-    <title>Tile Viewer</title>
-    <object class="wxBoxSizer">
-      <orient>wxVERTICAL</orient>
-      <object class="sizeritem">
-        <object class="wxBoxSizer">
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Color16">
-                      <label>1_6</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="Color256">
-                      <label>_256</label>
-                    </object>
-                  </object>
-                  <label>Colors</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticBoxSizer">
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase0">
-                      <label>0x600_0000</label>
-                      <style>wxRB_GROUP</style>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase1">
-                      <label>0x600_4000</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase2">
-                      <label>0x600_8000</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase3">
-                      <label>0x600_C000</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxRadioButton" name="CharBase4">
-                      <label>0x60_10000</label>
-                    </object>
-                  </object>
-                  <label>Char Base</label>
-                  <orient>wxVERTICAL</orient>
-                </object>
-                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Palette:</label>
-                </object>
-                <flag>wxTOP|wxLEFT|wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxSlider" name="Palette">
-                  <min>0</min>
-                  <max>15</max>
-                  <tickfreq>1</tickfreq>
-                  <pagesize>5</pagesize>
-                  <style>wxSL_BOTTOM</style>
-                </object>
-                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="Stretch">
-                  <label>Stretch to _fit</label>
-                </object>
-                <flag>wxTOP|wxLEFT|wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxCheckBox" name="AutoUpdate">
-                  <label>Automatic _update</label>
-                </object>
-                <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
-                <border>5</border>
-              </object>
-              <orient>wxVERTICAL</orient>
-            </object>
-            <flag>wxEXPAND</flag>
-          </object>
-          <object class="sizeritem">
-            <object class="wxBoxSizer">
-              <orient>wxVERTICAL</orient>
-              <object class="sizeritem">
-                <object class="wxGridSizer">
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Tile:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Tile"/>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>Address:</label>
-                    </object>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText" name="Address"/>
-                  </object>
-                  <cols>2</cols>
-                </object>
-                <flag>wxALL|wxEXPAND</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="wxPanel" name="Zoom" subclass="PixView">
-                  <size>64,64d</size>
-                  <style>wxBORDER_SUNKEN</style>
-                </object>
-                <flag>wxALL</flag>
-                <border>5</border>
-              </object>
-              <object class="sizeritem">
-                <object class="unknown" name="Color"/>
-                <flag>wxALL|wxALIGN_BOTTOM</flag>
-                <border>5</border>
-              </object>
-            </object>
-          </object>
-          <object class="sizeritem">
-            <object class="wxScrolledWindow">
-              <object class="wxPanel" name="GfxView" subclass="GfxPanel">
-                <size>128,128d</size>
-                <style>wxFULL_REPAINT_ON_RESIZE</style>
-              </object>
-              <size>128,128d</size>
-              <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <orient>wxHORIZONTAL</orient>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-      <object class="sizeritem">
-        <object class="wxGridSizer">
-          <object class="sizeritem">
-            <object class="wxButton" name="Refresh">
-              <label>_Refresh</label>
-            </object>
-            <flag>wxALL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_SAVE">
-              <label>_Save...</label>
-            </object>
-            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
-            <border>5</border>
-          </object>
-          <object class="sizeritem">
-            <object class="wxButton" name="wxID_CLOSE"/>
-            <flag>wxALL|wxALIGN_RIGHT</flag>
-            <border>5</border>
-          </object>
-          <cols>3</cols>
-        </object>
-        <flag>wxEXPAND</flag>
-      </object>
-    </object>
-  </object>
-</resource>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
+  <object class="wxDialog" name="TileViewer">
+    <title>Tile Viewer</title>
+    <object class="wxBoxSizer">
+      <orient>wxVERTICAL</orient>
+      <object class="sizeritem">
+        <object class="wxBoxSizer">
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Color16">
+                      <label>1_6</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="Color256">
+                      <label>_256</label>
+                    </object>
+                  </object>
+                  <label>Colors</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxTOP|wxLEFT|wxRIGHT|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticBoxSizer">
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase0">
+                      <label>0x600_0000</label>
+                      <style>wxRB_GROUP</style>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase1">
+                      <label>0x600_4000</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase2">
+                      <label>0x600_8000</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase3">
+                      <label>0x600_C000</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxRadioButton" name="CharBase4">
+                      <label>0x60_10000</label>
+                    </object>
+                  </object>
+                  <label>Char Base</label>
+                  <orient>wxVERTICAL</orient>
+                </object>
+                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText">
+                  <label>Palette:</label>
+                </object>
+                <flag>wxTOP|wxLEFT|wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxSlider" name="Palette">
+                  <min>0</min>
+                  <max>15</max>
+                  <tickfreq>1</tickfreq>
+                  <pagesize>5</pagesize>
+                  <style>wxSL_BOTTOM</style>
+                </object>
+                <flag>wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="Stretch">
+                  <label>Stretch to _fit</label>
+                </object>
+                <flag>wxTOP|wxLEFT|wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxCheckBox" name="AutoUpdate">
+                  <label>Automatic _update</label>
+                </object>
+                <flag>wxBOTTOM|wxLEFT|wxRIGHT</flag>
+                <border>5</border>
+              </object>
+              <orient>wxVERTICAL</orient>
+            </object>
+            <flag>wxEXPAND</flag>
+          </object>
+          <object class="sizeritem">
+            <object class="wxBoxSizer">
+              <orient>wxVERTICAL</orient>
+              <object class="sizeritem">
+                <object class="wxGridSizer">
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Tile:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Tile"/>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText">
+                      <label>Address:</label>
+                    </object>
+                  </object>
+                  <object class="sizeritem">
+                    <object class="wxStaticText" name="Address"/>
+                  </object>
+                  <cols>2</cols>
+                </object>
+                <flag>wxALL|wxEXPAND</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="wxPanel" name="Zoom" subclass="PixView">
+                  <size>64,64d</size>
+                  <style>wxBORDER_SUNKEN</style>
+                </object>
+                <flag>wxALL</flag>
+                <border>5</border>
+              </object>
+              <object class="sizeritem">
+                <object class="unknown" name="Color"/>
+                <flag>wxALL|wxALIGN_BOTTOM</flag>
+                <border>5</border>
+              </object>
+            </object>
+          </object>
+          <object class="sizeritem">
+            <object class="wxScrolledWindow">
+              <object class="wxPanel" name="GfxView" subclass="GfxPanel">
+                <size>128,128d</size>
+                <style>wxFULL_REPAINT_ON_RESIZE</style>
+              </object>
+              <size>128,128d</size>
+              <style>wxBORDER_SUNKEN|wxCLIP_CHILDREN</style>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <orient>wxHORIZONTAL</orient>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+      <object class="sizeritem">
+        <object class="wxGridSizer">
+          <object class="sizeritem">
+            <object class="wxButton" name="Refresh">
+              <label>_Refresh</label>
+            </object>
+            <flag>wxALL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_SAVE">
+              <label>_Save...</label>
+            </object>
+            <flag>wxALL|wxALIGN_CENTRE_HORIZONTAL</flag>
+            <border>5</border>
+          </object>
+          <object class="sizeritem">
+            <object class="wxButton" name="wxID_CLOSE"/>
+            <flag>wxALL|wxALIGN_RIGHT</flag>
+            <border>5</border>
+          </object>
+          <cols>3</cols>
+        </object>
+        <flag>wxEXPAND</flag>
+      </object>
+    </object>
+  </object>
+</resource>
diff --git a/vcpkg b/vcpkg
new file mode 160000
index 00000000..c2ad1baa
--- /dev/null
+++ b/vcpkg
@@ -0,0 +1 @@
+Subproject commit c2ad1baafccc91bf7e9e60a390eb91cf4e130062