diff --git a/eslint.config.mts b/eslint.config.mts
index 63964d8..a17aa50 100644
--- a/eslint.config.mts
+++ b/eslint.config.mts
@@ -1,9 +1,9 @@
 import tseslint from 'typescript-eslint';
 import obsidianmd from 'eslint-plugin-obsidianmd';
 import globals from 'globals';
-import { globalIgnores } from 'eslint/config';
+import { defineConfig, globalIgnores } from 'eslint/config';
 
-export default tseslint.config(
+export default defineConfig(
 	globalIgnores([
 		'node_modules',
 		'build',
diff --git a/src/manager/commands/pageHeaderManager.ts b/src/manager/commands/pageHeaderManager.ts
index 2e0da66..a5a4744 100644
--- a/src/manager/commands/pageHeaderManager.ts
+++ b/src/manager/commands/pageHeaderManager.ts
@@ -26,7 +26,7 @@ export default class PageHeaderManager extends CommandManagerBase {
 		const buttons = this.buttonsFor(leaf, true);
 		if (!buttons || buttons.has(id)) return;
 
-		const buttonIcon = (view as ItemView).addAction(icon, name, () => {
+		const buttonIcon = view.addAction(icon, name, () => {
 			this.plugin.app.workspace.setActiveLeaf(leaf, { focus: true });
 			this.plugin.app.commands.executeCommandById(id);
 		});
diff --git a/src/types.ts b/src/types.ts
index ca4d726..2130ff5 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -61,7 +61,7 @@ export interface Tab {
 	tab: h.JSX.Element;
 }
 
-export type Mode = "desktop" | "any" | "mobile" | string;
+export type Mode = "desktop" | "any" | "mobile" | (string & {});
 
 export interface CommandIconPair {
 	id: string;
diff --git a/src/ui/components/AdvancedToolbarSettings.tsx b/src/ui/components/AdvancedToolbarSettings.tsx
index c63be24..c25bea6 100644
--- a/src/ui/components/AdvancedToolbarSettings.tsx
+++ b/src/ui/components/AdvancedToolbarSettings.tsx
@@ -221,7 +221,9 @@ export default function AdvancedToolbarSettings({
 		if (ref.current) {
 			render(ref.current, plugin);
 		}
-		return () => ref.current && ref.current.empty();
+		return (): void => {
+			ref.current && ref.current.empty();
+		};
 	}, []);
 
 	return (
diff --git a/src/ui/components/ColorPicker/ColorPicker.tsx b/src/ui/components/ColorPicker/ColorPicker.tsx
index 188ac81..6947d1e 100644
--- a/src/ui/components/ColorPicker/ColorPicker.tsx
+++ b/src/ui/components/ColorPicker/ColorPicker.tsx
@@ -19,7 +19,9 @@ export const ColorPicker = ({
 				.onChange(onChange);
 		}
 
-		return () => ref.current?.empty?.();
+		return (): void => {
+			ref.current?.empty?.();
+		};
 	}, [onChange, initialColor]);
 
 	return <div ref={ref} className="cmdr-flex cmdr-items-center" />;
diff --git a/src/ui/components/mobileModifyComponent.tsx b/src/ui/components/mobileModifyComponent.tsx
index 01f043a..0d61d2c 100644
--- a/src/ui/components/mobileModifyComponent.tsx
+++ b/src/ui/components/mobileModifyComponent.tsx
@@ -18,7 +18,7 @@ export default function MobileModifyComponent({
 			this.forceUpdate();
 		};
 		addEventListener("cmdr-icon-changed", update);
-		return () => removeEventListener("cmdr-icon-changed", update);
+		return (): void => removeEventListener("cmdr-icon-changed", update);
 	}, []);
 
 	return (
diff --git a/src/ui/components/settingTabComponent.tsx b/src/ui/components/settingTabComponent.tsx
index 0e15112..07f76b3 100644
--- a/src/ui/components/settingTabComponent.tsx
+++ b/src/ui/components/settingTabComponent.tsx
@@ -37,7 +37,7 @@ export default function settingTabComponent({
 
 	useEffect(() => {
 		addEventListener("keydown", tabToNextTab);
-		return () => removeEventListener("keydown", tabToNextTab);
+		return (): void => removeEventListener("keydown", tabToNextTab);
 	}, [activeTab]);
 
 	//This is used to remove the initial onclick event listener.
@@ -342,7 +342,7 @@ export function TabHeader({
 		}
 
 		el.addEventListener("wheel", handleScroll);
-		return () => el.removeEventListener("wheel", handleScroll);
+		return (): void => el.removeEventListener("wheel", handleScroll);
 	}, []);
 
 	useEffect(