diff --git a/project/ToolkitBuild.xml b/project/ToolkitBuild.xml
index 0eb773646..d32c26e76 100644
--- a/project/ToolkitBuild.xml
+++ b/project/ToolkitBuild.xml
@@ -779,10 +779,12 @@
 
       <section if="NME_MIXER linux" >
          <compilerflag value="-Isupport/linux"  />
-         <compilerflag value="-DSDL_AUDIO_DRIVER_ALSA" />
-         <compilerflag value='-DSDL_AUDIO_DRIVER_ALSA_DYNAMIC="libasound.so.2"'  />
-         <compilerflag value="-DSDL_AUDIO_DRIVER_PULSEAUDIO" />
-         <compilerflag value='-DSDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC="libpulse-simple.so.0"' />
+         <section unless="NME_LOCAL_TOOLKIT" >
+            <compilerflag value="-DSDL_AUDIO_DRIVER_ALSA" />
+            <compilerflag value='-DSDL_AUDIO_DRIVER_ALSA_DYNAMIC="libasound.so.2"'  />
+            <compilerflag value="-DSDL_AUDIO_DRIVER_PULSEAUDIO" />
+            <compilerflag value='-DSDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC="libpulse-simple.so.0"' />
+         </section>
       </section>
    </files>
    <files id="native-toolkit-sdl-mixer" >
diff --git a/project/toolkit/jpeg/files.xml b/project/toolkit/jpeg/files.xml
index 7ef4e4f3b..d19cb31ea 100644
--- a/project/toolkit/jpeg/files.xml
+++ b/project/toolkit/jpeg/files.xml
@@ -166,6 +166,8 @@
 
 
       <section if="NME_SIMD_ARM64 || NME_SIMD_ARM7" >
+         <compilerflag value="-DNEON_INTRINSICS=1" />
+
          <file name="${NME_JPEG}jcapimin.c"/>
          <file name="${NME_JPEG}/simd/arm/jquanti-neon.c" />
          <file name="${NME_JPEG}/simd/arm/jidctred-neon.c" />
@@ -174,6 +176,7 @@
          <file name="${NME_JPEG}/simd/arm/jidctfst-neon.c" />
          <file name="${NME_JPEG}/simd/arm/jfdctfst-neon.c" />
          <file name="${NME_JPEG}/simd/arm/jdsample-neon.c" />
+
          <file name="${NME_JPEG}/simd/arm/jdcolor-neon.c" />
          <file name="${NME_JPEG}/simd/arm/jdmerge-neon.c" />
          <!--
@@ -187,16 +190,14 @@
          <file name="${NME_JPEG}/simd/arm/jccolor-neon.c" />
 
          <section if="NME_SIMD_ARM64" >
-            <file name="${NME_JPEG}/simd/arm/aarch64/jsimd_neon.S" />
+            <!--<file name="${NME_JPEG}/simd/arm/aarch64/jsimd_neon.S" />-->
             <file name="${NME_JPEG}/simd/arm/aarch64/jsimd.c" />
-            <!--<file name="${NME_JPEG}/simd/arm/aarch64/jccolext-neon.c" />-->
             <file name="${NME_JPEG}/simd/arm/aarch64/jchuff-neon.c" />
          </section>
          <section if="NME_SIMD_ARM7" >
-            <file name="${NME_JPEG}/simd/arm/aarch64/jsimd_neon.S" />
-            <file name="${NME_JPEG}/simd/arm/aarch64/jsimd.c" />
-            <!--<file name="${NME_JPEG}/simd/arm/aarch64/jccolext-neon.c" />-->
-            <file name="${NME_JPEG}/simd/arm/aarch64/jchuff-neon.c" />
+            <!--<file name="${NME_JPEG}/simd/arm/aarch64/jsimd_neon.S" />-->
+            <file name="${NME_JPEG}/simd/arm/aarch32/jsimd.c" />
+            <file name="${NME_JPEG}/simd/arm/aarch32/jchuff-neon.c" />
          </section>
       </section>
       <section if="NME_SIMD_X86_64" >
diff --git a/project/toolkit/png/files.xml b/project/toolkit/png/files.xml
index f2d3bd61a..d76426cd6 100644
--- a/project/toolkit/png/files.xml
+++ b/project/toolkit/png/files.xml
@@ -40,7 +40,7 @@
       <file name="${NME_PNG}pngwtran.c" />
       <file name="${NME_PNG}pngwutil.c" />
 
-      <section if="ios || tvoso || android">
+      <section if="NME_SIMD_ARM64 || NME_SIMD_ARM7">
 
          <file name="${NME_PNG}arm/arm_init.c" />
          <file name="${NME_PNG}arm/filter_neon_intrinsics.c" />
