diff --git a/sites/org/components/curate/sets/edit.mjs b/sites/org/components/curate/sets/edit.mjs
index 5e5236f0a46..5764eb0fe12 100644
--- a/sites/org/components/curate/sets/edit.mjs
+++ b/sites/org/components/curate/sets/edit.mjs
@@ -5,7 +5,6 @@ import { freeSewingConfig as conf } from 'shared/config/freesewing.config.mjs'
 import { measurements } from 'config/measurements.mjs'
 import { measurements as designMeasurements } from 'shared/prebuild/data/design-measurements.mjs'
 // Context
-import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 import { ModalContext } from 'shared/context/modal-context.mjs'
 // Hooks
 import { useState, useEffect, useContext } from 'react'
diff --git a/sites/org/components/github/create-post.mjs b/sites/org/components/github/create-post.mjs
index d04bea63d1f..b7d83b59557 100644
--- a/sites/org/components/github/create-post.mjs
+++ b/sites/org/components/github/create-post.mjs
@@ -1,7 +1,7 @@
 // Dependencies
 import { nsMerge, capitalize, cloudflareImageUrl, yyyymmdd } from 'shared/utils.mjs'
 // Hooks
-import { useState, Fragment } from 'react'
+import { useState, useContext, Fragment } from 'react'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 import { useTranslation } from 'next-i18next'
diff --git a/sites/org/components/github/create-showcase.mjs b/sites/org/components/github/create-showcase.mjs
index 1057516c267..003e17346ac 100644
--- a/sites/org/components/github/create-showcase.mjs
+++ b/sites/org/components/github/create-showcase.mjs
@@ -1,7 +1,7 @@
 // Dependencies
 import { nsMerge, capitalize, cloudflareImageUrl, yyyymmdd } from 'shared/utils.mjs'
 // Hooks
-import { useState, Fragment } from 'react'
+import { useState, useContext, Fragment } from 'react'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 import { useTranslation } from 'next-i18next'
diff --git a/sites/org/pages/account/apikeys/[id].mjs b/sites/org/pages/account/apikeys/[id].mjs
index ca7932ea350..5f49b0173eb 100644
--- a/sites/org/pages/account/apikeys/[id].mjs
+++ b/sites/org/pages/account/apikeys/[id].mjs
@@ -2,9 +2,11 @@
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import { nsMerge } from 'shared/utils.mjs'
+// Context
+import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
 import { useTranslation } from 'next-i18next'
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useContext } from 'react'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
 import { PageWrapper, ns as pageNs } from 'shared/components/wrappers/page.mjs'
