diff --git a/src/Htmxor/HtmxConfig.cs b/src/Htmxor/HtmxConfig.cs
index c677138..9c4763d 100644
--- a/src/Htmxor/HtmxConfig.cs
+++ b/src/Htmxor/HtmxConfig.cs
@@ -8,6 +8,8 @@ namespace Htmxor;
 /// </summary>
 public partial record class HtmxConfig
 {
+    private SwapStyle? defaultSwapStyle;
+
     /// <summary>
     /// Defaults to <see langword="true" /> if this property is null. really only useful for testing
     /// </summary>
@@ -31,7 +33,11 @@ public partial record class HtmxConfig
     /// Defaults to <see cref="SwapStyle.InnerHTML"/> if this property is null.
     /// </summary>
     [JsonPropertyName("defaultSwapStyle")]
-    public SwapStyle? DefaultSwapStyle { get; set; }
+    public SwapStyle? DefaultSwapStyle
+    {
+        get => defaultSwapStyle;
+        set => defaultSwapStyle = value is SwapStyle.Default ? null : value;
+    }
 
     /// <summary>
     /// Defaults to <see langword="0"/> if this property is null.
diff --git a/src/Htmxor/Http/HtmxResponse.cs b/src/Htmxor/Http/HtmxResponse.cs
index 74d06ee..e47c4c4 100644
--- a/src/Htmxor/Http/HtmxResponse.cs
+++ b/src/Htmxor/Http/HtmxResponse.cs
@@ -144,8 +144,8 @@ public HtmxResponse ReplaceUrl(string url)
     /// <returns>This <see cref="HtmxResponse"/> object instance.</returns>
     public HtmxResponse Reswap(string modifier)
     {
+        ArgumentNullException.ThrowIfNullOrWhiteSpace(modifier);
         headers[HtmxResponseHeaderNames.Reswap] = modifier;
-
         return this;
     }
 
@@ -159,20 +159,16 @@ public HtmxResponse Reswap(SwapStyle swapStyle, string? modifier = null)
     {
         AssertIsHtmxRequest();
 
-        var style = swapStyle switch
+        if (swapStyle is SwapStyle.Default)
         {
-            SwapStyle.InnerHTML => "innerHTML",
-            SwapStyle.OuterHTML => "outerHTML",
-            SwapStyle.BeforeBegin => "beforebegin",
-            SwapStyle.AfterBegin => "afterbegin",
-            SwapStyle.BeforeEnd => "beforeend",
-            SwapStyle.AfterEnd => "afterend",
-            SwapStyle.Delete => "delete",
-            SwapStyle.None => "none",
-            _ => throw new SwitchExpressionException(swapStyle),
-        };
+            Reswap(modifier);
+            return this;
+        }
 
-        var value = modifier != null ? $"{style} {modifier}" : style;
+        var style = swapStyle.ToHtmxString();
+        var value = !string.IsNullOrWhiteSpace(modifier)
+            ? $"{style} {modifier}"
+            : style;
 
         headers[HtmxResponseHeaderNames.Reswap] = value;
 
@@ -180,16 +176,18 @@ public HtmxResponse Reswap(SwapStyle swapStyle, string? modifier = null)
     }
 
     /// <summary>
-    ///     Allows you to specify how the response will be swapped.
+    /// Allows you to specify how the response will be swapped.
     /// </summary>
     /// <param></param>
     /// <param name="swapStyle"></param>
-    /// <returns></returns>
+    /// <returns>This <see cref="HtmxResponse"/> object instance.</returns>
     public HtmxResponse Reswap(SwapStyleBuilder swapStyle)
     {
-	    var (style, modifier) = swapStyle.Build();
+        var (style, modifier) = swapStyle.Build();
 
-        return style is null ? Reswap(modifier) : Reswap((SwapStyle)style, modifier);
+        return style is SwapStyle.Default
+            ? Reswap(modifier)
+            : Reswap(style, modifier);
     }
 
     /// <summary>
@@ -224,11 +222,12 @@ public HtmxResponse Reselect(string selector)
     /// Sets response code to stop polling
     /// </summary>
     /// <returns></returns>
+    /// <returns>This <see cref="HtmxResponse"/> object instance.</returns>
     public HtmxResponse StopPolling()
     {
-	    context.Response.StatusCode = HtmxStatusCodes.StopPolling;
+        context.Response.StatusCode = HtmxStatusCodes.StopPolling;
 
-	    return this;
+        return this;
     }
 
     /// <summary>
