diff --git a/project/toolkit/jpeg/files.xml b/project/toolkit/jpeg/files.xml
index 63b57a5ad..44bba6142 100644
--- a/project/toolkit/jpeg/files.xml
+++ b/project/toolkit/jpeg/files.xml
@@ -171,7 +171,7 @@
       <section if="NME_SIMD_ARM64 || NME_SIMD_ARM7" >
          <compilerflag value="-DNEON_INTRINSICS=1" />
 
-         <file name="${NME_JPEG}jcapimin.c"/>
+         <file name="${NME_JPEG_SRC}jcapimin.c"/>
          <file name="${NME_JPEG}/simd/arm/jquanti-neon.c" />
          <file name="${NME_JPEG}/simd/arm/jidctred-neon.c" />
          <file name="${NME_JPEG}/simd/arm/jidctint-neon.c" />
diff --git a/project/toolkit/sdl/configs/linux/SDL_build_config.h b/project/toolkit/sdl/configs/linux/SDL_build_config.h
new file mode 100644
index 000000000..15d56f966
--- /dev/null
+++ b/project/toolkit/sdl/configs/linux/SDL_build_config.h
@@ -0,0 +1,342 @@
+/* include/SDL_config.h.  Generated from SDL_config.h.in by configure.  */
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+*/
+
+#ifndef SDL_build_config_h_
+#define SDL_build_config_h_
+
+
+#ifdef HX_LINUX
+
+#include <SDL3/SDL_platform_defines.h>
+
+
+/* Make sure that this isn't included by Visual C++ */
+#ifdef _MSC_VER
+#error You should run hg revert SDL_config.h
+#endif
+
+/* C language features */
+/* #undef const */
+/* #undef inline */
+/* #undef volatile */
+
+/* C datatypes */
+#ifdef __LP64__
+#define SIZEOF_VOIDP 8
+#else
+#define SIZEOF_VOIDP 4
+#endif
+#define HAVE_GCC_ATOMICS 1
+/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
+#define HAVE_PTHREAD_SPINLOCK 1
+
+/* Comment this if you want to build without any C library requirements */
+#define HAVE_LIBC 1
+#if HAVE_LIBC
+
+/* Useful headers */
+#define HAVE_ALLOCA_H 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_ICONV_H 1
+#define HAVE_SIGNAL_H 1
+/* #undef HAVE_ALTIVEC_H */
+/* #undef HAVE_PTHREAD_NP_H */
+/* #undef HAVE_LIBUDEV_H */
+/* #undef HAVE_DBUS_DBUS_H */
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC    1
+#define HAVE_FREE   1
+#define HAVE_ALLOCA 1
+#define HAVE_GETENV 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV   1
+#define HAVE_QSORT  1
+#define HAVE_ABS    1
+#define HAVE_BCOPY  1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE    1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+/* #undef HAVE_STRLCPY */
+/* #undef HAVE_STRLCAT */
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR    1
+#define HAVE_STRSTR 1
+#define HAVE_STRTOL 1
+#define HAVE_STRTOUL    1
+#define HAVE_STRTOLL    1
+#define HAVE_STRTOULL   1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI   1
+#define HAVE_ATOF   1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP    1
+#define HAVE_STRCASECMP 1
+#define HAVE_STRNCASECMP 1
+#define HAVE_VSSCANF 1
+#define HAVE_VSNPRINTF  1
+#define HAVE_M_PI   1
+#define HAVE_ACOS   1
+#define HAVE_ACOSF  1
+#define HAVE_ASIN   1
+#define HAVE_ASINF  1
+#define HAVE_ATAN   1
+#define HAVE_ATANF  1
+#define HAVE_ATAN2  1
+#define HAVE_ATAN2F 1
+#define HAVE_CEIL   1
+#define HAVE_CEILF  1
+#define HAVE_COPYSIGN   1
+#define HAVE_COPYSIGNF  1
+#define HAVE_COS    1
+#define HAVE_COSF   1
+#define HAVE_EXP    1
+#define HAVE_EXPF   1
+#define HAVE_FABS   1
+#define HAVE_FABSF  1
+#define HAVE_FLOOR  1
+#define HAVE_FLOORF 1
+#define HAVE_FMOD   1
+#define HAVE_FMODF  1
+#define HAVE_LOG    1
+#define HAVE_LOGF   1
+#define HAVE_LOG10  1
+#define HAVE_LOG10F 1
+#define HAVE_POW    1
+#define HAVE_POWF   1
+#define HAVE_SCALBN 1
+#define HAVE_SCALBNF    1
+#define HAVE_SIN    1
+#define HAVE_SINF   1
+#define HAVE_SQRT   1
+#define HAVE_SQRTF  1
+#define HAVE_TAN    1
+#define HAVE_TANF   1
+#define HAVE_SIGACTION  1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP  1
+#define HAVE_SYSCONF    1
+#define HAVE_ISINF 1
+#define HAVE_ISINFF 1
+#define HAVE_ISNAN 1
+#define HAVE_ISNANF 1
+#define HAVE_MODF 1
+/* #undef HAVE_SYSCTLBYNAME */
+
+#define HAVE_STDARG_H 1
+#endif /* HAVE_LIBC */
+
+#define HAVE_STDDEF_H 1
+
+/* SDL internal assertion support */
+/* #undef SDL_DEFAULT_ASSERT_LEVEL */
+
+/* Allow disabling of core subsystems */
+/* #undef SDL_ATOMIC_DISABLED */
+/* #undef SDL_AUDIO_DISABLED */
+/* #undef SDL_CPUINFO_DISABLED */
+/* #undef SDL_EVENTS_DISABLED */
+/* #undef SDL_FILE_DISABLED */
+/* #undef SDL_JOYSTICK_DISABLED */
+/* #undef SDL_HAPTIC_DISABLED */
+/* #undef SDL_LOADSO_DISABLED */
+/* #undef SDL_RENDER_DISABLED */
+/* #undef SDL_THREADS_DISABLED */
+/* #undef SDL_TIMERS_DISABLED */
+/* #undef SDL_VIDEO_DISABLED */
+/* #undef SDL_POWER_DISABLED */
+/* #undef SDL_FILESYSTEM_DISABLED */
+
+/* Enable various audio drivers */
+//#define SDL_AUDIO_DRIVER_ALSA 1
+//#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
+/* #undef SDL_AUDIO_DRIVER_ARTS */
+/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
+#define SDL_AUDIO_DRIVER_PULSEAUDIO 1
+#define SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC "libpulse.so.0"
+/* #undef SDL_AUDIO_DRIVER_HAIKU */
+/* #undef SDL_AUDIO_DRIVER_BSD */
+/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
+#define SDL_AUDIO_DRIVER_DISK 1
+#define SDL_AUDIO_DRIVER_DUMMY 1
+/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
+/* #undef SDL_AUDIO_DRIVER_DSOUND */
+/* #undef SDL_AUDIO_DRIVER_ESD */
+/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
+/* #undef SDL_AUDIO_DRIVER_NAS */
+/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
+/* #undef SDL_AUDIO_DRIVER_SNDIO */
+/* #undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
+#define SDL_AUDIO_DRIVER_OSS 1
+/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
+/* #undef SDL_AUDIO_DRIVER_PAUDIO */
+/* #undef SDL_AUDIO_DRIVER_QSA */
+/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
+/* #undef SDL_AUDIO_DRIVER_WINMM */
+/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
+/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
+
+#define HAVE_LINUX_INPUT_H
+
+/* Enable various input drivers */
+#define SDL_INPUT_LINUXEV 1
+#define SDL_INPUT_LINUXKD 1
+/* #undef SDL_INPUT_TSLIB */
+/* #undef SDL_JOYSTICK_HAIKU */
+/* #undef SDL_JOYSTICK_DINPUT */
+/* #undef SDL_JOYSTICK_DUMMY */
+/* #undef SDL_JOYSTICK_IOKIT */
+#define SDL_JOYSTICK_LINUX 1
+/* #undef SDL_JOYSTICK_HIDAPI */
+/* #undef SDL_JOYSTICK_WINMM */
+/* #undef SDL_JOYSTICK_USBHID */
+/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
+/* #undef SDL_HAPTIC_DUMMY */
+#define SDL_HAPTIC_LINUX 1
+/* #undef SDL_HAPTIC_IOKIT */
+/* #undef SDL_HAPTIC_DINPUT */
+
+/* Enable the dummy sensor driver */
+#define SDL_SENSOR_DUMMY  1
+
+/* Enable various shared object loading systems */
+/* #undef SDL_LOADSO_HAIKU */
+#define SDL_LOADSO_DLOPEN 1
+/* #undef SDL_LOADSO_DUMMY */
+/* #undef SDL_LOADSO_LDG */
+/* #undef SDL_LOADSO_WINDOWS */
+
+/* Enable various threading systems */
+#define SDL_THREAD_PTHREAD 1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
+/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
+/* #undef SDL_THREAD_WINDOWS */
+
+/* Enable various timer systems */
+/* #undef SDL_TIMER_HAIKU */
+/* #undef SDL_TIMER_DUMMY */
+#define SDL_TIMER_UNIX 1
+/* #undef SDL_TIMER_WINDOWS */
+
+/* Enable various video drivers */
+/* #undef SDL_VIDEO_DRIVER_HAIKU */
+/* #undef SDL_VIDEO_DRIVER_COCOA */
+/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
+/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
+#define SDL_VIDEO_DRIVER_DUMMY 1
+/* #undef SDL_VIDEO_DRIVER_WINDOWS */
+/* #undef SDL_VIDEO_DRIVER_WAYLAND */
+/* #undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
+/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
+/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL */
+/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR */
+/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON */
+/* #undef SDL_VIDEO_DRIVER_MIR */
+/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC */
+/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON */
+#define SDL_VIDEO_DRIVER_X11 1
+/* #undef SDL_VIDEO_DRIVER_RPI */
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
+/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR */
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "libXinerama.so.1"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "libXi.so.6"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libxrandr.so.2"
+/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS */
+/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE */
+/* #undef SDL_VIDEO_DRIVER_X11_XCURSOR */
+#define  SDL_VIDEO_DRIVER_X11_XINERAMA 1
+#define SDL_VIDEO_DRIVER_X11_XINPUT2 NATIVE_TOOLKIT_SDL_X11_XINPUT2
+#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH NATIVE_TOOLKIT_SDL_X11_XINPUT2_SUPPORTS_MULTITOUCH
+#define SDL_VIDEO_DRIVER_X11_XRANDR 1
+/* #undef SDL_VIDEO_DRIVER_X11_XSCRNSAVER */
+#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
+/* #undef SDL_VIDEO_DRIVER_X11_XVIDMODE */
+#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
+/* #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 */
+/* #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY */
+#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
+
+/* #undef SDL_VIDEO_RENDER_D3D */
+/* #undef SDL_VIDEO_RENDER_D3D11 */
+#define SDL_VIDEO_RENDER_OGL 1
+/* #undef SDL_VIDEO_RENDER_OGL_ES */
+/* #undef SDL_VIDEO_RENDER_OGL_ES2 */
+/* #undef SDL_VIDEO_RENDER_DIRECTFB */
+
+/* Enable OpenGL support */
+#define SDL_VIDEO_OPENGL 1
+/* #undef SDL_VIDEO_OPENGL_ES */
+/* #undef SDL_VIDEO_OPENGL_ES2 */
+/* #undef SDL_VIDEO_OPENGL_BGL */
+/* #undef SDL_VIDEO_OPENGL_CGL */
+/* #undef SDL_VIDEO_OPENGL_EGL */
+#define SDL_VIDEO_OPENGL_GLX 1
+/* #undef SDL_VIDEO_OPENGL_WGL */
+/* #undef SDL_VIDEO_OPENGL_OSMESA */
+/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
+
+/* Enable system power support */
+#define SDL_POWER_LINUX 1
+/* #undef SDL_POWER_WINDOWS */
+/* #undef SDL_POWER_MACOSX */
+/* #undef SDL_POWER_HAIKU */
+/* #undef SDL_POWER_HARDWIRED */
+
+/* Enable system filesystem support */
+/* #undef SDL_FILESYSTEM_HAIKU */
+/* #undef SDL_FILESYSTEM_COCOA */
+/* #undef SDL_FILESYSTEM_DUMMY */
+#define SDL_FILESYSTEM_UNIX 1
+/* #undef SDL_FILESYSTEM_WINDOWS */
+
+/* Enable assembly routines */
+#define SDL_ASSEMBLY_ROUTINES 1
+/* #undef SDL_ALTIVEC_BLITTERS */
+
+
+#define SDL_TIME_UNIX 1
+#define SDL_FSOPS_POSIX 1
+#define SDL_PROCESS_POSIX 1
+
+
+
+ #endif //HX_LINUX
+
+#endif /* _SDL_config_h */
diff --git a/project/toolkit/sdl/files.xml b/project/toolkit/sdl/files.xml
index e3a182f90..85b0c95c3 100644
--- a/project/toolkit/sdl/files.xml
+++ b/project/toolkit/sdl/files.xml
@@ -3,17 +3,12 @@
    <set name="NME_LIBSDL" value="${this_dir}/SDL/" />
 
     <section unless="SDL_CONFIG_PATH" >
