diff --git a/nostr/commit-signatures.jsonl b/nostr/commit-signatures.jsonl
index 87d83dc..1d7687c 100644
--- a/nostr/commit-signatures.jsonl
+++ b/nostr/commit-signatures.jsonl
@@ -4,3 +4,4 @@
 {"kind":1640,"pubkey":"573634b648634cbad10f2451776089ea21090d9407f715e83c577b4611ae6edc","created_at":1771513666,"tags":[["author","Silberengel","silberengel7@protonmail.com"],["message","setup separate repos"]],"content":"Signed commit: setup separate repos","id":"62fa7c667e07791d898d0af8971165a57df5a061585e4a71447e52f7444dc687","sig":"25ef4575b03248381920985338e0ff4605f0af3fcaf8615d7906e3e116e3fbb64de3f3927f511fd45340e7dbdc4a2c3ea7fa150e5e9c75a6b5880cecaa4d2851"}
 {"kind":1640,"pubkey":"573634b648634cbad10f2451776089ea21090d9407f715e83c577b4611ae6edc","created_at":1771516332,"tags":[["author","Silberengel","silberengel7@protonmail.com"],["message","security fixes"]],"content":"Signed commit: security fixes","id":"a16b9538d6ce6ce2f1030042a4106534e2af1583642315893cc56d9f2e7cd385","sig":"0be95c5f2d720c008b52a1d38cef9952b1a615ecd3ef34b5b373266a2afb880e30347d3ee467b4ea42eca4a0e57808f98795ada878357ad39ca1a3063d6b6a22"}
 {"kind":1640,"pubkey":"573634b648634cbad10f2451776089ea21090d9407f715e83c577b4611ae6edc","created_at":1771519913,"tags":[["author","Silberengel","silberengel7@protonmail.com"],["message","fix swagger"]],"content":"Signed commit: fix swagger","id":"c0eb40be64306e1b11eba642ad357fd877776f50c8e64867cff845b92851c60e","sig":"194bedf752e25da9924bcf16b55eec0b29ae5da8bcd3f2a646e072f08d2d8f499269d42fafe6c056effb22840be0101c243aa1852b41899a73b242e6d6ad2932"}
+{"kind":1640,"pubkey":"573634b648634cbad10f2451776089ea21090d9407f715e83c577b4611ae6edc","created_at":1771520422,"tags":[["author","Silberengel","silberengel7@protonmail.com"],["message","correct icons"]],"content":"Signed commit: correct icons","id":"3d630436d21542aa097b574829ba03f9700db4d707f3d7065bc24000321d0ba2","sig":"6e345bb8ca6fef352400dd10a801d1f41b8798b7a0307eba9af84ea3b4045235b50510905ab2cc9cbdd2894b56a0d1524560a9347c137f39cf756c43ca72c326"}
diff --git a/src/app.css b/src/app.css
index b930166..7a60e17 100644
--- a/src/app.css
+++ b/src/app.css
@@ -37,6 +37,7 @@
   --input-bg: #ffffff;
   --input-border: var(--border-color);
   --input-focus: var(--royal-plum);
+  --input-placeholder: #6a6a6a; /* Medium gray for placeholder text */
   --error-bg: #fee2e2;
   --error-text: #7a0a0a; /* Darker for better contrast */
   --success-bg: #d1fae5;
@@ -78,6 +79,7 @@
   --input-bg: var(--lavender-blush);
   --input-border: var(--border-color);
   --input-focus: var(--royal-plum);
+  --input-placeholder: #a0a0a0; /* Lighter gray for placeholder on dark bg */
   --error-bg: #4a1f1f;
   --error-text: #ff8a8a; /* Brighter for better contrast */
   --success-bg: #1a3a2a;
@@ -119,6 +121,7 @@
   --input-bg: #0d1117; /* GitHub's input background */
   --input-border: #30363d; /* GitHub's input border */
   --input-focus: var(--royal-plum);
+  --input-placeholder: #6e7681; /* GitHub's placeholder color */
   --error-bg: #3d1f1f;
   --error-text: #f85149; /* GitHub's error color */
   --success-bg: #1a3a2a;
