diff --git a/dist/basecoat.css b/dist/basecoat.css
index 7873117..c47b0e6 100644
--- a/dist/basecoat.css
+++ b/dist/basecoat.css
@@ -2743,6 +2743,12 @@
         }
         -webkit-user-select: none;
         user-select: none;
+        &:disabled {
+          pointer-events: none;
+        }
+        &:disabled {
+          opacity: 50%;
+        }
         &[aria-disabled="true"] {
           pointer-events: none;
         }
diff --git a/dist/basecoat.tailwind.css b/dist/basecoat.tailwind.css
index 369c30a..c80f9e6 100644
--- a/dist/basecoat.tailwind.css
+++ b/dist/basecoat.tailwind.css
@@ -628,7 +628,7 @@
       }
       [role='menuitem'],
       [role='option'] {
-        @apply aria-hidden:hidden [&_svg]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none [&_svg]:shrink-0 [&_svg]:size-4 aria-disabled:opacity-50 aria-disabled:pointer-events-none w-full truncate;
+        @apply aria-hidden:hidden [&_svg]:text-muted-foreground relative flex cursor-default items-center gap-2 rounded-sm px-2 py-1.5 text-sm outline-hidden select-none [&_svg]:shrink-0 [&_svg]:size-4 aria-disabled:opacity-50 aria-disabled:pointer-events-none disabled:opacity-50 disabled:pointer-events-none w-full truncate;
       }
       [role='menuitem'] {
         @apply focus-visible:bg-accent focus-visible:text-accent-foreground hover:bg-accent hover:text-accent-foreground;
diff --git a/docs/_includes/components/tabs.njk b/docs/_includes/components/tabs.njk
index 600c239..4177ec9 100644
--- a/docs/_includes/components/tabs.njk
+++ b/docs/_includes/components/tabs.njk
@@ -8,18 +8,16 @@
 %}
 {% if registerComponent('tabs') %}
 <script>
