diff --git a/engine/ui/src/sgpu/papyrusSgpu.zig b/engine/ui/src/sgpu/papyrusSgpu.zig
index 2192dbc..164838e 100644
--- a/engine/ui/src/sgpu/papyrusSgpu.zig
+++ b/engine/ui/src/sgpu/papyrusSgpu.zig
@@ -132,6 +132,7 @@ pub fn destroy(self: *@This()) void {
     self.stringArena.deinit();
     self.runtime.destroy();
     self.drawList.deinit();
+    self.tempDrawCommand.deinit(self.allocator);
     self.allocator.destroy(self);
 }
 
diff --git a/projects/content/_shaders/dxil/rect.frag.dxil b/projects/content/_shaders/dxil/rect.frag.dxil
index 443d97d..8c775ad 100644
Binary files a/projects/content/_shaders/dxil/rect.frag.dxil and b/projects/content/_shaders/dxil/rect.frag.dxil differ
diff --git a/projects/content/_shaders/msl/rect.frag.msl b/projects/content/_shaders/msl/rect.frag.msl
index e38b4ac..15adce0 100644
--- a/projects/content/_shaders/msl/rect.frag.msl
+++ b/projects/content/_shaders/msl/rect.frag.msl
@@ -35,7 +35,7 @@ struct main0_in
     uint in_var_TEXCOORD3 [[user(locn3)]];
 };
 