-       <set name="SDL_CONFIG_PATH" value="${this_dir}/configs/default/" unless="windows || mac || linux || rpi" />
        <set name="SDL_CONFIG_PATH" value="${this_dir}/configs/linux/" if="linux" unless="rpi"/>
-       <set name="SDL_CONFIG_PATH" value="${this_dir}/configs/windows/" if="windows" unless="winrt" />
-       <set name="SDL_CONFIG_PATH" value="${this_dir}/configs/winrt/" if="winrt" />
-       <set name="SDL_CONFIG_PATH" value="${this_dir}/configs/mac/" if="mac" />
-       <set name="SDL_CONFIG_PATH" value="${this_dir}/configs/rpi/" if="rpi" />
     </section>
 
 
     <files id="native-toolkit-sdl-depends">
-        <depend name="${SDL_CONFIG_PATH}/SDL_config.h" if="SDL_CONFIG_PATH" />
+        <depend name="${SDL_CONFIG_PATH}/SDL_build_config.h" if="SDL_CONFIG_PATH" />
 
         <!--
         -->
@@ -69,6 +64,7 @@
 
             <compilerflag value="-DUSING_GENERATED_CONFIG_H" if="NME_USE_CONFIG" />
             <compilerflag value="-DHAVE_LINUX_VERSION_H" />
