diff --git a/src/seqta/ui/themes/downloadTheme.ts b/src/seqta/ui/themes/downloadTheme.ts
index 32e72eed..630cb624 100644
--- a/src/seqta/ui/themes/downloadTheme.ts
+++ b/src/seqta/ui/themes/downloadTheme.ts
@@ -31,13 +31,13 @@ export const InstallTheme = async (themeData: ThemeContent) => {
     blob: base64ToBlob(image.data)
   }));
 
-  let availableThemes = await localforage.getItem('availableThemes') as string[];
+  let availableThemes = await localforage.getItem('customThemes') as string[];
   if (availableThemes && !availableThemes.includes(themeData.id)) {
     availableThemes.push(themeData.id);
   } else if (!availableThemes) {
     availableThemes = [themeData.id];
   }
-  await localforage.setItem('availableThemes', availableThemes);
+  await localforage.setItem('customThemes', availableThemes);
 
   await localforage.setItem(themeData.id, {
     ...themeData,
diff --git a/src/svelte-interface/components/store/ThemeModal.svelte b/src/svelte-interface/components/store/ThemeModal.svelte
index 8350ca94..28cb904a 100644
--- a/src/svelte-interface/components/store/ThemeModal.svelte
+++ b/src/svelte-interface/components/store/ThemeModal.svelte
@@ -1,19 +1,61 @@
 <script lang="ts">
-  export let theme;
-  export let currentThemes = [];
-  export let onClose;
-  export let onInstall;
-  export let onRemove;
-  let installing = false;
+  import type { Theme } from '@/svelte-interface/types/Theme'
+  import { fade } from 'svelte/transition';
+  import { animate, spring } from 'motion'
+  import { delay } from '@/seqta/utils/delay'
 
-  // Transitions
-  import { fade, slide } from 'svelte/transition';
+  let { theme, currentThemes, setDisplayTheme, onInstall, onRemove, allThemes, displayTheme } = $props<{
+    theme: Theme | null;
+    currentThemes: string[];
+    setDisplayTheme: (theme: Theme | null) => void;
+    onInstall: (themeId: string) => void;
+    onRemove: (themeId: string) => void;
+    allThemes: Theme[];
+    displayTheme: Theme | null;
+  }>();
+  let installing = $state(false);
+  let modalElement: HTMLElement;
+
+  // Function to get related themes
+  function getRelatedThemes() {
+    return allThemes
+      .filter((t: Theme) => t.id !== theme.id)
+      .sort((a: Theme, b: Theme) => a.name.localeCompare(theme.name) - b.name.localeCompare(theme.name))
+      .slice(0, 4);
+  }
+
+  $effect(() => {
+    if (displayTheme) {
+      animate(
+        modalElement,
+        { y: [500, 0], opacity: [0, 1] },
+        { easing: spring({ stiffness: 150, damping: 20 }) }
+      );
+    }
+  });
+
+  const hideModal = (relatedTheme?: Theme | null) => {
+    animate(
+      modalElement,
+      { y: [10, 500], opacity: [1, 0] },
+      { easing: spring({ stiffness: 150, damping: 20 }) }
+    );
+    setTimeout(() => {
+      setDisplayTheme(relatedTheme ?? null);
+    }, 100);
+  }
 </script>
 
-<div class="fixed inset-0 z-50 flex items-end justify-center bg-black bg-opacity-70" on:click={onClose} transition:fade>
-  <div class="w-full max-w-xl h-[95%] p-4 bg-white rounded-t-2xl dark:bg-zinc-800 overflow-scroll" on:click|stopPropagation transition:slide={{ axis: 'y' }}>
+<div class="fixed inset-0 z-50 flex items-end justify-center bg-black bg-opacity-70" onclick={() => hideModal()} onkeydown={() => hideModal()} role="button" tabindex="-1" transition:fade>
+  <!-- svelte-ignore a11y_no_static_element_interactions -->
+  <div 
+    bind:this={modalElement}
+    class="w-full max-w-xl h-[95%] p-4 bg-white rounded-t-2xl dark:bg-zinc-800 overflow-scroll" 
+    onclick={(e) => e.stopPropagation()} 
+    onkeydown={(e) => e.stopPropagation()}
+  >
     <div class="relative h-auto">
-      <button class="absolute top-0 right-0 p-2 text-xl font-bold text-gray-600 font-IconFamily dark:text-gray-200" on:click={onClose}>
+      <button class="absolute top-0 right-0 p-2 text-xl font-bold text-gray-600 font-IconFamily dark:text-gray-200" onclick={() => hideModal()}>
         {'\ued8a'}
       </button>
       <h2 class="mb-4 text-2xl font-bold">
@@ -24,22 +66,43 @@
         {theme.description}
       </p>
       {#if currentThemes.includes(theme.id)}
-        <button on:click={() => {installing = true; onRemove(theme.id); installing = false;}} class="flex px-4 py-2 mt-4 ml-auto rounded-full dark:text-white bg-zinc-300 dark:bg-zinc-700 dark:hover:bg-zinc-600/50 hover:bg-zinc-200">
+        <button onclick={async () => {installing = true; await onRemove(theme.id); installing = false}} class="relative flex items-center justify-center w-32 px-4 py-2 mt-4 ml-auto text-black rounded-full dark:text-white bg-zinc-300 dark:bg-zinc-700 dark:hover:bg-zinc-600/50 hover:bg-zinc-200">
           {#if installing}
-            Removing...
-          {:else}
-            Remove
+            <svg class="absolute w-4 h-4 { installing ? 'opacity-100' : 'opacity-0' }" width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+              <path stroke="currentColor" fill="currentColor" class="origin-center animate-spin-fast" d="M2,12A11.2,11.2,0,0,1,13,1.05C12.67,1,12.34,1,12,1a11,11,0,0,0,0,22c.34,0,.67,0,1-.05C6,23,2,17.74,2,12Z"/>
+            </svg>
           {/if}
+          <span class="{ installing ? 'opacity-0' : 'opacity-100' }">Remove</span>
         </button>
       {:else}
-        <button on:click={() => {installing = true; onInstall(theme.id); installing = false;}} class="flex px-4 py-2 mt-4 ml-auto rounded-full dark:text-white bg-zinc-300 dark:bg-zinc-700 dark:hover:bg-zinc-600/50 hover:bg-zinc-200">
+        <button onclick={async () => {installing = true; await onInstall(theme.id); installing = false}} class="relative flex items-center justify-center w-32 px-4 py-2 mt-4 ml-auto text-black rounded-full dark:text-white bg-zinc-300 dark:bg-zinc-700 dark:hover:bg-zinc-600/50 hover:bg-zinc-200">
           {#if installing}
-            Installing...
-          {:else}
-            Install
+            <svg class="absolute w-4 h-4 { installing ? 'opacity-100' : 'opacity-0' }" width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+              <path stroke="currentColor" fill="currentColor" class="origin-center animate-spin-fast" d="M2,12A11.2,11.2,0,0,1,13,1.05C12.67,1,12.34,1,12,1a11,11,0,0,0,0,22c.34,0,.67,0,1-.05C6,23,2,17.74,2,12Z"/>
+            </svg>
           {/if}
+          <span class="{ installing ? 'opacity-0' : 'opacity-100' }">Install</span>
         </button>
       {/if}
+
+      <div class="my-8 border-b border-zinc-200 dark:border-zinc-700"></div>
+
+      <h3 class="mb-4 text-lg font-bold">
+        Similar Themes
+      </h3>
+      <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">
+        {#each getRelatedThemes() as relatedTheme (relatedTheme.id)}
+          <button onclick={() => { hideModal(relatedTheme) }} class="w-full cursor-pointer">
+            <div class="bg-gray-50 w-full transition-all hover:scale-105 duration-500 relative group group/card flex flex-col hover:shadow-2xl dark:hover:shadow-white/[0.1] hover:shadow-white/[0.8] dark:bg-zinc-800 dark:border-white/[0.1] h-auto rounded-xl overflow-clip border">
+              <div class="absolute z-10 mb-1 text-xl font-bold text-white transition-all duration-500 group-hover:-translate-y-0.5 bottom-1 left-3">
+                {relatedTheme.name}
+              </div>
+              <div class="absolute bottom-0 z-0 w-full h-3/4 bg-gradient-to-t from-black/80 to-transparent"></div>
+              <img src={relatedTheme.coverImage} alt="Theme Preview" class="object-cover w-full h-48" />
+            </div>
+          </button>
+        {/each}
+      </div>
     </div>
   </div>
 </div>
diff --git a/src/svelte-interface/pages/store.svelte b/src/svelte-interface/pages/store.svelte
index 642d6125..41d5f133 100644
--- a/src/svelte-interface/pages/store.svelte
+++ b/src/svelte-interface/pages/store.svelte
@@ -12,6 +12,8 @@
   import { StoreDownloadTheme } from '@/seqta/ui/themes/downloadTheme'
   import { setTheme } from '@/seqta/ui/themes/setTheme'
   import Header from '../components/store/Header.svelte'
+  import { deleteTheme } from '@/seqta/ui/themes/deleteTheme'
+  import { getAvailableThemes } from '@/seqta/ui/themes/getAvailableThemes'
 
   // State variables
   let searchTerm = $state<string>('');
@@ -20,8 +22,14 @@
   let loading = $state<boolean>(true);
   let darkMode = $state<boolean>(false);
   let displayTheme = $state<Theme | null>(null);
+  let currentThemes = $state<string[]>([]);
 
-  const setDisplayTheme = (theme: Theme) => {
+  const fetchCurrentThemes = async () => {
+    const themes = await getAvailableThemes();
+    currentThemes = themes.themes.filter(theme => theme !== null).map(theme => theme.id);
+  };
+
+  const setDisplayTheme = (theme: Theme | null) => {
     displayTheme = theme;
   };
   
@@ -50,7 +58,8 @@
   // On mount
   onMount(async () => {
     await fetchThemes();
-
+    await fetchCurrentThemes();
+    
     darkMode = (await browser.storage.local.get('DarkMode')).DarkMode === 'true';
 
     darkMode = $settingsState.DarkMode;
@@ -83,14 +92,21 @@
         <ThemeGrid themes={filteredThemes} searchTerm={searchTerm} setDisplayTheme={setDisplayTheme} />
   
         {#if displayTheme}
-          <ThemeModal theme={displayTheme} onClose={() => displayTheme = null} onInstall={() => {
-            StoreDownloadTheme({themeContent: displayTheme as Theme}).then(() => {
-              setTheme((displayTheme as Theme).id);
-              displayTheme = null;
-            });
-          }} onRemove={() => {}} />
+          <ThemeModal currentThemes={currentThemes} allThemes={themes} theme={displayTheme} displayTheme={displayTheme} setDisplayTheme={setDisplayTheme} onInstall={async () => {
+            if (displayTheme) {
+              await StoreDownloadTheme({themeContent: displayTheme})
+              // @ts-ignore
+              setTheme(displayTheme.id);
+              await fetchCurrentThemes();
+            }
+          }} onRemove={async () => {
+            if (displayTheme?.id) {
+              console.log('deleting theme', displayTheme.id);
+              deleteTheme(displayTheme.id)
+              await fetchCurrentThemes();
+            }
+          }} />
         {/if}
-          
       {/if}
     </div>
   </div>
diff --git a/tailwind.config.js b/tailwind.config.js
index fe161f23..67df1fdf 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -39,6 +39,9 @@ export default {
       fontFamily: {
         "IconFamily": "IconFamily"
       },
+      animation: {
+        'spin-fast': 'spin 0.4s linear infinite',
+      },
       aspectRatio: {
         "theme": "5 / 1"
       }