diff --git a/src/interface/components/BackgroundSelector.tsx b/src/interface/components/BackgroundSelector.tsx
index 308a25a1..fcf7f9c8 100644
--- a/src/interface/components/BackgroundSelector.tsx
+++ b/src/interface/components/BackgroundSelector.tsx
@@ -2,7 +2,6 @@ import { ChangeEvent, memo, useEffect, useState } from "react";
 import { downloadPresetBackground, openDB, readAllData, writeData } from "../hooks/BackgroundDataLoader";
 import presetBackgrounds from "../assets/presetBackgrounds";
 import "./BackgroundSelector.css";
-import { disableTheme } from "../hooks/ThemeManagment";
 import browser from "webextension-polyfill";
 
 // Custom Types and Interfaces
@@ -17,9 +16,8 @@ export interface Background {
 }
 
 interface BackgroundSelectorProps {
-  selectedType: "background" | "theme";
-  setSelectedType: (type: "background" | "theme") => void;
   isEditMode: boolean;
+  disableTheme: () => void;
 }
 
 async function GetTheme() {
@@ -31,7 +29,7 @@ async function SetTheme(theme: string) {
   await browser.storage.local.set({ theme });
 }
 
-function BackgroundSelector({ selectedType, setSelectedType, isEditMode }: BackgroundSelectorProps) {
+function BackgroundSelector({ isEditMode, disableTheme }: BackgroundSelectorProps) {
   const [backgrounds, setBackgrounds] = useState<Background[]>([]);
   const [selectedBackground, setSelectedBackground] = useState<string | null>();
   const [downloadedPresetIds, setDownloadedPresetIds] = useState<string[]>([]);
@@ -106,13 +104,11 @@ function BackgroundSelector({ selectedType, setSelectedType, isEditMode }: Backg
   };
   
   const selectBackground = (fileId: string): void => {
-    if (selectedType == 'background' && selectedBackground == fileId) {
+    if (selectedBackground == fileId) {
       selectNoBackground();
       return;
     }
 
-    disableTheme();
-    setSelectedType('background');
     setSelectedBackground(fileId);
     SetTheme(fileId);
   };
@@ -131,8 +127,6 @@ function BackgroundSelector({ selectedType, setSelectedType, isEditMode }: Backg
   };  
 
   const selectNoBackground = (): void => {
-    setSelectedType('background');
-    disableTheme();
     setSelectedBackground(null);
     SetTheme('');
   };
@@ -146,9 +140,10 @@ function BackgroundSelector({ selectedType, setSelectedType, isEditMode }: Backg
   return (
     <>
     <button
-      disabled={selectedBackground == null && selectedType != 'theme' ? true : false}
-      className={`w-full px-4 py-2 mb-4 dark:text-white transition ${selectedBackground == null && selectedType != 'theme' ? 'dark:bg-zinc-900 bg-zinc-100' : 'bg-blue-500 text-white'} rounded`} onClick={() => selectNoBackground()}>
-    {selectedBackground == null && selectedType != 'theme' ? 'No Background' : 'Remove Background'}
+      disabled={selectedBackground == null ? true : false}
+      className={`w-full px-4 py-2 mb-4 dark:text-white transition ${selectedBackground == null ? 'dark:bg-zinc-900 bg-zinc-100' : 'bg-blue-500 text-white'} rounded`}
+      onClick={() => { disableTheme(), selectNoBackground() }}>
+        {selectedBackground == null ? 'No Theme' : 'Remove Theme'}
     </button>
 
     {BackgroundsBlocked && (
@@ -173,7 +168,7 @@ function BackgroundSelector({ selectedType, setSelectedType, isEditMode }: Backg
         {backgrounds.filter(bg => bg.type === 'image').map(bg => (
           <div key={bg.id}
             onClick={() => selectBackground(bg.id)} 
-            className={`relative w-16 h-16 cursor-pointer rounded-xl transition ring dark:ring-white ring-zinc-300 ${isEditMode ? 'animate-shake' : ''} ${selectedBackground === bg.id && selectedType === "background" ? 'dark:ring-2 ring-4' : 'ring-0'}`}>
+            className={`relative w-16 h-16 cursor-pointer rounded-xl transition ring dark:ring-white ring-zinc-300 ${isEditMode ? 'animate-shake' : ''} ${selectedBackground === bg.id ? 'dark:ring-2 ring-4' : 'ring-0'}`}>
             {isEditMode && (
               <div className="absolute top-0 right-0 z-10 flex w-6 h-6 p-2 text-white translate-x-1/2 -translate-y-1/2 bg-red-600 rounded-full place-items-center"
                   onClick={() => deleteBackground(bg.id)}>
@@ -202,7 +197,7 @@ function BackgroundSelector({ selectedType, setSelectedType, isEditMode }: Backg
             </div>
             <img 
               className="absolute top-0 object-cover w-full h-full rounded-xl" 
-              src={bg.isPreset ? bg.previewUrl : bg.url}  // Use preview for preset backgrounds
+              src={bg.isPreset ? bg.previewUrl : bg.url}
               alt="swatch" />
           </button>
         ))}
@@ -219,7 +214,7 @@ function BackgroundSelector({ selectedType, setSelectedType, isEditMode }: Backg
           <input type="file" accept='image/*, video/*' onChange={handleFileChange} className="absolute inset-0 w-full h-full opacity-0 cursor-pointer" />
         </div>
         {backgrounds.filter(bg => bg.type === 'video').map(bg => (
-          <div key={bg.id} onClick={() => selectBackground(bg.id)} className={`relative w-16 h-16 cursor-pointer rounded-xl transition ring dark:ring-white ring-zinc-300 ${isEditMode ? 'animate-shake' : ''} ${selectedBackground === bg.id && selectedType === "background" ? 'dark:ring-2 ring-4' : 'ring-0'}`}>
+          <div key={bg.id} onClick={() => selectBackground(bg.id)} className={`relative w-16 h-16 cursor-pointer rounded-xl transition ring dark:ring-white ring-zinc-300 ${isEditMode ? 'animate-shake' : ''} ${selectedBackground === bg.id ? 'dark:ring-2 ring-4' : 'ring-0'}`}>
             {isEditMode && (
               <div className="absolute top-0 right-0 z-10 flex w-6 h-6 p-2 text-white translate-x-1/2 -translate-y-1/2 bg-red-600 rounded-full place-items-center"
                   onClick={() => deleteBackground(bg.id)}>
diff --git a/src/interface/components/ThemeSelector.tsx b/src/interface/components/ThemeSelector.tsx
index f4251d76..7f873b19 100644
--- a/src/interface/components/ThemeSelector.tsx
+++ b/src/interface/components/ThemeSelector.tsx
@@ -1,29 +1,25 @@
-import React, { useEffect, useState, useCallback } from 'react';
+import React, { useEffect, useState, useCallback, forwardRef, useImperativeHandle, ForwardRefExoticComponent, RefAttributes } from 'react';
 import { listThemes, deleteTheme, setTheme, disableTheme } from '../hooks/ThemeManagment';
 import { ThemeCover } from './ThemeCover';
 import Browser from 'webextension-polyfill';
 import { CustomTheme } from '../types/CustomThemes';
 
 interface ThemeSelectorProps {
-  setSelectedType: React.Dispatch<React.SetStateAction<'background' | 'theme'>>;
-  selectedType: 'background' | 'theme';
   isEditMode: boolean;
+  ref: React.Ref<any>;
 }
 
-const ThemeSelector: React.FC<ThemeSelectorProps> = ({
-  setSelectedType,
-  selectedType,
-  isEditMode,
-}) => {
+const ThemeSelector: ForwardRefExoticComponent<Omit<ThemeSelectorProps, "ref"> & RefAttributes<any>> = forwardRef(({ isEditMode = false }, ref) => {
   const [themes, setThemes] = useState<Omit<CustomTheme, 'CustomImages'>[]>([]);
   const [isLoading, setIsLoading] = useState<boolean>(true);
   const [selectedThemeId, setSelectedThemeId] = useState<string | null>(null);
 
-  useEffect(() => {
-    if (selectedType === 'background') {
+  useImperativeHandle(ref, () => ({
+    disableTheme: async () => {
+      await disableTheme();
       setSelectedThemeId(null);
     }
-  }, [selectedType]);
+  }));
 
   useEffect(() => {
     const fetchThemes = async () => {
@@ -49,17 +45,15 @@ const ThemeSelector: React.FC<ThemeSelectorProps> = ({
       if (themeId === selectedThemeId) {
         await disableTheme();
         setSelectedThemeId(null);
-        setSelectedType('background');
       } else {
         const selectedTheme = themes.find((theme) => theme.id === themeId);
         if (selectedTheme) {
           await setTheme(selectedTheme.id);
           setSelectedThemeId(themeId);
-          setSelectedType('theme');
         }
       }
     },
-    [selectedThemeId, themes, setSelectedType]
+    [selectedThemeId, themes]
   );
 
   const handleThemeDelete = useCallback(
@@ -69,13 +63,12 @@ const ThemeSelector: React.FC<ThemeSelectorProps> = ({
         setThemes((prevThemes) => prevThemes.filter((theme) => theme.id !== themeId));
         if (themeId === selectedThemeId) {
           setSelectedThemeId(null);
-          setSelectedType('background');
         }
       } catch (error) {
         console.error('Error deleting theme:', error);
       }
     },
-    [selectedThemeId, setSelectedType]
+    [selectedThemeId]
   );
 
   if (isLoading) {
@@ -83,9 +76,9 @@ const ThemeSelector: React.FC<ThemeSelectorProps> = ({
   }
 
   return (
-    <div className="my-2">
+    <div className="my-3">
       <h2 className="pb-2 text-lg font-bold">Themes</h2>
-      <div className="flex flex-col gap-4">
+      <div className="flex flex-col gap-2">
         {themes.map((theme) => (
           <ThemeCover
             key={theme.id}
@@ -107,6 +100,6 @@ const ThemeSelector: React.FC<ThemeSelectorProps> = ({
       </div>
     </div>
   );
-};
+});
 
 export default ThemeSelector;
\ No newline at end of file
diff --git a/src/interface/pages/SettingsPage/Themes.tsx b/src/interface/pages/SettingsPage/Themes.tsx
index c83a283c..a507ec3c 100644
--- a/src/interface/pages/SettingsPage/Themes.tsx
+++ b/src/interface/pages/SettingsPage/Themes.tsx
@@ -1,29 +1,23 @@
-import { FC, useEffect, useState } from 'react';
+import { FC, createRef, useState } from 'react';
 import BackgroundSelector from '../../components/BackgroundSelector';
 import ThemeSelector from '../../components/ThemeSelector';
-import { listThemes } from '../../hooks/ThemeManagment';
 
 const Themes: FC = () => {
   const [isEditMode, setIsEditMode] = useState<boolean>(false);
-  const [selectedType, setSelectedType] = useState<'background' | 'theme'>('background');
+  const themeSelectorRef = createRef();
+
+  const disableTheme = async () => {
+    themeSelectorRef?.current?.disableTheme();
+  }
 
-  useEffect(() => {
-    listThemes().then(themes => {
-      if (themes?.selectedTheme) {
-        setSelectedType('theme');
-      } else {
-        setSelectedType('background');
-      }
-    });
-  }, [])
 
   return (
   <div className="px-0.5">
       <button className="absolute top-12 z-20 right-0 p-2 text-[0.8rem] text-blue-500" onClick={() => setIsEditMode(!isEditMode)}>
         {isEditMode ? 'Done' : 'Edit'}
       </button>
-    <BackgroundSelector setSelectedType={setSelectedType} selectedType={selectedType} isEditMode={isEditMode} />
-    <ThemeSelector selectedType={selectedType} setSelectedType={setSelectedType} isEditMode={isEditMode} />
+    <BackgroundSelector disableTheme={disableTheme} isEditMode={isEditMode} />
+    <ThemeSelector ref={themeSelectorRef} isEditMode={isEditMode} />
   </div>
   );
 };