diff --git a/src/utils/shiki.ts b/src/utils/shiki.ts
index 67aae43..a798b9c 100644
--- a/src/utils/shiki.ts
+++ b/src/utils/shiki.ts
@@ -1,6 +1,6 @@
 import { mcfunctionGrammar } from "./mcfunction-grammar";
 import { mcscriptGrammar } from "./mcscript-grammar";
-import shulkerscriptGrammar from "./shulkerscript-grammar.json" with { type: 'json' };
+import { shulkerscriptGrammar } from "./shulkerscript-grammar";
 
 const config = {
     langs: [
diff --git a/src/utils/shulkerscript-grammar.ts b/src/utils/shulkerscript-grammar.ts
index 46d5e8c..25f670b 100644
--- a/src/utils/shulkerscript-grammar.ts
+++ b/src/utils/shulkerscript-grammar.ts
@@ -1,5 +1,5 @@
 import type { LanguageInput } from "shiki";
 
-import grammar from "./shulkerscript-grammar.json" with { type: 'json' };
+import grammar from "./shulkerscript.tmLanguage.json" with { type: 'json' };
 
 export const shulkerscriptGrammar: LanguageInput = grammar;
\ No newline at end of file
diff --git a/src/utils/shulkerscript-grammar.json b/src/utils/shulkerscript.tmLanguage.json
similarity index 100%
rename from src/utils/shulkerscript-grammar.json
rename to src/utils/shulkerscript.tmLanguage.json
diff --git a/src/wasm/webcompiler/Cargo.lock b/src/wasm/webcompiler/Cargo.lock
index a533b10..a9cb728 100644
--- a/src/wasm/webcompiler/Cargo.lock
+++ b/src/wasm/webcompiler/Cargo.lock
@@ -54,40 +54,18 @@ version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
 [[package]]
 name = "bumpalo"
 version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
 [[package]]
 name = "cfg-if"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
-[[package]]
-name = "chksum-core"
-version = "0.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6db20071fdeca52ed6a7745519fb2d343fddcb93af81448373b851f072aaec5"
-dependencies = [
- "chksum-hash-core",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "chksum-core"
 version = "0.1.0"
@@ -104,16 +82,6 @@ version = "0.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "221456234d441c788a2c51a27b91c4380f499de560670a67d3303e621d37b3bd"
 
-[[package]]
-name = "chksum-hash-md5"
-version = "0.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80c33d01c33c9e193fe33e719a29a7eb900c08583375dd1d3269991aacbe434a"
-dependencies = [
- "chksum-hash-core",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "chksum-hash-md5"
 version = "0.0.1"
@@ -124,24 +92,14 @@ dependencies = [
  "thiserror 1.0.69",
 ]
 
-[[package]]
-name = "chksum-md5"
-version = "0.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95dda0f76fbb6069e042c370a928457086e1b4eabc7e75f5f49fe1b913634351"
-dependencies = [
- "chksum-core 0.0.0",
- "chksum-hash-md5 0.0.0",
-]
-
 [[package]]
 name = "chksum-md5"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dda0016624d188e791afdf491de89d0157411dafedb0a46dbcd3f1a13ef0a611"
 dependencies = [
- "chksum-core 0.1.0",
- "chksum-hash-md5 0.0.1",
+ "chksum-core",
+ "chksum-hash-md5",
 ]
 
 [[package]]
@@ -180,7 +138,7 @@ checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -200,7 +158,7 @@ checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -218,7 +176,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -238,19 +196,6 @@ dependencies = [
  "miniz_oxide",
 ]
 
-[[package]]
-name = "flexbuffers"
-version = "25.9.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e6701cb4a12d88a63f83ac41a11aa61286b5a678445a1a5ab9bc8e38654910a"
-dependencies = [
- "bitflags",
- "byteorder",
- "num_enum",
- "serde",
- "serde_derive",
-]
-
 [[package]]
 name = "getset"
 version = "0.1.6"
@@ -260,7 +205,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -359,33 +304,18 @@ dependencies = [
  "adler2",
 ]
 
-[[package]]
-name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "oxford_join"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a7dbde52538869ae3769b3e6ec91baabfccae5afe36d6ac210aeee19b1c5c91"
+
 [[package]]
 name = "pathdiff"
 version = "0.2.3"
@@ -398,16 +328,6 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
-[[package]]
-name = "proc-macro-crate"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
-dependencies = [
- "once_cell",
- "toml_edit",
-]
-
 [[package]]
 name = "proc-macro-error-attr2"
 version = "2.0.0"
@@ -427,7 +347,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -533,7 +453,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -561,9 +481,9 @@ dependencies = [
 [[package]]
 name = "shulkerbox"
 version = "0.1.0"
-source = "git+https://github.com/moritz-hoelting/shulkerbox?rev=e9f2b9b91d72322ec2e063ce7b83415071306468#e9f2b9b91d72322ec2e063ce7b83415071306468"
+source = "git+https://github.com/moritz-hoelting/shulkerbox?rev=e1bc953b7a1692c65f1ed2c43fa3b0c607df8090#e1bc953b7a1692c65f1ed2c43fa3b0c607df8090"
 dependencies = [
- "chksum-md5 0.0.0",
+ "chksum-md5",
  "getset",
  "serde",
  "serde_json",
@@ -573,18 +493,19 @@ dependencies = [
 [[package]]
 name = "shulkerscript"
 version = "0.1.0"
-source = "git+https://github.com/moritz-hoelting/shulkerscript-lang.git?rev=d988a10d9dee222d16ec2b30da202fb8a9a1f051#d988a10d9dee222d16ec2b30da202fb8a9a1f051"
+source = "git+https://github.com/moritz-hoelting/shulkerscript-lang.git?rev=0f6d9b301f1a8b28685e1cda1509a4943fed080a#0f6d9b301f1a8b28685e1cda1509a4943fed080a"
 dependencies = [
  "cfg-if",
- "chksum-md5 0.1.0",
+ "chksum-md5",
  "colored",
  "derive_more",
  "enum-as-inner",
- "flexbuffers",
  "getset",
  "itertools",
+ "oxford_join",
  "pathdiff",
  "serde",
+ "serde_json",
  "shulkerbox",
  "strsim",
  "strum",
@@ -631,18 +552,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
+ "syn",
 ]
 
 [[package]]
@@ -682,7 +592,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -693,7 +603,7 @@ checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -705,18 +615,12 @@ dependencies = [
  "indexmap",
  "serde_core",
  "serde_spanned",
- "toml_datetime 0.7.2",
+ "toml_datetime",
  "toml_parser",
  "toml_writer",
- "winnow 0.7.13",
+ "winnow",
 ]
 
-[[package]]
-name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-
 [[package]]
 name = "toml_datetime"
 version = "0.7.2"
@@ -726,24 +630,13 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.19.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
-dependencies = [
- "indexmap",
- "toml_datetime 0.6.11",
- "winnow 0.5.40",
-]
-
 [[package]]
 name = "toml_parser"
 version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4cf893c33be71572e0e9aa6dd15e6677937abd686b066eac3f8cd3531688a627"
 dependencies = [
- "winnow 0.7.13",
+ "winnow",
 ]
 
 [[package]]
@@ -771,7 +664,7 @@ checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
 ]
 
 [[package]]
@@ -812,7 +705,7 @@ dependencies = [
  "log",
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
  "wasm-bindgen-shared",
 ]
 
@@ -834,7 +727,7 @@ checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.106",
+ "syn",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -940,15 +833,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "winnow"
-version = "0.5.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "winnow"
 version = "0.7.13"
diff --git a/src/wasm/webcompiler/Cargo.toml b/src/wasm/webcompiler/Cargo.toml
index b8752d6..4e79755 100644
--- a/src/wasm/webcompiler/Cargo.toml
+++ b/src/wasm/webcompiler/Cargo.toml
@@ -25,7 +25,7 @@ lol_alloc = { version = "0.4.1", optional = true }
 serde = "1.0.219"
 serde-wasm-bindgen = "0.6.5"
 # shulkerscript = { version = "0.1.0", default-features = false, features = ["serde", "shulkerbox"] }
-shulkerscript = { git = "https://github.com/moritz-hoelting/shulkerscript-lang.git", default-features = false, features = ["serde", "shulkerbox"], rev = "d988a10d9dee222d16ec2b30da202fb8a9a1f051" }
+shulkerscript = { git = "https://github.com/moritz-hoelting/shulkerscript-lang.git", default-features = false, features = ["serde", "shulkerbox"], rev = "0f6d9b301f1a8b28685e1cda1509a4943fed080a" }
 toml = "0.9.5"
 wasm-bindgen = "0.2.100"
 zip = { version = "4.3.0", default-features = false, features = ["deflate"] }