diff --git a/.github/workflows/tauri-release.yml b/.github/workflows/tauri-release.yml
index 4b114894a..a0e822527 100644
--- a/.github/workflows/tauri-release.yml
+++ b/.github/workflows/tauri-release.yml
@@ -1,4 +1,4 @@
-name: "publish"
+name: Tauri Publish
 
 # This will trigger the action on each push to the `release` branch.
 on:
diff --git a/.github/workflows/tauri.yaml b/.github/workflows/tauri.yaml
index 11dc78c21..67b25df1f 100644
--- a/.github/workflows/tauri.yaml
+++ b/.github/workflows/tauri.yaml
@@ -3,7 +3,16 @@ on: [push]
 
 jobs:
   build-tauri:
-    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [
+            macos-13,
+            macos-14,
+            ubuntu-22.04,
+          ]
+
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/Cargo.lock b/Cargo.lock
index ff407810f..0cdb2bf2a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6729,7 +6729,7 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 [[package]]
 name = "typeshare"
 version = "1.0.1"
-source = "git+https://github.com/1password/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c"
+source = "git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c"
 dependencies = [
  "chrono",
  "serde",
@@ -6740,7 +6740,7 @@ dependencies = [
 [[package]]
 name = "typeshare-annotation"
 version = "1.0.2"
-source = "git+https://github.com/1password/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c"
+source = "git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c"
 dependencies = [
  "quote",
  "syn 1.0.109",
diff --git a/Cargo.toml b/Cargo.toml
index f46fca54d..af0c51717 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,7 +32,7 @@ comfy-table = "7.1.0"
 cynic-codegen = { version = "3.4.0", features = ["rkyv"] }
 cynic = "3.4.0"
 chrono = "0.4.31"
-typeshare = { git = "https://github.com/1password/typeshare", rev = "556b44aafd5304eedf17206800f69834e3820b7c" }
+typeshare = { git = "https://github.com/tomjw64/typeshare", rev = "556b44aafd5304eedf17206800f69834e3820b7c" }
 thiserror = "1.0.56"
 strict-yaml-rust = "0.1.2"
 dotrain = "6.0.1-alpha.11"
diff --git a/flake.nix b/flake.nix
index 0710aa052..fb105c4a0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -24,8 +24,8 @@
               mkdir -p tauri-app/src/lib/typeshare
               
               mkdir /tmp/cargo
-              export CARGO_HOME=/tmp/cargo/         
-              cargo install --git https://github.com/1Password/typeshare --rev 556b44aafd5304eedf17206800f69834e3820b7c
+              export CARGO_HOME=$(mktemp -d)
+              cargo install --git https://github.com/tomjw64/typeshare --rev 556b44aafd5304eedf17206800f69834e3820b7c
               export PATH=$PATH:$CARGO_HOME/bin
 
               typeshare crates/subgraph/src/types/vault_balance_changes_list.rs  crates/subgraph/src/types/vault_balance_change.rs --lang=typescript --output-file=tauri-app/src/lib/typeshare/vaultBalanceChangesList.ts;
diff --git a/lib/rain.interpreter b/lib/rain.interpreter
index e1a476f20..a9ed18e39 160000
--- a/lib/rain.interpreter
+++ b/lib/rain.interpreter
@@ -1 +1 @@
-Subproject commit e1a476f20e7cca70d99992855b2fd87e91c011d3
+Subproject commit a9ed18e39c121b2cf39a6982db1acdd688a2545a
diff --git a/tauri-app/src-tauri/Cargo.lock b/tauri-app/src-tauri/Cargo.lock
index c9cc4c2b5..6d30c5fdc 100644
--- a/tauri-app/src-tauri/Cargo.lock
+++ b/tauri-app/src-tauri/Cargo.lock
@@ -6455,7 +6455,7 @@ dependencies = [
  "serde_yaml",
  "strict-yaml-rust",
  "thiserror",
- "typeshare 1.0.1 (git+https://github.com/1password/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c)",
+ "typeshare 1.0.1 (git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c)",
  "url",
 ]
 
@@ -6501,7 +6501,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tracing",
- "typeshare 1.0.1 (git+https://github.com/1password/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c)",
+ "typeshare 1.0.1 (git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c)",
  "url",
 ]
 
@@ -6517,7 +6517,7 @@ dependencies = [
  "reqwest",
  "serde",
  "thiserror",
- "typeshare 1.0.1 (git+https://github.com/1password/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c)",
+ "typeshare 1.0.1 (git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c)",
 ]
 
 [[package]]
@@ -9234,12 +9234,12 @@ dependencies = [
 [[package]]
 name = "typeshare"
 version = "1.0.1"
-source = "git+https://github.com/1password/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c"
+source = "git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c"
 dependencies = [
  "chrono",
  "serde",
  "serde_json",
- "typeshare-annotation 1.0.2 (git+https://github.com/1password/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c)",
+ "typeshare-annotation 1.0.2 (git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c)",
 ]
 
 [[package]]
@@ -9255,7 +9255,7 @@ dependencies = [
 [[package]]
 name = "typeshare-annotation"
 version = "1.0.2"
-source = "git+https://github.com/1password/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c"
+source = "git+https://github.com/tomjw64/typeshare?rev=556b44aafd5304eedf17206800f69834e3820b7c#556b44aafd5304eedf17206800f69834e3820b7c"
 dependencies = [
  "quote",
  "syn 1.0.109",