diff --git a/manifest.json b/manifest.json
index 0f81927..0a86ba4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Bolt to GitHub",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Automatically process your Bolt project zip files and upload them to your GitHub repository.",
   "icons": {
     "16": "assets/icons/icon16.png",
diff --git a/src/lib/components/GitHubSettings.svelte b/src/lib/components/GitHubSettings.svelte
index daa9815..3dccacd 100644
--- a/src/lib/components/GitHubSettings.svelte
+++ b/src/lib/components/GitHubSettings.svelte
@@ -266,12 +266,14 @@
     <Button
       type="submit"
       class="w-full bg-blue-600 hover:bg-blue-700 text-white"
-      disabled={!isSettingsValid || buttonDisabled || isValidatingToken || isTokenValid === false}
+      disabled={buttonDisabled || isValidatingToken || !githubToken || !repoOwner || !repoName || !branch || isTokenValid === false}
     >
       {#if isValidatingToken}
         Validating...
+      {:else if buttonDisabled}
+        {status}
       {:else}
-        {status ? status : "Save Settings"}
+        Save Settings
       {/if}
     </Button>
   </form>
diff --git a/src/lib/components/ProjectsList.svelte b/src/lib/components/ProjectsList.svelte
index 102fc81..c1ee005 100644
--- a/src/lib/components/ProjectsList.svelte
+++ b/src/lib/components/ProjectsList.svelte
@@ -12,21 +12,61 @@
 
   const githubService = new GitHubService(githubToken);
   let commitCounts: Record<string, number> = {};
+  let publicRepos: Array<{
+    name: string;
+    description: string | null;
+    html_url: string;
+    created_at: string;
+    updated_at: string;
+    language: string | null;
+  }> = [];
 
   let searchQuery = '';
-  let filteredProjects: [string, { repoName: string; branch: string }][] = [];
+  let showPublicRepos = true;
+  let filteredProjects: Array<{
+    projectId?: string;
+    repoName: string;
+    branch?: string;
+    isPublicOnly?: boolean;
+    description?: string | null;
+    language?: string | null;
+  }> = [];
+
+  async function loadPublicRepos() {
+    console.log('Loading public repos for', repoOwner);
+    try {
+      publicRepos = await githubService.listPublicRepos(repoOwner);
+    } catch (error) {
+      console.error('Failed to load public repos:', error);
+    }
+  }
 
   $: {
-    filteredProjects = Object.entries(projectSettings)
-      .filter(([projectId, settings]) => {
-        // Only apply search filter
-        const matchesSearch = settings.repoName.toLowerCase().includes(searchQuery.toLowerCase());
-        return matchesSearch;
-      });
+    const existingProjects = Object.entries(projectSettings).map(([projectId, settings]) => ({
+      projectId,
+      repoName: settings.repoName,
+      branch: settings.branch,
+      isPublicOnly: false
+    }));
+
+    const publicOnlyRepos = showPublicRepos ? publicRepos
+      .filter(repo => !Object.values(projectSettings).some(s => s.repoName === repo.name))
+      .map(repo => ({
+        repoName: repo.name,
+        isPublicOnly: true,
+        description: repo.description,
+        language: repo.language
+      })) : [];
+
+    filteredProjects = [...existingProjects, ...publicOnlyRepos]
+      .filter(project => project.repoName.toLowerCase().includes(searchQuery.toLowerCase()));
   }
 
   onMount(async () => {
-    // Fetch commit counts for all projects
+    // Load public repos
+    await loadPublicRepos();
+
+    // Fetch commit counts for projects that have IDs
     for (const [projectId, settings] of Object.entries(projectSettings)) {
       commitCounts[projectId] = await githubService.getCommitCount(
         repoOwner,
@@ -50,7 +90,36 @@
 </script>
 
 <div class="space-y-2">
-  {#if Object.keys(projectSettings).length === 0}
+  <div class="flex items-center gap-2 mb-4">
+    <div class="flex-1 relative">
+      <input
+        type="text"
+        bind:value={searchQuery}
+        placeholder="Search projects..."
+        class="w-full bg-transparent border border-slate-800 rounded-lg px-3 py-2 text-sm focus:outline-none focus:border-slate-700"
+      />
+      {#if searchQuery}
+        <Button
+          variant="ghost"
+          size="icon"
+          class="absolute right-1 top-1/2 -translate-y-1/2 h-7 w-7"
+          on:click={() => searchQuery = ''}
+        >
+          <X class="h-4 w-4" />
+        </Button>
+      {/if}
+    </div>
+    <label class="flex items-center gap-2 text-sm text-slate-400">
+      <input
+        type="checkbox"
+        bind:checked={showPublicRepos}
+        class="w-4 h-4 rounded border-slate-800 bg-transparent"
+      />
+      Show Public Repos
+    </label>
+  </div>
+
+  {#if filteredProjects.length === 0}
     <div class="flex flex-col items-center justify-center p-4 text-center space-y-6">
       <div class="space-y-2">
         <p class="text-sm text-slate-400 text-orange-400">No projects found. Create or load an existing project to get started.</p>
@@ -66,49 +135,39 @@
       {/if}
     </div>
   {:else}
-    <div class="flex items-center gap-2 mb-4">
-      <div class="flex-1 relative">
-        <input
-          type="text"
-          bind:value={searchQuery}
-          placeholder="Search projects..."
-          class="w-full bg-transparent border border-slate-800 rounded-lg px-3 py-2 text-sm focus:outline-none focus:border-slate-700"
-        />
-        {#if searchQuery}
-          <Button
-            variant="ghost"
-            size="icon"
-            class="absolute right-1 top-1/2 -translate-y-1/2 h-7 w-7"
-            on:click={() => searchQuery = ''}
-          >
-            <X class="h-4 w-4" />
-          </Button>
-        {/if}
-      </div>
-    </div>
-
-    {#each filteredProjects as [projectId, settings]}
-      <div class="border border-slate-800 rounded-lg p-3 hover:bg-slate-800/50 transition-colors group {currentlyLoadedProjectId === projectId ? 'bg-slate-800/30 border-slate-700' : ''}">
+    {#each filteredProjects as project}
+      <div class="border border-slate-800 rounded-lg p-3 hover:bg-slate-800/50 transition-colors group {project.projectId === currentlyLoadedProjectId ? 'bg-slate-800/30 border-slate-700' : ''}">
         <div class="flex items-center justify-between">
           <div class="space-y-0.5">
             <h3 class="font-medium">
-              {settings.repoName} ({settings.branch})
-              {#if currentlyLoadedProjectId === projectId}
+              {project.repoName} {project.branch ? `(${project.branch})` : ''}
+              {#if project.projectId === currentlyLoadedProjectId}
                 <span class="text-xs text-emerald-500 ml-2">(Current)</span>
               {/if}
+              {#if project.isPublicOnly}
+                <span class="text-xs text-blue-500 ml-2">(Public Repo)</span>
+              {/if}
             </h3>
-            <div class="flex gap-2 text-xs text-slate-400">
-              <p>Bolt ID: {projectId} ({commitCounts[projectId] ?? '...'} commits)</p>
+            <div class="flex flex-col gap-1 text-xs text-slate-400">
+              {#if project.projectId}
+                <p>Bolt ID: {project.projectId} ({commitCounts[project.projectId] ?? '...'} commits)</p>
+              {/if}
+              {#if project.description}
+                <p>{project.description}</p>
+              {/if}
+              {#if project.language}
+                <p>Language: {project.language}</p>
+              {/if}
             </div>
           </div>
           <div class="flex gap-1">
-            {#if currentlyLoadedProjectId !== projectId}
+            {#if project.projectId && project.projectId !== currentlyLoadedProjectId}
               <Button
                 variant="ghost"
                 size="icon"
                 title="Open in Bolt"
                 class="h-8 w-8 opacity-70 group-hover:opacity-100"
-                on:click={() => openBoltProject(projectId)}
+                on:click={() => project.projectId && openBoltProject(project.projectId)}
               >
                 <Zap class="h-5 w-5" />
               </Button>
@@ -118,19 +177,21 @@
               size="icon"
               title="Open GitHub Repository"
               class="h-8 w-8 opacity-70 group-hover:opacity-100"
-              on:click={() => openGitHubRepo(repoOwner, settings.repoName)}
+              on:click={() => openGitHubRepo(repoOwner, project.repoName)}
             >
               <Github class="h-5 w-5" />
             </Button>
-            <Button
-              variant="ghost"
-              size="icon"
-              title="Import from GitHub to Bolt"
-              class="h-8 w-8 opacity-70 group-hover:opacity-100"
-              on:click={() => importFromGitHub(repoOwner, settings.repoName)}
-            >
-              <Import class="h-5 w-5" />
-            </Button>
+            {#if !project.projectId}
+              <Button
+                variant="ghost"
+                size="icon"
+                title="Import from GitHub to Bolt"
+                class="h-8 w-8 opacity-70 group-hover:opacity-100"
+                on:click={() => importFromGitHub(repoOwner, project.repoName)}
+              >
+                <Import class="h-5 w-5" />
+              </Button>
+            {/if}
           </div>
         </div>
       </div>
diff --git a/src/popup/App.svelte b/src/popup/App.svelte
index 8ec891e..35190c8 100644
--- a/src/popup/App.svelte
+++ b/src/popup/App.svelte
@@ -17,6 +17,7 @@
   import type { GitHubSettingsInterface } from "$lib/types";
   import ProjectsList from "$lib/components/ProjectsList.svelte";
   import { GitHubService } from "../services/GitHubService";
+    import { Button } from "$lib/components/ui/button";
 
   let githubToken: string = "";
   let repoOwner = "";
@@ -63,6 +64,8 @@
     }
   }
 
+  $: console.log('repoOwner', repoOwner);
+
   onMount(async () => {
     // Add dark mode to the document
     document.documentElement.classList.add('dark');
@@ -172,86 +175,6 @@
 </script>
 
 <main class="w-[400px] p-3 bg-slate-950 text-slate-50">
-  {#if isBoltSite && parsedProjectId}
-  <Tabs bind:value={activeTab} class="w-full">
-    <Header />
-
-    <TabsContent value="home">
-      <Card class="border-slate-800 bg-slate-900">
-        <CardHeader>
-          <CardTitle class="flex items-center gap-2">
-            <img src="/assets/icons/icon48.png" alt="Bolt to GitHub" class="w-5 h-5" />
-            Bolt to GitHub <span class="text-xs text-slate-400">v{version}</span>
-          </CardTitle>
-          <CardDescription class="text-slate-400">
-            Upload and sync your Bolt projects to GitHub
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <button
-            class="w-full mb-3 px-4 py-2 bg-slate-700 hover:bg-slate-600 rounded-md text-slate-200 transition-colors"
-            on:click={() => activeTab = "projects"}
-          >
-            View All Projects
-          </button>
-
-          <StatusAlert 
-            {isSettingsValid} 
-            projectId={parsedProjectId}
-            gitHubUsername={repoOwner}
-            {repoName}
-            {branch}
-            on:switchTab={handleSwitchTab}
-          />
-
-          <div class="mt-6 space-y-4">
-            <SocialLinks {GITHUB_LINK} {YOUTUBE_LINK} {COFFEE_LINK} />
-          </div>
-        </CardContent>
-        <Footer />
-      </Card>
-    </TabsContent>
-
-    <TabsContent value="projects">
-      <Card class="border-slate-800 bg-slate-900">
-        <CardHeader>
-          <CardTitle>Projects</CardTitle>
-          <CardDescription class="text-slate-400">
-            Manage your Bolt projects and their GitHub repositories
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <ProjectsList {projectSettings} {repoOwner} {githubToken} currentlyLoadedProjectId={parsedProjectId} isBoltSite={isBoltSite} />
-        </CardContent>
-      </Card>
-    </TabsContent>
-
-    <TabsContent value="settings">
-      <Card class="border-slate-800 bg-slate-900">
-        <CardHeader>
-          <CardTitle>GitHub Settings</CardTitle>
-          <CardDescription class="text-slate-400">
-            Configure your GitHub repository settings
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <GitHubSettings
-            bind:githubToken
-            bind:repoOwner
-            bind:repoName
-            bind:branch
-            projectId={parsedProjectId}
-            {status}
-            {isSettingsValid}
-            buttonDisabled={hasStatus}
-            onSave={saveSettings}
-            onInput={checkSettingsValidity}
-          />
-        </CardContent>
-      </Card>
-    </TabsContent>
-    </Tabs>
-  {:else}
   <Card class="border-slate-800 bg-slate-900">
     <CardHeader>
       <CardTitle class="flex items-center gap-2">
@@ -263,11 +186,82 @@
       </CardDescription>
     </CardHeader>
     <CardContent>
-      <ProjectsList {projectSettings} {repoOwner} {githubToken} currentlyLoadedProjectId={parsedProjectId} isBoltSite={isBoltSite} />
+      {#if isBoltSite && parsedProjectId}
+        <Tabs bind:value={activeTab} class="w-full">
+          <Header />
+
+          <TabsContent value="home">
+            <button
+              class="w-full mb-3 px-4 py-2 bg-slate-700 hover:bg-slate-600 rounded-md text-slate-200 transition-colors"
+              on:click={() => activeTab = "projects"}
+            >
+              View All Projects
+            </button>
+
+            <StatusAlert 
+              {isSettingsValid} 
+              projectId={parsedProjectId}
+              gitHubUsername={repoOwner}
+              {repoName}
+              {branch}
+              on:switchTab={handleSwitchTab}
+            />
+
+            <div class="mt-6 space-y-4">
+              <SocialLinks {GITHUB_LINK} {YOUTUBE_LINK} {COFFEE_LINK} />
+            </div>
+          </TabsContent>
+
+          <TabsContent value="projects">
+            <ProjectsList {projectSettings} {repoOwner} {githubToken} currentlyLoadedProjectId={parsedProjectId} isBoltSite={isBoltSite} />
+          </TabsContent>
+
+          <TabsContent value="settings">
+            <Card class="border-slate-800 bg-slate-900">
+              <CardHeader>
+                <CardTitle>GitHub Settings</CardTitle>
+                <CardDescription class="text-slate-400">
+                  Configure your GitHub repository settings
+                </CardDescription>
+              </CardHeader>
+              <CardContent>
+                <GitHubSettings
+                  bind:githubToken
+                  bind:repoOwner
+                  bind:repoName
+                  bind:branch
+                  projectId={parsedProjectId}
+                  {status}
+                  {isSettingsValid}
+                  buttonDisabled={hasStatus}
+                  onSave={saveSettings}
+                  onInput={checkSettingsValidity}
+                />
+              </CardContent>
+            </Card>
+          </TabsContent>
+        </Tabs>
+      {:else if repoOwner}
+        <ProjectsList {projectSettings} {repoOwner} {githubToken} currentlyLoadedProjectId={parsedProjectId} isBoltSite={isBoltSite} />
+      {:else}
+        <div class="flex flex-col items-center justify-center p-4 text-center space-y-6">
+          <div class="space-y-2">
+            <p class="text-sm text-slate-400 text-orange-400">No projects found. Create or load an existing project to get started.</p>
+            {#if !isBoltSite}
+              <Button
+                variant="outline"
+                class="border-slate-800 hover:bg-slate-800 text-slate-200"
+                on:click={() => window.open('https://bolt.new', '_blank')}
+              >
+                Go to bolt.new
+              </Button>
+            {/if}
+          </div>
+        </div>
+      {/if}
     </CardContent>
     <Footer />
   </Card>
-  {/if}
 </main>
 
 <style>
diff --git a/src/services/GitHubService.ts b/src/services/GitHubService.ts
index c9d366c..1a57a9a 100644
--- a/src/services/GitHubService.ts
+++ b/src/services/GitHubService.ts
@@ -210,4 +210,35 @@ export class GitHubService {
       return 0;
     }
   }
+
+  async listPublicRepos(username: string): Promise<Array<{
+    name: string;
+    description: string | null;
+    html_url: string;
+    created_at: string;
+    updated_at: string;
+    language: string | null;
+  }>> {
+    try {
+      const repos = await this.request('GET', `/users/${username}/repos`, null, {
+        headers: {
+          'per_page': '100'  // Get up to 100 repos per page
+        }
+      });
+      
+      return repos
+        .filter((repo: any) => !repo.private)
+        .map((repo: any) => ({
+          name: repo.name,
+          description: repo.description,
+          html_url: repo.html_url,
+          created_at: repo.created_at,
+          updated_at: repo.updated_at,
+          language: repo.language
+        }));
+    } catch (error) {
+      console.error('Failed to fetch public repositories:', error);
+      throw new Error(`Failed to fetch public repositories: ${error instanceof Error ? error.message : 'Unknown error'}`);
+    }
+  }
 }