diff --git a/armorlab/khafile.js b/armorlab/khafile.js
index 368c5f8d..1bb7c946 100644
--- a/armorlab/khafile.js
+++ b/armorlab/khafile.js
@@ -19,6 +19,7 @@ project.addLibrary("../../Libraries/zui");
 project.addLibrary("../../base");
 project.addShaders("../armorcore/Shaders/*.glsl", { embed: snapshot });
 project.addShaders("../base/Shaders/common/*.glsl", { embed: snapshot });
+project.addShaders("../base/Shaders/shared/*.glsl", { embed: snapshot });
 project.addAssets("../base/Assets/common/*", { destination: "data/{name}", embed: snapshot });
 if (!snapshot) {
 	project.addDefine("arm_noembed");
diff --git a/armorpaint/Shaders/Material_mesh.frag.glsl b/armorpaint/Shaders/Material_mesh.frag.glsl
deleted file mode 100644
index 625a92a5..00000000
--- a/armorpaint/Shaders/Material_mesh.frag.glsl
+++ /dev/null
@@ -1,32 +0,0 @@
-#version 450
-#include "../../base/Shaders/std/gbuffer.glsl"
-in vec2 texCoord;
-in vec3 wnormal;
-in vec4 wvpposition;
-in vec4 prevwvpposition;
-out vec4 fragColor[3];
-void main() {
-	vec3 n = normalize(wnormal);
-	vec3 basecol;
-	float roughness;
-	float metallic;
-	float occlusion;
-	float emission;
-	float Mix_fac = 0.0;
-	vec3 RGB_Color_res = vec3(0.2176000028848648, 0.2176000028848648, 0.2176000028848648);
-	vec3 Mix_Color_res = RGB_Color_res + texCoord.x * 0.0000001; // keep texCoord
-	basecol = Mix_Color_res;
-	roughness = 0.4000000059604645;
-	metallic = 0.0;
-	occlusion = 1.0;
-	emission = 0.0;
-	n /= (abs(n.x) + abs(n.y) + abs(n.z));
-	n.xy = n.z >= 0.0 ? n.xy : octahedronWrap(n.xy);
-	uint matid = 0;
-	if (emission > 0) { basecol *= emission; matid = 1; }
-	fragColor[0] = vec4(n.xy, roughness, packFloatInt16(metallic, matid));
-	fragColor[1] = vec4(basecol, occlusion);
-	vec2 posa = (wvpposition.xy / wvpposition.w) * 0.5 + 0.5;
-	vec2 posb = (prevwvpposition.xy / prevwvpposition.w) * 0.5 + 0.5;
-	fragColor[2].rg = vec2(posa - posb);
-}
diff --git a/armorpaint/Shaders/Material_mesh.vert.glsl b/armorpaint/Shaders/Material_mesh.vert.glsl
deleted file mode 100644
index 1ee2805c..00000000
--- a/armorpaint/Shaders/Material_mesh.vert.glsl
+++ /dev/null
@@ -1,20 +0,0 @@
-#version 450
-in vec4 pos;
-in vec2 nor;
-in vec2 tex;
-out vec2 texCoord;
-out vec3 wnormal;
-out vec4 wvpposition;
-out vec4 prevwvpposition;
-uniform mat3 N;
-uniform mat4 WVP;
-uniform float texUnpack;
-uniform mat4 prevWVP;
-void main() {
-	vec4 spos = vec4(pos.xyz, 1.0);
-	texCoord = tex * texUnpack;
-	wnormal = normalize(N * vec3(nor.xy, pos.w));
-	gl_Position = WVP * spos;
-	wvpposition = gl_Position;
-	prevwvpposition = prevWVP * spos;
-}
diff --git a/armorpaint/Shaders/layer_copy.frag.glsl b/armorpaint/Shaders/layer_copy.frag.glsl
deleted file mode 100644
index b0b28b3a..00000000
--- a/armorpaint/Shaders/layer_copy.frag.glsl
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 330
-uniform sampler2D tex;
-in vec2 texCoord;
-in vec4 color;
-out vec4 FragColor;
-void main() {
-	FragColor = textureLod(tex, texCoord, 0).rgba * color;
-}
diff --git a/armorpaint/Shaders/layer_copy_bgra.frag.glsl b/armorpaint/Shaders/layer_copy_bgra.frag.glsl
deleted file mode 100644
index 0dcb5dca..00000000
--- a/armorpaint/Shaders/layer_copy_bgra.frag.glsl
+++ /dev/null
@@ -1,8 +0,0 @@
-#version 330
-uniform sampler2D tex;
-in vec2 texCoord;
-in vec4 color;
-out vec4 FragColor;
-void main() {
-	FragColor = textureLod(tex, texCoord, 0).bgra * color;
-}
diff --git a/armorpaint/Shaders/layer_view.vert.glsl b/armorpaint/Shaders/layer_view.vert.glsl
deleted file mode 100644
index c35e8db8..00000000
--- a/armorpaint/Shaders/layer_view.vert.glsl
+++ /dev/null
@@ -1,12 +0,0 @@
-#version 330
-in vec3 pos;
-in vec2 tex;
-in vec4 col;
-uniform mat4 projectionMatrix;
-out vec2 texCoord;
-out vec4 color;
-void main() {
-	gl_Position = projectionMatrix * vec4(pos, 1.0);
-	texCoord = tex;
-	color = col;
-}
diff --git a/armorpaint/Shaders/mask_apply.frag.glsl b/armorpaint/Shaders/mask_apply.frag.glsl
deleted file mode 100644
index d598edca..00000000
--- a/armorpaint/Shaders/mask_apply.frag.glsl
+++ /dev/null
@@ -1,10 +0,0 @@
-#version 330
-uniform sampler2D tex0;
-uniform sampler2D texa;
-in vec2 texCoord;
-out vec4 FragColor;
-void main() {
-	vec4 col0 = textureLod(tex0, texCoord, 0);
-	float mask = textureLod(texa, texCoord, 0).r;
-	FragColor = vec4(col0.rgb, col0.a * mask);
-}
diff --git a/armorpaint/Sources/arm/Strings.hx b/armorpaint/Sources/arm/Strings.hx
deleted file mode 100644
index 4dad86b0..00000000
--- a/armorpaint/Sources/arm/Strings.hx
+++ /dev/null
@@ -1,10 +0,0 @@
-package arm;
-
-class Strings {
-	public static function error0(): String { return tr("Error: .arm file expected"); }
-	public static function error1(): String { return tr("Error: Unknown asset format"); }
-	public static function error2(): String { return tr("Error: Could not locate texture"); }
-	public static function error3(): String { return tr("Error: Failed to read mesh data"); }
-	public static function error5(): String { return tr("Error: Check internet connection to access the cloud"); }
-	public static function info0(): String { return tr("Info: Asset already imported"); }
-}
diff --git a/armorpaint/khafile.js b/armorpaint/khafile.js
index e0ab0699..f122f895 100644
--- a/armorpaint/khafile.js
+++ b/armorpaint/khafile.js
@@ -21,6 +21,7 @@ project.addLibrary("../../Libraries/zui");
 project.addLibrary("../../base");
 project.addShaders("../armorcore/Shaders/*.glsl", { embed: snapshot });
 project.addShaders("../base/Shaders/common/*.glsl", { embed: snapshot });
+project.addShaders("../base/Shaders/shared/*.glsl", { embed: snapshot });
 project.addAssets("../base/Assets/common/*", { destination: "data/{name}", embed: snapshot });
 if (!snapshot) {
 	project.addDefine("arm_noembed");
diff --git a/armorlab/Shaders/Material_mesh.frag.glsl b/base/Shaders/shared/Material_mesh.frag.glsl
similarity index 95%
rename from armorlab/Shaders/Material_mesh.frag.glsl
rename to base/Shaders/shared/Material_mesh.frag.glsl
index 625a92a5..b9289b8e 100644
--- a/armorlab/Shaders/Material_mesh.frag.glsl
+++ b/base/Shaders/shared/Material_mesh.frag.glsl
@@ -1,5 +1,5 @@
 #version 450
-#include "../../base/Shaders/std/gbuffer.glsl"
+#include "../std/gbuffer.glsl"
 in vec2 texCoord;
 in vec3 wnormal;
 in vec4 wvpposition;
diff --git a/armorlab/Shaders/Material_mesh.vert.glsl b/base/Shaders/shared/Material_mesh.vert.glsl
similarity index 100%
rename from armorlab/Shaders/Material_mesh.vert.glsl
rename to base/Shaders/shared/Material_mesh.vert.glsl
diff --git a/armorlab/Shaders/layer_copy.frag.glsl b/base/Shaders/shared/layer_copy.frag.glsl
similarity index 100%
rename from armorlab/Shaders/layer_copy.frag.glsl
rename to base/Shaders/shared/layer_copy.frag.glsl
diff --git a/armorlab/Shaders/layer_copy_bgra.frag.glsl b/base/Shaders/shared/layer_copy_bgra.frag.glsl
similarity index 100%
rename from armorlab/Shaders/layer_copy_bgra.frag.glsl
rename to base/Shaders/shared/layer_copy_bgra.frag.glsl
diff --git a/armorlab/Shaders/layer_view.vert.glsl b/base/Shaders/shared/layer_view.vert.glsl
similarity index 100%
rename from armorlab/Shaders/layer_view.vert.glsl
rename to base/Shaders/shared/layer_view.vert.glsl
diff --git a/armorlab/Shaders/mask_apply.frag.glsl b/base/Shaders/shared/mask_apply.frag.glsl
similarity index 100%
rename from armorlab/Shaders/mask_apply.frag.glsl
rename to base/Shaders/shared/mask_apply.frag.glsl
diff --git a/armorlab/Sources/arm/Strings.hx b/base/Sources/arm/Strings.hx
similarity index 100%
rename from armorlab/Sources/arm/Strings.hx
rename to base/Sources/arm/Strings.hx
diff --git a/armorpaint/Sources/arm/plugin/Bt.hx b/base/Sources/arm/plugin/Bt.hx
similarity index 100%
rename from armorpaint/Sources/arm/plugin/Bt.hx
rename to base/Sources/arm/plugin/Bt.hx
diff --git a/armorpaint/Sources/arm/plugin/PhysicsBody.hx b/base/Sources/arm/plugin/PhysicsBody.hx
similarity index 100%
rename from armorpaint/Sources/arm/plugin/PhysicsBody.hx
rename to base/Sources/arm/plugin/PhysicsBody.hx
diff --git a/armorpaint/Sources/arm/plugin/PhysicsWorld.hx b/base/Sources/arm/plugin/PhysicsWorld.hx
similarity index 100%
rename from armorpaint/Sources/arm/plugin/PhysicsWorld.hx
rename to base/Sources/arm/plugin/PhysicsWorld.hx
diff --git a/armorpaint/Sources/arm/util/ParticleUtil.hx b/base/Sources/arm/util/ParticleUtil.hx
similarity index 100%
rename from armorpaint/Sources/arm/util/ParticleUtil.hx
rename to base/Sources/arm/util/ParticleUtil.hx