diff --git a/.histoire/dist/assets/__resolved__virtual_story-source_src-lib-components-shipedit-propulsion-story-svelte-eabfe58a.js b/.histoire/dist/assets/__resolved__virtual_story-source_src-lib-components-shipedit-propulsion-story-svelte-eabfe58a.js
deleted file mode 100644
index aea14e3..0000000
--- a/.histoire/dist/assets/__resolved__virtual_story-source_src-lib-components-shipedit-propulsion-story-svelte-eabfe58a.js
+++ /dev/null
@@ -1,4 +0,0 @@
-const __resolved__virtual_storySource_srcLibComponentsShipeditPropulsionStorySvelte = '<Hst.Story>\n  <Propulsion />\n</Hst.Story>\n\n<script>\n  export let Hst;\n  import Propulsion from "./Propulsion.svelte";\n<\/script>\n';
-export {
-  __resolved__virtual_storySource_srcLibComponentsShipeditPropulsionStorySvelte as default
-};
diff --git a/.histoire/dist/histoire.json b/.histoire/dist/histoire.json
index 479ccf9..6f7df4d 100644
--- a/.histoire/dist/histoire.json
+++ b/.histoire/dist/histoire.json
@@ -127,56 +127,6 @@
       "virtual": false,
       "markdownFile": null
     },
-    {
-      "id": "src-lib-components-shipedit-propulsion-story-svelte",
-      "title": "Propulsion",
-      "group": null,
-      "layout": {
-        "type": "single",
-        "iframe": true
-      },
-      "icon": null,
-      "iconColor": null,
-      "docsOnly": false,
-      "variants": [
-        {
-          "id": "_default",
-          "title": "default"
-        }
-      ],
-      "relativePath": "src/lib/components/ShipEdit/Propulsion.story.svelte",
-      "supportPluginId": "svelte3",
-      "treePath": [
-        "Propulsion"
-      ],
-      "virtual": false,
-      "markdownFile": null
-    },
-    {
-      "id": "src-lib-components-shipedit-weaponry-story-svelte",
-      "title": "Weaponry",
-      "group": null,
-      "layout": {
-        "type": "single",
-        "iframe": true
-      },
-      "icon": null,
-      "iconColor": null,
-      "docsOnly": false,
-      "variants": [
-        {
-          "id": "_default",
-          "title": "default"
-        }
-      ],
-      "relativePath": "src/lib/components/ShipEdit/Weaponry.story.svelte",
-      "supportPluginId": "svelte3",
-      "treePath": [
-        "Weaponry"
-      ],
-      "virtual": false,
-      "markdownFile": null
-    },
     {
       "id": "src-lib-components-shipedit-propulsion-engine-story-svelte",
       "title": "Engine",
@@ -203,58 +153,6 @@
       ],
       "virtual": false,
       "markdownFile": null
-    },
-    {
-      "id": "src-lib-components-shipedit-propulsion-ftl-story-svelte",
-      "title": "Ftl",
-      "group": null,
-      "layout": {
-        "type": "single",
-        "iframe": true
-      },
-      "icon": null,
-      "iconColor": null,
-      "docsOnly": false,
-      "variants": [
-        {
-          "id": "_default",
-          "title": "default"
-        }
-      ],
-      "relativePath": "src/lib/components/ShipEdit/Propulsion/Ftl.story.svelte",
-      "supportPluginId": "svelte3",
-      "treePath": [
-        "ShipEdit",
-        "Propulsion",
-        "Ftl"
-      ],
-      "virtual": false,
-      "markdownFile": null
-    },
-    {
-      "id": "src-lib-components-shipedit-weaponry-weapon-arcs-story-svelte",
-      "title": "Arcs",
-      "group": null,
-      "layout": {
-        "type": "single",
-        "iframe": true
-      },
-      "icon": null,
-      "iconColor": null,
-      "docsOnly": false,
-      "variants": [
-        {
-          "id": "_default",
-          "title": "default"
-        }
-      ],
-      "relativePath": "src/lib/components/ShipEdit/Weaponry/Weapon/Arcs.story.svelte",
-      "supportPluginId": "svelte3",
-      "treePath": [
-        "Arcs"
-      ],
-      "virtual": false,
-      "markdownFile": null
     }
   ],
   "markdownFiles": []
