diff --git a/package.json b/package.json
index 89e6e77..efc0ba4 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,8 @@
         "lint-staged": "^17.0.0",
         "prettier": "^3.8.1",
         "prettier-plugin-toml": "^2.0.6",
-        "rbxts-transform-boost": "^1.5.2",
+        "rbxts-transform-boost": "^2.0.1",
+        "rbxts-transform-luau": "^1.0.1",
         "rbxts-transformer-flamework": "^1.3.2",
         "rbxts-transformer-instances": "git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git",
         "rbxts-transformer-services": "^1.1.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 171e293..6c7f95e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -106,14 +106,14 @@ importers:
         specifier: ^2.0.6
         version: 2.0.6(prettier@3.8.4)
       rbxts-transform-boost:
-        specifier: ^1.5.2
-        version: 1.5.2
+        specifier: ^2.0.1
+        version: 2.0.1
+      rbxts-transform-luau:
+        specifier: ^1.0.1
+        version: 1.0.1
       rbxts-transformer-flamework:
         specifier: ^1.3.2
         version: 1.3.2(typescript@5.9.3)
-      rbxts-transformer-instances:
-        specifier: git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git
-        version: git+https://git.azur.webhop.me/Next-Station/rbxts-transformer-instances.git#aa08e75010f8893b6fd06f8782009b9c081772af
       rbxts-transformer-services:
         specifier: ^1.1.1
         version: 1.1.1(typescript@5.9.3)
@@ -1284,8 +1284,11 @@ packages:
     resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
     engines: {node: '>=6'}
 
-  rbxts-transform-boost@1.5.2:
-    resolution: {integrity: sha512-uMbBS+Aji17OFqOLCuV/pf7SOoe+SdHpQw8+4WKLTnOhjmbqX7ameqCfGOQfVeAcZpU6aqA6P/dirUWRLOLFdw==}
+  rbxts-transform-boost@2.0.1:
+    resolution: {integrity: sha512-jPpQDJOAvdG/tKdp06ZPJLQvyS6qrkrNsnL/AJRHTHykaImI/OzNJkLjcO/mKxndZ6guasWQQvbrgrP7PEiJrQ==}
+
+  rbxts-transform-luau@1.0.1:
+    resolution: {integrity: sha512-RlJAUVhQFIbm0jucZ2V4+hXGCNgUEkwMDo9q0zPDXpkYyvF9quYhLYI+M6gZSU4cqxE5qCKoZ50B6gykSHr1TA==}
 
   rbxts-transformer-flamework@1.3.2:
     resolution: {integrity: sha512-FKAT7+jAmoa2/MZNqZnjZfpSKypNO1+IzRGdHQAjGsKzH8J58Zcbb0fCA/Dydwb4LiPVVYlfgoItrxOCWRh3rg==}
@@ -2688,7 +2691,9 @@ snapshots:
 
   punycode@2.3.1: {}
 
-  rbxts-transform-boost@1.5.2: {}
+  rbxts-transform-boost@2.0.1: {}
+
+  rbxts-transform-luau@1.0.1: {}
 
   rbxts-transformer-flamework@1.3.2(typescript@5.9.3):
     dependencies:
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 8395552..b1fe7be 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -4,5 +4,3 @@ publicHoistPattern:
 allowBuilds:
     "@rotor-rbx/rotor": true
     rbxts-transformer-instances: true
-minimumReleaseAgeExclude:
-    - rbxts-transform-boost@1.5.2
diff --git a/src/client/controllers/settings.ts b/src/client/controllers/settings.ts
index 84ea661..bc9aeb3 100644
--- a/src/client/controllers/settings.ts
+++ b/src/client/controllers/settings.ts
@@ -82,7 +82,7 @@ export class SettingsController implements OnStart {
             typeIs(settingsFile[key], "table"),
         );
         sections.forEach((key) => {
-            const map = new Map<string, Charm.Atom<unknown>>();
+            const map = new Map<string, Atom<unknown>>();
             const defMap = new Map<string, SettingDefinition>();
             this.atomsCache.set(key, map);
             this.defCache.set(key, defMap);
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 4cb81bf..89c3a3d 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -37,10 +37,14 @@
             },
             {
                 "transform": "rbxts-transform-boost",
-                "optimize": true,
-                "strict": true,
                 "hoist": true
             },
+            {
+                "transform": "rbxts-transform-luau",
+                "strict": true,
+                "optimize": 2,
+                "annotate": true
+            },
             {
                 "transform": "tsc-progress",
                 "title": "Building...",