diff --git a/project/toolkit/sdl-mixer/files.xml b/project/toolkit/sdl-mixer/files.xml
index 00ff68d02..c5e7f43bb 100644
--- a/project/toolkit/sdl-mixer/files.xml
+++ b/project/toolkit/sdl-mixer/files.xml
@@ -23,6 +23,7 @@
    <compilerflag value="-I${NME_LIBSDL_MIXER}include" />
    <compilerflag value="-I${NME_LIBSDL_MIXER}src/codecs" />
    <compilerflag value="-I${NME_VORBIS}include" />
+   <compilerflag value="-I${this_dir}/.." />
    <compilerflag value="-I${NME_OGG}include" />
    <compilerflag value="-I${NME_MODPLUG}" />
 
diff --git a/project/toolkit/sdl/configs/linux/SDL_config.h b/project/toolkit/sdl/configs/linux/SDL_config.h
index f5f9e44b7..f22020351 100644
--- a/project/toolkit/sdl/configs/linux/SDL_config.h
+++ b/project/toolkit/sdl/configs/linux/SDL_config.h
@@ -209,6 +209,8 @@
 /* #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
diff --git a/project/toolkit/sdl/files.xml b/project/toolkit/sdl/files.xml
index c7ba1f404..be2a31a55 100644
--- a/project/toolkit/sdl/files.xml
+++ b/project/toolkit/sdl/files.xml
@@ -148,13 +148,17 @@
             <compilerflag value="-DUSING_GENERATED_CONFIG_H" />
             <compilerflag value="-DHAVE_LINUX_VERSION_H" />
             <compilerflag value="-D_REENTRANT" />
-            <compilerflag value="-mmmx" unless="rpi" />
-            <compilerflag value="-msse" unless="rpi" />
-            <compilerflag value="-msse2" unless="rpi" />
-            <compilerflag value="-msse3" unless="rpi" />
-            <compilerflag value="-mssse3" unless="rpi" />
+
+            <section unless="HXCPP_ARM64 || HXCPP_ARM7" >
+               <compilerflag value="-mmmx" />
+               <compilerflag value="-msse" />
+               <compilerflag value="-msse2" />
+               <compilerflag value="-msse3" />
+               <compilerflag value="-mssse3" />
+            </section>
 
             <compilerflag value="-mfpu=neon" if="rpi" />
+
             <compilerflag value="-mfloat-abi=hard" if="rpi" />
             <compilerflag value="-I-abi=hard" if="rpi" />
             <compilerflag value="-I/opt/vc/include" if="rpi" />
@@ -323,7 +327,7 @@
 
         </section>
 
-        <section if="windows || mac || ios || android || tvos">
+        <section if="windows || mac || ios || android || tvos || linux">
 
             <file name="${NME_LIBSDL}src/joystick/SDL_joystick.c" />
             <file name="${NME_LIBSDL}src/joystick/SDL_steam_virtual_gamepad.c" />
@@ -430,13 +434,13 @@
             <file name="${NME_LIBSDL}src/haptic/linux/SDL_syshaptic.c" />
             <!-- <file name="${NME_LIBSDL}src/hidapi/linux/hid.c" />
             <file name="${NME_LIBSDL}src/hidapi/linux/hidraw.cpp" /> -->
-            <file name="${NME_LIBSDL}src/joystick/bsd/SDL_sysjoystick.c" />
             <file name="${NME_LIBSDL}src/power/linux/SDL_syspower.c" />
             <file name="${NME_LIBSDL}src/core/linux/SDL_evdev.c" />
             <file name="${NME_LIBSDL}src/core/linux/SDL_evdev_kbd.c" />
+            <file name="${NME_LIBSDL}src/core/linux/SDL_evdev_capabilities.c" />
             <file name="${NME_LIBSDL}src/core/linux/SDL_udev.c" />
             <file name="${NME_LIBSDL}src/core/linux/SDL_dbus.c" />
-            <file name="${NME_LIBSDL}src/core/linux/SDL_fcitx.c" />
+            <!--<file name="${NME_LIBSDL}src/core/linux/SDL_fcitx.c" />-->
             <file name="${NME_LIBSDL}src/core/linux/SDL_ibus.c" />
             <file name="${NME_LIBSDL}src/core/linux/SDL_ime.c" />
             <file name="${NME_LIBSDL}src/core/linux/SDL_threadprio.c" />
@@ -459,7 +463,9 @@
             <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/edid-parse.c" />
-            <file name="${NME_LIBSDL}src/video/x11/imKStoUCS.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/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" />