diff --git a/next-env.d.ts b/next-env.d.ts
index c4b7818..9edff1c 100644
--- a/next-env.d.ts
+++ b/next-env.d.ts
@@ -1,6 +1,6 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/dev/types/routes.d.ts";
+import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
 // see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/src/components/ThemeProvider.tsx b/src/components/ThemeProvider.tsx
index a11e499..f2df7ce 100644
--- a/src/components/ThemeProvider.tsx
+++ b/src/components/ThemeProvider.tsx
@@ -1,8 +1,10 @@
 "use client";
 
 import { ThemeProvider as NextThemesProvider } from "next-themes";
-import { type ThemeProviderProps } from "next-themes/dist/types";
 
-export function ThemeProvider({ children, ...props }: ThemeProviderProps) {
+export function ThemeProvider({
+  children,
+  ...props
+}: React.ComponentProps<typeof NextThemesProvider>) {
   return <NextThemesProvider {...props}>{children}</NextThemesProvider>;
 }
diff --git a/src/components/ThemeToggle.tsx b/src/components/ThemeToggle.tsx
index 2d2fc03..af29d5e 100644
--- a/src/components/ThemeToggle.tsx
+++ b/src/components/ThemeToggle.tsx
@@ -46,16 +46,14 @@ export function ThemeToggle() {
   return (
     <TooltipProvider>
       <Tooltip>
-        <TooltipTrigger asChild>
-          <button
-            onClick={cycleTheme}
-            className="p-3 rounded-lg border border-border bg-card hover:bg-muted transition-colors"
-            aria-label={`Current theme: ${themeName}. Click to cycle.`}
-          >
-            <Icon className="h-5 w-5 text-foreground" />
-          </button>
+        <TooltipTrigger
+          onClick={cycleTheme}
+          className="p-3 rounded-lg border border-border bg-card hover:bg-muted transition-colors"
+          aria-label={`Current theme: ${themeName}. Click to cycle.`}
+        >
+          <Icon className="h-5 w-5 text-foreground" />
         </TooltipTrigger>
-        <TooltipContent side="right">
+        <TooltipContent>
           <p>Theme: {themeName}</p>
         </TooltipContent>
       </Tooltip>