diff --git a/Cargo.lock b/Cargo.lock
index 0c0088e..0b1e06f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -745,12 +745,12 @@ dependencies = [
 
 [[package]]
 name = "librashader"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "ash",
- "librashader-common",
+ "librashader-common 0.1.0-beta.18",
  "librashader-preprocess",
- "librashader-presets",
+ "librashader-presets 0.1.0-beta.18",
  "librashader-reflect",
  "librashader-runtime",
  "librashader-runtime-d3d11",
@@ -762,7 +762,7 @@ dependencies = [
 
 [[package]]
 name = "librashader-capi"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "ash",
  "gl",
@@ -776,7 +776,7 @@ dependencies = [
 
 [[package]]
 name = "librashader-common"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "ash",
  "gl",
@@ -784,14 +784,23 @@ dependencies = [
  "windows",
 ]
 
+[[package]]
+name = "librashader-common"
+version = "0.1.0-beta.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3aadd673bb1827a07d627f6ccc5937060a713168578220e68815cac4d4e67fe3"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "librashader-preprocess"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "encoding_rs",
  "glob",
- "librashader-common",
- "librashader-presets",
+ "librashader-common 0.1.0-beta.18",
+ "librashader-presets 0.1.0-beta.16",
  "nom",
  "rayon",
  "rustc-hash",
@@ -801,9 +810,22 @@ dependencies = [
 [[package]]
 name = "librashader-presets"
 version = "0.1.0-beta.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b898f8adfa451e1a6b3d17c8c30b2e0273a5fbe1e88050379c930f750cb7342c"
+dependencies = [
+ "librashader-common 0.1.0-beta.18 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nom",
+ "nom_locate",
+ "num-traits",
+ "thiserror",
+]
+
+[[package]]
+name = "librashader-presets"
+version = "0.1.0-beta.18"
 dependencies = [
  "glob",
- "librashader-common",
+ "librashader-common 0.1.0-beta.18",
  "nom",
  "nom_locate",
  "num-traits",
@@ -812,13 +834,13 @@ dependencies = [
 
 [[package]]
 name = "librashader-reflect"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "bitflags",
  "bytemuck",
- "librashader-common",
+ "librashader-common 0.1.0-beta.18",
  "librashader-preprocess",
- "librashader-presets",
+ "librashader-presets 0.1.0-beta.18",
  "librashader-spirv-cross",
  "naga",
  "rspirv",
@@ -830,13 +852,13 @@ dependencies = [
 
 [[package]]
 name = "librashader-runtime"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "bytemuck",
  "image",
- "librashader-common",
+ "librashader-common 0.1.0-beta.18",
  "librashader-preprocess",
- "librashader-presets",
+ "librashader-presets 0.1.0-beta.18",
  "librashader-reflect",
  "num-traits",
  "rustc-hash",
@@ -844,14 +866,14 @@ dependencies = [
 
 [[package]]
 name = "librashader-runtime-d3d11"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "array-concat",
  "bytemuck",
  "gfx-maths",
- "librashader-common",
+ "librashader-common 0.1.0-beta.18",
  "librashader-preprocess",
- "librashader-presets",
+ "librashader-presets 0.1.0-beta.18",
  "librashader-reflect",
  "librashader-runtime",
  "librashader-spirv-cross",
@@ -863,16 +885,16 @@ dependencies = [
 
 [[package]]
 name = "librashader-runtime-d3d12"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "array-concat",
  "array-init",
  "bitvec",
  "bytemuck",
  "gfx-maths",
- "librashader-common",
+ "librashader-common 0.1.0-beta.18",
  "librashader-preprocess",
- "librashader-presets",
+ "librashader-presets 0.1.0-beta.18",
  "librashader-reflect",
  "librashader-runtime",
  "librashader-spirv-cross",
@@ -885,14 +907,14 @@ dependencies = [
 
 [[package]]
 name = "librashader-runtime-gl"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "bytemuck",
  "gl",
  "glfw 0.47.0",
- "librashader-common",
+ "librashader-common 0.1.0-beta.18",
  "librashader-preprocess",
- "librashader-presets",
+ "librashader-presets 0.1.0-beta.18",
  "librashader-reflect",
  "librashader-runtime",
  "librashader-spirv-cross",
@@ -902,15 +924,15 @@ dependencies = [
 
 [[package]]
 name = "librashader-runtime-vk"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 dependencies = [
  "ash",
  "ash-window",
  "bytemuck",
  "glfw 0.49.1",
- "librashader-common",
+ "librashader-common 0.1.0-beta.18",
  "librashader-preprocess",
- "librashader-presets",
+ "librashader-presets 0.1.0-beta.18",
  "librashader-reflect",
  "librashader-runtime",
  "librashader-spirv-cross",
diff --git a/librashader-capi/Cargo.toml b/librashader-capi/Cargo.toml
index 3ce0844..d45ed6a 100644
--- a/librashader-capi/Cargo.toml
+++ b/librashader-capi/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-capi"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -22,7 +22,7 @@ runtime-d3d12 = ["windows", "librashader/runtime-d3d12", "windows/Win32_Graphics
 runtime-vulkan = ["ash", "librashader/runtime-vk"]
 
 [dependencies]
-librashader = { path = "../librashader", version = "0.1.0-beta.16", features = ["internal"] }
+librashader = { path = "../librashader", version = "0.1.0-beta.18", features = ["internal"] }
 thiserror = "1.0.37"
 paste = "1.0.9"
 gl = { version = "0.14.0", optional = true }
diff --git a/librashader-common/Cargo.toml b/librashader-common/Cargo.toml
index c18d52d..537a193 100644
--- a/librashader-common/Cargo.toml
+++ b/librashader-common/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-common"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
diff --git a/librashader-preprocess/Cargo.toml b/librashader-preprocess/Cargo.toml
index 3a758f4..0089b9f 100644
--- a/librashader-preprocess/Cargo.toml
+++ b/librashader-preprocess/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-preprocess"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -14,7 +14,7 @@ description = "RetroArch shaders for all."
 [dependencies]
 thiserror = "1.0.37"
 nom = "7.1.1"
-librashader-common = { path = "../librashader-common", version = "0.1.0-beta.16" }
+librashader-common = { path = "../librashader-common", version = "0.1.0-beta.18" }
 rustc-hash = "1.1.0"
 encoding_rs = "0.8.31"
 
@@ -23,6 +23,6 @@ default = [ "line_directives" ]
 line_directives = []
 
 [dev-dependencies]
-librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.16" }
+librashader-presets = "0.1.0-beta.16"
 glob = "0.3.1"
-rayon = "1.6.1"
\ No newline at end of file
+rayon = "1.6.1"
diff --git a/librashader-presets/Cargo.toml b/librashader-presets/Cargo.toml
index 92a18d0..940aac9 100644
--- a/librashader-presets/Cargo.toml
+++ b/librashader-presets/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-presets"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -15,7 +15,7 @@ description = "RetroArch shaders for all."
 thiserror = "1.0.37"
 nom = "7.1.1"
 nom_locate = "4.0.0"
-librashader-common = { path = "../librashader-common", version = "0.1.0-beta.16" }
+librashader-common = { path = "../librashader-common", version = "0.1.0-beta.18" }
 num-traits = "0.2"
 
 [features]
diff --git a/librashader-reflect/Cargo.toml b/librashader-reflect/Cargo.toml
index fc22154..809cb5c 100644
--- a/librashader-reflect/Cargo.toml
+++ b/librashader-reflect/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-reflect"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -19,9 +19,9 @@ thiserror = "1.0.37"
 bitflags = "1.3.2"
 rustc-hash = "1.1.0"
 
-librashader-common = { path = "../librashader-common", version = "0.1.0-beta.16" }
-librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.16" }
-librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.16" }
+librashader-common = { path = "../librashader-common", version = "0.1.0-beta.18" }
+librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.18" }
+librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.18" }
 
 spirv_cross = { package = "librashader-spirv-cross", version = "0.23", optional = true }
 spirv-to-dxil = { version = "0.3", optional = true }
diff --git a/librashader-runtime-d3d11/Cargo.toml b/librashader-runtime-d3d11/Cargo.toml
index 813f706..a8b2723 100644
--- a/librashader-runtime-d3d11/Cargo.toml
+++ b/librashader-runtime-d3d11/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-runtime-d3d11"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -12,11 +12,11 @@ keywords = ["shader", "retroarch", "SPIR-V"]
 description = "RetroArch shaders for all."
 
 [dependencies]
-librashader-common = { path = "../librashader-common", features = ["d3d11"], version = "0.1.0-beta.16" }
-librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.16" }
-librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.16" }
-librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.16", features = ["standalone"]  }
-librashader-runtime = { path = "../librashader-runtime", version = "0.1.0-beta.16" }
+librashader-common = { path = "../librashader-common", features = ["d3d11"], version = "0.1.0-beta.18" }
+librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.18" }
+librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.18" }
+librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.18", features = ["standalone"]  }
+librashader-runtime = { path = "../librashader-runtime", version = "0.1.0-beta.18" }
 thiserror = "1.0.37"
 spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
 
diff --git a/librashader-runtime-d3d12/Cargo.toml b/librashader-runtime-d3d12/Cargo.toml
index 124c0ca..24f0bbb 100644
--- a/librashader-runtime-d3d12/Cargo.toml
+++ b/librashader-runtime-d3d12/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-runtime-d3d12"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -12,11 +12,11 @@ keywords = ["shader", "retroarch", "SPIR-V"]
 description = "RetroArch shaders for all."
 
 [dependencies]
-librashader-common = { path = "../librashader-common", features = ["d3d12"], version = "0.1.0-beta.16" }
-librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.16" }
-librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.16" }
-librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.16", features = ["dxil", "standalone"]  }
-librashader-runtime = { path = "../librashader-runtime", version = "0.1.0-beta.16" }
+librashader-common = { path = "../librashader-common", features = ["d3d12"], version = "0.1.0-beta.18" }
+librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.18" }
+librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.18" }
+librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.18", features = ["dxil", "standalone"]  }
+librashader-runtime = { path = "../librashader-runtime", version = "0.1.0-beta.18" }
 thiserror = "1.0.37"
 spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
 
diff --git a/librashader-runtime-gl/Cargo.toml b/librashader-runtime-gl/Cargo.toml
index 94b8c4d..0807308 100644
--- a/librashader-runtime-gl/Cargo.toml
+++ b/librashader-runtime-gl/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-runtime-gl"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -12,11 +12,11 @@ keywords = ["shader", "retroarch", "SPIR-V"]
 description = "RetroArch shaders for all."
 
 [dependencies]
-librashader-common = { path = "../librashader-common", features = ["opengl"], version = "0.1.0-beta.16" }
-librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.16" }
-librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.16" }
-librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.16", features = ["standalone"]   }
-librashader-runtime = { path = "../librashader-runtime" , version = "0.1.0-beta.16" }
+librashader-common = { path = "../librashader-common", features = ["opengl"], version = "0.1.0-beta.18" }
+librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.18" }
+librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.18" }
+librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.18", features = ["standalone"]   }
+librashader-runtime = { path = "../librashader-runtime" , version = "0.1.0-beta.18" }
 spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
 rustc-hash = "1.1.0"
 gl = "0.14.0"
diff --git a/librashader-runtime-vk/Cargo.toml b/librashader-runtime-vk/Cargo.toml
index a8c24d9..dc86033 100644
--- a/librashader-runtime-vk/Cargo.toml
+++ b/librashader-runtime-vk/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-runtime-vk"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -14,11 +14,11 @@ description = "RetroArch shaders for all."
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-librashader-common = { path = "../librashader-common", features = ["vulkan"], version = "0.1.0-beta.16" }
-librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.16" }
-librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.16" }
-librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.16", features = []   }
-librashader-runtime = { path = "../librashader-runtime" , version = "0.1.0-beta.16" }
+librashader-common = { path = "../librashader-common", features = ["vulkan"], version = "0.1.0-beta.18" }
+librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.18" }
+librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.18" }
+librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.18", features = []   }
+librashader-runtime = { path = "../librashader-runtime" , version = "0.1.0-beta.18" }
 spirv_cross = { package = "librashader-spirv-cross", version = "0.23" }
 rustc-hash = "1.1.0"
 bytemuck = "1.12.3"
diff --git a/librashader-runtime/Cargo.toml b/librashader-runtime/Cargo.toml
index 93541b6..3e38988 100644
--- a/librashader-runtime/Cargo.toml
+++ b/librashader-runtime/Cargo.toml
@@ -3,7 +3,7 @@ name = "librashader-runtime"
 edition = "2021"
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -12,10 +12,10 @@ keywords = ["shader", "retroarch", "SPIR-V"]
 description = "RetroArch shaders for all."
 
 [dependencies]
-librashader-common = { path = "../librashader-common", version = "0.1.0-beta.16" }
-librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.16" }
-librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.16" }
-librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.16" }
+librashader-common = { path = "../librashader-common", version = "0.1.0-beta.18" }
+librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.18" }
+librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.18" }
+librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.18" }
 bytemuck = "1.12.3"
 rustc-hash = "1.1.0"
 num-traits = "0.2.15"
diff --git a/librashader/Cargo.toml b/librashader/Cargo.toml
index c507592..cab5284 100644
--- a/librashader/Cargo.toml
+++ b/librashader/Cargo.toml
@@ -4,7 +4,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 license = "MPL-2.0 OR GPL-3.0-only"
-version = "0.1.0-beta.16"
+version = "0.1.0-beta.18"
 authors = ["Ronny Chan <ronny@ronnychan.ca>"]
 repository = "https://github.com/SnowflakePowered/librashader"
 readme = "../README.md"
@@ -13,15 +13,15 @@ keywords = ["shader", "retroarch", "SPIR-V"]
 description = "RetroArch shaders for all."
 
 [dependencies]
-librashader-common = { path = "../librashader-common", version = "0.1.0-beta.16" }
-librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.16" }
-librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.16" }
-librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.16", features = ["standalone"] }
-librashader-runtime  = { path = "../librashader-runtime", version = "0.1.0-beta.16" }
-librashader-runtime-d3d11  = { path = "../librashader-runtime-d3d11", version = "0.1.0-beta.16", optional = true }
-librashader-runtime-d3d12  = { path = "../librashader-runtime-d3d12", version = "0.1.0-beta.16", optional = true }
-librashader-runtime-gl = { path = "../librashader-runtime-gl", version = "0.1.0-beta.16", optional = true }
-librashader-runtime-vk = { path = "../librashader-runtime-vk", version = "0.1.0-beta.16", optional = true }
+librashader-common = { path = "../librashader-common", version = "0.1.0-beta.18" }
+librashader-presets = { path = "../librashader-presets", version = "0.1.0-beta.18" }
+librashader-preprocess = { path = "../librashader-preprocess", version = "0.1.0-beta.18" }
+librashader-reflect = { path = "../librashader-reflect", version = "0.1.0-beta.18", features = ["standalone"] }
+librashader-runtime  = { path = "../librashader-runtime", version = "0.1.0-beta.18" }
+librashader-runtime-d3d11  = { path = "../librashader-runtime-d3d11", version = "0.1.0-beta.18", optional = true }
+librashader-runtime-d3d12  = { path = "../librashader-runtime-d3d12", version = "0.1.0-beta.18", optional = true }
+librashader-runtime-gl = { path = "../librashader-runtime-gl", version = "0.1.0-beta.18", optional = true }
+librashader-runtime-vk = { path = "../librashader-runtime-vk", version = "0.1.0-beta.18", optional = true }
 
 ash = { version = "0.37.1+1.3.235", optional = true }