diff --git a/Makefile b/Makefile
index e2b61e3e..f0df00b6 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,7 @@ INSTALL    = \
 	echo 'Please note that this may not work properly. If it doesn'\''t work for you, you can manually extract the .deb in /var/tmp/net.kdt.pojavlauncher.$(1)_$(VERSION)_$(2).deb with dpkg or Filza.'; \
 	if [ '$(4)' = '0' ]; then \
 		scp -P $(DEVICE_PORT) $(OUTPUTDIR)/net.kdt.pojavlauncher.$(1)_$(VERSION)_$(2).deb root@$(DEVICE_IP):/var/tmp/net.kdt.pojavlauncher.$(1)_$(VERSION)_$(2).deb; \
-		ssh root@$(DEVICE_IP) -p $(DEVICE_PORT) -t "dpkg -i /var/tmp/net.kdt.pojavlauncher.$(1)_$(VERSION)_$(2).deb; uicache -p $(3)/Applications/PojavLauncher.app"
+		ssh root@$(DEVICE_IP) -p $(DEVICE_PORT) -t "dpkg -i /var/tmp/net.kdt.pojavlauncher.$(1)_$(VERSION)_$(2).deb; uicache -p $(3)/Applications/PojavLauncher.app"; \
 	else \
 		sudo dpkg -i $(OUTPUTDIR)/net.kdt.pojavlauncher.$(1)_$(VERSION)_$(2).deb; uicache -p $(3)/Applications/PojavLauncher.app; \
 	fi
diff --git a/Natives/CMakeLists.txt b/Natives/CMakeLists.txt
index 9868db9a..dac0a2ff 100644
--- a/Natives/CMakeLists.txt
+++ b/Natives/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6)
 project(PojavLauncher)
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcommon -fobjc-arc -ObjC -I'${CMAKE_CURRENT_LIST_DIR}/resources/Frameworks/MetalANGLE.framework/Headers' -I'${CMAKE_CURRENT_LIST_DIR}/external/DBNumberedSlider/Classes' -I'${CMAKE_CURRENT_LIST_DIR}/external/fishhook' -I'${CMAKE_CURRENT_LIST_DIR}/external_include'"
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcommon -fobjc-arc -ObjC -I'${CMAKE_CURRENT_LIST_DIR}/resources/Frameworks/MetalANGLE.framework/Headers' -I'${CMAKE_CURRENT_LIST_DIR}/external/DBNumberedSlider/Classes' -I'${CMAKE_CURRENT_LIST_DIR}/external/fishhook' -I'${CMAKE_CURRENT_LIST_DIR}/external/zink'"
 )
 set(CMAKE_C_FLAGS_DEBUG "-funwind-tables -g")
 