+            <compilerflag value="-DHAVE_STDIO_H" />
             <compilerflag value="-D_REENTRANT" />
 
             <section unless="HXCPP_ARM64 || HXCPP_ARM7" >
@@ -392,16 +388,9 @@
         <section if="linux">
 
             <file name="${NME_LIBSDL}src/audio/SDL_audiodev.c" />
-            <file name="${NME_LIBSDL}src/audio/alsa/SDL_alsa_audio.c" />
-            <file name="${NME_LIBSDL}src/audio/arts/SDL_artsaudio.c" />
-            <file name="${NME_LIBSDL}src/audio/esd/SDL_esdaudio.c" />
-            <file name="${NME_LIBSDL}src/audio/fusionsound/SDL_fsaudio.c" />
-            <file name="${NME_LIBSDL}src/audio/nas/SDL_nasaudio.c" />
-            <file name="${NME_LIBSDL}src/audio/paudio/SDL_paudio.c" />
+            <!--<file name="${NME_LIBSDL}src/audio/alsa/SDL_alsa_audio.c" />-->
             <file name="${NME_LIBSDL}src/audio/pulseaudio/SDL_pulseaudio.c" />
-            <file name="${NME_LIBSDL}src/audio/qsa/SDL_qsa_audio.c" />
             <file name="${NME_LIBSDL}src/audio/sndio/SDL_sndioaudio.c" />
