diff --git a/public/images/icons/windows_98/cd_audio_cd_a-4.png b/public/images/icons/windows_98/cd_audio_cd_a-4.png
new file mode 100644
index 0000000000000000000000000000000000000000..fc07a9dea1c1cc5ef206eb76d3b2a971d0ae5674
GIT binary patch
literal 641
zcme7R@N?(olHy`uVBq!ia0y~yU@!n-7G?$phNU`BwlFX-u%tWsIx;Y9?C1WI$jZRL
zppfhl<jcTNrN+R}(89p*i-Ccm;RORjsR0ASs{{rHs~HRo;stYd1==t$Fh~UWgt#(*
zK|@2s|NjgJ4jf?k4+0GT8IpJW*}=fTz*rLG7tG-B>_!@hljQC0!j_n}qn3ezfxX1j
z*OmPdi!h^-#MF#mHyIchBRyRlLo80Oz2cpBSV4d-;S6U_>dM<yF0+^`CT<l}e0|~>
z!`dAVOG5V5rMD$4*km3W86h^mPL6q-z>Qg9Z??N_buUoh`0cbo+t+&&_alKLiXHnI
z5^mp|*HpMg?4I!#o}jZV*K#gdFjWT4Q}kwLNuPhfFLmLQSqHaC9+8yijOhw^V5oRT
z(CNfioA2|bEw;P1T)4Zzkt5OL@1>xd$_WQ%m`wX}<Nvp_4UB7rGpfU1Z9B(cn6Qj@
z&Gv6?)~tLl6q&mM8D2FrX)0F!tOM-8ENAyd6HgZFgs&;-JEkUBRmqnGuKUjt*U>k5
zy1P=PqMqJ%D{a0O{aXvx`H5>hkeT*mOUQvn0i6Sv!xbzWWFJ4>B@%pLlg5Du-U0&5
z9RB;COe~lrp|HS%O_G`8wW#vXUkNIQc0|1|POuhYky*`g<Z|u7y}wp0sXJ&D%DCsY
z?ct{%SI^J0J@}4)(J$LS3_5)cvin^Y>o71dsFt`!l%yn<q*^5xr6!i7G8h>cTId>>
z=o(sv7#La^n^+l{=o*+<85mr0{F#NKAvZrIGp!Q0hQ%_D*Fed^)78&qol`;+04kL4
AC;$Ke

literal 0
HcmV?d00001

