diff --git a/src/background.ts b/src/background.ts
index 990a0e0b..c1462f3e 100644
--- a/src/background.ts
+++ b/src/background.ts
@@ -166,10 +166,6 @@ browser.runtime.onMessage.addListener((request: any, _sender: any, sendResponse:
   case 'DownloadTheme':
     DownloadTheme(request.body.theme);
     break;
-  
-  case 'StoreDownloadTheme':
-    StoreDownloadTheme(request.body);
-    break;
 
   case 'DeleteDownloadedTheme':
     DeleteDownloadedTheme(request.body);
diff --git a/src/interface/components/LoadingSpinner.tsx b/src/interface/components/LoadingSpinner.tsx
new file mode 100644
index 00000000..249415d8
--- /dev/null
+++ b/src/interface/components/LoadingSpinner.tsx
@@ -0,0 +1,8 @@
+const SpinnerIcon = ({ className }: { className: string }) => (
+  <svg className={className} width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <style>{`.spinner_7mtw{transform-origin:center;animation:spinner_jgYN .6s linear infinite}@keyframes spinner_jgYN{100%{transform:rotate(360deg)}}`}</style>
+    <path stroke="currentColor" fill="currentColor" className="spinner_7mtw" 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>
+);
+
+export default SpinnerIcon;
\ No newline at end of file
diff --git a/src/interface/pages/Store.tsx b/src/interface/pages/Store.tsx
index e337e55a..cd786c02 100644
--- a/src/interface/pages/Store.tsx
+++ b/src/interface/pages/Store.tsx
@@ -9,6 +9,9 @@ import 'swiper/css';
 import 'swiper/css/pagination';
 import 'swiper/css/scrollbar';
 import 'swiper/css/autoplay';
+import SpinnerIcon from '../components/LoadingSpinner';
+import localforage from 'localforage';
+import { StoreDownloadTheme } from '../../seqta/ui/themes/downloadTheme';
 
 export type Theme = {
   name: string;
@@ -22,12 +25,24 @@ type ThemesResponse = {
   themes: Theme[];
 }
 
+const DeleteDownloadedTheme = async (themeID: string) => {
+  console.log('DeleteDownloaded Theme:', themeID)
+  await localforage.removeItem(themeID);
+
+  const availableThemesList = await localforage.getItem('availableThemes') as string[];
+  const updatedThemesList = availableThemesList.filter(theme => theme !== themeID);
+
+  await localforage.setItem('availableThemes', updatedThemesList);
+}
+
 const Store = () => {
   const [searchTerm, setSearchTerm] = useState('');
   const swiperCover = useRef<any | null>(null);
   const [gridThemes, setGridThemes] = useState<Theme[]>([]);
   const [filteredThemes, setFilteredThemes] = useState<Theme[]>([]);
   const [coverThemes, setCoverThemes] = useState<Theme[]>([]);
+  const [installingThemes, setInstallingThemes] = useState<string[]>([]);
+  const [currentThemes, setCurrentThemes] = useState<string[]>([]);
 
   useEffect(() => {
     fetch(`https://raw.githubusercontent.com/BetterSEQTA/BetterSEQTA-Themes/main/store/themes.json?nocache=${(new Date()).getTime()}`, { cache: 'no-store' })
@@ -39,6 +54,11 @@ const Store = () => {
         setCoverThemes(shuffled.slice(0, 3));
       })
       .catch(error => console.error('Failed to fetch themes', error));
+    
+    (async () => {
+      const availableThemes = await localforage.getItem('availableThemes') as string[];
+      setCurrentThemes(availableThemes)
+    })();
   }, []);
 
   useEffect(() => {
@@ -54,9 +74,34 @@ const Store = () => {
       return
     };
 
-    browser.runtime.sendMessage({ type: 'StoreDownloadTheme', body: { themeContent } });
+    setInstallingThemes([...installingThemes, id]);
+
+    StoreDownloadTheme({ themeContent }).then(() => {
+      setInstallingThemes(installingThemes.filter(theme => theme !== id));
+      setCurrentThemes([...currentThemes, id]);
+    });
   };
 
+  const removeTheme = async (id: string) => {
+    const themeContent = gridThemes.find(theme => theme.id === id);
+    if (!themeContent) {
+      alert('There was an error, The theme was not found!')
+      return
+    };
+
+    setInstallingThemes([...installingThemes, id]);
+
+    DeleteDownloadedTheme(id).then(() => {
+      setInstallingThemes(installingThemes.filter(theme => theme !== id));
+      setCurrentThemes(currentThemes.filter(theme => theme !== id));
+    });
+
+    /* browser.runtime.sendMessage({ type: 'StoreRemoveTheme', body: { themeContent } }).then(async () => {
+      await new Promise(resolve => setTimeout(resolve, 1000));
+      setInstallingThemes(installingThemes.filter(theme => theme !== id));
+    }); */
+  }
+
   return (
     <div className="w-screen h-screen overflow-y-scroll bg-zinc-200/50 dark:bg-zinc-900">
       
@@ -143,11 +188,31 @@ const Store = () => {
                   <img src={theme.coverImage} alt="Theme Preview" className="object-cover w-full h-48 rounded-md" />
                 </div>
                 <div>
-                  <button
-                    onClick={() => downloadTheme(theme.id)}
-                    className="px-4 py-2 mt-4 transition rounded-full dark:text-white bg-zinc-300 dark:bg-zinc-800 dark:hover:bg-zinc-700 hover:bg-zinc-200 focus:outline-none focus:ring-2 focus:ring-zinc-800 focus:ring-offset-2">
-                    Install
-                  </button>
+                  {
+                    currentThemes.includes(theme.id) ?
+                    <button
+                      onClick={() => removeTheme(theme.id)}
+                      className="flex px-4 py-2 mt-4 ml-auto transition rounded-full dark:text-white bg-zinc-300 dark:bg-zinc-700 dark:hover:bg-zinc-600/50 hover:bg-zinc-200 focus:outline-none focus:ring-2 focus:ring-zinc-800 focus:ring-offset-2">
+                      { installingThemes.includes(theme.id) ? 
+                        <>
+                        <SpinnerIcon className="w-4 h-4 mr-2" />
+                        Removing...
+                        </> :
+                        <> Remove </>
+                      }
+                    </button> :
+                    <button
+                      onClick={() => downloadTheme(theme.id)}
+                      className="flex px-4 py-2 mt-4 ml-auto transition rounded-full dark:text-white bg-zinc-300 dark:bg-zinc-700 dark:hover:bg-zinc-600/50 hover:bg-zinc-200 focus:outline-none focus:ring-2 focus:ring-zinc-800 focus:ring-offset-2">
+                      { installingThemes.includes(theme.id) ? 
+                        <>
+                        <SpinnerIcon className="w-4 h-4 mr-2" />
+                        Installing...
+                        </> :
+                        <> Install </>
+                      }
+                    </button>
+                  }
                 </div>
               </div>
             </div>