@@ -37,6 +39,7 @@ const DynamicApikey = dynamic(
 const ApikeyPage = ({ page, id }) => {
   const { t } = useTranslation(ns)
   const backend = useBackend()
+  const { setLoadingStatus } = useContext(LoadingStatusContext)
 
   const [apikey, setApikey] = useState()
 
diff --git a/sites/org/pages/account/bookmarks/[id].mjs b/sites/org/pages/account/bookmarks/[id].mjs
index 8fa13d6f9b1..db3623e8f42 100644
--- a/sites/org/pages/account/bookmarks/[id].mjs
+++ b/sites/org/pages/account/bookmarks/[id].mjs
@@ -2,6 +2,8 @@
 import dynamic from 'next/dynamic'
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import { nsMerge } from 'shared/utils.mjs'
+// Context
+import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
 import { useTranslation } from 'next-i18next'
 import { useState, useEffect } from 'react'
@@ -37,6 +39,7 @@ const DynamicBookmark = dynamic(
 const BookmarkPage = ({ page, id }) => {
   const { t } = useTranslation(ns)
   const backend = useBackend()
+  const { setLoadingStatus } = useContext(LoadingStatusContext)
 
   const [bookmark, setBookmark] = useState()
 
diff --git a/sites/org/pages/signin/callback/[provider].mjs b/sites/org/pages/signin/callback/[provider].mjs
index 4774f47d090..f647fd1be6b 100644
--- a/sites/org/pages/signin/callback/[provider].mjs
+++ b/sites/org/pages/signin/callback/[provider].mjs
@@ -2,7 +2,7 @@
 import { serverSideTranslations } from 'next-i18next/serverSideTranslations'
 import { nsMerge } from 'shared/utils.mjs'
 // Hooks
-import { useEffect } from 'react'
+import { useEffect, useContext } from 'react'
 import { useRouter } from 'next/router'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 import { useAccount } from 'shared/hooks/use-account.mjs'
diff --git a/sites/org/pages/typography.mjs b/sites/org/pages/typography.mjs
index 0403c5199a6..a066f8ce6b8 100644
--- a/sites/org/pages/typography.mjs
+++ b/sites/org/pages/typography.mjs
@@ -33,7 +33,7 @@ const TypographyPage = ({ page }) => {
           setLoadingStatus(
             i === 50
               ? [true, 'All done!', true, true]
-              : [true, <LoadingProgress val={i} max={50} msg={`Herding cats: ${i}/50`} />]
+              : [true, <LoadingProgress key={i} val={i} max={50} msg={`Herding cats: ${i}/50`} />]
           ),
         delay
       )
diff --git a/sites/shared/components/account/apikeys.mjs b/sites/shared/components/account/apikeys.mjs
index 3bd1f6d00b8..02ea7f91013 100644
--- a/sites/shared/components/account/apikeys.mjs
+++ b/sites/shared/components/account/apikeys.mjs
@@ -1,5 +1,5 @@
 // Dependencies
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useContext } from 'react'
 import { useTranslation } from 'next-i18next'
 import { DateTime } from 'luxon'
 import { CopyToClipboard } from 'react-copy-to-clipboard'
diff --git a/sites/shared/components/account/bio.mjs b/sites/shared/components/account/bio.mjs
index a2e494d0cba..2b5787e377b 100644
--- a/sites/shared/components/account/bio.mjs
+++ b/sites/shared/components/account/bio.mjs
@@ -1,5 +1,5 @@
 // Dependencies
-import { useState } from 'react'
+import { useState, useContext } from 'react'
 import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
diff --git a/sites/shared/components/account/bookmarks.mjs b/sites/shared/components/account/bookmarks.mjs
index 53a69d163cc..888a2c43c94 100644
--- a/sites/shared/components/account/bookmarks.mjs
+++ b/sites/shared/components/account/bookmarks.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useState, useEffect, Fragment, useContext } from 'react'
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useEffect, Fragment, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 import { useRouter } from 'next/router'
 // Components
diff --git a/sites/shared/components/account/control.mjs b/sites/shared/components/account/control.mjs
index 0b8092ac8bf..4067950ee5b 100644
--- a/sites/shared/components/account/control.mjs
+++ b/sites/shared/components/account/control.mjs
@@ -1,5 +1,5 @@
 // Dependencies
-import { useState } from 'react'
+import { useState, useContext } from 'react'
 import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
@@ -51,7 +51,7 @@ export const useControlState = () => {
 export const ControlSettings = ({ welcome = false, noBack = false }) => {
   const { t, i18n } = useTranslation(ns)
 
-  const { selection, update, LoadingStatus } = useControlState()
+  const { selection, update } = useControlState()
 
   // Helper to get the link to the next onboarding step
   const nextHref = welcome
diff --git a/sites/shared/components/account/email.mjs b/sites/shared/components/account/email.mjs
index 4c08fcc1c35..6671767eb60 100644
--- a/sites/shared/components/account/email.mjs
+++ b/sites/shared/components/account/email.mjs
@@ -1,5 +1,5 @@
 // Dependencies
-import { useState } from 'react'
+import { useState, useContext } from 'react'
 import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
diff --git a/sites/shared/components/account/export.mjs b/sites/shared/components/account/export.mjs
index 2ca1c939f48..97ff787c52a 100644
--- a/sites/shared/components/account/export.mjs
+++ b/sites/shared/components/account/export.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
-import { useState } from 'react'
+import { useTranslation } from 'next-i18next'
+import { useState, useContext } from 'react'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
 import { BackToAccountButton } from './shared.mjs'
diff --git a/sites/shared/components/account/github.mjs b/sites/shared/components/account/github.mjs
index e5d7cdfdfa5..d8de392c65d 100644
--- a/sites/shared/components/account/github.mjs
+++ b/sites/shared/components/account/github.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useState } from 'react'
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/img.mjs b/sites/shared/components/account/img.mjs
index 77b61207f0d..57adbcbf940 100644
--- a/sites/shared/components/account/img.mjs
+++ b/sites/shared/components/account/img.mjs
@@ -1,10 +1,10 @@
 // Dependencies
-import { useState } from 'react'
-import { useTranslation } from 'next-i18next'
 import { cloudflareImageUrl } from 'shared/utils.mjs'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/imperial.mjs b/sites/shared/components/account/imperial.mjs
index e9c16ad718a..452eeae0749 100644
--- a/sites/shared/components/account/imperial.mjs
+++ b/sites/shared/components/account/imperial.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useState } from 'react'
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/language.mjs b/sites/shared/components/account/language.mjs
index 0be0e4e8c7a..16b17d32de9 100644
--- a/sites/shared/components/account/language.mjs
+++ b/sites/shared/components/account/language.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useState } from 'react'
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/mfa.mjs b/sites/shared/components/account/mfa.mjs
index 9c4abc9cfcc..b7781b1eed7 100644
--- a/sites/shared/components/account/mfa.mjs
+++ b/sites/shared/components/account/mfa.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useState } from 'react'
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/newsletter.mjs b/sites/shared/components/account/newsletter.mjs
index 3c83c520622..c2a54fbd47c 100644
--- a/sites/shared/components/account/newsletter.mjs
+++ b/sites/shared/components/account/newsletter.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useState } from 'react'
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/platform.mjs b/sites/shared/components/account/platform.mjs
index 13e62f89564..bc6645cc942 100644
--- a/sites/shared/components/account/platform.mjs
+++ b/sites/shared/components/account/platform.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useState } from 'react'
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/reload.mjs b/sites/shared/components/account/reload.mjs
index 9b03065dd12..d82b43e7188 100644
--- a/sites/shared/components/account/reload.mjs
+++ b/sites/shared/components/account/reload.mjs
@@ -1,8 +1,8 @@
-// Dependencies
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useTranslation } from 'next-i18next'
+import { useContext } from 'react'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/remove.mjs b/sites/shared/components/account/remove.mjs
index e80eb701b15..b22536c21db 100644
--- a/sites/shared/components/account/remove.mjs
+++ b/sites/shared/components/account/remove.mjs
@@ -1,8 +1,8 @@
-// Dependencies
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/restrict.mjs b/sites/shared/components/account/restrict.mjs
index 12245285652..255b5d64aee 100644
--- a/sites/shared/components/account/restrict.mjs
+++ b/sites/shared/components/account/restrict.mjs
@@ -1,8 +1,8 @@
-// Dependencies
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/account/username.mjs b/sites/shared/components/account/username.mjs
index 8d8d495debe..1046237fbcb 100644
--- a/sites/shared/components/account/username.mjs
+++ b/sites/shared/components/account/username.mjs
@@ -1,9 +1,8 @@
-// Dependencies
-import { useState } from 'react'
-import { useTranslation } from 'next-i18next'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
+import { useState, useContext } from 'react'
+import { useTranslation } from 'next-i18next'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/submissions/index.mjs b/sites/shared/components/submissions/index.mjs
index 6950f2b31a6..e3bf1ee5012 100644
--- a/sites/shared/components/submissions/index.mjs
+++ b/sites/shared/components/submissions/index.mjs
@@ -4,7 +4,7 @@ import { cloudflareImageUrl, nsMerge } from 'shared/utils.mjs'
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
 import { useTranslation } from 'next-i18next'