diff --git a/src/pages/configurator/input/_applet.astro b/src/pages/configurator/input/_applet.astro
new file mode 100644
index 0000000..7b3e42a
--- /dev/null
+++ b/src/pages/configurator/input/_applet.astro
@@ -0,0 +1,106 @@
+<main class="container">
+  <h1>Input configuration</h1>
+  <p>
+    Here you can add your audio from various places.
+    <br />Add audio from:
+  </p>
+  <div id="options">
+    <p>
+      <a href="../../input/native-fs/" class="with-icon">
+        <i class="iconoir-open-in-window"></i>
+        <strong>My device</strong>
+      </a>
+    </p>
+  </div>
+  <p>
+    <small
+      ><em><strong>More options coming soon!</strong><br />S3-compatible APIs, Dropbox, etc.</em
+      ></small
+    >
+  </p>
+</main>
+
+<div id="iframes"></div>
+
+<style>
+  #iframes {
+    display: none;
+  }
+</style>
+
+<script>
+  import { applets } from "@web-applets/sdk";
+
+  import type { Output, Track } from "@applets/core/types.d.ts";
+  import { applet } from "@scripts/theme";
+
+  ////////////////////////////////////////////
+  // SETUP
+  ////////////////////////////////////////////
+  const container = document.querySelector("#iframes") || undefined;
+
+  // Applet connections
+  const input = {
+    nativeFs: await applet("../../input/native-fs", { container }),
+  };
+
+  // Register applet
+  const context = applets.register<Output>();
+
+  ////////////////////////////////////////////
+  // ACTIONS
+  ////////////////////////////////////////////
+
+  const list = async (cachedTracks: Track[] = []) => {
+    const groups = cachedTracks.reduce(
+      (acc: Record<string, Track[]>, track: Track) => {
+        const scheme = track.uri.split(":", 1)[0];
+        return { ...acc, [scheme]: [...(acc.scheme || []), track] };
+      },
+      {
+        [input.nativeFs.manifest.input_properties.scheme]: [],
+      },
+    );
+
+    const promises = Object.entries(groups).map(
+      async ([scheme, cachedTracks]: [string, Track[]]) => {
+        switch (scheme) {
+          case input.nativeFs.manifest.input_properties.scheme:
+            await input.nativeFs.sendAction("list", cachedTracks);
+            return input.nativeFs.data;
+
+          default:
+            return cachedTracks;
+        }
+      },
+    );
+
+    const nested = await Promise.all(promises);
+    const tracks = nested.flat(1);
+
+    // TODO: Ideally promise returns data
+    context.data = tracks as any;
+
+    return tracks;
+  };
+
+  const resolve = async (fileUri: string) => {
+    const scheme = fileUri.split(":", 1)[0];
+
+    switch (scheme) {
+      case input.nativeFs.manifest.input_properties.scheme:
+        await input.nativeFs.sendAction("resolve", fileUri);
+        // TODO: Ideally promise returns data
+        context.data = input.nativeFs.data as any;
+        return input.nativeFs.data;
+
+      default:
+        // TODO: Ideally promise returns data
+        context.data = undefined as any;
+        return undefined;
+    }
+  };
+
+  context.setActionHandler("list", list);
+  context.setActionHandler("resolve", resolve);
+</script>
diff --git a/src/pages/configurator/input/_manifest.json b/src/pages/configurator/input/_manifest.json
new file mode 100644
index 0000000..ec9a97d
--- /dev/null
+++ b/src/pages/configurator/input/_manifest.json
@@ -0,0 +1,31 @@
+{
+  "name": "diffuse/configurator/input",
+  "title": "Diffuse Configurator | Input",
+  "entrypoint": "index.html",
+  "actions": {
+    "list": {
+      "title": "List",
+      "description": "List tracks from all inputs.",
+      "params_schema": {
+        "type": "object",
+        "properties": {
+          "tracks": {
+            "type": "array",
+            "description": "A list of (cached) tracks",
+            "items": {
+              "type": "object"
+            }
+          }
+        }
+      }
+    },
+    "resolve": {
+      "title": "Resolve",
+      "description": "Potentially translates a track uri with a matching scheme into a URL pointing at the audio bytes. If it can be resolved that is, otherwise you'll get `undefined`.",
+      "params_schema": {
+        "type": "string",
+        "description": "The uri to resolve"
+      }
+    }
+  }
+}
diff --git a/src/pages/configurator/input/index.astro b/src/pages/configurator/input/index.astro
new file mode 100644
index 0000000..f6d0270
--- /dev/null
+++ b/src/pages/configurator/input/index.astro
@@ -0,0 +1,9 @@
+---
+import Layout from "@layouts/applet-pico-ui.astro";
+import Applet from "./_applet.astro";
+import { title } from "./_manifest.json";
+---
+
+<Layout title={title}>
+  <Applet />
+</Layout>
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 3ade5eb..32f4e9c 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -24,7 +24,10 @@ const themes = [
 // TODO
 
 // Applets
-const configurators = [{ url: "configurator/output/", title: "Output" }];
+const configurators = [
+  { url: "configurator/input/", title: "Input" },
+  { url: "configurator/output/", title: "Output" },
+];
 
 const engines = [
   { url: "engine/audio/", title: "Audio" },
@@ -121,7 +124,7 @@ const processors = [
         <Applet title="Configurators" list={configurators}>
           Applets that serve as an intermediate in order to make a particular kind of applet
           configurable. In other words, these allow for an applet to be swapped out with another
-          that takes the same actions and data output.
+          that takes the same, or a subset of the actions and data output.
         </Applet>
 
         <Applet title="Engines" list={engines}>
diff --git a/src/pages/input/native-fs/_applet.astro b/src/pages/input/native-fs/_applet.astro
index 3bfaa8b..f05670f 100644
--- a/src/pages/input/native-fs/_applet.astro
+++ b/src/pages/input/native-fs/_applet.astro
@@ -1,6 +1,9 @@
 <main class="container">
-  <h1>Native File System Input</h1>
-  <p>Add music from your device.</p>
+  <h1>Native file system input</h1>
+  <p>
+    Add music from your device.
+    <br />Music added so far:
+  </p>
   <div id="directories">
     <p>
       <span class="with-icon">
@@ -16,7 +19,7 @@
   import * as IDB from "idb-keyval";
 
   import { applets } from "@web-applets/sdk";
-  import { computed, Signal, signal } from "spellcaster";
+  import { computed, effect, Signal, signal } from "spellcaster";
   import { repeat, tags, text } from "spellcaster/hyperscript.js";
   import { type FileSystemDirectoryHandle, showDirectoryPicker } from "native-file-system-adapter";
   import * as URI from "uri-js";
@@ -36,7 +39,7 @@
   ////////////////////////////////////////////
   const IDB_PREFIX = "@applets/input/native-fs";
   const IDB_HANDLES = `${IDB_PREFIX}/handles`;
-  const INPUT_SCHEME = manifest.input_properties.scheme;
+  const SCHEME = manifest.input_properties.scheme;
 
   const context = applets.register();
 
@@ -69,27 +72,40 @@
   };
 
   const Directories = computed(() => {
+    if (mounts().length === 0) {
+      return tags.p({ id: "directories" }, [
+        tags.small({}, [
+          tags.em({}, text("No audio added yet, click the button below to add some.")),
+        ]),
+      ]);
+    }
+
     return tags.ul({ id: "directories" }, repeat(dirList, Item));
   });
 
   // Add to DOM
-  document.getElementById("directories")?.replaceWith(Directories());
+  effect(() => {
+    document.getElementById("directories")?.replaceWith(Directories());
+  });
 
   ////////////////////////////////////////////
   // ACTIONS
   ////////////////////////////////////////////
-  const isAvailable = async (fileUri: string) => {
+  const consult = async (fileUriOrScheme: string) => {
     const isSupported = !!(globalThis as any).showDirectoryPicker;
     if (!isSupported) {
-      console.warn(
-        "`input/native-fs` is not supported on this platform, missing File System Access API.",
-      );
-      return false;
+      return { supported: false, reason: "File System Access API is not supported" };
+    }
+
+    if (!fileUriOrScheme.includes(":")) {
+      if (fileUriOrScheme !== SCHEME) return { supported: false, reason: "Scheme does not match" };
+      return { supported: true };
     }
 
     const handles = await fetchHandles();
-    const uri = URI.parse(fileUri);
-    return uri.host && !!handles[uri.host];
+    const uri = URI.parse(fileUriOrScheme);
+    if (uri.scheme !== SCHEME) return { supported: false, reason: "Scheme does not match" };
+    return { supported: true, consultation: uri.host && !!handles[uri.host] };
   };
 
   const list = async (cachedTracks: Track[] = []) => {
@@ -137,8 +153,11 @@
   };
 
   const resolve = async (fileUri: string) => {
+    const isSupported = !!(globalThis as any).showDirectoryPicker;
+    if (!isSupported) return undefined;
+
     const uri = URI.parse(fileUri);
-    if (uri.scheme !== INPUT_SCHEME) return undefined;
+    if (uri.scheme !== SCHEME) return undefined;
     if (!uri.host || !uri.path) return undefined;
 
     const handles = await fetchHandles();
@@ -191,7 +210,7 @@
     setMounts(await fetchHandlesList());
   };
 
-  context.setActionHandler("isAvailable", isAvailable);
+  context.setActionHandler("consult", consult);
   context.setActionHandler("list", list);
   context.setActionHandler("resolve", resolve);
   context.setActionHandler("mount", mount);
@@ -231,7 +250,7 @@
     for await (const item of dir.values()) {
       if (item.kind === "file" && isAudioFile(item.name)) {
         const uri = URI.serialize({
-          scheme: INPUT_SCHEME,
+          scheme: SCHEME,
           host: rootHandleId,
           path: `${path.length ? "/" + path.join("/") : ""}/${item.name}`,
         });
diff --git a/src/pages/input/native-fs/_manifest.json b/src/pages/input/native-fs/_manifest.json
index bb38c85..3482dae 100644
--- a/src/pages/input/native-fs/_manifest.json
+++ b/src/pages/input/native-fs/_manifest.json
@@ -32,7 +32,7 @@
     },
     "resolve": {
       "title": "Resolve",
-      "description": "Potentially translates a track uri with a matching scheme into a URL pointing at the audio bytes. If it can be resolved that is, otherwise you'll get `undefined`.",
+      "description": "Potentially translates a track uri with a matching scheme into a URL pointing at the audio bytes. If it can be resolved that is, otherwise you'll get `undefined`. Use the `consult` action to get a more detailed answer.",
       "params_schema": {
         "type": "string",
         "description": "The uri to resolve"
diff --git a/src/pages/orchestrator/input-cache/_applet.astro b/src/pages/orchestrator/input-cache/_applet.astro
new file mode 100644
index 0000000..4e8784d
--- /dev/null
+++ b/src/pages/orchestrator/input-cache/_applet.astro
@@ -0,0 +1,25 @@
+<script>
+  import { applets } from "@web-applets/sdk";
+
+  import type { Output, Track } from "@applets/core/types.d.ts";
+  import { applet } from "@scripts/theme";
+
+  ////////////////////////////////////////////
+  // SETUP
+  ////////////////////////////////////////////
+  // Register applet
+  const context = applets.register<Output>();
+
+  // Applet connections
+  const orchestrator = {
+    output: await applet("../../configurator/output", { context: self.parent }),
+  };
+
+  ////////////////////////////////////////////
+  // ACTIONS
+  ////////////////////////////////////////////
+
+  ////////////////////////////////////////////
+  // 🛠️
+  ////////////////////////////////////////////
+</script>
diff --git a/src/pages/orchestrator/input-cache/_manifest.json b/src/pages/orchestrator/input-cache/_manifest.json
new file mode 100644
index 0000000..5177246
--- /dev/null
+++ b/src/pages/orchestrator/input-cache/_manifest.json
@@ -0,0 +1,6 @@
+{
+  "name": "diffuse/orchestrator/input-cache",
+  "title": "Diffuse Orchestrator | Input cache",
+  "entrypoint": "index.html",
+  "actions": {}
+}
diff --git a/src/pages/orchestrator/input-cache/index.astro b/src/pages/orchestrator/input-cache/index.astro
new file mode 100644
index 0000000..dfb1e1a
--- /dev/null
+++ b/src/pages/orchestrator/input-cache/index.astro
@@ -0,0 +1,9 @@
+---
+import Layout from "@layouts/applet.astro";
+import Applet from "./_applet.astro";
+import { title } from "./_manifest.json";
+---
+
+<Layout title={title}>
+  <Applet />
+</Layout>
diff --git a/src/pages/themes/webamp/index.astro b/src/pages/themes/webamp/index.astro
index 530ba09..f46c7f9 100644
--- a/src/pages/themes/webamp/index.astro
+++ b/src/pages/themes/webamp/index.astro
@@ -9,15 +9,15 @@
     <main>
       <div class="desktop">
         <!-- INPUT -->
-        <a href="/input/native-fs/" target="_blank" class="button desktop__item">
-          <img src="/images/icons/windows_98/directory_open_cool-0.png" width="32" />
-          <label>Manage input (music)</label>
+        <a href="/configurator/input/" target="_blank" class="button desktop__item">
+          <img src="/images/icons/windows_98/cd_audio_cd_a-4.png" width="32" />
+          <label>Manage audio inputs</label>
         </a>
 
         <!-- OUTPUT -->
         <a href="/configurator/output/" target="_blank" class="button desktop__item">
           <img src="/images/icons/windows_98/directory_open_file_mydocs_2k-2.png" width="32" />
-          <label>Manage output (data)</label>
+          <label>Manage user data</label>
         </a>
       </div>
     </main>
diff --git a/src/scripts/theme.ts b/src/scripts/theme.ts
index 15c36fd..01b2ee5 100644
--- a/src/scripts/theme.ts
+++ b/src/scripts/theme.ts
@@ -13,7 +13,7 @@ export async function applet<D>(
   opts: {
     addSlashSuffix?: boolean;
     context?: Window;
-    container?: HTMLElement;
+    container?: HTMLElement | Element;
     id?: string;
     setHeight?: boolean;
   } = {},
diff --git a/src/scripts/themes/webamp/index.ts b/src/scripts/themes/webamp/index.ts
index bb141bb..83aba45 100644
--- a/src/scripts/themes/webamp/index.ts
+++ b/src/scripts/themes/webamp/index.ts
@@ -13,38 +13,19 @@ import "@styles/themes/webamp/index.css";
 // 🗂️ Applets
 ////////////////////////////////////////////
 
-// const _configurator = {
-//   output: await applet("../../configurator/output"),
-// };
-
-const input = {
-  nativeFs: await applet("../../input/native-fs"),
+const configurator = {
+  input: await applet("../../configurator/input"),
 };
 
-const _orchestrator = {
-  output: await applet<Output>("../../orchestrator/output-management"),
-};
+// const orchestrator = {
+//   output: await applet<Output>("../../orchestrator/output-management"),
+// };
 
 ////////////////////////////////////////////
 // ⚡
 ////////////////////////////////////////////
 const amp = new Webamp({
-  filePickers: [
-    {
-      contextMenuName: "(applet) Mount directory",
-      filePicker: async () => {
-        try {
-          await input.nativeFs.sendAction("mount");
-        } catch (_err) {}
-        amp.setTracksToPlay(await listMountDirectories());
-        return [];
-      },
-      requiresNetwork: false,
-    },
-  ],
-
-  // Tracks
-  initialTracks: await listMountDirectories(),
+  initialTracks: await makeList(),
 });
 
 const ampNode = document.createElement("div");
@@ -56,13 +37,14 @@ amp.renderWhenReady(ampNode);
 // 🛠️
 ////////////////////////////////////////////
 
-async function listMountDirectories() {
-  await input.nativeFs.sendAction("list");
-  const list = input.nativeFs.data as Track[];
+async function makeList() {
+  await configurator.input.sendAction("list");
+  const list = configurator.input.data as Track[];
 
   return list.reduce(async (acc: Promise<Array<{ url: string }>>, track: Track) => {
-    await input.nativeFs.sendAction("resolve", track.uri);
-    const url = input.nativeFs.data as string;
-    return [...(await acc), { url }];
+    await configurator.input.sendAction("resolve", track.uri);
+    const url = configurator.input.data as string | undefined;
+    if (url) return [...(await acc), { url }];
+    return await acc;
   }, Promise.resolve([]));
 }