diff --git a/src/app.css b/src/app.css
index 082d4fe..2ae759f 100644
--- a/src/app.css
+++ b/src/app.css
@@ -1,4 +1,7 @@
 @import "tailwindcss";
+@import "tailwindcss/theme.css" layer(theme);
+@import "tailwindcss/preflight.css" layer(base);
+@import "tailwindcss/utilities.css" layer(utilities);
 /* then your own imports and layers */
 @import "./styles/base.css";
 @import "./styles/scrollbar.css";
@@ -7,6 +10,8 @@
 @import "./styles/asciidoc.css";
 @import "./theme-tokens.css";
 
+@layer theme, base, components, utilities;
+
 @plugin "flowbite/plugin";
 @custom-variant dark (&:where(.dark, .dark *));
 
@@ -125,10 +130,10 @@
 
 /* Custom styles */
 @layer base {
-    /* disable chrome cancel button */
-    input[type="search"]::-webkit-search-cancel-button {
-        display: none;
-    }
+  /* disable chrome cancel button */
+  input[type="search"]::-webkit-search-cancel-button {
+      display: none;
+  }
 
   .leather {
     @apply bg-primary-50 dark:bg-primary-1000 text-gray-900 dark:text-gray-100;
diff --git a/src/lib/a/forms/ACommentForm.svelte b/src/lib/a/forms/ACommentForm.svelte
new file mode 100644
index 0000000..5509dcc
--- /dev/null
+++ b/src/lib/a/forms/ACommentForm.svelte
@@ -0,0 +1,133 @@
+<script lang="ts">
+  import { Textarea, Toolbar, ToolbarGroup, ToolbarButton, Button, Label } from "flowbite-svelte";
+  import {
+    LetterBoldOutline,
+    LetterItalicOutline
+  } from "flowbite-svelte-icons";
+  import { userPubkey } from "$lib/stores/authStore.Svelte";
+
+  let {
+    content = "",
+    extensions,
+    profile,
+    isSubmitting = false,
+    onSubmit = () => {}
+  } = $props<{
+    content?: string;
+    extensions?: any;
+    profile?: any;
+    isSubmitting?: boolean;
+    onSubmit?: (content: string) => Promise<void>;
+  }>();
+
+  const markupButtons = [
+    { label: "Bold", icon: LetterBoldOutline, action: () => insertMarkup("**", "**") },
+    { label: "Italic", icon: LetterItalicOutline, action: () => insertMarkup("_", "_") },
+    { label: "Strike", action: () => insertMarkup("~~", "~~") },
+    { label: "Link", action: () => insertMarkup("[", "](url)") },
+    { label: "Image", action: () => insertMarkup("![", "](url)") },
+    { label: "Quote", action: () => insertMarkup("> ", "") },
+    { label: "List", action: () => insertMarkup("* ", "") },
+    { label: "Numbered List", action: () => insertMarkup("1. ", "") },
+    { label: "Hashtag", action: () => insertMarkup("#", "") },
+    ];
+
+  function insertMarkup(prefix: string, suffix: string) {
+    const textarea = document.querySelector("textarea");
+    if (!textarea) return;
+
+    const start = textarea.selectionStart;
+    const end = textarea.selectionEnd;
+    const selectedText = content.substring(start, end);
+
+    content =
+      content.substring(0, start) +
+      prefix +
+      selectedText +
+      suffix +
+      content.substring(end);
+
+    // Set cursor position after the inserted markup
+    setTimeout(() => {
+      textarea.focus();
+      textarea.selectionStart = textarea.selectionEnd =
+        start + prefix.length + selectedText.length + suffix.length;
+    }, 0);
+  }
+
+  function clearForm() {
+    content = "";
+  }
+
+  function removeFormatting() {
+    content = content
+      .replace(/\*\*(.*?)\*\*/g, "$1")
+      .replace(/_(.*?)_/g, "$1")
+      .replace(/~~(.*?)~~/g, "$1")
+      .replace(/\[([^\]]+)\]\([^)]+\)/g, "$1")
+      .replace(/!\[(.*?)\]\(.*?\)/g, "$1")
+      .replace(/^>\s*/gm, "")
+      .replace(/^[-*]\s*/gm, "")
+      .replace(/^\d+\.\s*/gm, "")
+      .replace(/#(\w+)/g, "$1");
+  }
+
+  async function handleSubmit(e: SubmitEvent) {
+    e.preventDefault();
+    await onSubmit(content.trim());
+  }
+</script>
+
+
+<form novalidate onsubmit={handleSubmit}>
+  <Label for="editor" class="sr-only">Comment</Label>
+  <Textarea id="editor" rows={8}
+            bind:value={content}
+            class="!m-0 p-4"
+            innerClass="!m-0 !bg-transparent"
+            headerClass="!m-0 !bg-transparent"
+            footerClass="!m-0 !bg-transparent"
+            addonClass="!m-0 top-3"
+            textareaClass="!m-0 !bg-transparent !border-0 !rounded-none !shadow-none !focus:ring-0"
+            placeholder="Write a comment">
+    {#snippet header()}
+      <Toolbar embedded class="flex-row !m-0">
+        <ToolbarGroup class="flex-row !m-0">
+          {#each markupButtons as button}
+            {#if button.icon}
+              {@const TheIcon = button.icon}
+              <ToolbarButton size="xs" onclick={button.action} >
+                <TheIcon />
+              </ToolbarButton>
+            {:else}
+              <ToolbarButton onclick={button.action}>{button.label}</ToolbarButton>
+            {/if}
+          {/each}
+          {@render extensions()}
+        </ToolbarGroup>
+      </Toolbar>
+    {/snippet}
+    {#snippet addon()}
+      {@render profile()}
+    {/snippet}
+    {#snippet footer()}
+      <div class="flex flex-row justify-between">
+          <div class="flex flex-row gap-3 !m-0">
+            <Button size="xs" color="alternative" onclick={removeFormatting} class="!m-0">Remove Formatting</Button>
+            <Button size="xs" color="alternative" class="!m-0" onclick={clearForm}>Clear</Button>
+          </div>
+        <Button
+          disabled={isSubmitting || !content.trim() || !$userPubkey}
+          type="submit">
+          {#if !$userPubkey}
+            Not Signed In
+          {:else if isSubmitting}
+            Publishing...
+          {:else}
+            Post Comment
+          {/if}
+        </Button>
+      </div>
+    {/snippet}
+  </Textarea>
+</form>
diff --git a/src/lib/a/index.ts b/src/lib/a/index.ts
index 28834b8..999bb26 100644
--- a/src/lib/a/index.ts
+++ b/src/lib/a/index.ts
@@ -20,5 +20,6 @@ export { default as ANavbar } from './nav/ANavbar.svelte';
 export { default as AFooter } from './nav/AFooter.svelte';
 
 export { default as ASearchForm } from './forms/ASearchForm.svelte';
+export { default as ACommentForm } from './forms/ACommentForm.svelte';
 
 export { default as AEventPreview } from './cards/AEventPreview.svelte';
\ No newline at end of file
diff --git a/src/lib/a/primitives/AAlert.svelte b/src/lib/a/primitives/AAlert.svelte
index 9fe0261..c651435 100644
--- a/src/lib/a/primitives/AAlert.svelte
+++ b/src/lib/a/primitives/AAlert.svelte
@@ -1,9 +1,13 @@
-<script>
+<script lang="ts">
   import { Alert } from "flowbite-svelte";
 
-  let { color, children } = $props();
+  let { color, dismissable, children } = $props<{
+    color?: string;
+    dismissable?: boolean;
+    children?: any;
+  }>();
 </script>
 
-<Alert {color} class="alert-leather mb-4">
+<Alert {color} {dismissable} class="alert-leather mb-4">
   {@render children()}
 </Alert>
\ No newline at end of file
diff --git a/src/styles/base.css b/src/styles/base.css
index c4eac98..b26638f 100644
--- a/src/styles/base.css
+++ b/src/styles/base.css
@@ -1,5 +1,3 @@
-@tailwind base;
-@tailwind components;
 @tailwind utilities;
 
 @layer components {