-            <file name="${NME_LIBSDL}src/audio/sun/SDL_sunaudio.c" />
             <file name="${NME_LIBSDL}src/audio/dsp/SDL_dspaudio.c" />
             <file name="${NME_LIBSDL}src/haptic/linux/SDL_syshaptic.c" />
             <!-- <file name="${NME_LIBSDL}src/hidapi/linux/hid.c" />
@@ -417,6 +406,7 @@
             <file name="${NME_LIBSDL}src/core/linux/SDL_ime.c" />
             <file name="${NME_LIBSDL}src/core/linux/SDL_threadprio.c" />
             <file name="${NME_LIBSDL}src/core/unix/SDL_poll.c" />
+            <file name="${NME_LIBSDL}src/core/unix/SDL_appid.c" />
             <file name="${NME_LIBSDL}src/joystick/linux/SDL_sysjoystick.c" />
             <file name="${NME_LIBSDL}src/video/x11/SDL_x11clipboard.c" />
             <file name="${NME_LIBSDL}src/video/x11/SDL_x11dyn.c" />
@@ -434,13 +424,21 @@
             <file name="${NME_LIBSDL}src/video/x11/SDL_x11vulkan.c" />
             <file name="${NME_LIBSDL}src/video/x11/SDL_x11window.c" />
             <file name="${NME_LIBSDL}src/video/x11/SDL_x11xinput2.c" />
+            <file name="${NME_LIBSDL}src/video/x11/SDL_x11pen.c" />
+            <file name="${NME_LIBSDL}src/video/x11/SDL_x11settings.c" />
+            <file name="${NME_LIBSDL}src/video/x11/xsettings-client.c" />
             <file name="${NME_LIBSDL}src/video/x11/edid-parse.c" />
             <file name="${NME_LIBSDL}src/events/imKStoUCS.c" />
             <file name="${NME_LIBSDL}src/events/SDL_scancode_tables.c" />
             <file name="${NME_LIBSDL}src/events/SDL_keysym_to_scancode.c" />
+            <file name="${NME_LIBSDL}src/events/SDL_keysym_to_keycode.c" />
             <file name="${NME_LIBSDL}src/filesystem/unix/SDL_sysfilesystem.c" />
             <file name="${NME_LIBSDL}src/locale/unix/SDL_syslocale.c" />
             <file name="${NME_LIBSDL}src/misc/unix/SDL_sysurl.c" />