diff --git a/.histoire/screenshots/src-lib-components-shipedit-carrier-story-svelte-_default-1280x800.png b/.histoire/screenshots/src-lib-components-shipedit-carrier-story-svelte-_default-1280x800.png
index 5c20207..05b743f 100644
Binary files a/.histoire/screenshots/src-lib-components-shipedit-carrier-story-svelte-_default-1280x800.png and b/.histoire/screenshots/src-lib-components-shipedit-carrier-story-svelte-_default-1280x800.png differ
diff --git a/.histoire/screenshots/src-lib-components-shipedit-identification-story-svelte-_default-1280x800.png b/.histoire/screenshots/src-lib-components-shipedit-identification-story-svelte-_default-1280x800.png
index 85ace74..8b561f2 100644
Binary files a/.histoire/screenshots/src-lib-components-shipedit-identification-story-svelte-_default-1280x800.png and b/.histoire/screenshots/src-lib-components-shipedit-identification-story-svelte-_default-1280x800.png differ
diff --git a/.histoire/screenshots/src-lib-components-shipedit-story-svelte-_default-1280x800.png b/.histoire/screenshots/src-lib-components-shipedit-story-svelte-_default-1280x800.png
index 48d928e..5671341 100644
Binary files a/.histoire/screenshots/src-lib-components-shipedit-story-svelte-_default-1280x800.png and b/.histoire/screenshots/src-lib-components-shipedit-story-svelte-_default-1280x800.png differ
diff --git a/package.json b/package.json
index 1fef999..602fecf 100644
--- a/package.json
+++ b/package.json
@@ -12,8 +12,8 @@
     "story:build": "histoire build"
   },
   "devDependencies": {
-    "@histoire/plugin-screenshot": "^0.15.9",
-    "@histoire/plugin-svelte": "^0.15.9",
+    "@histoire/plugin-screenshot": "^0.16.1",
+    "@histoire/plugin-svelte": "^0.16.1",
     "@sveltejs/adapter-static": "^1.0.0-next.28",
     "@sveltejs/kit": "^1.10.0",
     "@sveltejs/vite-plugin-svelte": "^1.0.0-next.38",
@@ -41,7 +41,7 @@
     "beercss": "^3.1.0",
     "chota": "^0.8.0",
     "effector": "^22.5.2",
-    "histoire": "^0.15.9",
+    "histoire": "^0.16.1",
     "jsdom": "^21.1.1",
     "lodash": "^4.17.21",
     "memoize-one": "^6.0.0",
diff --git a/src/lib/components/ShipEdit/Propulsion.story.svelte b/src/lib/components/ShipEdit/Propulsion.story.svelte.todo
similarity index 71%
rename from src/lib/components/ShipEdit/Propulsion.story.svelte
rename to src/lib/components/ShipEdit/Propulsion.story.svelte.todo
index a89dbde..fc3a2b6 100644
--- a/src/lib/components/ShipEdit/Propulsion.story.svelte
+++ b/src/lib/components/ShipEdit/Propulsion.story.svelte.todo
@@ -3,7 +3,10 @@
 </Hst.Story>
 
 <script>
+  import { setContext } from "svelte";
   export let Hst;
 
   import Propulsion from "./Propulsion.svelte";
+
+  setContext("api", {});
 </script>
diff --git a/src/lib/components/ShipEdit/Propulsion.svelte b/src/lib/components/ShipEdit/Propulsion.svelte
index e361da1..5136edf 100644
--- a/src/lib/components/ShipEdit/Propulsion.svelte
+++ b/src/lib/components/ShipEdit/Propulsion.svelte
@@ -3,7 +3,7 @@
   <Ftl {...ftl} />
 </Section>
 
-<script lang="ts">
+<script>
   import Section from "$lib/components/Section.svelte";
   import Drive from "./Propulsion/Engine.svelte";
   import Ftl from "./Propulsion/Ftl.svelte";
diff --git a/src/lib/components/ShipEdit/Propulsion/Ftl.story.svelte b/src/lib/components/ShipEdit/Propulsion/Ftl.story.svelte
deleted file mode 100644
index b69f090..0000000
--- a/src/lib/components/ShipEdit/Propulsion/Ftl.story.svelte
+++ /dev/null
@@ -1,16 +0,0 @@
-<Hst.Story title="ShipEdit/Propulsion/Ftl">
-  <Ftl {api} />
-</Hst.Story>
-
-<script>
-  export let Hst;
-  import { logEvent } from "histoire/client";
-
-  const api = {
-    dispatch: {
-      setFtl: (ftl) => logEvent("setFtl", { ftl }),
-    },
-  };
-
-  import Ftl from "./Ftl.svelte";
-</script>
diff --git a/src/lib/components/ShipEdit/Propulsion/Ftl.story.svelte.todo b/src/lib/components/ShipEdit/Propulsion/Ftl.story.svelte.todo
new file mode 100644
index 0000000..d61b0a5
--- /dev/null
+++ b/src/lib/components/ShipEdit/Propulsion/Ftl.story.svelte.todo
@@ -0,0 +1,18 @@
+<Hst.Story title="ShipEdit/Propulsion/Ftl">
+  <Ftl {api} />
+</Hst.Story>
+
+<script>
+  export let Hst;
+  //import { logEvent, isCollecting } from "histoire/client";
+
+  const api = true
+    ? {}
+    : {
+        dispatch: {
+          //       setFtl: (ftl) => logEvent("setFtl", { ftl }),
+        },
+      };
+
+  import Ftl from "./Ftl.svelte";
+</script>
diff --git a/src/lib/components/ShipEdit/Weaponry.story.svelte b/src/lib/components/ShipEdit/Weaponry.story.svelte.todo
similarity index 100%
rename from src/lib/components/ShipEdit/Weaponry.story.svelte
rename to src/lib/components/ShipEdit/Weaponry.story.svelte.todo
diff --git a/src/lib/components/ShipEdit/Weaponry/Weapon/Arcs.story.svelte b/src/lib/components/ShipEdit/Weaponry/Weapon/Arcs.story.svelte.todo
similarity index 100%
rename from src/lib/components/ShipEdit/Weaponry/Weapon/Arcs.story.svelte
rename to src/lib/components/ShipEdit/Weaponry/Weapon/Arcs.story.svelte.todo
diff --git a/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-2-snap.png b/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-2-snap.png
index 5c20207..05b743f 100644
Binary files a/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-2-snap.png and b/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-2-snap.png differ
diff --git a/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-3-snap.png b/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-3-snap.png
index 85ace74..8b561f2 100644
Binary files a/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-3-snap.png and b/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-3-snap.png differ
diff --git a/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-7-snap.png b/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-7-snap.png
index 48d928e..5671341 100644
Binary files a/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-7-snap.png and b/src/lib/components/__image_snapshots__/screenshots-test-ts-src-lib-components-screenshots-test-ts-image-snapshot-7-snap.png differ