diff --git a/Natives/external_include/GL/gl.h b/Natives/external/zink/GL/gl.h
similarity index 100%
rename from Natives/external_include/GL/gl.h
rename to Natives/external/zink/GL/gl.h
diff --git a/Natives/external_include/GL/glcorearb.h b/Natives/external/zink/GL/glcorearb.h
similarity index 100%
rename from Natives/external_include/GL/glcorearb.h
rename to Natives/external/zink/GL/glcorearb.h
diff --git a/Natives/external_include/GL/glext.h b/Natives/external/zink/GL/glext.h
similarity index 100%
rename from Natives/external_include/GL/glext.h
rename to Natives/external/zink/GL/glext.h
diff --git a/Natives/external_include/GL/glx.h b/Natives/external/zink/GL/glx.h
similarity index 100%
rename from Natives/external_include/GL/glx.h
rename to Natives/external/zink/GL/glx.h
diff --git a/Natives/external_include/GL/glxext.h b/Natives/external/zink/GL/glxext.h
similarity index 100%
rename from Natives/external_include/GL/glxext.h
rename to Natives/external/zink/GL/glxext.h
diff --git a/Natives/external_include/GL/internal/dri_interface.h b/Natives/external/zink/GL/internal/dri_interface.h
similarity index 100%
rename from Natives/external_include/GL/internal/dri_interface.h
rename to Natives/external/zink/GL/internal/dri_interface.h
diff --git a/Natives/external_include/GL/mesa_glinterop.h b/Natives/external/zink/GL/mesa_glinterop.h
similarity index 100%
rename from Natives/external_include/GL/mesa_glinterop.h
rename to Natives/external/zink/GL/mesa_glinterop.h
diff --git a/Natives/external_include/GL/osmesa.h b/Natives/external/zink/GL/osmesa.h
similarity index 100%
rename from Natives/external_include/GL/osmesa.h
rename to Natives/external/zink/GL/osmesa.h
diff --git a/Natives/external_include/GL/wglext.h b/Natives/external/zink/GL/wglext.h
similarity index 100%
rename from Natives/external_include/GL/wglext.h
rename to Natives/external/zink/GL/wglext.h
diff --git a/Natives/external_include/MoltenVK/mvk_datatypes.h b/Natives/external/zink/MoltenVK/mvk_datatypes.h
similarity index 100%
rename from Natives/external_include/MoltenVK/mvk_datatypes.h
rename to Natives/external/zink/MoltenVK/mvk_datatypes.h
diff --git a/Natives/external_include/MoltenVK/mvk_vulkan.h b/Natives/external/zink/MoltenVK/mvk_vulkan.h
similarity index 100%
rename from Natives/external_include/MoltenVK/mvk_vulkan.h
rename to Natives/external/zink/MoltenVK/mvk_vulkan.h
diff --git a/Natives/external_include/MoltenVK/vk_mvk_moltenvk.h b/Natives/external/zink/MoltenVK/vk_mvk_moltenvk.h
similarity index 100%
rename from Natives/external_include/MoltenVK/vk_mvk_moltenvk.h
rename to Natives/external/zink/MoltenVK/vk_mvk_moltenvk.h
diff --git a/Natives/external_include/vulkan/.editorconfig b/Natives/external/zink/vulkan/.editorconfig
similarity index 100%
rename from Natives/external_include/vulkan/.editorconfig
rename to Natives/external/zink/vulkan/.editorconfig
diff --git a/Natives/external_include/vulkan/vk_android_native_buffer.h b/Natives/external/zink/vulkan/vk_android_native_buffer.h
similarity index 100%
rename from Natives/external_include/vulkan/vk_android_native_buffer.h
rename to Natives/external/zink/vulkan/vk_android_native_buffer.h
diff --git a/Natives/external_include/vulkan/vk_icd.h b/Natives/external/zink/vulkan/vk_icd.h
similarity index 100%
rename from Natives/external_include/vulkan/vk_icd.h
rename to Natives/external/zink/vulkan/vk_icd.h
diff --git a/Natives/external_include/vulkan/vk_layer.h b/Natives/external/zink/vulkan/vk_layer.h
similarity index 100%
rename from Natives/external_include/vulkan/vk_layer.h
rename to Natives/external/zink/vulkan/vk_layer.h
diff --git a/Natives/external_include/vulkan/vk_platform.h b/Natives/external/zink/vulkan/vk_platform.h
similarity index 100%
rename from Natives/external_include/vulkan/vk_platform.h
rename to Natives/external/zink/vulkan/vk_platform.h
diff --git a/Natives/external_include/vulkan/vulkan.h b/Natives/external/zink/vulkan/vulkan.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan.h
rename to Natives/external/zink/vulkan/vulkan.h
diff --git a/Natives/external_include/vulkan/vulkan_android.h b/Natives/external/zink/vulkan/vulkan_android.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_android.h
rename to Natives/external/zink/vulkan/vulkan_android.h
diff --git a/Natives/external_include/vulkan/vulkan_beta.h b/Natives/external/zink/vulkan/vulkan_beta.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_beta.h
rename to Natives/external/zink/vulkan/vulkan_beta.h
diff --git a/Natives/external_include/vulkan/vulkan_core.h b/Natives/external/zink/vulkan/vulkan_core.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_core.h
rename to Natives/external/zink/vulkan/vulkan_core.h
diff --git a/Natives/external_include/vulkan/vulkan_directfb.h b/Natives/external/zink/vulkan/vulkan_directfb.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_directfb.h
rename to Natives/external/zink/vulkan/vulkan_directfb.h
diff --git a/Natives/external_include/vulkan/vulkan_fuchsia.h b/Natives/external/zink/vulkan/vulkan_fuchsia.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_fuchsia.h
rename to Natives/external/zink/vulkan/vulkan_fuchsia.h
diff --git a/Natives/external_include/vulkan/vulkan_ggp.h b/Natives/external/zink/vulkan/vulkan_ggp.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_ggp.h
rename to Natives/external/zink/vulkan/vulkan_ggp.h
diff --git a/Natives/external_include/vulkan/vulkan_intel.h b/Natives/external/zink/vulkan/vulkan_intel.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_intel.h
rename to Natives/external/zink/vulkan/vulkan_intel.h
diff --git a/Natives/external_include/vulkan/vulkan_ios.h b/Natives/external/zink/vulkan/vulkan_ios.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_ios.h
rename to Natives/external/zink/vulkan/vulkan_ios.h
diff --git a/Natives/external_include/vulkan/vulkan_macos.h b/Natives/external/zink/vulkan/vulkan_macos.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_macos.h
rename to Natives/external/zink/vulkan/vulkan_macos.h
diff --git a/Natives/external_include/vulkan/vulkan_metal.h b/Natives/external/zink/vulkan/vulkan_metal.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_metal.h
rename to Natives/external/zink/vulkan/vulkan_metal.h
diff --git a/Natives/external_include/vulkan/vulkan_vi.h b/Natives/external/zink/vulkan/vulkan_vi.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_vi.h
rename to Natives/external/zink/vulkan/vulkan_vi.h
diff --git a/Natives/external_include/vulkan/vulkan_wayland.h b/Natives/external/zink/vulkan/vulkan_wayland.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_wayland.h
rename to Natives/external/zink/vulkan/vulkan_wayland.h
diff --git a/Natives/external_include/vulkan/vulkan_win32.h b/Natives/external/zink/vulkan/vulkan_win32.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_win32.h
rename to Natives/external/zink/vulkan/vulkan_win32.h
diff --git a/Natives/external_include/vulkan/vulkan_xcb.h b/Natives/external/zink/vulkan/vulkan_xcb.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_xcb.h
rename to Natives/external/zink/vulkan/vulkan_xcb.h
diff --git a/Natives/external_include/vulkan/vulkan_xlib.h b/Natives/external/zink/vulkan/vulkan_xlib.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_xlib.h
rename to Natives/external/zink/vulkan/vulkan_xlib.h
diff --git a/Natives/external_include/vulkan/vulkan_xlib_xrandr.h b/Natives/external/zink/vulkan/vulkan_xlib_xrandr.h
similarity index 100%
rename from Natives/external_include/vulkan/vulkan_xlib_xrandr.h
rename to Natives/external/zink/vulkan/vulkan_xlib_xrandr.h