-import { useEffect, useState } from 'react'
+import { useEffect, useState, useContext } from 'react'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 import { useRouter } from 'next/router'
 // Components
diff --git a/sites/shared/components/support.mjs b/sites/shared/components/support.mjs
index 366eef655f6..b59cd7af50f 100644
--- a/sites/shared/components/support.mjs
+++ b/sites/shared/components/support.mjs
@@ -3,7 +3,7 @@ import { freeSewingConfig as config } from 'shared/config/freesewing.config.mjs'
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
 import { useTranslation } from 'next-i18next'
-import { useState, Fragment } from 'react'
+import { useState, Fragment, useContext } from 'react'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
 // Components
diff --git a/sites/shared/components/susi/sign-in.mjs b/sites/shared/components/susi/sign-in.mjs
index 5bcb8b4ae78..3254e5e0326 100644
--- a/sites/shared/components/susi/sign-in.mjs
+++ b/sites/shared/components/susi/sign-in.mjs
@@ -1,7 +1,7 @@
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useContext } from 'react'
 import { useAccount } from 'shared/hooks/use-account.mjs'
 import { useTranslation } from 'next-i18next'
 import { useBackend } from 'shared/hooks/use-backend.mjs'
diff --git a/sites/shared/components/workbench/views/edit/index.mjs b/sites/shared/components/workbench/views/edit/index.mjs
index 7cec1435ddc..2b473e2d6c9 100644
--- a/sites/shared/components/workbench/views/edit/index.mjs
+++ b/sites/shared/components/workbench/views/edit/index.mjs
@@ -5,7 +5,7 @@ import { capitalize } from 'shared/utils.mjs'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
-import { useEffect, useState, useRef, useMemo } from 'react'
+import { useEffect, useState, useRef, useMemo, useContext } from 'react'
 import { useTranslation } from 'next-i18next'
 // Components
 import { CloseIcon } from 'shared/components/icons.mjs'
diff --git a/sites/shared/components/workbench/views/measies/index.mjs b/sites/shared/components/workbench/views/measies/index.mjs
index 1398d29728b..20aecd6e2bb 100644
--- a/sites/shared/components/workbench/views/measies/index.mjs
+++ b/sites/shared/components/workbench/views/measies/index.mjs
@@ -1,5 +1,5 @@
 // Dependencies
-import { Fragment } from 'react'
+import { Fragment, useContext } from 'react'
 import { nsMerge } from 'shared/utils.mjs'
 import { ns as authNs } from 'shared/components/wrappers/auth/index.mjs'
 import { designMeasurements, horFlexClasses } from 'shared/utils.mjs'
diff --git a/sites/shared/components/workbench/views/save/index.mjs b/sites/shared/components/workbench/views/save/index.mjs
index fedc5559bb5..93441caaaed 100644
--- a/sites/shared/components/workbench/views/save/index.mjs
+++ b/sites/shared/components/workbench/views/save/index.mjs
@@ -4,7 +4,7 @@ import yaml from 'js-yaml'
 // Context
 import { LoadingStatusContext } from 'shared/context/loading-status-context.mjs'
 // Hooks
-import { useState } from 'react'
+import { useState, useContext } from 'react'
 import { useTranslation } from 'next-i18next'
 import { useRouter } from 'next/router'
 import { useBackend } from 'shared/hooks/use-backend.mjs'