diff --git a/web/src/components/queue/ProcessingQueue.svelte b/web/src/components/queue/ProcessingQueue.svelte
index 62ecdcbb..a38b9bb2 100644
--- a/web/src/components/queue/ProcessingQueue.svelte
+++ b/web/src/components/queue/ProcessingQueue.svelte
@@ -6,7 +6,6 @@
     import { clearFileStorage } from "$lib/storage/opfs";
 
     import { queueVisible } from "$lib/state/queue-visibility";
-    import { currentTasks } from "$lib/state/task-manager/current-tasks";
     import { clearQueue, queue as readableQueue } from "$lib/state/task-manager/queue";
     import { getProgress } from "$lib/task-manager/queue";
 
@@ -22,13 +21,13 @@
         $queueVisible = !$queueVisible;
     };
 
-    $: queue = Object.entries($readableQueue);
+    let queue = $derived(Object.entries($readableQueue));
 
-    $: totalProgress = queue.length ? queue.map(([, item]) => {
-        return getProgress(item) * 100;
-    }).reduce((a, b) => a + b) / (100 * queue.length) : 0;
+    let totalProgress = $derived(queue.length ? queue.map(
+        ([, item]) => getProgress(item) * 100
+    ).reduce((a, b) => a + b) / (100 * queue.length) : 0);
 
-    $: indeterminate = queue.length > 0 && totalProgress === 0;
+    let indeterminate = $derived(queue.length > 0 && totalProgress === 0);
 
     onNavigate(() => {
         $queueVisible = false;
@@ -68,9 +67,7 @@
                 />
                 <div class="header-buttons">
                     {#if queue.length}
-                        <button class="clear-button" on:click={() => {
-                            clearQueue();
-                        }}>
+                        <button class="clear-button" onclick={clearQueue}>
                             <IconX />
                             {$t("button.clear")}
                         </button>
diff --git a/web/src/components/queue/ProcessingQueueItem.svelte b/web/src/components/queue/ProcessingQueueItem.svelte
index bcbc48b4..af781bde 100644
--- a/web/src/components/queue/ProcessingQueueItem.svelte
+++ b/web/src/components/queue/ProcessingQueueItem.svelte
@@ -29,10 +29,14 @@
         image: IconPhoto,
     };
 
-    export let id: string;
-    export let info: CobaltQueueItem;
+    type Props = {
+        id: string;
+        info: CobaltQueueItem;
+    }
 
-    let retrying = false;
+    let { id, info }: Props = $props();
+
+    let retrying = $state(false);
 
     const retry = async (info: CobaltQueueItem) => {
         if (info.canRetry && info.originalRequest) {
@@ -131,18 +135,20 @@
         the function every time either of them is changed,
         which is what we want in this case :3
     */
-    $: statusText = generateStatusText({
+    let statusText = $derived(generateStatusText({
         info,
         retrying,
         currentTasks: $currentTasks
-    });
+    }));
+
+    const MediaTypeIcon = $derived(itemIcons[info.mediaType]);
 </script>
 
 <div class="processing-item" role="listitem">
     <div class="processing-info">
         <div class="file-title">
             <div class="processing-type">
-                <svelte:component this={itemIcons[info.mediaType]} />
+                <MediaTypeIcon />
             </div>
             <span class="filename">
                 {info.filename}
@@ -187,7 +193,7 @@
             <button
                 class="button action-button"
                 aria-label={$t("button.download")}
-                on:click={() => download(info.resultFile)}
+                onclick={() => download(info.resultFile)}
             >
                 <IconDownload />
             </button>
@@ -198,7 +204,7 @@
                 <button
                     class="button action-button"
                     aria-label={$t("button.retry")}
-                    on:click={() => retry(info)}
+                    onclick={() => retry(info)}
                 >
                     <IconReload />
                 </button>
@@ -206,7 +212,7 @@
             <button
                 class="button action-button"
                 aria-label={$t(`button.${info.state === "done" ? "delete" : "remove"}`)}
-                on:click={() => removeItem(id)}
+                onclick={() => removeItem(id)}
             >
                 <IconX />
             </button>
diff --git a/web/src/components/queue/ProgressBar.svelte b/web/src/components/queue/ProgressBar.svelte
index e6531387..64289a81 100644
--- a/web/src/components/queue/ProgressBar.svelte
+++ b/web/src/components/queue/ProgressBar.svelte
@@ -1,9 +1,13 @@
 <script lang="ts">
     import Skeleton from "$components/misc/Skeleton.svelte";
 
-    export let percentage: number = 0;
-    export let workerId: string;
-    export let completedWorkers: Set<string>;
+    type Props = {
+        percentage?: number;
+        workerId: string;
+        completedWorkers: Set<string>;
+    }
+
+    let { percentage = 0, workerId, completedWorkers }: Props = $props();
 </script>
 
 <div class="file-progress">