-fragment main0_out main0(main0_in in [[stage_in]], const device type_StructuredBuffer_Scene& scene [[buffer(4294967295)]], texture2d<float> Texture0 [[texture(0)]], sampler Sampler0 [[sampler(0)]])
+fragment main0_out main0(main0_in in [[stage_in]], const device type_StructuredBuffer_Scene& scene [[buffer(0)]], texture2d<float> Texture0 [[texture(0)]], sampler Sampler0 [[sampler(0)]])
 {
     main0_out out = {};
     bool _73 = in.in_var_TEXCOORD2.x < scene._m0[in.in_var_TEXCOORD3].rounding.x;
diff --git a/projects/content/_shaders/spv/rect.frag.spv b/projects/content/_shaders/spv/rect.frag.spv
index 7e0c98c..de42cd1 100644
Binary files a/projects/content/_shaders/spv/rect.frag.spv and b/projects/content/_shaders/spv/rect.frag.spv differ
diff --git a/tools/scripts/content/_shaders/dxil/lit_mesh.frag.dxil b/tools/scripts/content/_shaders/dxil/lit_mesh.frag.dxil
deleted file mode 100644
index b79acd2..0000000
Binary files a/tools/scripts/content/_shaders/dxil/lit_mesh.frag.dxil and /dev/null differ
diff --git a/tools/scripts/content/_shaders/dxil/meshes.vert.dxil b/tools/scripts/content/_shaders/dxil/meshes.vert.dxil
deleted file mode 100644
index f401411..0000000
Binary files a/tools/scripts/content/_shaders/dxil/meshes.vert.dxil and /dev/null differ
diff --git a/tools/scripts/content/_shaders/dxil/sample.frag.dxil b/tools/scripts/content/_shaders/dxil/sample.frag.dxil
deleted file mode 100644
index 6115e3a..0000000
Binary files a/tools/scripts/content/_shaders/dxil/sample.frag.dxil and /dev/null differ
diff --git a/tools/scripts/content/_shaders/dxil/sample.vert.dxil b/tools/scripts/content/_shaders/dxil/sample.vert.dxil
deleted file mode 100644
index fdabb15..0000000
Binary files a/tools/scripts/content/_shaders/dxil/sample.vert.dxil and /dev/null differ
diff --git a/tools/scripts/content/_shaders/dxil/test.vert.dxil b/tools/scripts/content/_shaders/dxil/test.vert.dxil
deleted file mode 100644
index a29b0fe..0000000
Binary files a/tools/scripts/content/_shaders/dxil/test.vert.dxil and /dev/null differ
diff --git a/tools/scripts/content/_shaders/msl/lit_mesh.frag.msl b/tools/scripts/content/_shaders/msl/lit_mesh.frag.msl
deleted file mode 100644
index 3f1796e..0000000
--- a/tools/scripts/content/_shaders/msl/lit_mesh.frag.msl
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-
-using namespace metal;
-
-struct main0_out
-{
-    float4 out_var_SV_Target0 [[color(0)]];
-};
-
-struct main0_in
-{
-    float2 in_var_TEXCOORD0 [[user(locn0)]];
-};
-
-fragment main0_out main0(main0_in in [[stage_in]], texture2d<float> Texture [[texture(0)]], sampler Sampler [[sampler(0)]])
-{
-    main0_out out = {};
-    out.out_var_SV_Target0 = Texture.sample(Sampler, in.in_var_TEXCOORD0);
-    return out;
-}
-
diff --git a/tools/scripts/content/_shaders/msl/meshes.vert.msl b/tools/scripts/content/_shaders/msl/meshes.vert.msl
deleted file mode 100644
index 88a175b..0000000
--- a/tools/scripts/content/_shaders/msl/meshes.vert.msl
+++ /dev/null
@@ -1,41 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-
-using namespace metal;
-
-struct Scene
-{
-    float4x4 Model;
-};
-
-struct type_StructuredBuffer_Scene
-{
-    Scene _m0[1];
-};
-
-struct type_Uniforms
-{
-    float4x4 ViewProjection;
-    float time;
-};
-
-struct main0_out
-{
-    float2 out_var_TEXCOORD0 [[user(locn0)]];
-    float4 gl_Position [[position]];
-};
-
-struct main0_in
-{
-    float3 in_var_TEXCOORD0 [[attribute(0)]];
-    float2 in_var_TEXCOORD3 [[attribute(3)]];
-};
-
-vertex main0_out main0(main0_in in [[stage_in]], constant type_Uniforms& Uniforms [[buffer(0)]], const device type_StructuredBuffer_Scene& scene [[buffer(1)]], uint gl_InstanceIndex [[instance_id]])
-{
-    main0_out out = {};
-    out.out_var_TEXCOORD0 = in.in_var_TEXCOORD3;
-    out.gl_Position = Uniforms.ViewProjection * (scene._m0[gl_InstanceIndex].Model * float4(in.in_var_TEXCOORD0, 1.0));
-    return out;
-}
-
diff --git a/tools/scripts/content/_shaders/msl/sample.frag.msl b/tools/scripts/content/_shaders/msl/sample.frag.msl
deleted file mode 100644
index e9e2dad..0000000
--- a/tools/scripts/content/_shaders/msl/sample.frag.msl
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-
-using namespace metal;
-
-struct main0_out
-{
-    float4 out_var_SV_Target0 [[color(0)]];
-};
-
-struct main0_in
-{
-    float4 in_var_TEXCOORD0 [[user(locn0)]];
-};
-
-fragment main0_out main0(main0_in in [[stage_in]])
-{
-    main0_out out = {};
-    out.out_var_SV_Target0 = in.in_var_TEXCOORD0;
-    return out;
-}
-
diff --git a/tools/scripts/content/_shaders/msl/sample.vert.msl b/tools/scripts/content/_shaders/msl/sample.vert.msl
deleted file mode 100644
index 15b45b2..0000000
--- a/tools/scripts/content/_shaders/msl/sample.vert.msl
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-
-using namespace metal;
-
-struct Scene
-{
-    float3 color;
-};
-
-struct type_StructuredBuffer_Scene
-{
-    Scene _m0[1];
-};
-
-constant float2 _31 = {};
-constant float4 _32 = {};
-
-struct main0_out
-{
-    float4 out_var_TEXCOORD0 [[user(locn0)]];
-    float4 gl_Position [[position]];
-};
-
-vertex main0_out main0(const device type_StructuredBuffer_Scene& test [[buffer(0)]], uint gl_VertexIndex [[vertex_id]])
-{
-    main0_out out = {};
-    float4 _71;
-    float2 _72;
-    if (gl_VertexIndex == 0u)
-    {
-        _71 = float4(test._m0[0u].color, 1.0);
-        _72 = float2(-1.0);
-    }
-    else
-    {
-        float4 _69;
-        float2 _70;
-        if (gl_VertexIndex == 1u)
-        {
-            _69 = float4(test._m0[1u].color, 1.0);
-            _70 = float2(1.0, -1.0);
-        }
-        else
-        {
-            bool _57 = gl_VertexIndex == 2u;
-            float4 _66;
-            if (_57)
-            {
-                _66 = float4(test._m0[2u].color, 1.0);
-            }
-            else
-            {
-                _66 = _32;
-            }
-            _69 = _66;
-            _70 = select(_31, float2(0.0, 1.0), bool2(_57));
-        }
-        _71 = _69;
-        _72 = _70;
-    }
-    out.out_var_TEXCOORD0 = _71;
-    out.gl_Position = float4(_72, 0.0, 1.0);
-    return out;
-}
-
diff --git a/tools/scripts/content/_shaders/msl/test.vert.msl b/tools/scripts/content/_shaders/msl/test.vert.msl
deleted file mode 100644
index 564cda3..0000000
--- a/tools/scripts/content/_shaders/msl/test.vert.msl
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <metal_stdlib>
-#include <simd/simd.h>
-
-using namespace metal;
-
-struct Scene
-{
-    float4 color;
-};
-
-struct type_StructuredBuffer_Scene
-{
-    Scene _m0[1];
-};
-
-constant float2 _30 = {};
-constant float4 _31 = {};
-
-struct main0_out
-{
-    float4 out_var_TEXCOORD0 [[user(locn0)]];
-    float4 gl_Position [[position]];
-};
-
-vertex main0_out main0(const device type_StructuredBuffer_Scene& test [[buffer(0)]], uint gl_VertexIndex [[vertex_id]])
-{
-    main0_out out = {};
-    float4 _58;
-    float2 _59;
-    if (gl_VertexIndex == 0u)
-    {
-        _58 = test._m0[0u].color;
-        _59 = float2(-1.0);
-    }
-    else
-    {
-        float4 _56;
-        float2 _57;
-        if (gl_VertexIndex == 1u)
-        {
-            _56 = test._m0[1u].color;
-            _57 = float2(1.0, -1.0);
-        }
-        else
-        {
-            bool _48 = gl_VertexIndex == 2u;
-            float4 _53;
-            if (_48)
-            {
-                _53 = test._m0[2u].color;
-            }
-            else
-            {
-                _53 = _31;
-            }
-            _56 = _53;
-            _57 = select(_30, float2(0.0, 1.0), bool2(_48));
-        }
-        _58 = _56;
-        _59 = _57;
-    }
-    out.out_var_TEXCOORD0 = _58;
-    out.gl_Position = float4(_59, 0.0, 1.0);
-    return out;
-}
-
diff --git a/tools/scripts/content/_shaders/spv/lit_mesh.frag.spv b/tools/scripts/content/_shaders/spv/lit_mesh.frag.spv
deleted file mode 100644
index 33a8e95..0000000
Binary files a/tools/scripts/content/_shaders/spv/lit_mesh.frag.spv and /dev/null differ
diff --git a/tools/scripts/content/_shaders/spv/meshes.vert.spv b/tools/scripts/content/_shaders/spv/meshes.vert.spv
deleted file mode 100644
index 2290eda..0000000
Binary files a/tools/scripts/content/_shaders/spv/meshes.vert.spv and /dev/null differ
diff --git a/tools/scripts/content/_shaders/spv/sample.frag.spv b/tools/scripts/content/_shaders/spv/sample.frag.spv
deleted file mode 100644
index 5f4c638..0000000
Binary files a/tools/scripts/content/_shaders/spv/sample.frag.spv and /dev/null differ
diff --git a/tools/scripts/content/_shaders/spv/sample.vert.spv b/tools/scripts/content/_shaders/spv/sample.vert.spv
deleted file mode 100644
index 8e1453e..0000000
Binary files a/tools/scripts/content/_shaders/spv/sample.vert.spv and /dev/null differ
diff --git a/tools/scripts/content/_shaders/spv/test.vert.spv b/tools/scripts/content/_shaders/spv/test.vert.spv
deleted file mode 100644
index 203031d..0000000
Binary files a/tools/scripts/content/_shaders/spv/test.vert.spv and /dev/null differ