diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 7b05aecc..7eb5582b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,5 +21,6 @@
 <!-- If this PR closes any issues, use the keyword 'closes' followed by the issue number -->
 
 Closes # Fixes #
+My name 
 
 
diff --git a/src/components/ai-chat/chat-history-modal.tsx b/src/components/ai-chat/chat-history-modal.tsx
index d626c471..943732c8 100644
--- a/src/components/ai-chat/chat-history-modal.tsx
+++ b/src/components/ai-chat/chat-history-modal.tsx
@@ -46,7 +46,7 @@ export default function ChatHistoryModal({
           </div>
         </div>
 
-        <div className="max-h-[50vh] overflow-y-auto">
+        <div className="custom-scrollbar max-h-[50vh] overflow-y-auto">
           {filteredChats.length === 0 ? (
             <div className="py-8 text-center text-text-lighter">
               <MessageSquare size={24} className="mx-auto mb-2 opacity-50" />
diff --git a/src/components/editor/code-editor.tsx b/src/components/editor/code-editor.tsx
index f091b6ad..62168464 100644
--- a/src/components/editor/code-editor.tsx
+++ b/src/components/editor/code-editor.tsx
@@ -30,7 +30,6 @@ interface CodeEditorProps {
   disabled?: boolean;
   className?: string;
 }
-
 export interface CodeEditorRef {
   editor: HTMLDivElement | null;
   textarea: HTMLDivElement | null;
diff --git a/src/contexts/toast-context.tsx b/src/contexts/toast-context.tsx
index cc4f6539..40777a76 100644
--- a/src/contexts/toast-context.tsx
+++ b/src/contexts/toast-context.tsx
@@ -14,7 +14,7 @@ interface Toast {
 }
 
 interface ToastContextType {
-  toasts: Toast[];
+  toasts: ToastContextTypeoast[];
   showToast: (toast: Omit<Toast, "id">) => string; // Return toast ID
   updateToast: (id: string, updates: Partial<Omit<Toast, "id">>) => void;
   dismissToast: (id: string) => void;
diff --git a/src/main.tsx b/src/main.tsx
index d74b08c8..4e703a0c 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -6,7 +6,8 @@ import { ToastProvider } from "./contexts/toast-context.tsx";
 
 // helps track re-renders in development mode
 scan({
-  enabled: true,
+  enabled: import.meta.env.DEV,
+  log: import.meta.env.DEV,
 });
 
 createRoot(document.getElementById("root")!).render(
diff --git a/src/styles.css b/src/styles.css
index a7affb7d..5f32ceda 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -795,7 +795,7 @@ button {
 /* Ensure scrolling works properly in all browsers */
 textarea {
     scrollbar-width: thin;
-    scrollbar-color: #ccc #f5f5f5;
+    scrollbar-color: var(--color-border) var(--color-secondary-bg);
     /* Force enable scrolling in Tauri */
     overflow: auto !important;
     -webkit-overflow-scrolling: touch;
@@ -807,26 +807,79 @@ textarea::-webkit-scrollbar {
 }
 
 textarea::-webkit-scrollbar-track {
-    background: #f5f5f5;
+    background: var(--color-secondary-bg);
 }
 
 textarea::-webkit-scrollbar-thumb {
-    background: #ccc;
+    background: var(--color-border);
     border-radius: 6px;
 }
 
 textarea::-webkit-scrollbar-thumb:hover {
-    background: #999;
+    background: var(--color-text-lighter);
 }
 
-/* Force proper scrolling for all overflow auto elements */
+/* Theme-aware scrollbars for all overflow elements */
 [class*="overflow-auto"],
-.overflow-auto {
+.overflow-auto,
+[class*="overflow-y-auto"],
+.overflow-y-auto,
+[class*="overflow-x-auto"],
+.overflow-x-auto {
+    scrollbar-width: thin;
+    scrollbar-color: var(--color-border) var(--color-secondary-bg);
     overflow: auto !important;
     -webkit-overflow-scrolling: touch;
     overscroll-behavior: none !important;
 }
 
+[class*="overflow-auto"]::-webkit-scrollbar,
+.overflow-auto::-webkit-scrollbar,
+[class*="overflow-y-auto"]::-webkit-scrollbar,
+.overflow-y-auto::-webkit-scrollbar,
+[class*="overflow-x-auto"]::-webkit-scrollbar,
+.overflow-x-auto::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+}
+
+[class*="overflow-auto"]::-webkit-scrollbar-track,
+.overflow-auto::-webkit-scrollbar-track,
+[class*="overflow-y-auto"]::-webkit-scrollbar-track,
+.overflow-y-auto::-webkit-scrollbar-track,
+[class*="overflow-x-auto"]::-webkit-scrollbar-track,
+.overflow-x-auto::-webkit-scrollbar-track {
+    background: var(--color-secondary-bg);
+}
+
+[class*="overflow-auto"]::-webkit-scrollbar-thumb,
+.overflow-auto::-webkit-scrollbar-thumb,
+[class*="overflow-y-auto"]::-webkit-scrollbar-thumb,
+.overflow-y-auto::-webkit-scrollbar-thumb,
+[class*="overflow-x-auto"]::-webkit-scrollbar-thumb,
+.overflow-x-auto::-webkit-scrollbar-thumb {
+    background: var(--color-border);
+    border-radius: 4px;
+}
+
+[class*="overflow-auto"]::-webkit-scrollbar-thumb:hover,
+.overflow-auto::-webkit-scrollbar-thumb:hover,
+[class*="overflow-y-auto"]::-webkit-scrollbar-thumb:hover,
+.overflow-y-auto::-webkit-scrollbar-thumb:hover,
+[class*="overflow-x-auto"]::-webkit-scrollbar-thumb:hover,
+.overflow-x-auto::-webkit-scrollbar-thumb:hover {
+    background: var(--color-text-lighter);
+}
+
+[class*="overflow-auto"]::-webkit-scrollbar-corner,
+.overflow-auto::-webkit-scrollbar-corner,
+[class*="overflow-y-auto"]::-webkit-scrollbar-corner,
+.overflow-y-auto::-webkit-scrollbar-corner,
+[class*="overflow-x-auto"]::-webkit-scrollbar-corner,
+.overflow-x-auto::-webkit-scrollbar-corner {
+    background: var(--color-secondary-bg);
+}
+
 /* Paper texture and theme-aware colors for welcome screen */
 .paper-texture {
     background: var(--color-primary-bg);