diff --git a/deno.jsonc b/deno.jsonc
index 6e172a42..eb2e6d0e 100644
--- a/deno.jsonc
+++ b/deno.jsonc
@@ -77,7 +77,7 @@
   },
   "exports": {
     // .js
-    "./common/facets/foundation.js": "./src/common/facets/foundation.js",
+    "./common/foundation.js": "./src/common/foundation.js",
     "./common/facets/utils.js": "./src/common/facets/utils.js",
     "./common/element.js": "./src/common/element.js",
     "./common/signal.js": "./src/common/signal.js",
diff --git a/src/build.vto b/src/build.vto
index 39fc2c00..3a3fecd7 100644
--- a/src/build.vto
+++ b/src/build.vto
@@ -65,7 +65,7 @@ examples:
     <div class="code-block">
       <code>
         {{- echo -}}
-          import foundation from "common/facets/foundation.js"
+          import foundation from "common/foundation.js"
         {{ /echo }}
 {{ echo -}}await foundation.configurator.scrobbles(){{- /echo }}
 
diff --git a/src/common/facets/utils.js b/src/common/facets/utils.js
index d5fc1541..ae946f38 100644
--- a/src/common/facets/utils.js
+++ b/src/common/facets/utils.js
@@ -1,5 +1,3 @@
-// import { fragments, serializeFragments } from "@fcrozatier/htmlcrunch";
-
 import * as TID from "@atcute/tid";
 
 import { loadURI } from "../loader.js";
@@ -39,47 +37,3 @@ export async function facetFromURI(
 
   return facet;
 }
-
-// /**
-//  * @param {string} html
-//  */
-// export async function inlineModuleScripts(html) {
-//   const docPromises = fragments.parseOrThrow(html).map(async (frag) => {
-//     if ("tagName" in frag && frag.tagName === "script") {
-//       const isModScript = frag.attributes.find((a) =>
-//         a[0] === "type"
-//       )?.[1] === "module";
-//       if (!isModScript) return frag;
-//
-//       const src = frag.attributes.find((a) => a[0] === "src")?.[1];
-//       if (!src) return frag;
-//
-//       const scriptContents = await fetch(src).then((r) => r.text()).catch(() =>
-//         null
-//       );
-//
-//       if (!scriptContents) return frag;
-//
-//       /**
-//        * @type {import("@fcrozatier/htmlcrunch").MTextNode}
-//        */
-//       const child = {
-//         kind: "TEXT",
-//         text: "\n" + scriptContents.split("\n").map((l) =>
-//           `  ${l}`
-//         ).join("\n") + "\n",
-//       };
-//
-//       return {
-//         ...frag,
-//         attributes: frag.attributes.filter((a) => a[0] !== "src"),
-//         children: [child],
-//       };
-//     }
-//
-//     return frag;
-//   });
-//
-//   const doc = await Promise.all(docPromises);
-//   return serializeFragments(doc);
-// }
diff --git a/src/common/facets/foundation.js b/src/common/foundation.js
similarity index 100%
rename from src/common/facets/foundation.js
rename to src/common/foundation.js
diff --git a/src/common/pages/build.js b/src/common/pages/build.js
index b1005d4a..73d0497f 100644
--- a/src/common/pages/build.js
+++ b/src/common/pages/build.js
@@ -39,7 +39,7 @@ export function renderEditor() {
 </style>
 
 <script type="module">
-  import foundation from "~/common/facets/foundation.js";
+  import foundation from "~/common/foundation.js";
 </script>
     `.trim(),
     extensions: [
diff --git a/src/common/pages/guide.js b/src/common/pages/guide.js
index b7d4c5a3..5d41e4da 100644
--- a/src/common/pages/guide.js
+++ b/src/common/pages/guide.js
@@ -14,7 +14,7 @@ async function addSampleContent() {
     Loading dependencies
   </span>`;
 
-  const { default: foundation } = await import("~/common/facets/foundation.js");
+  const { default: foundation } = await import("~/common/foundation.js");
   const Output = await import("~/common/output.js");
 
   const output = await foundation.orchestrator.output();
diff --git a/src/common/pages/output.js b/src/common/pages/output.js
index f9ce22c6..d4761fb5 100644
--- a/src/common/pages/output.js
+++ b/src/common/pages/output.js
@@ -1,6 +1,6 @@
 import { effect } from "~/common/signal.js";
 import { insertPreludes } from "~/common/facets/prelude.js";
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 
 const elements = document.createElement("div");
 elements.id = "elements-container";
diff --git a/src/common/themes/utils.js b/src/common/themes/utils.js
deleted file mode 100644
index d76d00b8..00000000
--- a/src/common/themes/utils.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as TID from "@atcute/tid";
-
-import { loadURI } from "../loader.js";
-import * as CID from "../cid.js";
-
-/**
- * @import {Theme} from "~/definitions/types.d.ts"
- */
-
-/**
- * @param {{ name: string; uri: string }} _args
- * @param {{ fetchHTML: boolean }} options
- */
-export async function themeFromURI({ name, uri }, { fetchHTML }) {
-  const html = fetchHTML ? await loadURI(uri) : undefined;
-  const cid = html
-    ? await CID.create(0x55, new TextEncoder().encode(html))
-    : undefined;
-  const timestamp = new Date().toISOString();
-
-  /** @type {Theme} */
-  const theme = {
-    $type: "sh.diffuse.output.theme",
-    createdAt: timestamp,
-    id: TID.now(),
-    cid,
-    html,
-    name,
-    updatedAt: timestamp,
-    uri,
-  };
-
-  return theme;
-}
diff --git a/src/facets/data/export-import/index.inline.js b/src/facets/data/export-import/index.inline.js
index 8e29c6fb..b7e506a7 100644
--- a/src/facets/data/export-import/index.inline.js
+++ b/src/facets/data/export-import/index.inline.js
@@ -1,5 +1,5 @@
 import * as Output from "~/common/output.js";
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import { effect } from "~/common/signal.js";
 
 // Setup
diff --git a/src/facets/data/output-bundle/index.inline.js b/src/facets/data/output-bundle/index.inline.js
index 252b5704..edb795db 100644
--- a/src/facets/data/output-bundle/index.inline.js
+++ b/src/facets/data/output-bundle/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import { effect } from "~/common/signal.js";
 
 import { NAME as ATPROTO_OUTPUT_NAME } from "~/components/output/raw/atproto/element.js";
diff --git a/src/facets/data/process-tracks/index.inline.js b/src/facets/data/process-tracks/index.inline.js
index fd3ecfab..fb3ce22b 100644
--- a/src/facets/data/process-tracks/index.inline.js
+++ b/src/facets/data/process-tracks/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 
 foundation.orchestrator.processTracks({
   disableWhenReady: false,
diff --git a/src/facets/data/v3-import/index.inline.js b/src/facets/data/v3-import/index.inline.js
index dca58931..dc5542d3 100644
--- a/src/facets/data/v3-import/index.inline.js
+++ b/src/facets/data/v3-import/index.inline.js
@@ -1,5 +1,5 @@
 import * as TID from "@atcute/tid";
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 
 /**
  * @import {PlaylistItem, Track} from "~/definitions/types.d.ts"
diff --git a/src/facets/examples/generate-playlist/index.inline.js b/src/facets/examples/generate-playlist/index.inline.js
index be149c8c..f027865e 100644
--- a/src/facets/examples/generate-playlist/index.inline.js
+++ b/src/facets/examples/generate-playlist/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 
 const output = await foundation.orchestrator.output();
 const queue = await foundation.engine.queue();
diff --git a/src/facets/examples/now-playing/index.inline.js b/src/facets/examples/now-playing/index.inline.js
index 40f3be0e..a37368fa 100644
--- a/src/facets/examples/now-playing/index.inline.js
+++ b/src/facets/examples/now-playing/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import { effect } from "~/common/signal.js";
 
 const output = await foundation.orchestrator.output();
diff --git a/src/facets/misc/scrobble/index.inline.js b/src/facets/misc/scrobble/index.inline.js
index 7d02dc9c..e2eea3c2 100644
--- a/src/facets/misc/scrobble/index.inline.js
+++ b/src/facets/misc/scrobble/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import { effect } from "~/common/signal.js";
 
 effect(() => {
diff --git a/src/facets/misc/scrobble/last.fm/index.inline.js b/src/facets/misc/scrobble/last.fm/index.inline.js
index 55ab71c9..dc2e725a 100644
--- a/src/facets/misc/scrobble/last.fm/index.inline.js
+++ b/src/facets/misc/scrobble/last.fm/index.inline.js
@@ -6,7 +6,7 @@ import "@awesome.me/webawesome/dist/components/icon/icon.js";
 
 import "~/common/webawesome/detect-dark.js";
 
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import { effect } from "~/common/signal.js";
 
 /**
diff --git a/src/facets/misc/split-view/index.inline.js b/src/facets/misc/split-view/index.inline.js
index e0c85645..c99395c9 100644
--- a/src/facets/misc/split-view/index.inline.js
+++ b/src/facets/misc/split-view/index.inline.js
@@ -9,7 +9,7 @@ import "@awesome.me/webawesome/dist/components/select/select.js";
 import "@awesome.me/webawesome/dist/components/option/option.js";
 
 import "~/common/webawesome/detect-dark.js";
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import * as Output from "~/common/output.js";
 
 /**
diff --git a/src/facets/playback/auto-queue/index.inline.js b/src/facets/playback/auto-queue/index.inline.js
index b66c354a..1ca624d3 100644
--- a/src/facets/playback/auto-queue/index.inline.js
+++ b/src/facets/playback/auto-queue/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import { effect } from "~/common/signal.js";
 import * as Playlist from "~/common/playlist.js";
 
diff --git a/src/facets/playback/auto-queue/prelude/index.inline.js b/src/facets/playback/auto-queue/prelude/index.inline.js
index a9880f53..d146108f 100644
--- a/src/facets/playback/auto-queue/prelude/index.inline.js
+++ b/src/facets/playback/auto-queue/prelude/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import { effect } from "~/common/signal.js";
 
 effect(() => {
diff --git a/src/l/index.js b/src/l/index.js
index 0f167c01..1010eb94 100644
--- a/src/l/index.js
+++ b/src/l/index.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import * as CID from "~/common/cid.js";
 import * as Output from "~/common/output.js";
 import { createLoader, renderError } from "~/common/loader.js";
diff --git a/src/themes/blur/artwork-controller/facet/index.inline.js b/src/themes/blur/artwork-controller/facet/index.inline.js
index 503a2e35..c9c83e6d 100644
--- a/src/themes/blur/artwork-controller/facet/index.inline.js
+++ b/src/themes/blur/artwork-controller/facet/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import ArtworkController from "~/themes/blur/artwork-controller/element.js";
 
 // Setup the prerequisite elements
diff --git a/src/themes/webamp/browser/facet/index.inline.js b/src/themes/webamp/browser/facet/index.inline.js
index 445bb88d..6a63a899 100644
--- a/src/themes/webamp/browser/facet/index.inline.js
+++ b/src/themes/webamp/browser/facet/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import BrowserElement from "~/themes/webamp/browser/element.js";
 
 const [out, que, scp, trc] = await Promise.all([
diff --git a/src/themes/webamp/configurators/input/facet/index.inline.js b/src/themes/webamp/configurators/input/facet/index.inline.js
index 6af7ada3..d7d7a600 100644
--- a/src/themes/webamp/configurators/input/facet/index.inline.js
+++ b/src/themes/webamp/configurators/input/facet/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import InputConfigElement from "~/themes/webamp/configurators/input/element.js";
 
 const [inp, out, pro, sou] = await Promise.all([
diff --git a/src/themes/webamp/configurators/output/facet/index.inline.js b/src/themes/webamp/configurators/output/facet/index.inline.js
index a08003a4..a35ebea8 100644
--- a/src/themes/webamp/configurators/output/facet/index.inline.js
+++ b/src/themes/webamp/configurators/output/facet/index.inline.js
@@ -1,4 +1,4 @@
-import foundation from "~/common/facets/foundation.js";
+import foundation from "~/common/foundation.js";
 import OutputConfigElement from "~/themes/webamp/configurators/output/element.js";
 
 const out = await foundation.orchestrator.output();