diff --git a/components/AppShelf/AddAppShelfItem.tsx b/components/AppShelf/AddAppShelfItem.tsx
index 749e7ab07..dca90cad3 100644
--- a/components/AppShelf/AddAppShelfItem.tsx
+++ b/components/AppShelf/AddAppShelfItem.tsx
@@ -17,7 +17,7 @@ import { useForm } from '@mantine/hooks';
 import { motion } from 'framer-motion';
 import { useState } from 'react';
 import { Apps } from 'tabler-icons-react';
-import { ServiceTypes } from './AppShelf.d';
+import { ServiceTypes } from '../../tools/types';
 
 export default function AddItemShelfItem(props: any) {
   const { additem: addItem } = props;
diff --git a/components/AppShelf/AppShelf.tsx b/components/AppShelf/AppShelf.tsx
index e7c901bca..687ff854f 100644
--- a/components/AppShelf/AppShelf.tsx
+++ b/components/AppShelf/AppShelf.tsx
@@ -13,7 +13,6 @@ import {
 } from '@mantine/core';
 import { showNotification } from '@mantine/notifications';
 import { AlertCircle, Cross, X } from 'tabler-icons-react';
-import { serviceItem } from './AppShelf.d';
 import AppShelfMenu from './AppShelfMenu';
 import AddItemShelfItem from './AddAppShelfItem';
 import { useServices } from '../../tools/state';
diff --git a/components/SearchBar/SearchBar.tsx b/components/SearchBar/SearchBar.tsx
index fb914b3a7..0cef310cf 100644
--- a/components/SearchBar/SearchBar.tsx
+++ b/components/SearchBar/SearchBar.tsx
@@ -19,7 +19,8 @@ import {
   InfoCircle,
   FileX,
 } from 'tabler-icons-react';
-import { Settings, loadSettings } from '../../tools/settings';
+import { loadSettings } from '../../tools/settings';
+import { Settings } from '../../tools/types';
 
 export default function SearchBar(props: any) {
   const [opened, setOpened] = useState(false);
diff --git a/components/Settings/SettingsMenu.tsx b/components/Settings/SettingsMenu.tsx
index 8b45d8841..1cbd9a8d7 100644
--- a/components/Settings/SettingsMenu.tsx
+++ b/components/Settings/SettingsMenu.tsx
@@ -3,7 +3,8 @@ import { showNotification } from '@mantine/notifications';
 import { motion } from 'framer-motion';
 import { CSSProperties, useEffect, useState } from 'react';
 import { Mail, Settings as SettingsIcon, X } from 'tabler-icons-react';
-import { Settings, loadSettings } from '../../tools/settings';
+import { loadSettings } from '../../tools/settings';
+import { Settings } from '../../tools/types';
 import SaveConfigComponent from '../Config/SaveConfig';
 
 function SettingsMenu(props: any) {
diff --git a/tools/state.tsx b/tools/state.tsx
index 70b7e0a65..924ae7a09 100644
--- a/tools/state.tsx
+++ b/tools/state.tsx
@@ -1,6 +1,6 @@
 // src/context/state.js
 import { createContext, ReactNode, useContext, useState } from 'react';
-import { serviceItem } from '../components/AppShelf/AppShelf.d';
+import { serviceItem } from './types';
 
 type servicesContextType = {
   services: serviceItem[];