diff --git a/packages/website/src/components/Compare/Body.tsx b/packages/website/src/components/Compare/Body.tsx
index d6bdc5193..a3e559ce4 100644
--- a/packages/website/src/components/Compare/Body.tsx
+++ b/packages/website/src/components/Compare/Body.tsx
@@ -1,4 +1,3 @@
-import { asset } from "@blitzkit/core";
 import { Flex, Heading, IconButton, Table } from "@radix-ui/themes";
 import type { TankCharacteristics } from "../../core/blitzkit/tankCharacteristics";
 import { useLocale } from "../../hooks/useLocale";
@@ -58,7 +57,7 @@ export function Body({ stats }: BodyProps) {
                         alt={unwrap(thisShell.name!)}
                         width={16}
                         height={16}
-                        src={asset(`icons/shells/${thisShell.icon}.webp`)}
+                        src={`/api/icons/shells/${thisShell.icon}.webp`}
                       />
                     </IconButton>
                   ))}
diff --git a/packages/website/src/components/Compare/CompareTable.tsx b/packages/website/src/components/Compare/CompareTable.tsx
index d3ca23c23..87123a411 100644
--- a/packages/website/src/components/Compare/CompareTable.tsx
+++ b/packages/website/src/components/Compare/CompareTable.tsx
@@ -1,4 +1,4 @@
-import { asset, availableProvisions, permanentSkills } from "@blitzkit/core";
+import { availableProvisions, permanentSkills } from "@blitzkit/core";
 import { checkConsumableProvisionInclusivity } from "@blitzkit/core/src/blitzkit/checkConsumableProvisionInclusivity";
 import { ComponentPlaceholderIcon } from "@radix-ui/react-icons";
 import {
@@ -11,10 +11,7 @@ import {
   Text,
 } from "@radix-ui/themes";
 import { times } from "lodash-es";
-import { awaitableConsumableDefinitions } from "../../core/awaitables/consumableDefinitions";
-import { awaitableEquipmentDefinitions } from "../../core/awaitables/equipmentDefinitions";
-import { awaitableProvisionDefinitions } from "../../core/awaitables/provisionDefinitions";
-import { awaitableSkillDefinitions } from "../../core/awaitables/skillDefinitions";
+import { api } from "../../core/blitzkit/api";
 import type { TankCharacteristics } from "../../core/blitzkit/tankCharacteristics";
 import { Var } from "../../core/radix/var";
 import { useLocale } from "../../hooks/useLocale";
@@ -42,10 +39,10 @@ const [
   consumableDefinitions,
   provisionDefinitions,
 ] = await Promise.all([
-  awaitableSkillDefinitions,
-  awaitableEquipmentDefinitions,
-  awaitableConsumableDefinitions,
-  awaitableProvisionDefinitions,
+  api.skillDefinitions(),
+  api.equipmentDefinitions(),
+  api.consumableDefinitions(),
+  api.provisionDefinitions(),
 ]);
 
 export function CompareTable({ stats }: CompareTableProps) {
@@ -234,7 +231,7 @@ export function CompareTable({ stats }: CompareTableProps) {
                                 alt={module}
                                 width={24}
                                 height={24}
-                                src={asset(`icons/modules/${module}.webp`)}
+                                src={`/api/icons/modules/${module}.webp`}
                                 style={{
                                   marginLeft: index > 0 ? -8 : 0,
                                   objectFit: "contain",
@@ -323,9 +320,7 @@ export function CompareTable({ stats }: CompareTableProps) {
                                       .name!,
                                   )}
                                   key={provision}
-                                  src={asset(
-                                    `/icons/provisions/${provision}.webp`,
-                                  )}
+                                  src={`/api//icons/provisions/${provision}.webp`}
                                   style={{
                                     left: "50%",
                                     /**
@@ -530,9 +525,7 @@ export function CompareTable({ stats }: CompareTableProps) {
                                     ].name!,
                                   )}
                                   key={consumable}
-                                  src={asset(
-                                    `/icons/consumables/${consumable}.webp`,
-                                  )}
+                                  src={`/api/icons/consumables/${consumable}.webp`}
                                   style={{
                                     left: "50%",
                                     /**
@@ -624,7 +617,7 @@ export function CompareTable({ stats }: CompareTableProps) {
                         variant={camouflage ? "solid" : "outline"}
                       >
                         <img
-                          src={asset("icons/camo.webp")}
+                          src={`/api/icons/camo.webp`}
                           style={{
                             width: "1em",
                             height: "1em",
diff --git a/packages/website/src/components/Compare/Controls.tsx b/packages/website/src/components/Compare/Controls.tsx
index ee86c027f..1bb45c6cb 100644
--- a/packages/website/src/components/Compare/Controls.tsx
+++ b/packages/website/src/components/Compare/Controls.tsx
@@ -1,6 +1,6 @@
 import { PlusIcon, TrashIcon } from "@radix-ui/react-icons";
 import { Button, Dialog, Flex, SegmentedControl } from "@radix-ui/themes";
-import { awaitableProvisionDefinitions } from "../../core/awaitables/provisionDefinitions";
+import { api } from "../../core/blitzkit/api";
 import { tankToCompareMember } from "../../core/blitzkit/tankToCompareMember";
 import { useLocale } from "../../hooks/useLocale";
 import { CompareEphemeral } from "../../stores/compareEphemeral";
@@ -15,7 +15,7 @@ interface ControlsProps {
   onAddTankDialogOpenChange: (open: boolean) => void;
 }
 
-const provisionDefinitions = await awaitableProvisionDefinitions;
+const provisionDefinitions = await api.provisionDefinitions();
 
 export function Controls({
   addTankDialogOpen,
@@ -56,7 +56,7 @@ export function Controls({
                 onSelect={(tank) => {
                   CompareEphemeral.mutate((draft) => {
                     draft.members.push(
-                      tankToCompareMember(tank, provisionDefinitions)
+                      tankToCompareMember(tank, provisionDefinitions),
                     );
                     draft.sorting = undefined;
                   });
@@ -67,7 +67,7 @@ export function Controls({
                     draft.members.push(
                       ...tanks.map((tank) => {
                         return tankToCompareMember(tank, provisionDefinitions);
-                      })
+                      }),
                     );
                     draft.sorting = undefined;
                   });
diff --git a/packages/website/src/components/Compare/TankControl.tsx b/packages/website/src/components/Compare/TankControl.tsx
index a9ebe9a4a..28ab0e129 100644
--- a/packages/website/src/components/Compare/TankControl.tsx
+++ b/packages/website/src/components/Compare/TankControl.tsx
@@ -1,7 +1,7 @@
 import { ExternalLinkIcon, LoopIcon, TrashIcon } from "@radix-ui/react-icons";
 import { Dialog, Flex, IconButton } from "@radix-ui/themes";
 import { useState } from "react";
-import { awaitableProvisionDefinitions } from "../../core/awaitables/provisionDefinitions";
+import { api } from "../../core/blitzkit/api";
 import { tankToCompareMember } from "../../core/blitzkit/tankToCompareMember";
 import { useLocale } from "../../hooks/useLocale";
 import { CompareEphemeral } from "../../stores/compareEphemeral";
@@ -13,7 +13,7 @@ interface TankControlProps {
   slug: string;
 }
 
-const provisionDefinitions = await awaitableProvisionDefinitions;
+const provisionDefinitions = await api.provisionDefinitions();
 
 export function TankControl({ index, slug }: TankControlProps) {
   const { locale, strings } = useLocale();
@@ -61,7 +61,7 @@ export function TankControl({ index, slug }: TankControlProps) {
                   CompareEphemeral.mutate((draft) => {
                     draft.members[index] = tankToCompareMember(
                       tank,
-                      provisionDefinitions
+                      provisionDefinitions,
                     );
                     draft.sorting = undefined;
                   });
diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx
index b658aa085..25a8649fa 100644
--- a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx
+++ b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/_index.tsx
@@ -1,23 +1,19 @@
 import { createDefaultSkills } from "@blitzkit/core";
 import { Flex, Heading, Text } from "@radix-ui/themes";
 import { useEffect, useMemo, useState } from "react";
-import { CompareTable } from "../../../components/Compare/CompareTable";
-import { Controls } from "../../../components/Compare/Controls";
-import { DamageWarning } from "../../../components/DamageWarning";
-import { PageWrapper } from "../../../components/PageWrapper";
-import { awaitableEquipmentDefinitions } from "../../../core/awaitables/equipmentDefinitions";
-import { awaitableModelDefinitions } from "../../../core/awaitables/modelDefinitions";
-import { awaitableProvisionDefinitions } from "../../../core/awaitables/provisionDefinitions";
-import { awaitableSkillDefinitions } from "../../../core/awaitables/skillDefinitions";
-import { awaitableTankDefinitions } from "../../../core/awaitables/tankDefinitions";
-import { tankCharacteristics } from "../../../core/blitzkit/tankCharacteristics";
-import { tankToCompareMember } from "../../../core/blitzkit/tankToCompareMember";
+import { CompareTable } from "../../../../components/Compare/CompareTable";
+import { Controls } from "../../../../components/Compare/Controls";
+import { DamageWarning } from "../../../../components/DamageWarning";
+import { PageWrapper } from "../../../../components/PageWrapper";
+import { api } from "../../../../core/blitzkit/api";
+import { tankCharacteristics } from "../../../../core/blitzkit/tankCharacteristics";
+import { tankToCompareMember } from "../../../../core/blitzkit/tankToCompareMember";
 import {
   type LocaleAcceptorProps,
   LocaleProvider,
   useLocale,
-} from "../../../hooks/useLocale";
-import { CompareEphemeral } from "../../../stores/compareEphemeral";
+} from "../../../../hooks/useLocale";
+import { CompareEphemeral } from "../../../../stores/compareEphemeral";
 
 const [
   modelDefinitions,
@@ -26,11 +22,11 @@ const [
   skillDefinitions,
   tankDefinitions,
 ] = await Promise.all([
-  awaitableModelDefinitions,
-  awaitableEquipmentDefinitions,
-  awaitableProvisionDefinitions,
-  awaitableSkillDefinitions,
-  awaitableTankDefinitions,
+  api.modelDefinitions(),
+  api.equipmentDefinitions(),
+  api.provisionDefinitions(),
+  api.skillDefinitions(),
+  api.tankDefinitions(),
 ]);
 
 export function Page({ locale }: LocaleAcceptorProps) {
diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/index.astro
index fe6f043cb..b61354c93 100644
--- a/packages/website/src/pages/[...chunk_default]/[...locale]/compare/index.astro
+++ b/packages/website/src/pages/[...chunk_default]/[...locale]/compare/index.astro
@@ -1,7 +1,7 @@
 ---
-import ToolOpenGraph from "../../../components/ToolOpenGraph.astro";
-import { tools } from "../../../constants/tools";
-import BaseLayout from "../../../layouts/BaseLayout.astro";
+import ToolOpenGraph from "../../../../components/ToolOpenGraph.astro";
+import { tools } from "../../../../constants/tools";
+import BaseLayout from "../../../../layouts/BaseLayout.astro";
 import { Page } from "./_index";
 
 export { getStaticPaths } from "../index.astro";