diff --git a/package-lock.json b/package-lock.json
index 6058b70ad..e21aa6120 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2216,7 +2216,7 @@
     },
     "node_modules/govuk-svelte": {
       "version": "0.0.1",
-      "resolved": "git+ssh://git@github.com/acteng/govuk-svelte.git#edb9f4d8e780bc2f6d04a969cc17760725a26183",
+      "resolved": "git+ssh://git@github.com/acteng/govuk-svelte.git#595076fbedab9b1bf8a0211329ba67499913fee2",
       "license": "Apache-2.0",
       "dependencies": {
         "uuid": "^9.0.1"
diff --git a/src/lib/browse/Filters.svelte b/src/lib/browse/Filters.svelte
index 31f6f1206..c5babf3c1 100644
--- a/src/lib/browse/Filters.svelte
+++ b/src/lib/browse/Filters.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { CollapsibleCard } from "lib/common";
   import {
     Checkbox,
+    CollapsibleCard,
     CheckboxGroup,
     FormElement,
     SecondaryButton,
diff --git a/src/lib/browse/InterventionColorSelector.svelte b/src/lib/browse/InterventionColorSelector.svelte
index fb809bd23..cdc4ae36f 100644
--- a/src/lib/browse/InterventionColorSelector.svelte
+++ b/src/lib/browse/InterventionColorSelector.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
-  import { CollapsibleCard, Legend } from "lib/common";
-  import { Select } from "govuk-svelte";
+  import { Legend } from "lib/common";
+  import { CollapsibleCard, Select } from "govuk-svelte";
   import { colorInterventionsBySchema, schemaLegend } from "schemas";
   import { map } from "stores";
   import { styleByCurrentMilestone, styleByFundingProgramme } from "./colors";
diff --git a/src/lib/browse/LayerControls.svelte b/src/lib/browse/LayerControls.svelte
index acbcb34fa..22af71469 100644
--- a/src/lib/browse/LayerControls.svelte
+++ b/src/lib/browse/LayerControls.svelte
@@ -2,11 +2,10 @@
   import {
     appVersion,
     BaselayerSwitcher,
-    CollapsibleCard,
     LineMeasureController,
     StreetViewTool,
   } from "lib/common";
-  import { CheckboxGroup } from "govuk-svelte";
+  import { CollapsibleCard, CheckboxGroup } from "govuk-svelte";
   import { layerId } from "lib/maplibre";
   import { FillLayer, GeoJSON } from "svelte-maplibre";
   import CensusOutputAreaLayerControl from "./layers/areas/CensusOutputAreas.svelte";
diff --git a/src/lib/browse/SchemeCard.svelte b/src/lib/browse/SchemeCard.svelte
index b58831704..315efbf48 100644
--- a/src/lib/browse/SchemeCard.svelte
+++ b/src/lib/browse/SchemeCard.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import type { FeatureCollection } from "geojson";
-  import { CollapsibleCard } from "lib/common";
-  import { ButtonGroup, SecondaryButton } from "govuk-svelte";
+  import { CollapsibleCard, ButtonGroup, SecondaryButton } from "govuk-svelte";
   import { bbox } from "lib/maplibre";
   import { map } from "stores";
   import type { SchemeData } from "types";
diff --git a/src/lib/browse/layers/lines/Gradients.svelte b/src/lib/browse/layers/lines/Gradients.svelte
index 261e4b5fd..46f9690ff 100644
--- a/src/lib/browse/layers/lines/Gradients.svelte
+++ b/src/lib/browse/layers/lines/Gradients.svelte
@@ -7,7 +7,7 @@
     Popup,
     publicResourceBaseUrl,
   } from "lib/common";
-  import { Checkbox } from "lib/govuk";
+  import { Checkbox } from "govuk-svelte";
   import { layerId, makeColorRamp } from "lib/maplibre";
   import {
     hoverStateFilter,
diff --git a/src/lib/browse/layers/points/CriticalIssues.svelte b/src/lib/browse/layers/points/CriticalIssues.svelte
index 690082195..e3e7b4a56 100644
--- a/src/lib/browse/layers/points/CriticalIssues.svelte
+++ b/src/lib/browse/layers/points/CriticalIssues.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
-  import { CollapsibleCard, ColorLegend, Popup } from "lib/common";
+  import { ColorLegend, Popup } from "lib/common";
   import {
+    CollapsibleCard,
     Checkbox,
     CheckboxGroup,
     ErrorMessage,
diff --git a/src/lib/common/CollapsibleCard.svelte b/src/lib/common/CollapsibleCard.svelte
deleted file mode 100644
index 15d836632..000000000
--- a/src/lib/common/CollapsibleCard.svelte
+++ /dev/null
@@ -1,13 +0,0 @@
-<script lang="ts">
-  export let label: string;
-  export let open = false;
-</script>
-
-<details {open} class="govuk-details" data-module="govuk-details">
-  <summary class="govuk-details__summary">
-    <span class="govuk-details__summary-text">{label}</span>
-  </summary>
-  <div class="govuk-details__text">
-    <slot />
-  </div>
-</details>
diff --git a/src/lib/common/FileInput.svelte b/src/lib/common/FileInput.svelte
deleted file mode 100644
index ffa13a6a7..000000000
--- a/src/lib/common/FileInput.svelte
+++ /dev/null
@@ -1,34 +0,0 @@
-<script lang="ts">
-  import { v4 as uuidv4 } from "uuid";
-  import { FormElement } from "govuk-svelte";
-
-  export let label: string;
-  // Called with the file contents as text
-  export let loadFile: (text: string) => void;
-
-  export let disabled = false;
-
-  let fileInput: HTMLInputElement;
-
-  function onChange(e: Event) {
-    let reader = new FileReader();
-    reader.onload = (e) => {
-      loadFile(e.target!.result as string);
-    };
-    let files = fileInput.files!;
-    reader.readAsText(files[0]);
-  }
-
-  let id = uuidv4();
-</script>
-
-<FormElement {label} {id}>
-  <input
-    bind:this={fileInput}
-    on:change={onChange}
-    {disabled}
-    class="govuk-file-upload"
-    {id}
-    type="file"
-  />
-</FormElement>
diff --git a/src/lib/common/LineMeasureController.svelte b/src/lib/common/LineMeasureController.svelte
index cd6c45ad5..68a9ef158 100644
--- a/src/lib/common/LineMeasureController.svelte
+++ b/src/lib/common/LineMeasureController.svelte
@@ -3,13 +3,12 @@
   import length from "@turf/length";
   import { colors } from "colors";
   import DraggablePin from "lib/common/DraggablePin.svelte";
-  import { SecondaryButton } from "govuk-svelte";
+  import { CollapsibleCard, SecondaryButton } from "govuk-svelte";
   import { emptyGeojson, layerId } from "lib/maplibre";
   import { LngLat, MapMouseEvent } from "maplibre-gl";
   import { map } from "stores";
   import { onDestroy, onMount } from "svelte";
   import { GeoJSON, LineLayer } from "svelte-maplibre";
-  import { CollapsibleCard } from ".";
 
   let isInactive = true;
   let waypoints: any[] = [];
diff --git a/src/lib/common/StreetViewTool.svelte b/src/lib/common/StreetViewTool.svelte
index cbace1166..0f98a53d7 100644
--- a/src/lib/common/StreetViewTool.svelte
+++ b/src/lib/common/StreetViewTool.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { colors } from "colors";
-  import { CollapsibleCard } from "lib/common";
-  import { Radio, SecondaryButton } from "govuk-svelte";
+  import { CollapsibleCard, Radio, SecondaryButton } from "govuk-svelte";
   import { getRoadLayerHelpers, LayerHelper } from "lib/maplibre";
   import type { MapMouseEvent } from "maplibre-gl";
   import { map, userSettings } from "stores";
diff --git a/src/lib/common/index.ts b/src/lib/common/index.ts
index d8a496c35..54207be81 100644
--- a/src/lib/common/index.ts
+++ b/src/lib/common/index.ts
@@ -3,10 +3,8 @@ import authoritiesUrl from "../../../assets/authorities.geojson?url";
 
 export { default as Alpha } from "./Alpha.svelte";
 export { default as BaselayerSwitcher } from "./BaselayerSwitcher.svelte";
-export { default as CollapsibleCard } from "./CollapsibleCard.svelte";
 export { default as ColorLegend } from "./ColorLegend.svelte";
 export { default as ExternalLink } from "./ExternalLink.svelte";
-export { default as FileInput } from "./FileInput.svelte";
 export { default as Geocoder } from "./Geocoder.svelte";
 export { default as HelpButton } from "./HelpButton.svelte";
 export { default as Layout } from "./Layout.svelte";
diff --git a/src/lib/sidebar/FileManagement.svelte b/src/lib/sidebar/FileManagement.svelte
index d10f3ffcc..d59ea5e39 100644
--- a/src/lib/sidebar/FileManagement.svelte
+++ b/src/lib/sidebar/FileManagement.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { CollapsibleCard, FileInput, Modal } from "lib/common";
+  import { Modal } from "lib/common";
   import {
     gjSchemeCollection,
     hideSchemes,
@@ -9,6 +9,8 @@
   import {
     ButtonGroup,
     ErrorMessage,
+    CollapsibleCard,
+    FileInput,
     SecondaryButton,
     WarningButton,
   } from "govuk-svelte";
diff --git a/src/lib/sidebar/ListMode.svelte b/src/lib/sidebar/ListMode.svelte
index 35f70600d..1e2765622 100644
--- a/src/lib/sidebar/ListMode.svelte
+++ b/src/lib/sidebar/ListMode.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
-  import { FileInput } from "lib/common";
   import { gjSchemeCollection } from "lib/draw/stores";
-  import { ErrorMessage, SecondaryButton } from "govuk-svelte";
+  import { ErrorMessage, FileInput, SecondaryButton } from "govuk-svelte";
   import PerSchemeControls from "./PerSchemeControls.svelte";
   import { addEmptyScheme, backfill } from "./scheme_data";
 
diff --git a/src/pages/BrowseSchemes.svelte b/src/pages/BrowseSchemes.svelte
index 3236d02dd..038646846 100644
--- a/src/pages/BrowseSchemes.svelte
+++ b/src/pages/BrowseSchemes.svelte
@@ -11,7 +11,6 @@
   import { schemes, schemesGj } from "lib/browse/stores";
   import {
     appVersion,
-    FileInput,
     Geocoder,
     Layout,
     LoggedIn,
@@ -19,7 +18,7 @@
     Modal,
     ZoomOutMap,
   } from "lib/common";
-  import { ErrorMessage, SecondaryButton } from "govuk-svelte";
+  import { ErrorMessage, FileInput, SecondaryButton } from "govuk-svelte";
   import { mapStyle } from "stores";
   import { onMount } from "svelte";
 
diff --git a/src/pages/ChooseArea.svelte b/src/pages/ChooseArea.svelte
index 533518a3a..843efd678 100644
--- a/src/pages/ChooseArea.svelte
+++ b/src/pages/ChooseArea.svelte
@@ -8,6 +8,7 @@
     DefaultButton,
     ErrorMessage,
     FormElement,
+    FileInput,
     Radio,
     SecondaryButton,
   } from "govuk-svelte";
@@ -16,7 +17,6 @@
   import { findSmallestAuthority, type AuthorityBoundaries } from "boundaries";
   import {
     appVersion,
-    FileInput,
     getAuthoritiesGeoJson,
     LoggedIn,
     MapLibreMap,