-  document.addEventListener('alpine:init', (initialTabIndex = 0) => {
-    Alpine.data('tabs', () => ({
+  document.addEventListener('alpine:init', () => {
+    Alpine.data('tabs', (initialTabIndex = 0) => ({
       activeTabIndex: initialTabIndex,
       tabs: [],
       panels: [],
 
       init() {
-        console.log("initialTabIndex", initialTabIndex);
         this.$nextTick(() => {
-          this.tabs = Array.from(this.$el.querySelectorAll('[role=tab]:not([disabled])'));
-          this.panels = Array.from(this.$el.querySelectorAll('[role=tabpanel]'));
-
+          this.tabs = Array.from(this.$el.querySelectorAll(':scope > [role=tablist] [role=tab]:not([disabled])'));
+          this.panels = Array.from(this.$el.querySelectorAll(':scope > [role=tabpanel]'));
           if (this.tabs.length > 0) {
             this.selectTab(this.tabs[initialTabIndex], false);
           }
@@ -76,7 +74,7 @@
 
 <div
   class="tabs {{ main_attrs.class }}"
-  x-data="tabs({{ default_tab_index }})"
+  x-data="tabs({{ default_tab_index - 1 }})"
   {% if id %}id="{{ id }}"{% endif %}
   {% for key, value in main_attrs %}
     {% if key != 'class' %}{{ key }}="{{ value }}"{% endif %}
diff --git a/docs/_includes/layouts/component.njk b/docs/_includes/layouts/component.njk
index e63d0f8..eb40f4e 100644
--- a/docs/_includes/layouts/component.njk
+++ b/docs/_includes/layouts/component.njk
@@ -22,7 +22,6 @@ layout: layouts/base.njk
             {% for item in items %}
               <li>
                 <a href="#{{ item.id }}">{{ item.label }}</a>
-                {# Recursively call the macro if there are children #}
                 {% if item.children and item.children.length %}
                   {{ renderToc(item.children) }}
                 {% endif %}
diff --git a/docs/_includes/partials/sidebar.njk b/docs/_includes/partials/sidebar.njk
index e0ca927..cc816db 100644
--- a/docs/_includes/partials/sidebar.njk
+++ b/docs/_includes/partials/sidebar.njk
@@ -102,7 +102,10 @@
           <a
             href="/components/{{ component.id }}"
             class="h-8 flex items-center gap-2 rounded-md p-2 text-left text-sm outline-hidden ring-sidebar-ring transition-[width,height,padding] hover:bg-sidebar-accent hover:text-sidebar-accent-foreground focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0"
-            
+            hx-boost="true"
+            hx-select="#content"
+            hx-target="#content"
+            hx-swap="outerHTML"
           >
             {{ component.name }}
           </a>
diff --git a/docs/components/alert-dialog.njk b/docs/components/alert-dialog.njk
index 88afc5d..f035b5f 100644
--- a/docs/components/alert-dialog.njk
+++ b/docs/components/alert-dialog.njk
@@ -16,20 +16,15 @@ toc:
 {% from "macros/code_block.njk" import code_block %}
 {% from "components/dialog.njk" import dialog %}
 
-<div class="alert mb-6">
-  {% lucide "info" %}
-  <h2>The Alert Dialog component uses the <a href="/components/dialog" class="font-medium underline underline-offset-4">Dialog</a> component.</h2>
-</div>
-
 {% set code %}{% set footer %}
   <button class="btn-outline" @click="open = false">Cancel</button>
   <button class="btn-primary" @click="open = false">Continue</button>
 {% endset %}
 {{ dialog(
-  id="demo-alert-dialog",
+  id="alert-dialog",
   title="Are you absolutely sure?",
   description="This action cannot be undone. This will permanently delete your account and remove your data from our servers.",
-  trigger="Open Alert Dialog",
+  trigger="Open alert dialog",
   trigger_attrs={"class": "btn-outline"},
   footer=footer,
   close_button=false,
diff --git a/docs/components/dialog.njk b/docs/components/dialog.njk
index 6c35030..281fc88 100644
--- a/docs/components/dialog.njk
+++ b/docs/components/dialog.njk
@@ -2,26 +2,122 @@
 layout: layouts/component.njk
 title: Dialog
 description: A window overlaid on either the primary window or another dialog window, rendering the content underneath inert.
+toc:
+  - label: Usage
+    id: usage
+    children:
+      - label: Default
+        id: usage-default
+      - label: Jinja or Nunjucks
+        id: usage-jinja
+  - label: Examples
+    id: examples
+    children:
+      - label: Scrollable content
+        id: example-scrollable-content
 ---
 
 {% from "macros/code_block.njk" import code_block %}
+{% from "macros/code_preview.njk" import code_preview %}
 {% from "components/dialog.njk" import dialog %}
-{% set code %}{% set footer %}
+
+{% set code %}
+{% set footer %}
+  <button class="btn-outline" @click="open = false">Cancel</button>
+  <button class="btn" @click="open = false">Save changes</button>
+{% endset %}
+{% call dialog(
+  id="demo-dialog-edit-profile",
+  title="Edit profile",
+  description="Make changes to your profile here. Click save when you're done.",
+  main_attrs={"x-ref": "myDialog"},
+  trigger="Edit Profile",
+  trigger_attrs={"class": "btn-outline"},
+  content_attrs={"class": "w-full sm:max-w-[425px] max-h-[612px]"},
+  footer=footer
+) %}
+<form class="form grid gap-4">
+  <div class="grid gap-3">
+    <label for="demo-dialog-edit-profile-name">Name</label>
+    <input type="text" value="Pedro Duarte" id="demo-dialog-edit-profile-name" />
+  </div>
+  <div class="grid gap-3">
+    <label for="demo-dialog-edit-profile-username">Username</label>
+    <input type="text" value="@peduarte" id="demo-dialog-edit-profile-username" />
+  </div>
+</form>
+{% endcall %}
+{% endset %}
+{{ code_preview("dialog", code | prettyHtml) }}
+
+<h2 id="usage"><a href="#usage">Usage</a></h2>
+
+<h3 id="usage-default"><a href="#usage-default">Default</a></h3>
+
+{{ code_block(code | prettyHtml) }}
+
+<h3 id="usage-jinja"><a href="#usage-jinja">Jinja or Nunjucks</a></h3>
+
+<section class="prose my-6">
+  <p>If you use Jinja (or Nunjucks), you can use the <code>dialog()</code> macro directly, making sure to set <code>close_on_overlay_click</code> to <code>False</code> (or <code>false</code> for Nunjucks).</p>
+  <ul>
+    <li>
+      <a href="/jinja-and-nunjucks">Read more about using Basecoat with Jinja or Nunjucks</a>
+    </li>
+    <li>
+      <a href="/components/dialog">Read more about the Dialog component</a>
+    </li>
+  </ul>
+</section>
+
+{% set raw_code %}{% raw %}{% set footer %}
   <button class="btn-outline" @click="open = false">Cancel</button>
   <button class="btn-primary" @click="open = false">Continue</button>
 {% endset %}
 {{ dialog(
-  id="alert-dialog-demo",
+  id="demo-alert-dialog",
   title="Are you absolutely sure?",
   description="This action cannot be undone. This will permanently delete your account and remove your data from our servers.",
-  trigger="Open dialog",
+  trigger="Open Alert Dialog",
   trigger_attrs={"class": "btn-outline"},
   footer=footer,
-  close_button=false,
-  close_on_overlay_click=false
-) }}{% endset %}
-{{ code_block("alert-dialog", code | prettyHtml) }}
+  close_button=False,
+  close_on_overlay_click=False
+) }}{% endraw %}
+{% endset%}
+{{ code_block(raw_code, "jinja") }}
 
-<h2>Usage</h2>
+<h2 id="examples"><a href="#examples">Examples</a></h2>
 
-<p>The Alert Dialog component uses the same syntax as the <a href="/components/dialog" class="font-medium underline underline-offset-4">Dialog</a> component with one difference in the JS.</p>
\ No newline at end of file
+<h3 id="example-scrollable-content"><a href="#example-scrollable-content">Scrollable content</a></h3>
+
+{% set code %}
+{% set footer %}
+  <button class="btn-outline" @click="open = false">Close</button>
+{% endset %}
+{% call dialog(
+  id="dialog-example",
+  title="Scrollable Content",
+  description="This is a dialog with scrollable content.",
+  main_attrs={"x-ref": "myDialog"},
+  trigger="Scrollable Content",
+  trigger_attrs={"class": "btn-outline"},
+  content_attrs={"class": "w-full sm:max-w-[425px] max-h-[612px]"},
+  content_body_attrs={"class": "overflow-y-auto scrollbar"},
+  footer=footer
+) %}
+<div class="space-y-4 text-sm">
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+  <p>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+</div>
+{% endcall %}
+{% endset %}
+{{ code_preview("dialog-scrollable-content", code | prettyHtml) }}
\ No newline at end of file
diff --git a/docs/components/dropdown-menu.njk b/docs/components/dropdown-menu.njk
index 8622ccf..6198a86 100644
--- a/docs/components/dropdown-menu.njk
+++ b/docs/components/dropdown-menu.njk
@@ -5,43 +5,58 @@ description: Displays a menu to the user — such as a set of actions or functio
 ---
 
 {% from "macros/code_block.njk" import code_block %}
+{% from "macros/code_preview.njk" import code_preview %}
 {% from "components/dropdown-menu.njk" import dropdown_menu %}
+
 {% set code %}{% call dropdown_menu(
   id="dropdown-menu",
-  trigger="Open Menu",
+  trigger="Open",
   trigger_attrs={"class": "btn-outline"},
   content_attrs={"class": "min-w-56"}
 ) %}
 <div role="group" aria-labelledby="account-options">
   <span id="account-options" role="heading">Account Options</span>
   <button type="button" role="menuitem">
+    {% lucide "user" %}
     Profile
     <span class="text-muted-foreground ml-auto text-xs tracking-widest">⇧⌘P</span>
   </button>
   <button type="button" role="menuitem">
+    {% lucide "credit-card" %}
     Billing
     <span class="text-muted-foreground ml-auto text-xs tracking-widest">⌘B</span>
   </button>
   <button type="button" role="menuitem">
+    {% lucide "settings" %}
     Settings
     <span class="text-muted-foreground ml-auto text-xs tracking-widest">⌘S</span>
   </button>
   <button type="button" role="menuitem">
+    {% lucide "keyboard" %}
     Keyboard shortcuts
     <span class="text-muted-foreground ml-auto text-xs tracking-widest">⌘K</span>
   </button>
 </div>
 <hr role="separator">
-<button type="button" role="menuitem">GitHub</button>
-<button type="button" role="menuitem">Support</button>
-<button type="button" role="menuitem" disabled>API</button>
+<button type="button" role="menuitem">
+  {% lucide "github" %}
+  GitHub
+</button>
+<button type="button" role="menuitem">
+  {% lucide "life-buoy" %}
+  Support
+</button>
+<button type="button" role="menuitem" disabled>
+  {% lucide "cloud" %}
+  API
+</button>
 <hr role="separator">
 <button type="button" role="menuitem">
+  {% lucide "log-out" %}
   Logout
   <span class="text-muted-foreground ml-auto text-xs tracking-widest">⇧⌘P</span>
 </button>{% endcall %}{% endset %}
-{{ code_block("dropdown-menu", code | prettyHtml) }}
-
+{{ code_preview("dropdown-menu", code | prettyHtml) }}
 
 <h2 id="usage">Usage</h2>
 
@@ -61,85 +76,4 @@ description: Displays a menu to the user — such as a set of actions or functio
       or <code>btn-icon-sm-secondary</code>.
     </li>
   </ul>
-</section>
-
-<h2>Examples</h2>
-
-<h3>Primary</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn">Primary</button>{% endset %}
-{{ code_block("accordion", code | prettyHtml) }}
-
-<h3>Secondary</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn-secondary">Button</button>{% endset %}
-{{ code_block("accordion", code | prettyHtml) }}
-
-<h3>Destructive</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn-destructive">Destructive</button>{% endset %}
-{{ code_block("accordion", code | prettyHtml) }}
-
-<h3>Outline</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn-outline">Outline</button>{% endset %}
-{{ code_block("accordion", code | prettyHtml) }}
-
-<h3>Ghost</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn-ghost">Ghost</button>{% endset %}
-{{ code_block("accordion", code | prettyHtml) }}
-
-<h3>Link</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn-link">Link</button>{% endset %}
-{{ code_block("accordion", code | prettyHtml) }}
-
-<h3>Icon</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn-icon-outline">
-  {% lucide "chevron-right" %}
-</button>{% endset %}
-{{ code_block("accordion", code | prettyHtml) }}
-
-<h3>With Icon</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn">
-  {% lucide "send" %}
-  Send email
-</button>{% endset %}
-{{ code_block("accordion", code | prettyHtml) }}
-
-<h3>Loading</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn" disabled>
-  {% lucide "loader", { "class": "animate-spin" } %}
-  Loading
-</button>{% endset %}
-{{ code_block("accordion", code) }}
-
-<h3>Large</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn-lg">
-  {% lucide "shopping-cart" %}
-  Buy
-</button>{% endset %}
-{{ code_block("accordion", code) }}
-
-<h3>Small</h3>
-
-{% from "macros/code_block.njk" import code_block %}
-{% set code %}<button class="btn-icon-sm-destructive">
-  {% lucide "trash" %}
-</button>{% endset %}
-{{ code_block("accordion", code) }}
\ No newline at end of file
+</section>
\ No newline at end of file
diff --git a/docs/components/tabs.njk b/docs/components/tabs.njk
new file mode 100644
index 0000000..7c147a7
--- /dev/null
+++ b/docs/components/tabs.njk
@@ -0,0 +1,79 @@
+---
+layout: layouts/component.njk
+title: Tabs
+description: A set of layered sections of content—known as tab panels—that are displayed one at a time.
+toc:
+  - label: Usage
+    id: usage
+---
+
+{% from "macros/code_preview.njk" import code_preview %}
+{% from "macros/code_block.njk" import code_block %}
+{% from "components/tabs.njk" import tabs %}
+{% set code %}
+{% set account_panel %}
+<div class="card">
+  <header>
+    <h2>Account</h2>
+    <p>Make changes to your account here. Click save when you're done.</p>
+  </header>
+  <section>
+    <form class="form grid gap-6">
+      <div class="grid gap-3">
+        <label for="demo-tabs-account-name">Name</label>
+        <input type="text" id="demo-tabs-account-name" value="Pedro Duarte" />
+      </div>
+      <div class="grid gap-3">
+        <label for="demo-tabs-account-username">Username</label>
+        <input type="text" id="demo-tabs-account-username" value="@peduarte" />
+      </div>
+    </form>
+  </section>
+  <footer>
+    <button type="button" class="btn">Save changes</button>
+  </footer>
+</div>
+{% endset %}
+{% set password_panel %}
+<div class="card">
+  <header>
+    <h2>Password</h2>
+    <p>Change your password here. After saving, you'll be logged out.</p>
+  </header>
+  <section>
+    <form class="form grid gap-6">
+      <div class="grid gap-3">
+        <label for="demo-tabs-password-current">Current password</label>
+        <input type="password" id="demo-tabs-password-current" />
+      </div>
+      <div class="grid gap-3">
+        <label for="demo-tabs-password-new">New password</label>
+        <input type="password" id="demo-tabs-password-new"/>
+      </div>
+    </form>
+  </section>
+  <footer>
+    <button type="button" class="btn">Save Password</button>
+  </footer>
+</div>
+{% endset %}
+{% set tabsets_demo = [
+{ tab: "Account", panel: account_panel },
+{ tab: "Password", panel: password_panel }
+] %}
+{{ tabs(
+id='demo-tabs-with-panels',
+tabsets=tabsets_demo,
+main_attrs={ "class": "w-full" },
+tablist_attrs={ "class": "w-full" }
+) }}
+{% endset %}
+{{ code_preview("tabs", code | prettyHtml, "max-w-[300px] w-full") }}
+
+<h2 id="usage"><a href="#usage">Usage</a></h2>
+
+<section class="prose my-6">
+  <p>You can style an <code>&lt;input type="range"&gt;</code> element by either adding the <code>input</code> class or having a parent with the <code>form</code> class (<a href="/components/form">read more about form</a>). However, the range input also requries some Javacript code to be able to paint the left side of the slider.</p>
+</section>
+
+{{ code_block(code) }}
\ No newline at end of file