+            <file name="${NME_LIBSDL}src/tray/unix/SDL_tray.c" />
+            <file name="${NME_LIBSDL}src/dialog/unix/SDL_unixdialog.c" />
+            <file name="${NME_LIBSDL}src/dialog/unix/SDL_portaldialog.c" />
+            <file name="${NME_LIBSDL}src/dialog/unix/SDL_zenitydialog.c" />
 
         </section>
 
diff --git a/run.n b/run.n
index 32c45f4d0..ad6661c1b 100644
Binary files a/run.n and b/run.n differ
diff --git a/src/nme/Loader.hx b/src/nme/Loader.hx
index 2e28d57df..512c40068 100644
--- a/src/nme/Loader.hx
+++ b/src/nme/Loader.hx
@@ -33,7 +33,9 @@ class Loader
 
    static public function findHaxeLib(inLib:String) 
    {
-      Sys.setCwd(Sys.args()[Sys.args().length-1]);
+      var args = Sys.args();
+      if (args!=null && args.length>0)
+         Sys.setCwd(args[args.length-1]);
       try 
       {
          var proc = new Process("haxelib", ["path", inLib]);
diff --git a/tools/run/RunMain.hx b/tools/run/RunMain.hx
index 86629b34a..19aa06d99 100644
--- a/tools/run/RunMain.hx
+++ b/tools/run/RunMain.hx
@@ -8,29 +8,31 @@ class RunMain
       log("Before this can be used, you need to:");
       log(" 1. Build the binaries appropriate to your system(s), this can be done with:");
       log("     cd project");
-      log("     neko build.n");
-      log("   Note: this requires the 'nme-toolkit' library, which can be installed with:");
-      log("     haxelib install nme-toolkit");
+      log("     haxelib run hxcpp ToolkitBuild.xml");
       log(" 2. Rebuild the main command-line tool, this can be done with:");
       log("     cd tools/nme");
       log("     haxe compile.hxml");
       log("   Note: this requires the 'gm2d' and 'format' libraries, which can be installed with:");
       log("     haxelib install gm2d");
       log("     haxelib install format");
-      log(" 3. Build the acadnme tool, this can be done with:");
+      log(" 3. Optionally, build the acadnme tool, this can be done with:");
       log("     cd acadnme");
-      log("     neko ../nme.n build .");
+      log("     haxelib run nme cpp nocompile");
+      log("     cd ../samples/AcadnmeBoot");
+      log("     haxelib run nme cppia installer");
+      log("     cd ../acadnme");
+      log("     haxelib run nme cpp build");
       while(true)
       {
-         Sys.print("\nWould you like to do this now [y/n]");
+         Sys.print("\nWould you like to do this now [y/n/a(ll, including acadnme)]");
          var code = Sys.getChar(true);
          if (code<=32)
             break;
          var answer = String.fromCharCode(code);
-         if (answer=="y" || answer=="Y")
+         if (answer=="y" || answer=="Y" || answer=="a" ||  answer=="A" )
          {
             log("");
-            setup();
+            setup(answer=="a" || answer=="A");
             executeNme();
             return;
          }
@@ -40,25 +42,23 @@ class RunMain
       log("");
    }
 
-   public static function setup()
+   public static function setup(acadnmeToo:Bool)
    {
-      log("Installing nme-toolkit...");
-      run("","haxelib", [ "install","nme-toolkit"]);
       buildBinaries([]);
       log("Installing gm2d...");
       run("","haxelib", [ "install","gm2d"]);
       log("Installing format...");
       run("","haxelib", [ "install","format"]);
       compileTool();
-      compileAcadnme();
+      if (acadnmeToo)
+         compileAcadnme();
       log("Initial setup complete.");
    }
 
    public static function buildBinaries(platforms:Array<String>)
    {
       log("Building binaries...");
-      var args = ["build.n"].concat(platforms);
-      run("project","neko", args);
+      run("project","haxelib", ["run","hxcpp","ToolkitBuild.xml"]);
    }
 
    public static function compileTool()
@@ -70,7 +70,9 @@ class RunMain
    public static function compileAcadnme()
    {
       log("Compiling acadnme tool...");
-      run("acadnme","neko", [ "../nme.n", "build", "."]);
+      run("acadnme","haxelib", [ "run", "nme", "cpp", "nocompile"]);
+      run("samples/AcadnmeBoot","haxelib", [ "run", "nme", "cppia", "installer"]);
+      run("acadnme","haxelib", [ "run", "nme", "cpp", "build"]);
    }
 
    public static function run(dir:String, command:String, args:Array<String>)