@@ -314,7 +313,7 @@ public override string ToString()
 
     private void AssertIsHtmxRequest()
     {
-        if(!isHtmxRequest)
+        if (!isHtmxRequest)
         {
             throw new InvalidOperationException(
                 "The active request is not an htmx request. " +
diff --git a/src/Htmxor/Http/SwapStyleBuilder.cs b/src/Htmxor/Http/SwapStyleBuilder.cs
index 433eb40..0b4afc3 100644
--- a/src/Htmxor/Http/SwapStyleBuilder.cs
+++ b/src/Htmxor/Http/SwapStyleBuilder.cs
@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Specialized;
+using System.Diagnostics;
 using System.Numerics;
 
 namespace Htmxor.Http;
@@ -7,16 +8,17 @@ namespace Htmxor.Http;
 /// <summary>
 /// A builder class for constructing a swap style command string for HTMX responses.
 /// </summary>
-public sealed class SwapStyleBuilder 
+[DebuggerDisplay("{ToString(),nq}")]
+public sealed class SwapStyleBuilder
 {
-    private readonly SwapStyle? style;
-    private readonly OrderedDictionary modifiers = new();
+    private readonly SwapStyle style;
+    private readonly OrderedDictionary modifiers = new(StringComparer.Ordinal);
 
     /// <summary>
     /// Initializes a new instance of the SwapStyleBuilder with a specified swap style.
     /// </summary>
     /// <param name="style">The initial swap style to be applied.</param>
-    public SwapStyleBuilder(SwapStyle? style = null)
+    public SwapStyleBuilder(SwapStyle style = SwapStyle.Default)
     {
         this.style = style;
     }
@@ -32,6 +34,7 @@ public SwapStyleBuilder(SwapStyle? style = null)
     /// </remarks>
     /// <param name="time">The amount of time htmx should wait after receiving a 
     /// response to swap the content.</param>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder AfterSwapDelay(TimeSpan time)
     {
         AddModifier("swap", time.TotalMilliseconds < 1000 ? $"{time.TotalMilliseconds}ms" : $"{time.TotalSeconds}s");
@@ -50,11 +53,12 @@ public SwapStyleBuilder AfterSwapDelay(TimeSpan time)
     /// </remarks>
     /// <param name="time">The amount of time htmx should wait after receiving a 
     /// response to swap the content.</param>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder AfterSettleDelay(TimeSpan time)
     {
-	    AddModifier("settle", time.TotalMilliseconds < 1000 ? $"{time.TotalMilliseconds}ms" : $"{time.TotalSeconds}s");
+        AddModifier("settle", time.TotalMilliseconds < 1000 ? $"{time.TotalMilliseconds}ms" : $"{time.TotalSeconds}s");
 
-	    return this;
+        return this;
     }
 
     /// <summary>
@@ -67,7 +71,7 @@ public SwapStyleBuilder AfterSettleDelay(TimeSpan time)
     /// </remarks>
     /// <param name="direction">The scroll direction after the swap.</param>
     /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder Scroll(ScrollDirection direction, string? selector = null)
     {
         switch (direction)
@@ -92,7 +96,7 @@ public SwapStyleBuilder Scroll(ScrollDirection direction, string? selector = nul
     /// is present then the page is scrolled to the top of the content identified by the css selector.
     /// </remarks>
     /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ScrollTop(string? selector = null) => Scroll(ScrollDirection.Top, selector);
 
     /// <summary>
@@ -104,9 +108,9 @@ public SwapStyleBuilder Scroll(ScrollDirection direction, string? selector = nul
     /// is present then the page is scrolled to the bottom of the content identified by the css selector.
     /// </remarks>
     /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ScrollBottom(string? selector = null) => Scroll(ScrollDirection.Bottom, selector);
-    
+
     /// <summary>
     /// Determines whether to ignore the document title in the swap response by appending the modifier
     /// <c>ignoreTitle:<paramref name="ignore"/></c>.
@@ -117,7 +121,7 @@ public SwapStyleBuilder Scroll(ScrollDirection direction, string? selector = nul
     /// This keeps the current title unchanged regardless of the incoming swap content's title tag.
     /// </remarks>
     /// <param name="ignore">Whether to ignore the title.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder IgnoreTitle(bool ignore = true)
     {
         AddModifier("ignoreTitle", ignore);
@@ -132,7 +136,7 @@ public SwapStyleBuilder IgnoreTitle(bool ignore = true)
     /// This method ensures the title of the document is updated according to the swap response by removing any
     /// ignoreTitle modifiers, effectively setting <c>ignoreTitle:false</c>.
     /// </remarks>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder IncludeTitle() => IgnoreTitle(false);
 
     /// <summary>
@@ -143,7 +147,7 @@ public SwapStyleBuilder IgnoreTitle(bool ignore = true)
     /// will add the modifier <c>transition:true</c> to enable smooth transitions.
     /// </remarks>
     /// <param name="show">Whether to show transition effects.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder Transition(bool show)
     {
         AddModifier("transition", show);
@@ -157,7 +161,7 @@ public SwapStyleBuilder Transition(bool show)
     /// <remarks>
     /// By calling this method, transition effects are enabled for the swap, adding the modifier <c>transition:true</c>.
     /// </remarks>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder IncludeTransition() => Transition(true);
 
     /// <summary>
@@ -166,7 +170,7 @@ public SwapStyleBuilder Transition(bool show)
     /// <remarks>
     /// This method disables transition effects by adding the modifier <c>transition:false</c> to the swap commands.
     /// </remarks>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder IgnoreTransition() => Transition(false);
 
     /// <summary>
@@ -180,7 +184,7 @@ public SwapStyleBuilder Transition(bool show)
     /// will be <c>focus-scroll:false</c>
     /// </remarks>
     /// <param name="scroll">Whether to scroll to the focus element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ScrollFocus(bool scroll = true)
     {
         AddModifier("focus-scroll", scroll);
@@ -195,7 +199,7 @@ public SwapStyleBuilder ScrollFocus(bool scroll = true)
     /// <remarks>
     /// Adds a modifier of <c>focus-scroll:false</c>
     /// </remarks>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder PreserveFocus() => ScrollFocus(false);
 
     /// <summary>
@@ -209,7 +213,7 @@ public SwapStyleBuilder ScrollFocus(bool scroll = true)
     /// </remarks>
     /// <param name="direction">The scroll direction after swap.</param>
     /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ShowOn(ScrollDirection direction, string? selector = null)
     {
         switch (direction)
@@ -233,7 +237,7 @@ public SwapStyleBuilder ShowOn(ScrollDirection direction, string? selector = nul
     /// <paramref name="selector"/>.
     /// </remarks>
     /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ShowOnTop(string? selector = null) => ShowOn(ScrollDirection.Top, selector);
 
     /// <summary>
@@ -244,18 +248,18 @@ public SwapStyleBuilder ShowOn(ScrollDirection direction, string? selector = nul
     /// <paramref name="selector"/>.
     /// </remarks>
     /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ShowOnBottom(string? selector = null) => ShowOn(ScrollDirection.Bottom, selector);
 
     /// <summary>
     /// Specifies that the swap should show in the window by smoothly scrolling to either the top or bottom of the window.
     /// </summary>
-    /// <param name="direction">The direction to scroll the window after the swap.</param>
     /// <remarks>
     /// This method adds the modifier <c>show:window:<paramref name="direction"/></c>, directing the swap to display the specified
     /// element at the bottom of the window.
     /// </remarks>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <param name="direction">The direction to scroll the window after the swap.</param>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ShowWindow(ScrollDirection direction)
     {
         switch (direction)
@@ -280,7 +284,7 @@ public SwapStyleBuilder ShowWindow(ScrollDirection direction)
     /// for ensuring that important content or notifications at the top of the page are immediately visible to
     /// the user after a swap operation.
     /// </remarks>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ShowWindowTop() => ShowWindow(ScrollDirection.Top);
 
     /// <summary>
@@ -291,7 +295,7 @@ public SwapStyleBuilder ShowWindow(ScrollDirection direction)
     /// at the bottom of the window following a swap by smoothly animating the scrollbar position. This positioning
     /// can be used for infinite scrolling, footers, or information appended at the end of the page.
     /// </remarks>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ShowWindowBottom() => ShowWindow(ScrollDirection.Bottom);
 
     /// <summary>
@@ -301,7 +305,7 @@ public SwapStyleBuilder ShowWindow(ScrollDirection direction)
     /// This method disables automatic scrolling by setting the modifier <c>show:none</c>, ensuring the page
     /// position remains unchanged after the swap.
     /// </remarks>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
+    /// <returns>This <see cref="SwapStyleBuilder"/> object instance.</returns>
     public SwapStyleBuilder ShowNone()
     {
         AddModifier("show", "none");
@@ -309,17 +313,29 @@ public SwapStyleBuilder ShowNone()
         return this;
     }
 
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        var (swapStyle, modifier) = Build();
+        var style = swapStyle.ToHtmxString();
+        var value = !string.IsNullOrWhiteSpace(modifier)
+            ? $"{style} {modifier}"
+            : style;
+        return value;
+    }
+
     /// <summary>
     /// Builds the swap style command string with all specified modifiers.
     /// </summary>
-    /// <returns>A tuple containing the SwapStyle and the constructed command string.</returns>
-    internal (SwapStyle?, string) Build()
+    /// <returns>A tuple containing the <see cref="SwapStyle"/> and the constructed command string.</returns>
+    internal (SwapStyle, string) Build()
     {
         var value = string.Empty;
 
         if (modifiers.Count > 0)
         {
-            value = modifiers.Cast<DictionaryEntry>()
+            value = modifiers
+                .Cast<DictionaryEntry>()
                 .Select(entry => $"{entry.Key}:{entry.Value}")
                 .Aggregate((current, next) => $"{current} {next}");
         }
@@ -336,7 +352,7 @@ private void AddModifier(string modifier, string options)
     {
         if (modifiers.Contains(modifier))
             modifiers.Remove(modifier);
-        
+
         modifiers.Add(modifier, options);
     }
 
@@ -347,245 +363,3 @@ private void AddModifier(string modifier, string options)
     /// <param name="option"></param>
     private void AddModifier(string modifier, bool option) => AddModifier(modifier, option ? "true" : "false");
 }
-
-/// <summary>
-/// Extension methods for the SwapStyle enum to facilitate building swap style commands.
-/// </summary>
-public static class SwapStyleBuilderExtension
-{
-    /// <summary>
-    /// Modifies the amount of time that htmx will wait after receiving a 
-    /// response to swap the content by including the modifier <c>swap:<paramref name="time"/></c>.
-    /// </summary>
-    /// <remarks>
-    /// <paramref name="time"/> will be converted to milliseconds if less than 1000, otherwise seconds, 
-    /// meaning the resulting modifier will be <c>swap:500ms</c> for a <see cref="TimeSpan"/> of 500 milliseconds 
-    /// or <c>swap:2s</c> for a <see cref="TimeSpan"/> of 2 seconds..
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="time">The amount of time htmx should wait after receiving a 
-    /// response to swap the content.</param>
-    public static SwapStyleBuilder AfterSwapDelay(this SwapStyle style, TimeSpan time) => new SwapStyleBuilder(style).AfterSwapDelay(time);
-
-    /// <summary>
-    /// Modifies the amount of time that htmx will wait between the swap 
-    /// and the settle logic by including the modifier <c>settle:<paramref name="time"/></c>.
-    /// </summary>
-    /// <remarks>
-    /// <paramref name="time"/> will be converted to milliseconds if less than 1000, otherwise seconds, 
-    /// meaning the resulting modifier will be <c>settle:500ms</c> for a <see cref="TimeSpan"/> of 500 milliseconds 
-    /// or <c>settle:2s</c> for a <see cref="TimeSpan"/> of 2 seconds..
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="time">The amount of time htmx should wait after receiving a 
-    /// response to swap the content.</param>
-    public static SwapStyleBuilder AfterSettleDelay(this SwapStyle style, TimeSpan time) => new SwapStyleBuilder(style).AfterSettleDelay(time);
-
-    /// <summary>
-    /// Specifies how to set the content scrollbar position after the swap and appends the modifier <c>scroll:<paramref name="direction"/></c>.
-    /// </summary>
-    /// <remarks>
-    /// Sets the swapped content scrollbar position after swapping immediately (without animation). For instance, using <see cref="ScrollDirection.Top"/>
-    /// will add the modifier <c>scroll:top</c> which sets the scrollbar position to the top of swap content after the swap.
-    /// If css <paramref name="selector"/> is present then the page is scrolled to the <paramref name="direction"/> of the content identified by the css selector.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="direction">The scroll direction after the swap.</param>
-    /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder Scroll(this SwapStyle style, ScrollDirection direction, string? selector) => new SwapStyleBuilder(style).Scroll(direction, selector);
-
-    /// <summary>
-    /// Sets the content scrollbar position to the top of the swapped content after a swap.
-    /// </summary>
-    /// <remarks>
-    /// This method adds the modifier <c>scroll:top</c> to the swap commands, instructing the page to scroll to
-    /// the top of the content after content is swapped immediately and without animation. If css <paramref name="selector"/>
-    /// is present then the page is scrolled to the top of the content identified by the css selector.
-    /// </remarks>
-    /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ScrollTop(this SwapStyle style, string? selector) => new SwapStyleBuilder(style).ScrollTop(selector);
-
-    /// <summary>
-    /// Sets the content scrollbar position to the bottom of the swapped content after a swap.
-    /// </summary>
-    /// <remarks>
-    /// This method adds the modifier <c>scroll:bottom</c> to the swap commands, instructing the page to scroll to
-    /// the bottom of the content after content is swapped immediately and without animation. If css <paramref name="selector"/>
-    /// is present then the page is scrolled to the bottom of the content identified by the css selector.
-    /// </remarks>
-    /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ScrollBottom(this SwapStyle style, string? selector) => new SwapStyleBuilder(style).ScrollBottom(selector);
-
-    /// <summary>
-    /// Determines whether to ignore the document title in the swap response by appending the modifier
-    /// <c>ignoreTitle:<paramref name="ignore"/></c>.
-    /// </summary>
-    /// <remarks>
-    /// When set to true, the document title in the swap response will be ignored by adding the modifier
-    /// <c>ignoreTitle:true</c>.
-    /// This keeps the current title unchanged regardless of the incoming swap content's title tag.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="ignore">Whether to ignore the title.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder IgnoreTitle(this SwapStyle style, bool ignore = true) => new SwapStyleBuilder(style).IgnoreTitle(ignore);
-
-    /// <summary>
-    /// Includes the document title from the swap response in the current page.
-    /// </summary>
-    /// <remarks>
-    /// This method ensures the title of the document is updated according to the swap response by removing any
-    /// ignoreTitle modifiers, effectively setting <c>ignoreTitle:false</c>.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder IncludeTitle(this SwapStyle style) => new SwapStyleBuilder(style).IncludeTitle();
-
-    /// <summary>
-    /// Enables or disables transition effects for the swap by appending the modifier <c>transition:{show}</c>.
-    /// </summary>
-    /// <remarks>
-    /// Controls the display of transition effects during the swap. For example, setting <paramref name="show"/> to true
-    /// will add the modifier <c>transition:true</c> to enable smooth transitions.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="show">Whether to show transition effects.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder Transition(this SwapStyle style, bool show) => new SwapStyleBuilder(style).Transition(show);
-
-    /// <summary>
-    /// Explicitly includes transition effects for the swap.
-    /// </summary>
-    /// <remarks>
-    /// By calling this method, transition effects are enabled for the swap, adding the modifier <c>transition:true</c>.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder IncludeTransition(this SwapStyle style) => new SwapStyleBuilder(style).IncludeTransition();
-
-    /// <summary>
-    /// Explicitly ignores transition effects for the swap.
-    /// </summary>
-    /// <remarks>
-    /// This method disables transition effects by adding the modifier <c>transition:false</c> to the swap commands.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder IgnoreTransition(this SwapStyle style) => new SwapStyleBuilder(style).IgnoreTransition();
-
-    /// <summary>
-    /// Allows you to specify that htmx should scroll to the focused element when a request completes.
-    /// htmx preserves focus between requests for inputs that have a defined id attribute. By
-    /// default htmx prevents auto-scrolling to focused inputs between requests which can be
-    /// unwanted behavior on longer requests when the user has already scrolled away. 
-    /// </summary>
-    /// <remarks>
-    /// <paramref name="scroll"/> when true will be <c>focus-scroll:true</c>, otherwise when false
-    /// will be <c>focus-scroll:false</c>
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="scroll">Whether to scroll to the focus element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ScrollFocus(this SwapStyle style, bool scroll = true) => new SwapStyleBuilder(style).ScrollFocus(scroll);
-
-    /// <summary>
-    /// Explicitly preserves focus between requests for inputs that have a defined id attribute without
-    /// scrolling.
-    /// </summary>
-    /// <remarks>
-    /// Adds a modifier of <c>focus-scroll:false</c>
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="scroll">Whether to scroll to current focus or preserve focus</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder PreserveFocus(this SwapStyle style, bool scroll = true) => new SwapStyleBuilder(style).PreserveFocus();
-
-    /// <summary>
-    /// Specifies a CSS selector to dynamically target for the swap operation, with a scroll direction after the swap.
-    /// </summary>
-    /// <remarks>
-    /// Adds a show modifier with the specified CSS selector and scroll direction. For example, if <paramref name="selector"/>
-    /// is ".item" and <paramref name="direction"/> is <see cref="ScrollDirection.Top"/>, the modifier <c>show:.item:top</c>
-    /// is added.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <param name="direction">The scroll direction after swap.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ShowOn(this SwapStyle style, ScrollDirection direction, string? selector = null) => new SwapStyleBuilder(style).ShowOn(direction, selector);
-
-    /// <summary>
-    /// Specifies that the swap should show the element matching the CSS selector at the top of the window.
-    /// </summary>
-    /// <remarks>
-    /// This method adds the modifier <c>show:{selector}:top</c>, directing the swap to display the specified element at the top of the window.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="selector">Optional CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ShowOnTop(this SwapStyle style, string? selector = null) => new SwapStyleBuilder(style).ShowOnTop(selector);
-
-    /// <summary>
-    /// Specifies that the swap should show the element matching the CSS selector at the bottom of the window.
-    /// </summary>
-    /// <remarks>
-    /// This method adds the modifier <c>show:{selector}:bottom</c>, directing the swap to display the specified element at the bottom of the window.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <param name="selector">The CSS selector of the target element.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ShowOnBottom(this SwapStyle style, string? selector = null) => new SwapStyleBuilder(style).ShowOnBottom(selector);
-
-    /// <summary>
-    /// Specifies that the swap should show in the window by smoothly scrolling to either the top or bottom of the window.
-    /// </summary>
-    /// <param name="direction">The direction to scroll the window after the swap.</param>
-    /// <remarks>
-    /// This method adds the modifier <c>show:window:<paramref name="direction"/></c>, directing the swap to display the specified
-    /// element at the bottom of the window.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ShowWindow(this SwapStyle style, ScrollDirection direction) => new SwapStyleBuilder(style).ShowWindow(direction);
-
-    /// <summary>
-    /// Specifies that the swap should smoothly scroll to the top of the window.
-    /// </summary>
-    /// <remarks>
-    /// This method adds the modifier <c>show:window:top</c>, instructing the content to be displayed
-    /// at the top of the window following a swap by smoothly animating the scrollbar position. This can be useful
-    /// for ensuring that important content or notifications at the top of the page are immediately visible to
-    /// the user after a swap operation.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ShowWindowTop(this SwapStyle style) => new SwapStyleBuilder(style).ShowWindowTop();
-
-    /// <summary>
-    /// Specifies that the swap should smoothly scroll to the bottom of the window.
-    /// </summary>
-    /// <remarks>
-    /// This method adds the modifier <c>show:window:bottom</c>, instructing the content to be displayed
-    /// at the bottom of the window following a swap by smoothly animating the scrollbar position. This positioning
-    /// can be used for infinite scrolling, footers, or information appended at the end of the page.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ShowWindowBottom(this SwapStyle style) => new SwapStyleBuilder(style).ShowWindowBottom();
-
-    /// <summary>
-    /// Turns off scrolling after swap.
-    /// </summary>
-    /// <remarks>
-    /// This method disables automatic scrolling by setting the modifier <c>show:none</c>, ensuring the page
-    /// position remains unchanged after the swap.
-    /// </remarks>
-    /// <param name="style">The swap style.</param>
-    /// <returns>The SwapStyleBuilder instance for chaining.</returns>
-    public static SwapStyleBuilder ShowNone(this SwapStyle style) => new SwapStyleBuilder(style).ShowNone();
-}
\ No newline at end of file
diff --git a/src/Htmxor/Http/SwapStyleBuilderExtension.cs b/src/Htmxor/Http/SwapStyleBuilderExtension.cs
new file mode 100644
index 0000000..79ffa37
--- /dev/null
+++ b/src/Htmxor/Http/SwapStyleBuilderExtension.cs
@@ -0,0 +1,245 @@
+namespace Htmxor.Http;
+
+/// <summary>
+/// Extension methods for the SwapStyle enum to facilitate building swap style commands.
+/// </summary>
+public static class SwapStyleBuilderExtension
+{
+    /// <summary>
+    /// Modifies the amount of time that htmx will wait after receiving a 
+    /// response to swap the content by including the modifier <c>swap:<paramref name="time"/></c>.
+    /// </summary>
+    /// <remarks>
+    /// <paramref name="time"/> will be converted to milliseconds if less than 1000, otherwise seconds, 
+    /// meaning the resulting modifier will be <c>swap:500ms</c> for a <see cref="TimeSpan"/> of 500 milliseconds 
+    /// or <c>swap:2s</c> for a <see cref="TimeSpan"/> of 2 seconds..
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="time">The amount of time htmx should wait after receiving a 
+    /// response to swap the content.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder AfterSwapDelay(this SwapStyle style, TimeSpan time) => new SwapStyleBuilder(style).AfterSwapDelay(time);
+
+    /// <summary>
+    /// Modifies the amount of time that htmx will wait between the swap 
+    /// and the settle logic by including the modifier <c>settle:<paramref name="time"/></c>.
+    /// </summary>
+    /// <remarks>
+    /// <paramref name="time"/> will be converted to milliseconds if less than 1000, otherwise seconds, 
+    /// meaning the resulting modifier will be <c>settle:500ms</c> for a <see cref="TimeSpan"/> of 500 milliseconds 
+    /// or <c>settle:2s</c> for a <see cref="TimeSpan"/> of 2 seconds..
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="time">The amount of time htmx should wait after receiving a 
+    /// response to swap the content.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder AfterSettleDelay(this SwapStyle style, TimeSpan time) => new SwapStyleBuilder(style).AfterSettleDelay(time);
+
+    /// <summary>
+    /// Specifies how to set the content scrollbar position after the swap and appends the modifier <c>scroll:<paramref name="direction"/></c>.
+    /// </summary>
+    /// <remarks>
+    /// Sets the swapped content scrollbar position after swapping immediately (without animation). For instance, using <see cref="ScrollDirection.Top"/>
+    /// will add the modifier <c>scroll:top</c> which sets the scrollbar position to the top of swap content after the swap.
+    /// If css <paramref name="selector"/> is present then the page is scrolled to the <paramref name="direction"/> of the content identified by the css selector.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="direction">The scroll direction after the swap.</param>
+    /// <param name="selector">Optional CSS selector of the target element.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder Scroll(this SwapStyle style, ScrollDirection direction, string? selector) => new SwapStyleBuilder(style).Scroll(direction, selector);
+
+    /// <summary>
+    /// Sets the content scrollbar position to the top of the swapped content after a swap.
+    /// </summary>
+    /// <remarks>
+    /// This method adds the modifier <c>scroll:top</c> to the swap commands, instructing the page to scroll to
+    /// the top of the content after content is swapped immediately and without animation. If css <paramref name="selector"/>
+    /// is present then the page is scrolled to the top of the content identified by the css selector.
+    /// </remarks>
+    /// <param name="selector">Optional CSS selector of the target element.</param>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ScrollTop(this SwapStyle style, string? selector) => new SwapStyleBuilder(style).ScrollTop(selector);
+
+    /// <summary>
+    /// Sets the content scrollbar position to the bottom of the swapped content after a swap.
+    /// </summary>
+    /// <remarks>
+    /// This method adds the modifier <c>scroll:bottom</c> to the swap commands, instructing the page to scroll to
+    /// the bottom of the content after content is swapped immediately and without animation. If css <paramref name="selector"/>
+    /// is present then the page is scrolled to the bottom of the content identified by the css selector.
+    /// </remarks>
+    /// <param name="selector">Optional CSS selector of the target element.</param>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ScrollBottom(this SwapStyle style, string? selector) => new SwapStyleBuilder(style).ScrollBottom(selector);
+
+    /// <summary>
+    /// Determines whether to ignore the document title in the swap response by appending the modifier
+    /// <c>ignoreTitle:<paramref name="ignore"/></c>.
+    /// </summary>
+    /// <remarks>
+    /// When set to true, the document title in the swap response will be ignored by adding the modifier
+    /// <c>ignoreTitle:true</c>.
+    /// This keeps the current title unchanged regardless of the incoming swap content's title tag.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="ignore">Whether to ignore the title.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder IgnoreTitle(this SwapStyle style, bool ignore = true) => new SwapStyleBuilder(style).IgnoreTitle(ignore);
+
+    /// <summary>
+    /// Includes the document title from the swap response in the current page.
+    /// </summary>
+    /// <remarks>
+    /// This method ensures the title of the document is updated according to the swap response by removing any
+    /// ignoreTitle modifiers, effectively setting <c>ignoreTitle:false</c>.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder IncludeTitle(this SwapStyle style) => new SwapStyleBuilder(style).IncludeTitle();
+
+    /// <summary>
+    /// Enables or disables transition effects for the swap by appending the modifier <c>transition:{show}</c>.
+    /// </summary>
+    /// <remarks>
+    /// Controls the display of transition effects during the swap. For example, setting <paramref name="show"/> to true
+    /// will add the modifier <c>transition:true</c> to enable smooth transitions.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="show">Whether to show transition effects.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder Transition(this SwapStyle style, bool show) => new SwapStyleBuilder(style).Transition(show);
+
+    /// <summary>
+    /// Explicitly includes transition effects for the swap.
+    /// </summary>
+    /// <remarks>
+    /// By calling this method, transition effects are enabled for the swap, adding the modifier <c>transition:true</c>.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder IncludeTransition(this SwapStyle style) => new SwapStyleBuilder(style).IncludeTransition();
+
+    /// <summary>
+    /// Explicitly ignores transition effects for the swap.
+    /// </summary>
+    /// <remarks>
+    /// This method disables transition effects by adding the modifier <c>transition:false</c> to the swap commands.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder IgnoreTransition(this SwapStyle style) => new SwapStyleBuilder(style).IgnoreTransition();
+
+    /// <summary>
+    /// Allows you to specify that htmx should scroll to the focused element when a request completes.
+    /// htmx preserves focus between requests for inputs that have a defined id attribute. By
+    /// default htmx prevents auto-scrolling to focused inputs between requests which can be
+    /// unwanted behavior on longer requests when the user has already scrolled away. 
+    /// </summary>
+    /// <remarks>
+    /// <paramref name="scroll"/> when true will be <c>focus-scroll:true</c>, otherwise when false
+    /// will be <c>focus-scroll:false</c>
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="scroll">Whether to scroll to the focus element.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ScrollFocus(this SwapStyle style, bool scroll = true) => new SwapStyleBuilder(style).ScrollFocus(scroll);
+
+    /// <summary>
+    /// Explicitly preserves focus between requests for inputs that have a defined id attribute without
+    /// scrolling.
+    /// </summary>
+    /// <remarks>
+    /// Adds a modifier of <c>focus-scroll:false</c>
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="scroll">Whether to scroll to current focus or preserve focus</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder PreserveFocus(this SwapStyle style, bool scroll = true) => new SwapStyleBuilder(style).PreserveFocus();
+
+    /// <summary>
+    /// Specifies a CSS selector to dynamically target for the swap operation, with a scroll direction after the swap.
+    /// </summary>
+    /// <remarks>
+    /// Adds a show modifier with the specified CSS selector and scroll direction. For example, if <paramref name="selector"/>
+    /// is ".item" and <paramref name="direction"/> is <see cref="ScrollDirection.Top"/>, the modifier <c>show:.item:top</c>
+    /// is added.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="selector">Optional CSS selector of the target element.</param>
+    /// <param name="direction">The scroll direction after swap.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ShowOn(this SwapStyle style, ScrollDirection direction, string? selector = null) => new SwapStyleBuilder(style).ShowOn(direction, selector);
+
+    /// <summary>
+    /// Specifies that the swap should show the element matching the CSS selector at the top of the window.
+    /// </summary>
+    /// <remarks>
+    /// This method adds the modifier <c>show:{selector}:top</c>, directing the swap to display the specified element at the top of the window.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="selector">Optional CSS selector of the target element.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ShowOnTop(this SwapStyle style, string? selector = null) => new SwapStyleBuilder(style).ShowOnTop(selector);
+
+    /// <summary>
+    /// Specifies that the swap should show the element matching the CSS selector at the bottom of the window.
+    /// </summary>
+    /// <remarks>
+    /// This method adds the modifier <c>show:{selector}:bottom</c>, directing the swap to display the specified element at the bottom of the window.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <param name="selector">The CSS selector of the target element.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ShowOnBottom(this SwapStyle style, string? selector = null) => new SwapStyleBuilder(style).ShowOnBottom(selector);
+
+    /// <summary>
+    /// Specifies that the swap should show in the window by smoothly scrolling to either the top or bottom of the window.
+    /// </summary>
+    /// <param name="direction">The direction to scroll the window after the swap.</param>
+    /// <remarks>
+    /// This method adds the modifier <c>show:window:<paramref name="direction"/></c>, directing the swap to display the specified
+    /// element at the bottom of the window.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ShowWindow(this SwapStyle style, ScrollDirection direction) => new SwapStyleBuilder(style).ShowWindow(direction);
+
+    /// <summary>
+    /// Specifies that the swap should smoothly scroll to the top of the window.
+    /// </summary>
+    /// <remarks>
+    /// This method adds the modifier <c>show:window:top</c>, instructing the content to be displayed
+    /// at the top of the window following a swap by smoothly animating the scrollbar position. This can be useful
+    /// for ensuring that important content or notifications at the top of the page are immediately visible to
+    /// the user after a swap operation.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ShowWindowTop(this SwapStyle style) => new SwapStyleBuilder(style).ShowWindowTop();
+
+    /// <summary>
+    /// Specifies that the swap should smoothly scroll to the bottom of the window.
+    /// </summary>
+    /// <remarks>
+    /// This method adds the modifier <c>show:window:bottom</c>, instructing the content to be displayed
+    /// at the bottom of the window following a swap by smoothly animating the scrollbar position. This positioning
+    /// can be used for infinite scrolling, footers, or information appended at the end of the page.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ShowWindowBottom(this SwapStyle style) => new SwapStyleBuilder(style).ShowWindowBottom();
+
+    /// <summary>
+    /// Turns off scrolling after swap.
+    /// </summary>
+    /// <remarks>
+    /// This method disables automatic scrolling by setting the modifier <c>show:none</c>, ensuring the page
+    /// position remains unchanged after the swap.
+    /// </remarks>
+    /// <param name="style">The swap style.</param>
+    /// <returns>A <see cref="SwapStyleBuilder"/> object instance.</returns>
+    public static SwapStyleBuilder ShowNone(this SwapStyle style) => new SwapStyleBuilder(style).ShowNone();
+}
diff --git a/src/Htmxor/Http/SwapStyleExtensions.cs b/src/Htmxor/Http/SwapStyleExtensions.cs
new file mode 100644
index 0000000..21f9e68
--- /dev/null
+++ b/src/Htmxor/Http/SwapStyleExtensions.cs
@@ -0,0 +1,29 @@
+using System.Runtime.CompilerServices;
+
+namespace Htmxor.Http;
+
+public static class SwapStyleExtensions
+{
+    /// <summary>
+    /// Converts the <paramref name="swapStyle"/> to their string version expected by htmx.
+    /// </summary>
+    /// <param name="swapStyle">The style to convert.</param>
+    public static string ToHtmxString(this SwapStyle swapStyle)
+    {
+        var style = swapStyle switch
+        {
+            SwapStyle.InnerHTML => "innerHTML",
+            SwapStyle.OuterHTML => "outerHTML",
+            SwapStyle.BeforeBegin => "beforebegin",
+            SwapStyle.AfterBegin => "afterbegin",
+            SwapStyle.BeforeEnd => "beforeend",
+            SwapStyle.AfterEnd => "afterend",
+            SwapStyle.Delete => "delete",
+            SwapStyle.None => "none",
+            SwapStyle.Default => "",
+            _ => throw new SwitchExpressionException(swapStyle),
+        };
+
+        return style;
+    }
+}
\ No newline at end of file
diff --git a/src/Htmxor/SwapStyle.cs b/src/Htmxor/SwapStyle.cs
index 3ea8f5a..109dc2f 100644
--- a/src/Htmxor/SwapStyle.cs
+++ b/src/Htmxor/SwapStyle.cs
@@ -5,6 +5,12 @@
 /// </summary>
 public enum SwapStyle
 {
+    /// <summary>
+    /// Default style is what is specified in <see cref="HtmxConfig.DefaultSwapStyle"/> for the application
+    /// or htmx's default, which is <see cref="InnerHTML"/>.
+    /// </summary>
+    Default,
+
     /// <summary>
     /// Replace the inner html of the target element.
     /// </summary>
diff --git a/test/Htmxor.Tests/Configuration/HtmxHeadOutletTest.cs b/test/Htmxor.Tests/Configuration/HtmxHeadOutletTest.cs
index c33846d..1a71d8e 100644
--- a/test/Htmxor.Tests/Configuration/HtmxHeadOutletTest.cs
+++ b/test/Htmxor.Tests/Configuration/HtmxHeadOutletTest.cs
@@ -90,4 +90,15 @@ public void HtmxConfig_serializer()
             }
             """);
     }
+
+    [Fact]
+    public void HtmxConfig_default_swap_style_serializer()
+    {
+        var config = new HtmxConfig
+        {
+            DefaultSwapStyle = SwapStyle.Default,
+        };
+
+        config.DefaultSwapStyle.Should().BeNull();
+    }
 }
diff --git a/test/Htmxor.Tests/Http/SwapStyleBuilderTests.cs b/test/Htmxor.Tests/Http/SwapStyleBuilderTests.cs
index 6f38856..96d6aea 100644
--- a/test/Htmxor.Tests/Http/SwapStyleBuilderTests.cs
+++ b/test/Htmxor.Tests/Http/SwapStyleBuilderTests.cs
@@ -191,11 +191,11 @@ public void SwapStyleBuilder_ShowWindow_BottomDirection_AddsCorrectModifier()
     public void SwapStyleBuilder_NullSwapStyle_ReturnsNullStyle()
     {
         // Arrange & Act
-        var builder = new SwapStyleBuilder(null);
+        var builder = new SwapStyleBuilder();
         var (style, _) = builder.Build();
 
         // Assert
-        style.Should().BeNull();
+        style.Should().Be(SwapStyle.Default);
     }
 
     [Fact]