diff --git a/src/app/repos/page.tsx b/src/app/repos/page.tsx
index b5b91be9..742e0160 100644
--- a/src/app/repos/page.tsx
+++ b/src/app/repos/page.tsx
@@ -1,8 +1,11 @@
+"use server";
+
 import { NavigationMenu } from "../navigationMenu";
 import { DataTable } from "@/components/ui/data-table";
 import { columns, RepositoryColumnInfo } from "./columns";
 import { listRepositories } from "@/lib/server/searchService";
 import { isServiceError } from "@/lib/utils";
+import { Suspense } from "react";
 
 export default async function ReposPage() {
     const _repos = await listRepositories();
@@ -27,17 +30,21 @@ export default async function ReposPage() {
             indexedFiles: repo.Stats.Documents,
             commitUrlTemplate: repo.Repository.CommitURLTemplate,
         }
-    });
+    }).sort((a, b) => {
+        return new Date(b.lastIndexed).getTime() -  new Date(a.lastIndexed).getTime();
+    })
 
     return (
         <div className="h-screen flex flex-col items-center">
             <NavigationMenu />
-            <DataTable
-                columns={columns}
-                data={repos}
-                searchKey="name"
-                searchPlaceholder="Search repositories..."
-            />
+            <Suspense fallback={<div>Loading...</div>}>
+                <DataTable
+                    columns={columns}
+                    data={repos}
+                    searchKey="name"
+                    searchPlaceholder="Search repositories..."
+                />
+            </Suspense>
         </div>
     )
 }
\ No newline at end of file
diff --git a/src/app/search/codePreviewPanel.tsx b/src/app/search/codePreviewPanel.tsx
index 0b5797f7..9327c4ac 100644
--- a/src/app/search/codePreviewPanel.tsx
+++ b/src/app/search/codePreviewPanel.tsx
@@ -98,7 +98,7 @@ export const CodePreviewPanel = ({
         }
 
         highlightRanges(selectedMatchIndex, ranges, editorRef.current.view);
-    }, [ranges, selectedMatchIndex]);
+    }, [ranges, selectedMatchIndex, file]);
 
     const onUpClicked = useCallback(() => {
         onSelectedMatchIndexChange(selectedMatchIndex - 1);
diff --git a/src/hooks/useThemeNormalized.ts b/src/hooks/useThemeNormalized.ts
index 65008e83..9feb9926 100644
--- a/src/hooks/useThemeNormalized.ts
+++ b/src/hooks/useThemeNormalized.ts
@@ -12,7 +12,7 @@ export const useThemeNormalized = (defaultTheme: "light" | "dark" = "light") =>
         }
 
         return _theme ?? defaultTheme;
-    }, [_theme, systemTheme]);
+    }, [_theme, systemTheme, defaultTheme]);
 
     return {
         theme,