diff --git a/src/client/graphics/webgpu/core/ShaderLoader.ts b/src/client/graphics/webgpu/core/ShaderLoader.ts
index 19ad380ec..e5e81d400 100644
--- a/src/client/graphics/webgpu/core/ShaderLoader.ts
+++ b/src/client/graphics/webgpu/core/ShaderLoader.ts
@@ -4,7 +4,8 @@
  */
 
 const shaderSources = import.meta.glob("../shaders/**/*.wgsl", {
-  as: "raw",
+  query: "?raw",
+  import: "default",
   eager: true,
 }) as Record<string, string>;
 
diff --git a/src/core/game/UserSettings.ts b/src/core/game/UserSettings.ts
index add4a66c4..180dc67db 100644
--- a/src/core/game/UserSettings.ts
+++ b/src/core/game/UserSettings.ts
@@ -110,7 +110,15 @@ export class UserSettings {
     this.setCached(key, value);
   }
 
-  private getFloat(key: string, defaultValue: number): number {
+  get(key: string, defaultValue: boolean): boolean {
+    return this.getBool(key, defaultValue);
+  }
+
+  set(key: string, value: boolean): void {
+    this.setBool(key, value);
+  }
+
+  getFloat(key: string, defaultValue: number): number {
     const value = this.getCached(key);
     if (!value) return defaultValue;
 
@@ -119,7 +127,7 @@ export class UserSettings {
     return floatValue;
   }
 
-  private setFloat(key: string, value: number) {
+  setFloat(key: string, value: number) {
     this.setCached(key, value.toString());
   }
 
@@ -185,6 +193,10 @@ export class UserSettings {
     return this.getBool("settings.attackingTroopsOverlay", true);
   }
 
+  territoryBorderMode(): number {
+    return this.getInt("settings.territoryBorderMode", 1);
+  }
+
   toggleAttackingTroopsOverlay() {
     this.setBool(
       "settings.attackingTroopsOverlay",