diff --git a/appview/pages/templates/repo/fork.html b/appview/pages/templates/repo/fork.html
index 468bf572..3ad2df29 100644
--- a/appview/pages/templates/repo/fork.html
+++ b/appview/pages/templates/repo/fork.html
@@ -49,7 +49,7 @@
                   name="repo_name"
                   value="{{ .RepoInfo.Name }}"
                   required
-                  class="flex-1 dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded md:rounded-r md:rounded-l-none px-3 py-2"
+                  class="flex-1 md:rounded-r md:rounded-l-none py-2"
                 />
               </div>
             </div>
@@ -64,7 +64,7 @@
                 value="{{ .RepoInfo.Description }}"
                 maxlength="140"
                 oninput="document.getElementById('fork-desc-count').textContent = this.value.length + '/140 characters'"
-                class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 border border-gray-300 rounded px-3 py-2"
+                class="w-full py-2"
                 placeholder="A brief description of your project..."
               />
               <p id="fork-desc-count" class="text-sm text-gray-500 dark:text-gray-400 mt-1">{{ len .RepoInfo.Description }}/140 characters</p>
diff --git a/appview/pages/templates/repo/new.html b/appview/pages/templates/repo/new.html
index 5b1c14f6..602d3f75 100644
--- a/appview/pages/templates/repo/new.html
+++ b/appview/pages/templates/repo/new.html
@@ -90,7 +90,7 @@
         id="name"
         name="name"
         required
-        class="flex-1 dark:bg-gray-700 dark:text-white dark:border-gray-600 border border-gray-300 rounded md:rounded-r md:rounded-l-none px-3 py-2"
+        class="flex-1 md:rounded-r md:rounded-l-none py-2"
         placeholder="repository-name"
       />
     </div>
@@ -111,7 +111,7 @@
       id="description"
       name="description"
       maxlength="140"
-      class="w-full w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 border border-gray-300 rounded px-3 py-2"
+      class="w-full py-2"
       placeholder="A brief description of your project..."
     />
     <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">
@@ -132,7 +132,7 @@
       name="branch"
       value="main"
       required
-      class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 border border-gray-300 rounded px-3 py-2"
+      class="w-full py-2"
     />
     <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">
       The primary branch where development happens. Common choices are "main" or "master".
@@ -146,7 +146,7 @@
     <label class="block text-sm font-bold uppercase dark:text-white mb-1">
       Select a knot
     </label>
-    <div class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 border border-gray-300 rounded p-3 space-y-2">
+    <div class="w-full space-y-2">
       {{ range .Knots }}
         <div class="flex items-center">
           <input
diff --git a/appview/pages/templates/repo/pulls/fragments/pullNewComment.html b/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
index ca0a97a5..2717deea 100644
--- a/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
+++ b/appview/pages/templates/repo/pulls/fragments/pullNewComment.html
@@ -34,7 +34,7 @@
 {{ define "cancel" }}
   <button
     type="button"
-    class="btn text-red-500 dark:text-red-400 flex gap-2 items-center group"
+    class="btn-flat text-red-500 dark:text-red-400 flex gap-2 items-center group"
     hx-get="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/round/{{ .RoundNumber }}/actions"
     hx-swap="outerHTML"
     hx-target="#actions-{{.RoundNumber}}"
@@ -48,10 +48,9 @@
   <button
     type="submit"
     id="reply-{{ .RoundNumber }}"
-    class="btn-create flex items-center gap-2">
+    class="btn-create-flat flex items-center gap-2">
       {{ i "reply" "w-4 h-4 inline group-[.htmx-request]:hidden" }}
       {{ i "loader-circle" "w-4 h-4 animate-spin hidden group-[.htmx-request]:inline" }}
       reply
   </button>
 {{ end }}
-
diff --git a/appview/pages/templates/strings/fragments/form.html b/appview/pages/templates/strings/fragments/form.html
index c7b48da1..69d64930 100644
--- a/appview/pages/templates/strings/fragments/form.html
+++ b/appview/pages/templates/strings/fragments/form.html
@@ -16,7 +16,7 @@
         placeholder="Filename"
         required
         value="{{ .String.Filename }}"
-        class="md:max-w-64 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-3 py-2 border rounded"
+        class="md:max-w-64"
         >
       <input
         type="text"
@@ -24,14 +24,14 @@
         name="description"
         value="{{ .String.Description }}"
         placeholder="Description ..."
-        class="flex-1 dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-3 py-2 border rounded"
+        class="flex-1"
       >
     </div>
     <textarea
       name="content" 
       id="content-textarea"
       wrap="off"
-      class="w-full dark:bg-gray-800 dark:text-white dark:border-gray-700 dark:placeholder-gray-400 font-mono"
+      class="w-full font-mono"
       rows="20"
       spellcheck="false"
       placeholder="Paste your string here!"
@@ -54,7 +54,7 @@
         <button
           type="submit"
           id="new-button"
-          class="w-fit btn-create rounded flex items-center py-0 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600 group"
+          class="w-fit btn-create group"
           >
           <span class="inline-flex items-center gap-2">
             {{ i "arrow-up" "w-4 h-4" }}
diff --git a/input.css b/input.css
index 64b201d6..b2f6fa2d 100644
--- a/input.css
+++ b/input.css
@@ -241,6 +241,13 @@
           hover:before:shadow-[inset_0_-2px_0_0_theme(colors.gray.900/25%)]
           active:before:shadow-[inset_0_2px_2px_0_theme(colors.gray.900/50%)];
     }
+    
+    .btn-create-flat {
+        @apply btn-create
+        before:shadow-none
+        hover:before:shadow-none
+        active:before:shadow-none;
+    }
 
     .btn-cancel {
       @apply btn text-white
@@ -250,6 +257,13 @@
           disabled:bg-red-400 dark:disabled:bg-red-600;
     }
 
+    .btn-cancel-flat {
+        @apply btn-cancel
+        before:shadow-none
+        hover:before:shadow-none
+        active:before:shadow-none;
+    }
+
     .btn-group {
       @apply inline-flex items-stretch
           max-h-[32px]
@@ -261,7 +275,7 @@
     .btn-group-item {
       @apply btn-flat min-h-[30px] gap-1.5
           bg-gray-50 dark:bg-gray-900
-          border-y-0
+          rounded-none border-y-0
           no-underline hover:no-underline
           hover:text-gray-600 dark:hover:text-gray-400;
     }