diff --git a/package.json b/package.json
index 802878254..0db831705 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "build:assets": "bun --filter=@blitzkit/scripts run build:assets",
     "build:averages": "bun --filter=@blitzkit/scripts run build:averages",
     "build:bot": "rm -rf dist/bot && mkdir -p dist/bot/prisma && bun build src/index.ts src/workers/bot.ts src/workers/render.ts --outdir dist/bot --target=bun --splitting --sourcemap=inline --external sharp && cp -R src/lang dist/bot/lang && prisma generate && cp prisma/schema.prisma dist/bot/prisma/schema.prisma && cp -R node_modules/prisma/*.node dist/bot/prisma && cd dist/bot && bun init -y && bun add sharp",
-    "build:website": "prisma generate && bun --filter=@blitzkit/website run build",
+    "build:website": "prisma generate && bun build:protos && bun --filter=@blitzkit/website run build",
     "build:sitemap": "bun scripts/sitemap.ts",
     "build:docs": "vitepress build docs",
     "build:ratingleaderboard": "bun --script scripts/buildRatingLeaderboard.ts",
diff --git a/packages/website/src/components/ClassIcon/index.ts b/packages/website/src/components/ClassIcon/index.ts
index 71cc58c3f..018ee4cde 100644
--- a/packages/website/src/components/ClassIcon/index.ts
+++ b/packages/website/src/components/ClassIcon/index.ts
@@ -1,6 +1,5 @@
 import { TankClass } from '@blitzkit/core';
 import type { ComponentProps, ReactNode } from 'react';
-import { StupidCat } from '../StupidCat';
 import { ClassHeavy } from './components/ClassHeavy';
 import { ClassLight } from './components/ClassLight';
 import { ClassMedium } from './components/ClassMedium';
@@ -14,5 +13,4 @@ export const classIcons: Record<
   [TankClass.HEAVY]: ClassHeavy,
   [TankClass.LIGHT]: ClassLight,
   [TankClass.MEDIUM]: ClassMedium,
-  [TankClass.UNRECOGNIZED]: StupidCat,
 };
diff --git a/packages/website/src/components/TankSearch/components/TankCard.tsx b/packages/website/src/components/TankSearch/components/TankCard.tsx
index c9514f59b..73e753569 100644
--- a/packages/website/src/components/TankSearch/components/TankCard.tsx
+++ b/packages/website/src/components/TankSearch/components/TankCard.tsx
@@ -122,18 +122,19 @@ export function TankCard({ tank, onSelect }: TankCardProps) {
           ),
         );
 
-        return (dimensions[0] * dimensions[1] * dimensions[2]).toFixed(0);
+        return (dimensions.x * dimensions.y * dimensions.z).toFixed(0);
       }
 
-      case 'survivability.length':
-        return Math.max(
-          ...normalizeBoundingBox(
-            unionBoundingBox(
-              tankModelDefinition.boundingBox,
-              turretModelDefinition.boundingBox,
-            ),
+      case 'survivability.length': {
+        const bounds = normalizeBoundingBox(
+          unionBoundingBox(
+            tankModelDefinition.boundingBox,
+            turretModelDefinition.boundingBox,
           ),
-        ).toFixed(0);
+        );
+
+        return Math.max(bounds.x, bounds.y, bounds.z).toFixed(0);
+      }
     }
   }, [tankopediaSort.by]);
 
diff --git a/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx b/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx
index cce2c8ca6..54ba9407f 100644
--- a/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx
+++ b/packages/website/src/components/Tankopedia/TechTreeSection/components/Node.tsx
@@ -22,11 +22,15 @@ export function Node({ id, highlight, nextIds }: NodeProps) {
   const tank = tankDefinitions.tanks[id];
   const nextTanks = nextIds?.map((id) => tankDefinitions.tanks[id]);
   const thisTankXp =
-    tank.xp === undefined || tank.tier === 1 ? 0 : tank.xp! / xpMultiplier;
+    tank.researchCost === undefined || tank.tier === 1
+      ? 0
+      : (tank.researchCost.researchCostType!.value as number)! / xpMultiplier;
   const nextTanksXp = nextTanks?.reduce(
     (xp, tank) =>
       xp +
-      (tank.xp === undefined || tank.tier === 1 ? 0 : tank.xp! / xpMultiplier),
+      (tank.researchCost === undefined || tank.tier === 1
+        ? 0
+        : (tank.researchCost.researchCostType!.value as number) / xpMultiplier),
     0,
   );
   const averages = averageDefinitions.averages[tank.id]?.mu;
diff --git a/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx b/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx
index 377e1711c..57397327a 100644
--- a/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx
+++ b/packages/website/src/components/Tankopedia/TechTreeSection/index.tsx
@@ -53,10 +53,11 @@ export function TechTreeSection() {
   const totalXp = line.reduce(
     (xp, id) =>
       xp +
-      (tankDefinitions.tanks[id].xp === undefined ||
+      (tankDefinitions.tanks[id].researchCost === undefined ||
       tankDefinitions.tanks[id].tier === 1
         ? 0
-        : tankDefinitions.tanks[id].xp),
+        : (tankDefinitions.tanks[id].researchCost.researchCostType!
+            .value as number)),
     0,
   );
   const totalCredits = line.reduce(