diff --git a/src/app/dashboard/invoices/[id]/_components/pdf-download-button.tsx b/src/app/dashboard/invoices/[id]/_components/pdf-download-button.tsx
index 88cbf57..c9f4607 100644
--- a/src/app/dashboard/invoices/[id]/_components/pdf-download-button.tsx
+++ b/src/app/dashboard/invoices/[id]/_components/pdf-download-button.tsx
@@ -9,7 +9,7 @@ import { Download, Loader2 } from "lucide-react";
 
 interface PDFDownloadButtonProps {
   invoiceId: string;
-  variant?: "default" | "outline" | "ghost" | "icon";
+  variant?: "default" | "outline" | "ghost" | "icon" | "secondary";
   className?: string;
 }
 
diff --git a/src/app/dashboard/settings/_components/theme-selector.tsx b/src/app/dashboard/settings/_components/theme-selector.tsx
index fafc1bb..b534933 100644
--- a/src/app/dashboard/settings/_components/theme-selector.tsx
+++ b/src/app/dashboard/settings/_components/theme-selector.tsx
@@ -9,7 +9,6 @@ import {
   DropdownMenuTrigger,
 } from "~/components/ui/dropdown-menu";
 import { Button } from "~/components/ui/button";
-import { cn } from "~/lib/utils";
 
 export function ThemeSelector() {
   const { theme, setTheme } = useTheme();
diff --git a/src/components/data/client-list.tsx b/src/components/data/client-list.tsx
index b78c21d..37b1f6c 100644
--- a/src/components/data/client-list.tsx
+++ b/src/components/data/client-list.tsx
@@ -102,7 +102,7 @@ export function ClientList() {
         </CardHeader>
         <CardContent className="text-center">
           <Link href="/dashboard/clients/new">
-            <Button variant="brand" className="h-12 w-full">
+            <Button variant="default" className="h-12 w-full">
               <Plus className="mr-2 h-4 w-4" />
               Add Your First Client
             </Button>
@@ -131,7 +131,7 @@ export function ClientList() {
           </div>
         </div>
         <Link href="/dashboard/clients/new">
-          <Button variant="brand" className="h-12 w-full sm:w-auto">
+          <Button variant="default" className="h-12 w-full sm:w-auto">
             <Plus className="mr-2 h-4 w-4" />
             Add Client
           </Button>
diff --git a/src/components/data/current-open-invoice-card.tsx b/src/components/data/current-open-invoice-card.tsx
index d481e72..dcd7ae6 100644
--- a/src/components/data/current-open-invoice-card.tsx
+++ b/src/components/data/current-open-invoice-card.tsx
@@ -63,7 +63,7 @@ export function CurrentOpenInvoiceCard() {
               No open invoice found. Create a new invoice to start tracking your
               time.
             </p>
-            <Button asChild variant="brand">
+            <Button asChild variant="default">
               <Link href="/dashboard/invoices/new">
                 <Plus className="mr-2 h-4 w-4" />
                 Create New Invoice
@@ -133,7 +133,7 @@ export function CurrentOpenInvoiceCard() {
               View
             </Link>
           </Button>
-          <Button asChild variant="brand" size="sm" className="flex-1">
+          <Button asChild variant="default" size="sm" className="flex-1">
             <Link href={`/dashboard/invoices/${currentInvoice.id}`}>
               <Edit className="mr-2 h-3 w-3" />
               Continue
diff --git a/src/components/forms/enhanced-send-invoice-button.tsx b/src/components/forms/enhanced-send-invoice-button.tsx
index fe3448c..65a76d4 100644
--- a/src/components/forms/enhanced-send-invoice-button.tsx
+++ b/src/components/forms/enhanced-send-invoice-button.tsx
@@ -7,7 +7,7 @@ import { Send, Loader2, Mail, MailCheck } from "lucide-react";
 
 interface EnhancedSendInvoiceButtonProps {
   invoiceId: string;
-  variant?: "default" | "outline" | "ghost" | "icon";
+  variant?: "default" | "outline" | "ghost" | "icon" | "secondary";
   className?: string;
   showResend?: boolean;
   size?: "default" | "sm" | "lg" | "icon";
diff --git a/src/components/ui/badge.tsx b/src/components/ui/badge.tsx
index 96b8900..d9bbced 100644
--- a/src/components/ui/badge.tsx
+++ b/src/components/ui/badge.tsx
@@ -1,5 +1,4 @@
 import * as React from "react";
-import { Slot } from "@radix-ui/react-slot";
 import { cva, type VariantProps } from "class-variance-authority";
 
 import { cn } from "~/lib/utils";
diff --git a/src/components/ui/input.tsx b/src/components/ui/input.tsx
index a6b52c5..836cb95 100644
--- a/src/components/ui/input.tsx
+++ b/src/components/ui/input.tsx
@@ -1,8 +1,7 @@
 import { cn } from "~/lib/utils";
 import * as React from "react";
 
-export interface InputProps
-  extends React.InputHTMLAttributes<HTMLInputElement> {}
+export type InputProps = React.InputHTMLAttributes<HTMLInputElement>;
 
 const Input = React.forwardRef<HTMLInputElement, InputProps>(
   ({ className, type, ...props }, ref) => {
diff --git a/src/components/ui/switch.tsx b/src/components/ui/switch.tsx
index d23627d..9029604 100644
--- a/src/components/ui/switch.tsx
+++ b/src/components/ui/switch.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import * as SwitchPrimitive from "@radix-ui/react-switch";
-import { Check, X } from "lucide-react";
+import { Check } from "lucide-react";
 import * as React from "react";
 import { cn } from "~/lib/utils";
 
diff --git a/src/components/ui/textarea.tsx b/src/components/ui/textarea.tsx
index 8f1566a..cfdb041 100644
--- a/src/components/ui/textarea.tsx
+++ b/src/components/ui/textarea.tsx
@@ -2,8 +2,7 @@ import * as React from "react";
 
 import { cn } from "~/lib/utils";
 
-export interface TextareaProps
-  extends React.TextareaHTMLAttributes<HTMLTextAreaElement> {}
+export type TextareaProps = React.TextareaHTMLAttributes<HTMLTextAreaElement>;
 
 const Textarea = React.forwardRef<HTMLTextAreaElement, TextareaProps>(
   ({ className, ...props }, ref) => {