@@ -299,7 +302,7 @@ button:disabled, .button:disabled {
 
 .btn-primary, .login-button, .save-button, .search-button, .create-file-button, .create-branch-button, .create-tag-button, .create-issue-button, .create-pr-button, .add-comment-btn, .reply-btn {
   background: var(--button-primary);
-  color: white;
+  color: var(--accent-text, #ffffff); /* Use theme-aware text color */
   border: none;
 }
 
@@ -309,7 +312,7 @@ button:disabled, .button:disabled {
 
 .btn-secondary, .logout-button {
   background: var(--button-secondary);
-  color: #ffffff; /* Ensure white text for contrast */
+  color: var(--accent-text, #ffffff); /* Use theme-aware text color */
 }
 
 .btn-secondary:hover, .logout-button:hover {
@@ -326,7 +329,7 @@ button:disabled, .button:disabled {
 
 .btn-danger {
   background: var(--error-text);
-  color: white;
+  color: #ffffff; /* Always white on error background for maximum contrast */
 }
 
 .btn-danger:hover {
@@ -415,6 +418,13 @@ input, textarea, select {
   transition: border-color 0.2s ease;
 }
 
+/* Placeholder styling with proper contrast for all themes */
+input::placeholder,
+textarea::placeholder {
+  color: var(--input-placeholder, var(--text-muted));
+  opacity: 1; /* Ensure full opacity for better contrast */
+}
+
 input:focus, textarea:focus, select:focus {
   outline: none;
   border-color: var(--input-focus);
@@ -422,7 +432,14 @@ input:focus, textarea:focus, select:focus {
 
 input:disabled, textarea:disabled, select:disabled {
   background: var(--bg-secondary);
+  color: var(--text-muted);
   cursor: not-allowed;
+  opacity: 0.7;
+}
+
+input:disabled::placeholder,
+textarea:disabled::placeholder {
+  color: var(--text-muted);
   opacity: 0.6;
 }
 
@@ -518,7 +535,7 @@ input:disabled, textarea:disabled, select:disabled {
   padding: 0.5rem 0.75rem;
   font-size: 0.9rem;
   background: var(--button-secondary);
-  color: white;
+  color: var(--accent-text, #ffffff); /* Use theme-aware text color */
   border: none;
   border-radius: 4px;
   cursor: pointer;
@@ -983,7 +1000,8 @@ input:disabled, textarea:disabled, select:disabled {
 
 .pr-status.open, .issue-status.open {
   background: var(--accent-light);
-  color: var(--text-primary); /* Better contrast */
+  color: var(--accent); /* Use accent color for better contrast on light background */
+  font-weight: 600;
 }
 
 .pr-status.closed, .issue-status.closed {
diff --git a/src/lib/components/Footer.svelte b/src/lib/components/Footer.svelte
index 8d2a7e2..2c6c286 100644
--- a/src/lib/components/Footer.svelte
+++ b/src/lib/components/Footer.svelte
@@ -38,7 +38,7 @@
 
   .back-to-top-button {
     background: var(--button-primary);
-    color: white;
+    color: var(--accent-text, #ffffff);
     border: none;
     padding: 0.5rem 1rem;
     border-radius: 0.375rem;
diff --git a/src/lib/components/NavBar.svelte b/src/lib/components/NavBar.svelte
index aea995b..006bdf2 100644
--- a/src/lib/components/NavBar.svelte
+++ b/src/lib/components/NavBar.svelte
@@ -406,7 +406,7 @@
 
     .nav-links a.active {
       background: var(--accent);
-      color: white;
+      color: var(--accent-text, #ffffff);
     }
 
     .nav-links a.active::after {
diff --git a/src/lib/components/PRDetail.svelte b/src/lib/components/PRDetail.svelte
index 475a61e..905cfb6 100644
--- a/src/lib/components/PRDetail.svelte
+++ b/src/lib/components/PRDetail.svelte
@@ -572,7 +572,7 @@
   .add-comment-btn, .reply-btn {
     padding: 0.4rem 0.8rem;
     background: var(--button-primary);
-    color: white;
+    color: var(--accent-text, #ffffff);
     border: none;
     border-radius: 4px;
     cursor: pointer;
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index bc46687..833570e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -382,7 +382,7 @@
 
   .splash-button-primary {
     background: var(--accent, #007bff);
-    color: white;
+    color: var(--accent-text, #ffffff);
     box-shadow: 0 4px 6px rgba(0, 123, 255, 0.3);
   }
 
@@ -393,14 +393,14 @@
   }
 
   .splash-button-secondary {
-    background: white;
+    background: var(--card-bg, #ffffff);
     color: var(--accent, #007bff);
     border: 2px solid var(--accent, #007bff);
   }
 
   .splash-button-secondary:hover {
     background: var(--accent, #007bff);
-    color: white;
+    color: var(--accent-text, #ffffff);
     transform: translateY(-2px);
   }
 
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte
index a02753e..53070c1 100644
--- a/src/routes/dashboard/+page.svelte
+++ b/src/routes/dashboard/+page.svelte
@@ -340,7 +340,7 @@
   .refresh-button {
     padding: 0.5rem 1rem;
     background: var(--button-primary);
-    color: white;
+    color: var(--accent-text, #ffffff);
     border: none;
     border-radius: 6px;
     cursor: pointer;
diff --git a/src/routes/repos/[npub]/[repo]/+page.svelte b/src/routes/repos/[npub]/[repo]/+page.svelte
index ed462eb..9040dd2 100644
--- a/src/routes/repos/[npub]/[repo]/+page.svelte
+++ b/src/routes/repos/[npub]/[repo]/+page.svelte
@@ -3004,7 +3004,7 @@
               disabled={deletingAnnouncement}
               class="delete-announcement-button"
               title="Send deletion request for repository announcement (NIP-09)"
-              style="background: var(--danger, #dc2626); color: white; border: none; padding: 0.5rem 1rem; border-radius: 0.25rem; cursor: pointer; font-size: 0.875rem;"
+              style="background: var(--error-text, #dc2626); color: #ffffff; border: none; padding: 0.5rem 1rem; border-radius: 0.25rem; cursor: pointer; font-size: 0.875rem;"
             >
               {deletingAnnouncement ? 'Deleting...' : 'Delete Announcement'}
             </button>
@@ -3031,7 +3031,7 @@
               disabled={copyingCloneUrl}
               class="clone-url-button"
               title="Copy clone URL to clipboard"
-              style="padding: 0.5rem 1rem; font-size: 0.875rem; background: var(--primary, #3b82f6); color: white; border: none; border-radius: 0.25rem; cursor: pointer; display: flex; align-items: center; gap: 0.5rem;"
+              style="padding: 0.5rem 1rem; font-size: 0.875rem; background: var(--button-primary, #3b82f6); color: var(--accent-text, #ffffff); border: none; border-radius: 0.25rem; cursor: pointer; display: flex; align-items: center; gap: 0.5rem;"
             >
               {#if copyingCloneUrl}
                 <span>Copying...</span>
@@ -3060,7 +3060,7 @@
                 class="delete-branch-button"
                 disabled={saving}
                 title="Delete current branch"
-                style="padding: 0.25rem 0.5rem; font-size: 0.875rem; background: var(--danger, #dc2626); color: white; border: none; border-radius: 0.25rem; cursor: pointer;"
+                style="padding: 0.25rem 0.5rem; font-size: 0.875rem; background: var(--error-text, #dc2626); color: #ffffff; border: none; border-radius: 0.25rem; cursor: pointer;"
               >×</button>
             {/if}
           {/if}
@@ -4802,18 +4802,18 @@
   }
 
   .contributor-badge.owner {
-    /* High contrast colors for light mode */
-    background: #4a5568;
-    color: #ffffff;
-    border-color: #2d3748;
+    /* High contrast colors for all themes */
+    background: var(--bg-tertiary, #4a5568);
+    color: var(--text-primary, #ffffff);
+    border-color: var(--border-color, #2d3748);
   }
 
 
   .contributor-badge.maintainer {
-    /* High contrast colors for light mode */
-    background: #22543d;
-    color: #ffffff;
-    border-color: #1a202c;
+    /* High contrast colors for all themes */
+    background: var(--success-bg, #22543d);
+    color: var(--success-text, #ffffff);
+    border-color: var(--border-color, #1a202c);
   }
 
 
@@ -4987,7 +4987,7 @@
   .save-button {
     padding: 0.5rem 1rem;
     background: var(--button-primary);
-    color: white;
+    color: var(--accent-text, #ffffff);
     border: none;
     border-radius: 0.25rem;
     cursor: pointer;
diff --git a/src/routes/users/[npub]/+page.svelte b/src/routes/users/[npub]/+page.svelte
index 63dd6fd..c8fd44f 100644
--- a/src/routes/users/[npub]/+page.svelte
+++ b/src/routes/users/[npub]/+page.svelte
@@ -508,7 +508,7 @@
     height: 80px;
     border-radius: 50%;
     background: var(--accent);
-    color: white;
+    color: var(--accent-text, #ffffff);
     display: flex;
     align-items: center;
     justify-content: center;
@@ -585,7 +585,7 @@
   .send-message-button {
     padding: 0.5rem 1rem;
     background: var(--accent);
-    color: white;
+    color: var(--accent-text, #ffffff);
     border: none;
     border-radius: 6px;
     cursor: pointer;
@@ -726,7 +726,7 @@
 
   .send-button {
     background: var(--accent);
-    color: white;
+    color: var(--accent-text, #ffffff);
   }
 
   .send-button:hover:not(:disabled) {
@@ -748,7 +748,7 @@
     gap: 0.5rem;
     padding: 0.75rem 1.5rem;
     background: var(--accent);
-    color: white;
+    color: var(--accent-text, #ffffff);
     text-decoration: none;
     border-radius: 6px;
     font-size: 0.95rem;