diff --git a/packages/bot/src/core/blitzkit/jsxToSvg/index.ts b/packages/bot/src/core/blitzkit/jsxToSvg/index.ts
index cc36c95a9..43b08734c 100644
--- a/packages/bot/src/core/blitzkit/jsxToSvg/index.ts
+++ b/packages/bot/src/core/blitzkit/jsxToSvg/index.ts
@@ -10,7 +10,7 @@ const fontsPromise = [
   { file: robotoBold, weight: 700 as const },
   { file: robotoBlack, weight: 900 as const },
 ].map(async ({ file, weight }) => {
-  const data = await readFile(`dist/bot/workers/${file}`);
+  const data = await readFile(file);
   return { name: 'Roboto', weight, data };
 });
 
diff --git a/packages/bot/src/core/blitzkit/svgToPngThreaded.ts b/packages/bot/src/core/blitzkit/svgToPngThreaded.ts
index 344fb4627..c29b40eda 100644
--- a/packages/bot/src/core/blitzkit/svgToPngThreaded.ts
+++ b/packages/bot/src/core/blitzkit/svgToPngThreaded.ts
@@ -3,7 +3,7 @@ import { Worker } from 'worker_threads';
 const RENDER_WORKERS = 1;
 
 const workers = [...Array(RENDER_WORKERS)].map(() => {
-  const worker = new Worker('dist/bot/workers/render.js');
+  const worker = new Worker('src/workers/render.ts');
   console.log(`🟡 Launching render worker ${worker.threadId}`);
   return worker;
 });
diff --git a/packages/bot/src/core/discord/addFilterOptions.ts b/packages/bot/src/core/discord/addFilterOptions.ts
index ac820d138..1daabbaa3 100644
--- a/packages/bot/src/core/discord/addFilterOptions.ts
+++ b/packages/bot/src/core/discord/addFilterOptions.ts
@@ -1,4 +1,8 @@
-import { TANK_CLASSES, TREE_TYPES } from '@blitzkit/core';
+import {
+  TANK_CLASSES,
+  TANK_TYPE_COMMAND_NAMES,
+  TANK_TYPES,
+} from '@blitzkit/core';
 import {
   APIApplicationCommandOptionChoice,
   Locale,
@@ -87,10 +91,10 @@ export function addFilterOptions<
             ),
           )
           .addChoices(
-            ...TREE_TYPES.map(
+            ...TANK_TYPES.map(
               (treeType) =>
                 ({
-                  value: treeType,
+                  value: TANK_TYPE_COMMAND_NAMES[treeType],
                   name: translate(`common.tree_type.${treeType}`),
                   name_localizations: localizationObject(
                     `common.tree_type.${treeType}`,
diff --git a/packages/bot/src/core/discord/manager.ts b/packages/bot/src/core/discord/manager.ts
index 280d1d67d..0dd8cbc50 100644
--- a/packages/bot/src/core/discord/manager.ts
+++ b/packages/bot/src/core/discord/manager.ts
@@ -1,6 +1,6 @@
 import { assertSecret } from '@blitzkit/core';
 import { ShardingManager } from 'discord.js';
 
-export const manager = new ShardingManager('dist/bot/workers/bot.js', {
+export const manager = new ShardingManager('src/workers/bot.ts', {
   token: assertSecret(process.env.DISCORD_TOKEN),
 });
diff --git a/packages/bot/src/core/localization/strings/index.ts b/packages/bot/src/core/localization/strings/index.ts
index b2c679268..a2171acad 100644
--- a/packages/bot/src/core/localization/strings/index.ts
+++ b/packages/bot/src/core/localization/strings/index.ts
@@ -13,7 +13,7 @@ export const translations = SUPPORTED_LOCALES.reduce<
 >(
   (table, locale) => ({
     ...table,
-    [locale]: require(`../lang/${locale}.json`),
+    [locale]: require(`@blitzkit/core/lang/${locale}.json`),
   }),
   {},
 );
diff --git a/packages/bot/src/events/interactionCreate/index.ts b/packages/bot/src/events/interactionCreate/index.ts
index 6b8d84021..7325b6d64 100644
--- a/packages/bot/src/events/interactionCreate/index.ts
+++ b/packages/bot/src/events/interactionCreate/index.ts
@@ -25,8 +25,6 @@ import { ownedTanksCommand } from '../../commands/ownedTanks';
 import { permissionsCommand } from '../../commands/permissions';
 import { pingCommand } from '../../commands/ping';
 import { playerInfoCommand } from '../../commands/playerInfo';
-import { ratingCommand } from '../../commands/rating';
-import { ratingLeaderboardCommand } from '../../commands/ratingLeaderboard';
 import { replayCommand } from '../../commands/replay';
 import { researchCommand } from '../../commands/research';
 import { searchClansCommand } from '../../commands/searchClans';
@@ -90,10 +88,10 @@ export const COMMANDS_RAW: Promise<CommandRegistry>[] = [
   pingCommand,
   evolutionCommand,
   statsCommand,
-  ratingLeaderboardCommand,
+  // ratingLeaderboardCommand,
   todayCommand,
   researchCommand,
-  ratingCommand,
+  // ratingCommand,
   replayCommand,
 ];
 
diff --git a/packages/core/src/blitz/constants.ts b/packages/core/src/blitz/constants.ts
index f2ae72204..3c36edc1d 100644
--- a/packages/core/src/blitz/constants.ts
+++ b/packages/core/src/blitz/constants.ts
@@ -1,14 +1,24 @@
-import { TankClass } from '../protos';
+import { TankClass, TankType } from '../protos';
 import { BlitzStats } from '../statistics';
 
-export const TREE_TYPES = ['researchable', 'premium', 'collector'] as const;
+export const TANK_TYPES = [
+  TankType.RESEARCHABLE,
+  TankType.PREMIUM,
+  TankType.COLLECTOR,
+];
+
+export const TANK_TYPE_COMMAND_NAMES = {
+  [TankType.RESEARCHABLE]: 'researchable',
+  [TankType.PREMIUM]: 'premium',
+  [TankType.COLLECTOR]: 'collector',
+};
 
 export const TANK_CLASSES = [
   TankClass.LIGHT,
   TankClass.MEDIUM,
   TankClass.HEAVY,
   TankClass.TANK_DESTROYER,
-] as const;
+];
 
 export const emptyAllStats: BlitzStats = {
   battles: 0,