diff --git a/src/pages/settings/components/Theming/Backgrounds/BackgroundModal.tsx b/src/pages/settings/components/Theming/Backgrounds/BackgroundModal.tsx
index 79b583c..dbfa632 100644
--- a/src/pages/settings/components/Theming/Backgrounds/BackgroundModal.tsx
+++ b/src/pages/settings/components/Theming/Backgrounds/BackgroundModal.tsx
@@ -97,7 +97,7 @@ export function BackgroundModal({
 				}}
 				fullScreen={isMobile}
 				centered
-				keepMounted={false}
+				keepMounted={true}
 			>
 				<Modal.Overlay />
 				<Modal.Content>
diff --git a/src/pages/settings/components/Theming/Themes/ThemeModalColorSwatches.tsx b/src/pages/settings/components/Theming/Themes/ThemeModalColorSwatches.tsx
deleted file mode 100644
index 77e38e3..0000000
--- a/src/pages/settings/components/Theming/Themes/ThemeModalColorSwatches.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { ColorSwatch, Group, Stack, Text } from '@mantine/core';
-import { colorSwatchClasses, textClasses } from 'styles';
-import type { Theme } from 'types';
-
-export function ThemeModalColorSwatches({
-	selectedTheme,
-	openPicker,
-	setColorId,
-	setColorValue,
-}: {
-	selectedTheme: Theme;
-	openPicker: () => void;
-	setColorId: (colorId: string) => void;
-	setColorValue: (colorValue: string) => void;
-}) {
-	return (
-		<Stack justify='center'>
-			<Group justify='space-between'>
-				<Text className={textClasses.label} classNames={textClasses}>
-					Primary Color
-				</Text>
-				<ColorSwatch
-					onClick={() => {
-						setColorId('primaryColor');
-						openPicker();
-						setColorValue(selectedTheme.primaryColor);
-					}}
-					color={selectedTheme.primaryColor}
-					className={colorSwatchClasses.default}
-					classNames={colorSwatchClasses}
-				/>
-			</Group>
-			<Group justify='space-between'>
-				<Text className={textClasses.label} classNames={textClasses}>
-					Accent Color
-				</Text>
-				<ColorSwatch
-					onClick={() => {
-						setColorId('accentColor');
-						openPicker();
-						setColorValue(selectedTheme.accentColor);
-					}}
-					color={selectedTheme.accentColor}
-					className={colorSwatchClasses.default}
-					classNames={colorSwatchClasses}
-				/>
-			</Group>
-			<Group justify='space-between'>
-				<Text className={textClasses.label} classNames={textClasses}>
-					Background Color
-				</Text>
-				<ColorSwatch
-					onClick={() => {
-						setColorId('background');
-						openPicker();
-						setColorValue(selectedTheme.backgroundColor);
-					}}
-					color={selectedTheme.backgroundColor}
-					className={colorSwatchClasses.default}
-					classNames={colorSwatchClasses}
-				/>
-			</Group>
-			<Group justify='space-between'>
-				<Text className={textClasses.label} classNames={textClasses}>
-					Border Color
-				</Text>
-				<ColorSwatch
-					onClick={() => {
-						setColorId('borderColor');
-						openPicker();
-						setColorValue(selectedTheme.borderColor);
-					}}
-					color={selectedTheme.borderColor}
-					className={colorSwatchClasses.default}
-					classNames={colorSwatchClasses}
-				/>
-			</Group>
-			<Group justify='space-between'>
-				<Text className={textClasses.label} classNames={textClasses}>
-					Search Background Color
-				</Text>
-				<ColorSwatch
-					onClick={() => {
-						setColorId('searchBackground');
-						openPicker();
-						setColorValue(selectedTheme.searchColor);
-					}}
-					color={selectedTheme.searchColor}
-					className={colorSwatchClasses.default}
-					classNames={colorSwatchClasses}
-				/>
-			</Group>
-		</Stack>
-	);
-}
diff --git a/src/pages/settings/components/Theming/Themes/ThemeModalContent.tsx b/src/pages/settings/components/Theming/Themes/ThemeModalContent.tsx
index c2af660..60712ab 100644
--- a/src/pages/settings/components/Theming/Themes/ThemeModalContent.tsx
+++ b/src/pages/settings/components/Theming/Themes/ThemeModalContent.tsx
@@ -1,5 +1,4 @@
 import { Select, Stack, Text } from '@mantine/core';
-import SearchSelectItem from 'pages/homepage/components/Search/SearchSelectItem';
 import { selectClasses } from 'styles';
 import type { Theme } from 'types';
 import { ThemeExampleApp } from './ThemeExampleApp';
@@ -51,15 +50,6 @@ export function ThemeModalContent({ selectedTheme }: { selectedTheme: Theme }) {
 				autoFocus={false}
 				leftSection={'Google Search'}
 				rightSection={<div />}
-				renderOption={(item: any) => {
-					return (
-						<SearchSelectItem
-							item={item}
-							handleSearchHistoryItem={undefined}
-							searchEndpoint={undefined}
-						/>
-					);
-				}}
 			/>
 			<Stack gap={0} w={'100%'}>
 				<Text
diff --git a/src/pages/settings/components/Theming/Themes/index.ts b/src/pages/settings/components/Theming/Themes/index.ts
index 48cab0f..cddff64 100644
--- a/src/pages/settings/components/Theming/Themes/index.ts
+++ b/src/pages/settings/components/Theming/Themes/index.ts
@@ -5,7 +5,6 @@ export { ThemeExampleApp } from './ThemeExampleApp';
 export { ThemeManagementPill } from './ThemeManagementPill';
 export { ThemeMiniCard } from './ThemeMiniCard';
 export { ThemeModal } from './ThemeModal/ThemeModal';
-export { ThemeModalColorSwatches } from './ThemeModalColorSwatches';
 export { ThemeModalContent } from './ThemeModalContent';
 export { ThemePreviewMiddleware } from './ThemePreviewMiddleware';
 export { ThemeSelect } from './ThemeSelect';