diff --git a/src/seqta/utils/listeners/SettingsState.ts b/src/seqta/utils/listeners/SettingsState.ts
index 77c02e58..a3280c42 100644
--- a/src/seqta/utils/listeners/SettingsState.ts
+++ b/src/seqta/utils/listeners/SettingsState.ts
@@ -1,5 +1,6 @@
 import browser from 'webextension-polyfill';
 import type { SettingsState } from '@/types/storage';
+import type { Subscriber, Unsubscriber } from 'svelte/store';
 
 type ChangeListener = (newValue: any, oldValue: any) => void;
 type GlobalChangeListener = (newValue: any, oldValue: any, key: string) => void;
@@ -9,6 +10,7 @@ class StorageManager {
   private data: SettingsState;
   private listeners: { [key: string]: ChangeListener[] };
   private globalListeners: GlobalChangeListener[];
+  private subscribers: Set<Subscriber<SettingsState>> = new Set();
 
   private constructor() {
     this.data = {} as SettingsState;
@@ -60,7 +62,7 @@ class StorageManager {
     await instance.loadFromStorage();
     return instance;
   }
-  
+
   public setKey<K extends keyof SettingsState>(key: K, value: SettingsState[K]): void {
     this.data[key] = value;
     this.saveToStorage();
@@ -73,6 +75,7 @@ class StorageManager {
 
   private async saveToStorage(): Promise<void> {
     await browser.storage.local.set(this.data);
+    this.notifySubscribers();
   }
 
   private async removeFromStorage(key: string): Promise<void> {
@@ -128,6 +131,20 @@ class StorageManager {
   public getAll(): SettingsState {
     return this.data;
   }
+
+  public subscribe(run: Subscriber<SettingsState>): Unsubscriber {
+    this.subscribers.add(run);
+    run(this.data);
+    return () => {
+      this.subscribers.delete(run);
+    };
+  }
+
+  private notifySubscribers(): void {
+    for (const subscriber of this.subscribers) {
+      subscriber(this.data);
+    }
+  }
 }
 
 export const settingsState = StorageManager.getInstance();
diff --git a/src/svelte-interface/components/Button.svelte b/src/svelte-interface/components/Button.svelte
index 944b98ff..22362c6d 100644
--- a/src/svelte-interface/components/Button.svelte
+++ b/src/svelte-interface/components/Button.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
-  export let onClick: () => void;
-  export let text: string;
+  let { onClick, text, ...props } = $props<{ onClick: () => void, text: string, [key: string]: any }>();
 </script>
 
-<button on:click={onClick} class='px-4 py-1 text-[0.75rem] dark:bg-[#38373D] bg-[#DDDDDD] dark:text-white rounded-md'>
+<button onclick={onClick} class='px-4 py-1 text-[0.75rem] dark:bg-[#38373D] bg-[#DDDDDD] dark:text-white rounded-md' {...props}>
   {text}
 </button>
\ No newline at end of file
diff --git a/src/svelte-interface/components/Switch.svelte b/src/svelte-interface/components/Switch.svelte
index 92d9b718..507c34e9 100644
--- a/src/svelte-interface/components/Switch.svelte
+++ b/src/svelte-interface/components/Switch.svelte
@@ -10,10 +10,6 @@
     onChange(!state);
   };
 
-  $effect(() => {
-    console.log('state', state);
-  });
-
   const springParams = {
     stiffness: 700,
     damping: 30,
diff --git a/src/svelte-interface/pages/settings/general.svelte b/src/svelte-interface/pages/settings/general.svelte
index 003e58f4..60043869 100644
--- a/src/svelte-interface/pages/settings/general.svelte
+++ b/src/svelte-interface/pages/settings/general.svelte
@@ -6,24 +6,32 @@
 
   import browser from "webextension-polyfill"
   
-  import type { SettingsList } from "../../types/SettingsProps"
-  import { createSettingsState } from "../../state/SettingsStore.svelte.ts"
+  import type { SettingsList } from "@/svelte-interface/types/SettingsProps"
+  import { settingsState } from "@/seqta/utils/listeners/SettingsState.ts"
+</script>
 
-  const settingsStore = createSettingsState();
+{#snippet Setting({ title, description, Component, props }: SettingsList) }
+<div class="flex items-center justify-between px-4 py-3">
+  <div class="pr-4">
+    <h2 class="text-sm font-bold">{title}</h2>
+    <p class="text-xs">{description}</p>
+  </div>
+  <div>
+    <Component {...props} />
+  </div>
+</div>
+{/snippet}
 
-  let test = $state(false);
-
-  const settings: SettingsList[] = [
+<div class="flex flex-col -mt-4 overflow-y-scroll divide-y divide-zinc-100 dark:divide-zinc-700">
+  {#each [
     {
       title: "Transparency Effects",
       description: "Enables transparency effects on certain elements such as blur. (May impact battery life)",
       id: 1,
       Component: Switch,
       props: {
-        /* state: $settingsStore.transparencyEffects,
-        onChange: (isOn: boolean) => settingsStore.setKey('transparencyEffects', isOn) */
-        state: test,
-        onChange: (isOn: boolean) => test = isOn
+        state: $settingsState.transparencyEffects,
+        onChange: (isOn: boolean) => settingsState.transparencyEffects = isOn
       }
     },
     {
@@ -32,8 +40,8 @@
       id: 2,
       Component: Switch as any,
       props: {
-        state: $settingsStore.animatedbk,
-        onChange: (isOn: boolean) => settingsStore.setKey('animatedbk', isOn)
+        state: $settingsState.animatedbk,
+        onChange: (isOn: boolean) => settingsState.animatedbk = isOn
       }
     },
     {
@@ -42,8 +50,8 @@
       id: 3,
       Component: Slider,
       props: {
-        state: $settingsStore.bksliderinput,
-        onChange: (value: number) => settingsStore.setKey('bksliderinput', `${value}`)
+        state: $settingsState.bksliderinput,
+        onChange: (value: number) => settingsState.bksliderinput = `${value}`
       }
     },
     /* {
@@ -68,8 +76,8 @@
       id: 7,
       Component: Switch,
       props: {
-        state: $settingsStore.notificationcollector,
-        onChange: (isOn: boolean) => settingsStore.setKey('notificationcollector', isOn)
+        state: $settingsState.notificationcollector,
+        onChange: (isOn: boolean) => settingsState.notificationcollector = isOn
       }
     },
     {
@@ -78,8 +86,8 @@
       id: 8,
       Component: Switch,
       props: {
-        state: $settingsStore.lessonalert,
-        onChange: (isOn: boolean) => settingsStore.setKey('lessonalert', isOn)
+        state: $settingsState.lessonalert,
+        onChange: (isOn: boolean) => settingsState.lessonalert = isOn
       }
     },
     {
@@ -88,26 +96,11 @@
       id: 9,
       Component: Switch,
       props: {
-        state: $settingsStore.onoff,
-        onChange: (isOn: boolean) => settingsStore.setKey('onoff', isOn)
+        state: $settingsState.onoff,
+        onChange: (isOn: boolean) => settingsState.onoff = isOn
       }
     }
-  ];
-</script>
-
-<div class="flex flex-col -mt-4 overflow-y-scroll divide-y divide-zinc-100 dark:divide-zinc-700">
-  <Switch state={$settingsStore.DarkMode} onChange={(isOn: boolean) => settingsStore.setKey('DarkMode', isOn)} />
-  {#if settings}
-    {#each settings as { title, description, Component, props, id } (id)}
-      <div  class="flex items-center justify-between px-4 py-3">
-        <div class="pr-4">
-          <h2 class="text-sm font-bold">{title}</h2>
-          <p class="text-xs">{description}</p>
-        </div>
-        <div>
-          <Component {...props} />
-        </div>
-      </div>
-    {/each}
-  {/if}
+  ] as setting}
+    {@render Setting(setting)}
+  {/each}
 </div>
\ No newline at end of file
diff --git a/src/svelte-interface/state/SettingsStore.svelte.ts b/src/svelte-interface/state/SettingsStore.svelte.ts
deleted file mode 100644
index 7c253d0c..00000000
--- a/src/svelte-interface/state/SettingsStore.svelte.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { settingsState } from "@/seqta/utils/listeners/SettingsState";
-import type { SettingsState } from '@/types/storage';
-
-export function createSettingsState() {
-  let settings = $state<SettingsState>(settingsState);
-
-  const subscribers = new Set<(value: SettingsState) => void>();
-
-  // Register a global listener to notify subscribers on any change
-  settingsState.registerGlobal((newValue, oldValue, key) => {
-    console.log('Global listener triggered:', { newValue, oldValue, key });
-    if (newValue !== undefined) {
-      settings = { ...settings, [key]: newValue };
-      notifySubscribers(settings);
-    }
-  });
-
-  function notifySubscribers(newValue: SettingsState) {
-    console.log('Notifying subscribers with:', newValue);
-    subscribers.forEach(subscriber => subscriber(newValue));
-  }
-
-  return {
-    get settings() { return settings; },
-    set(newSettings: SettingsState) {
-      settings = newSettings;
-      notifySubscribers(settings);
-    },
-    setKey<K extends keyof SettingsState>(key: K, value: SettingsState[K]) {
-      settings[key] = value;
-      settingsState.setKey(key, value);
-      notifySubscribers(settings);
-    },
-    subscribe(callback: (value: SettingsState) => void) {
-      subscribers.add(callback);
-      // Immediately call the callback with the current value
-      callback(settings);
-      
-      // Return an unsubscribe function
-      return () => {
-        subscribers.delete(callback);
-      };
-    }
-  };
-}
\ No newline at end of file
diff --git a/src/svelte-interface/types/SettingsProps.ts b/src/svelte-interface/types/SettingsProps.ts
index 8c598d9b..4c7f5673 100644
--- a/src/svelte-interface/types/SettingsProps.ts
+++ b/src/svelte-interface/types/SettingsProps.ts
@@ -1,11 +1,10 @@
 import type { SettingsState } from './AppProps';
-import type { Component } from 'svelte';
 
 export interface SettingsList {
   title: string;
   id: number;
   description: string;
-  Component: Component;
+  Component: any; /* TODO: Give this a type */
   props?: any;
 }
 export interface SettingsProps {