diff --git a/.formatter.exs b/.formatter.exs
index 1483505..1e7574a 100644
--- a/.formatter.exs
+++ b/.formatter.exs
@@ -1,7 +1,10 @@
 # Used by "mix format"
 [
   import_deps: [:phoenix, :surface],
-  plugins: [Phoenix.LiveView.HTMLFormatter],
+  plugins: [
+    Phoenix.LiveView.HTMLFormatter,
+    Surface.Formatter.Plugin
+  ],
   line_length: 115,
   inputs: [
     "{mix,.formatter}.exs",
diff --git a/lib/surface/components/form.ex b/lib/surface/components/form.ex
index da75b7b..c2333c6 100644
--- a/lib/surface/components/form.ex
+++ b/lib/surface/components/form.ex
@@ -101,7 +101,7 @@ defmodule Surface.Components.Form do
     ~F"""
     <!-- XXX -->
     <.form :let={form} for={@for} action={@action} {...@opts}>
-      <#slot {@default, form: form} context_put={__MODULE__, form: form}/>
+      <#slot {@default, form: form} context_put={__MODULE__, form: form} />
     </.form>
     """
   end
diff --git a/lib/surface/components/form/field.ex b/lib/surface/components/form/field.ex
index b135c9b..1511adb 100644
--- a/lib/surface/components/form/field.ex
+++ b/lib/surface/components/form/field.ex
@@ -23,7 +23,7 @@ defmodule Surface.Components.Form.Field do
   def render(assigns) do
     ~F"""
     <div class={class_value(@class)}>
-      <#slot context_put={__MODULE__, field: @name}/>
+      <#slot context_put={__MODULE__, field: @name} />
     </div>
     """
   end
diff --git a/lib/surface/components/form/field_context.ex b/lib/surface/components/form/field_context.ex
index c403df0..f2c3431 100644
--- a/lib/surface/components/form/field_context.ex
+++ b/lib/surface/components/form/field_context.ex
@@ -20,6 +20,6 @@ defmodule Surface.Components.Form.FieldContext do
   slot default, required: true
 
   def render(assigns) do
-    ~F[<#slot context_put={Field, field: @name}/>]
+    ~F[<#slot context_put={Field, field: @name} />]
   end
 end
diff --git a/lib/surface/components/form/input.ex b/lib/surface/components/form/input.ex
index e5b4818..3fe4ab7 100644
--- a/lib/surface/components/form/input.ex
+++ b/lib/surface/components/form/input.ex
@@ -84,7 +84,7 @@ defmodule Surface.Components.Form.Input do
       field = Context.get(assigns, Surface.Components.Form.Field, :field)
 
       ~F"""
-      <#slot {@default, form: @assigns[:form] || form, field: @assigns[:field] || field}/>
+      <#slot {@default, form: @assigns[:form] || form, field: @assigns[:field] || field} />
       """
     end
   end
diff --git a/lib/surface/components/form/inputs.ex b/lib/surface/components/form/inputs.ex
index 9ac1136..62774ce 100644
--- a/lib/surface/components/form/inputs.ex
+++ b/lib/surface/components/form/inputs.ex
@@ -38,7 +38,7 @@ defmodule Surface.Components.Form.Inputs do
   def render(assigns) do
     ~F"""
     <.inputs_for :let={nested_form} field={@form[@for || @field]} {...@opts}>
-      <#slot {@default, form: nested_form, index: nested_form.index } context_put={Form, form: nested_form} />
+      <#slot {@default, form: nested_form, index: nested_form.index} context_put={Form, form: nested_form} />
     </.inputs_for>
     """
   end
diff --git a/lib/surface/components/form/label.ex b/lib/surface/components/form/label.ex
index 8ec5b62..acafae1 100644
--- a/lib/surface/components/form/label.ex
+++ b/lib/surface/components/form/label.ex
@@ -54,7 +54,7 @@ defmodule Surface.Components.Form.Label do
     assigns = assign(assigns, opts: opts)
 
     ~F"""
-    <label :attrs={input_id(@form, @field) ++ @opts}>
+    <label {...input_id(@form, @field) ++ @opts}>
       <#slot>{@text || Phoenix.Naming.humanize(@field)}</#slot>
     </label>
     """
diff --git a/lib/surface/components/form/telephone_input.ex b/lib/surface/components/form/telephone_input.ex
index 5d9635e..3475eb9 100644
--- a/lib/surface/components/form/telephone_input.ex
+++ b/lib/surface/components/form/telephone_input.ex
@@ -37,6 +37,6 @@ defmodule Surface.Components.Form.TelephoneInput do
 
     assigns = assign(assigns, opts: opts)
 
-    ~F[{telephone_input(@form, @field,  @opts)}]
+    ~F[{telephone_input(@form, @field, @opts)}]
   end
 end
diff --git a/lib/surface/components/link/button.ex b/lib/surface/components/link/button.ex
index 69d872c..b39c795 100644
--- a/lib/surface/components/link/button.ex
+++ b/lib/surface/components/link/button.ex
@@ -72,7 +72,7 @@ defmodule Surface.Components.Link.Button do
     assigns = assign(assigns, to: to, opts: events ++ opts)
 
     ~F"""
-    <button id={@id} class={@class} :attrs={@opts}><#slot>{@label}</#slot></button>
+    <button id={@id} class={@class} {...@opts}><#slot>{@label}</#slot></button>
     """
   end
 
diff --git a/priv/catalogue/surface/components/form/example01.ex b/priv/catalogue/surface/components/form/example01.ex
index 811557b..bbcaa30 100644
--- a/priv/catalogue/surface/components/form/example01.ex
+++ b/priv/catalogue/surface/components/form/example01.ex
@@ -13,15 +13,15 @@ defmodule Surface.Components.Form.Example01 do
     ~F"""
     <Form for={%{}} as={:user} change="change" submit="submit" opts={autocomplete: "off"}>
       <Field class="field" name="name">
-        <Label class="label"/>
+        <Label class="label" />
         <div class="control">
-          <TextInput class="input" value={@user["name"]}/>
+          <TextInput class="input" value={@user["name"]} />
         </div>
       </Field>
       <Field class="field" name="email">
         <Label class="label">E-mail</Label>
         <div class="control">
-          <TextInput class="input" value={@user["email"]}/>
+          <TextInput class="input" value={@user["email"]} />
         </div>
       </Field>
     </Form>
diff --git a/priv/catalogue/surface/components/form/textarea/example01.ex b/priv/catalogue/surface/components/form/textarea/example01.ex
index f1e62ca..977dcef 100644
--- a/priv/catalogue/surface/components/form/textarea/example01.ex
+++ b/priv/catalogue/surface/components/form/textarea/example01.ex
@@ -6,11 +6,7 @@ defmodule Surface.Components.Form.TextArea.Example01 do
 
   def render(assigns) do
     ~F"""
-    <TextArea
-      rows="4"
-      class="textarea"
-      opts={placeholder: "4 lines of textarea"}
-    />
+    <TextArea rows="4" class="textarea" opts={placeholder: "4 lines of textarea"} />
     """
   end
 end
diff --git a/test/surface/components/context_test.exs b/test/surface/components/context_test.exs
index 89608e2..263bf3d 100644
--- a/test/surface/components/context_test.exs
+++ b/test/surface/components/context_test.exs
@@ -10,7 +10,7 @@ defmodule Surface.Components.ContextTest do
       ~F"""
       <Inputs for={:children}>
         <Field name={:name}>
-          <TextInput/>
+          <TextInput />
         </Field>
       </Inputs>
       """
@@ -25,7 +25,7 @@ defmodule Surface.Components.ContextTest do
         render_surface do
           ~F"""
           <Form for={%{}} as={:parent} opts={csrf_token: "test"}>
-            <InputsWithNestedField/>
+            <InputsWithNestedField />
           </Form>
           """
         end
diff --git a/test/surface/components/field_context_test.exs b/test/surface/components/field_context_test.exs
index 8d0944a..902183b 100644
--- a/test/surface/components/field_context_test.exs
+++ b/test/surface/components/field_context_test.exs
@@ -8,7 +8,7 @@ defmodule Surface.Components.FieldContextTest do
       render_surface do
         ~F"""
         <FieldContext name="my_field">
-          <TextInput form="my_form"/>
+          <TextInput form="my_form" />
         </FieldContext>
         """
       end
@@ -21,7 +21,7 @@ defmodule Surface.Components.FieldContextTest do
       render_surface do
         ~F"""
         <FieldContext name={:my_field}>
-          <TextInput form="my_form"/>
+          <TextInput form="my_form" />
         </FieldContext>
         """
       end
diff --git a/test/surface/components/field_test.exs b/test/surface/components/field_test.exs
index a2065bd..2d4d59d 100644
--- a/test/surface/components/field_test.exs
+++ b/test/surface/components/field_test.exs
@@ -42,7 +42,7 @@ defmodule Surface.Components.FieldTest do
       render_surface do
         ~F"""
         <Field name="my_field">
-          <TextInput form="my_form"/>
+          <TextInput form="my_form" />
         </Field>
         """
       end
diff --git a/test/surface/components/form/checkbox_test.exs b/test/surface/components/form/checkbox_test.exs
index dec6771..402a0a4 100644
--- a/test/surface/components/form/checkbox_test.exs
+++ b/test/surface/components/form/checkbox_test.exs
@@ -75,7 +75,7 @@ defmodule Surface.Components.Form.CheckboxTest do
     html =
       render_surface do
         ~F"""
-        <Checkbox form="user" field="admin" checked_value="admin"/>
+        <Checkbox form="user" field="admin" checked_value="admin" />
         """
       end
 
@@ -88,7 +88,7 @@ defmodule Surface.Components.Form.CheckboxTest do
     html =
       render_surface do
         ~F"""
-        <Checkbox value={true}/>
+        <Checkbox value />
         """
       end
 
@@ -97,7 +97,7 @@ defmodule Surface.Components.Form.CheckboxTest do
     html =
       render_surface do
         ~F"""
-        <Checkbox value={false}/>
+        <Checkbox value={false} />
         """
       end
 
@@ -108,7 +108,7 @@ defmodule Surface.Components.Form.CheckboxTest do
     html =
       render_surface do
         ~F"""
-        <Checkbox hidden_input={true}/>
+        <Checkbox hidden_input />
         """
       end
 
@@ -117,7 +117,7 @@ defmodule Surface.Components.Form.CheckboxTest do
     html =
       render_surface do
         ~F"""
-        <Checkbox hidden_input={false}/>
+        <Checkbox hidden_input={false} />
         """
       end
 
@@ -199,7 +199,7 @@ defmodule Surface.Components.Form.CheckboxConfigTest do
       html =
         render_surface do
           ~F"""
-          <Checkbox/>
+          <Checkbox />
           """
         end
 
@@ -213,7 +213,7 @@ defmodule Surface.Components.Form.CheckboxConfigTest do
         html =
           render_surface do
             ~F"""
-            <Checkbox/>
+            <Checkbox />
             """
           end
 
diff --git a/test/surface/components/form/color_input_test.exs b/test/surface/components/form/color_input_test.exs
index 470e527..cf01b0b 100644
--- a/test/surface/components/form/color_input_test.exs
+++ b/test/surface/components/form/color_input_test.exs
@@ -46,7 +46,7 @@ defmodule Surface.Components.Form.ColorInputTest do
     html =
       render_surface do
         ~F"""
-        <ColorInput form="user" field="color" class="input"/>
+        <ColorInput form="user" field="color" class="input" />
         """
       end
 
@@ -57,7 +57,7 @@ defmodule Surface.Components.Form.ColorInputTest do
     html =
       render_surface do
         ~F"""
-        <ColorInput form="user" field="color" class="input primary"/>
+        <ColorInput form="user" field="color" class="input primary" />
         """
       end
 
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.ColorInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <ColorInput/>
+          <ColorInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.ColorInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <ColorInput/>
+          <ColorInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.ColorInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <ColorInput/>
+            <ColorInput />
             """
           end
 
diff --git a/test/surface/components/form/date_input_test.exs b/test/surface/components/form/date_input_test.exs
index 058d0e5..499e9e2 100644
--- a/test/surface/components/form/date_input_test.exs
+++ b/test/surface/components/form/date_input_test.exs
@@ -46,7 +46,7 @@ defmodule Surface.Components.Form.DateInputTest do
     html =
       render_surface do
         ~F"""
-        <DateInput form="user" field="birthday" class="input"/>
+        <DateInput form="user" field="birthday" class="input" />
         """
       end
 
@@ -57,7 +57,7 @@ defmodule Surface.Components.Form.DateInputTest do
     html =
       render_surface do
         ~F"""
-        <DateInput form="user" field="birthday" class="input primary"/>
+        <DateInput form="user" field="birthday" class="input primary" />
         """
       end
 
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.DateInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <DateInput/>
+          <DateInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.DateInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <DateInput/>
+          <DateInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.DateInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <DateInput/>
+            <DateInput />
             """
           end
 
diff --git a/test/surface/components/form/date_select_test.exs b/test/surface/components/form/date_select_test.exs
index 40db9aa..a8acab3 100644
--- a/test/surface/components/form/date_select_test.exs
+++ b/test/surface/components/form/date_select_test.exs
@@ -89,13 +89,7 @@ defmodule Surface.Components.Form.DateSelectTest do
     html =
       render_surface do
         ~F"""
-        <DateSelect
-          form="user"
-          field="born_at"
-          year={prompt: "Year"}
-          month={prompt: "Month"}
-          day={prompt: "Day"}
-        />
+        <DateSelect form="user" field="born_at" year={prompt: "Year"} month={prompt: "Month"} day={prompt: "Day"} />
         """
       end
 
@@ -118,7 +112,7 @@ defmodule Surface.Components.Form.DateSelectTest do
               "Month: ",
               b.(:month, class: "month"),
               "Day: ",
-              b.(:day, class: "day"),
+              b.(:day, class: "day")
             ]
           end}
         />
@@ -157,12 +151,7 @@ defmodule Surface.Components.Form.DateSelectTest do
     html =
       render_surface do
         ~F"""
-        <DateSelect
-          form="user"
-          field="born_at"
-          id="born_at"
-          name="born_at"
-        />
+        <DateSelect form="user" field="born_at" id="born_at" name="born_at" />
         """
       end
 
diff --git a/test/surface/components/form/datetime_local_input_test.exs b/test/surface/components/form/datetime_local_input_test.exs
index cd46f6f..c137c9d 100644
--- a/test/surface/components/form/datetime_local_input_test.exs
+++ b/test/surface/components/form/datetime_local_input_test.exs
@@ -33,7 +33,7 @@ defmodule Surface.Components.Form.DateTimeLocalInputTest do
     html =
       render_surface do
         ~F"""
-        <DateTimeLocalInput form="order" field="completed_at" class="input"/>
+        <DateTimeLocalInput form="order" field="completed_at" class="input" />
         """
       end
 
@@ -44,7 +44,7 @@ defmodule Surface.Components.Form.DateTimeLocalInputTest do
     html =
       render_surface do
         ~F"""
-        <DateTimeLocalInput form="order" field="completed_at" class="input primary"/>
+        <DateTimeLocalInput form="order" field="completed_at" class="input primary" />
         """
       end
 
@@ -113,7 +113,7 @@ defmodule Surface.Components.Form.DateTimeLocalInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <DateTimeLocalInput/>
+          <DateTimeLocalInput />
           """
         end
 
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.DateTimeLocalInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <DateTimeLocalInput/>
+          <DateTimeLocalInput />
           """
         end
 
@@ -140,7 +140,7 @@ defmodule Surface.Components.Form.DateTimeLocalInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <DateTimeLocalInput/>
+            <DateTimeLocalInput />
             """
           end
 
diff --git a/test/surface/components/form/datetime_select_test.exs b/test/surface/components/form/datetime_select_test.exs
index c9db7c3..dd032ea 100644
--- a/test/surface/components/form/datetime_select_test.exs
+++ b/test/surface/components/form/datetime_select_test.exs
@@ -41,7 +41,12 @@ defmodule Surface.Components.Form.DateTimeSelectTest do
     html =
       render_surface do
         ~F"""
-        <DateTimeSelect form="user" field="born_at" value={%{year: 2020, month: 10, day: 9, hour: 2, minute: 11, second: 13}} second={[]} />
+        <DateTimeSelect
+          form="user"
+          field="born_at"
+          value={%{year: 2020, month: 10, day: 9, hour: 2, minute: 11, second: 13}}
+          second={[]}
+        />
         """
       end
 
@@ -57,7 +62,7 @@ defmodule Surface.Components.Form.DateTimeSelectTest do
     html =
       render_surface do
         ~F"""
-        <DateTimeSelect form="user" field="born_at" value={{ {2020, 10, 9}, {2, 11, 13} }} second={[]} />
+        <DateTimeSelect form="user" field="born_at" value={{{2020, 10, 9}, {2, 11, 13}}} second={[]} />
         """
       end
 
@@ -73,7 +78,12 @@ defmodule Surface.Components.Form.DateTimeSelectTest do
     html =
       render_surface do
         ~F"""
-        <DateTimeSelect form="user" field="born_at" default={%{year: 2020, month: 10, day: 9, hour: 2, minute: 11, second: 13}} second={[]} />
+        <DateTimeSelect
+          form="user"
+          field="born_at"
+          default={%{year: 2020, month: 10, day: 9, hour: 2, minute: 11, second: 13}}
+          second={[]}
+        />
         """
       end
 
@@ -89,7 +99,7 @@ defmodule Surface.Components.Form.DateTimeSelectTest do
     html =
       render_surface do
         ~F"""
-        <DateTimeSelect form="user" field="born_at" default={{ {2020, 10, 9}, {2, 11, 13} }} second={[]} />
+        <DateTimeSelect form="user" field="born_at" default={{{2020, 10, 9}, {2, 11, 13}}} second={[]} />
         """
       end
 
@@ -121,7 +131,7 @@ defmodule Surface.Components.Form.DateTimeSelectTest do
               "Minute: ",
               b.(:minute, class: "minute"),
               "Second: ",
-              b.(:second, class: "second"),
+              b.(:second, class: "second")
             ]
           end}
         />
@@ -201,13 +211,7 @@ defmodule Surface.Components.Form.DateTimeSelectTest do
     html =
       render_surface do
         ~F"""
-        <DateTimeSelect
-          form="user"
-          field="born_at"
-          second={[]}
-          id="born_at"
-          name="born_at"
-        />
+        <DateTimeSelect form="user" field="born_at" second={[]} id="born_at" name="born_at" />
         """
       end
 
diff --git a/test/surface/components/form/email_input_test.exs b/test/surface/components/form/email_input_test.exs
index b2120ed..4c92792 100644
--- a/test/surface/components/form/email_input_test.exs
+++ b/test/surface/components/form/email_input_test.exs
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.EmailInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <EmailInput/>
+          <EmailInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.EmailInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <EmailInput/>
+          <EmailInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.EmailInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <EmailInput/>
+            <EmailInput />
             """
           end
 
diff --git a/test/surface/components/form/file_input_test.exs b/test/surface/components/form/file_input_test.exs
index 3741ad5..22a2e86 100644
--- a/test/surface/components/form/file_input_test.exs
+++ b/test/surface/components/form/file_input_test.exs
@@ -34,7 +34,7 @@ defmodule Surface.Components.Form.FileInputTest do
     html =
       render_surface do
         ~F"""
-        <Form for={%{}} as={:user} csrf_token="test" multipart={true} >
+        <Form for={%{}} as={:user} csrf_token="test" multipart>
           <FileInput field={:picture} />
         </Form>
         """
@@ -158,7 +158,7 @@ defmodule Surface.Components.Form.FileInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <FileInput/>
+          <FileInput />
           """
         end
 
@@ -172,7 +172,7 @@ defmodule Surface.Components.Form.FileInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <FileInput/>
+            <FileInput />
             """
           end
 
diff --git a/test/surface/components/form/inputs_test.exs b/test/surface/components/form/inputs_test.exs
index 801e37f..d7f3a5a 100644
--- a/test/surface/components/form/inputs_test.exs
+++ b/test/surface/components/form/inputs_test.exs
@@ -34,7 +34,11 @@ defmodule Surface.Components.Form.InputsTest do
     html =
       render_surface do
         ~F"""
-        <Form for={Parent.changeset(%{children: [%{name: "first"}, %{name: "second"}]})} as={:cs} opts={csrf_token: "test"}>
+        <Form
+          for={Parent.changeset(%{children: [%{name: "first"}, %{name: "second"}]})}
+          as={:cs}
+          opts={csrf_token: "test"}
+        >
           <Inputs for={:children} :let={index: idx}>
             <div>index: <span>{idx}</span></div>
           </Inputs>
diff --git a/test/surface/components/form/label_test.exs b/test/surface/components/form/label_test.exs
index f1e9d93..29a3983 100644
--- a/test/surface/components/form/label_test.exs
+++ b/test/surface/components/form/label_test.exs
@@ -8,7 +8,7 @@ defmodule Surface.Components.Form.LabelTest do
     html =
       render_surface do
         ~F"""
-        <Label opts={id: "my_id"}/>
+        <Label opts={id: "my_id"} />
         """
       end
 
@@ -19,7 +19,7 @@ defmodule Surface.Components.Form.LabelTest do
     html =
       render_surface do
         ~F"""
-        <Label class={:label}/>
+        <Label class={:label} />
         """
       end
 
@@ -30,7 +30,7 @@ defmodule Surface.Components.Form.LabelTest do
     html =
       render_surface do
         ~F"""
-        <Label class={:label, :primary}/>
+        <Label class={:label, :primary} />
         """
       end
 
@@ -41,7 +41,7 @@ defmodule Surface.Components.Form.LabelTest do
     html =
       render_surface do
         ~F"""
-        <Label form="user" field="name"/>
+        <Label form="user" field="name" />
         """
       end
 
@@ -52,7 +52,7 @@ defmodule Surface.Components.Form.LabelTest do
     html =
       render_surface do
         ~F"""
-        <Label form={:user} field={:name}/>
+        <Label form={:user} field={:name} />
         """
       end
 
@@ -65,7 +65,7 @@ defmodule Surface.Components.Form.LabelTest do
         ~F"""
         <Form for={%{}} as={:user}>
           <Field name="name">
-            <Label/>
+            <Label />
           </Field>
         </Form>
         """
@@ -213,7 +213,7 @@ defmodule Surface.Components.Form.LabelConfigTest do
       html =
         render_surface do
           ~F"""
-          <Label/>
+          <Label />
           """
         end
 
diff --git a/test/surface/components/form/multiple_select_test.exs b/test/surface/components/form/multiple_select_test.exs
index 194f846..0fc266f 100644
--- a/test/surface/components/form/multiple_select_test.exs
+++ b/test/surface/components/form/multiple_select_test.exs
@@ -20,7 +20,7 @@ defmodule Surface.Components.Form.MultipleSelectTest do
     html =
       render_surface do
         ~F"""
-        <MultipleSelect form="user" field="roles" options={["Admin": "admin", "User": "user"]} />
+        <MultipleSelect form="user" field="roles" options={[Admin: "admin", User: "user"]} />
         """
       end
 
@@ -36,7 +36,7 @@ defmodule Surface.Components.Form.MultipleSelectTest do
     html =
       render_surface do
         ~F"""
-        <MultipleSelect form="user" field="roles" options={["Admin": "admin", "User": "user"]} class="select" />
+        <MultipleSelect form="user" field="roles" options={[Admin: "admin", User: "user"]} class="select" />
         """
       end
 
@@ -47,7 +47,7 @@ defmodule Surface.Components.Form.MultipleSelectTest do
     html =
       render_surface do
         ~F"""
-        <MultipleSelect form="user" field="roles" options={["Admin": "admin", "User": "user"]} class="select primary" />
+        <MultipleSelect form="user" field="roles" options={[Admin: "admin", User: "user"]} class="select primary" />
         """
       end
 
@@ -58,7 +58,7 @@ defmodule Surface.Components.Form.MultipleSelectTest do
     html =
       render_surface do
         ~F"""
-        <MultipleSelect form="user" field="roles" options={["Admin": "admin", "User": "user"]} selected="admin"/>
+        <MultipleSelect form="user" field="roles" options={[Admin: "admin", User: "user"]} selected="admin" />
         """
       end
 
@@ -74,7 +74,7 @@ defmodule Surface.Components.Form.MultipleSelectTest do
     html =
       render_surface do
         ~F"""
-        <MultipleSelect form="user" field="roles" options={["Admin": "admin", "User": "user"]} opts={disabled: "disabled"}/>
+        <MultipleSelect form="user" field="roles" options={[Admin: "admin", User: "user"]} opts={disabled: "disabled"} />
         """
       end
 
@@ -90,7 +90,7 @@ defmodule Surface.Components.Form.MultipleSelectTest do
     html =
       render_surface do
         ~F"""
-        <MultipleSelect form="user" field="roles" options={["Admin": "admin", "User": "user"]} id="roles" name="roles[]"/>
+        <MultipleSelect form="user" field="roles" options={[Admin: "admin", User: "user"]} id="roles" name="roles[]" />
         """
       end
 
diff --git a/test/surface/components/form/number_input_test.exs b/test/surface/components/form/number_input_test.exs
index d80cd42..96a04d9 100644
--- a/test/surface/components/form/number_input_test.exs
+++ b/test/surface/components/form/number_input_test.exs
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.NumberInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <NumberInput/>
+          <NumberInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.NumberInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <NumberInput/>
+          <NumberInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.NumberInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <NumberInput/>
+            <NumberInput />
             """
           end
 
diff --git a/test/surface/components/form/options_for_select_test.exs b/test/surface/components/form/options_for_select_test.exs
index 4234a98..c85909f 100644
--- a/test/surface/components/form/options_for_select_test.exs
+++ b/test/surface/components/form/options_for_select_test.exs
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.OptionsForSelectTest do
     html =
       render_surface do
         ~F"""
-        <OptionsForSelect options={["Admin": "admin", "User": "user"]} />
+        <OptionsForSelect options={[Admin: "admin", User: "user"]} />
         """
       end
 
@@ -32,7 +32,7 @@ defmodule Surface.Components.Form.OptionsForSelectTest do
     html =
       render_surface do
         ~F"""
-        <OptionsForSelect options={["Admin": "admin", "User": "user"]} selected={"admin"} />
+        <OptionsForSelect options={[Admin: "admin", User: "user"]} selected="admin" />
         """
       end
 
@@ -46,7 +46,7 @@ defmodule Surface.Components.Form.OptionsForSelectTest do
     html =
       render_surface do
         ~F"""
-        <OptionsForSelect options={["Admin": "admin", "User": "user"]} selected={["admin", "user"]} />
+        <OptionsForSelect options={[Admin: "admin", User: "user"]} selected={["admin", "user"]} />
         """
       end
 
diff --git a/test/surface/components/form/password_input_test.exs b/test/surface/components/form/password_input_test.exs
index 3c9ec36..7fe7c82 100644
--- a/test/surface/components/form/password_input_test.exs
+++ b/test/surface/components/form/password_input_test.exs
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.PasswordInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <PasswordInput/>
+          <PasswordInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.PasswordInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <PasswordInput/>
+          <PasswordInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.PasswordInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <PasswordInput/>
+            <PasswordInput />
             """
           end
 
diff --git a/test/surface/components/form/radio_button_test.exs b/test/surface/components/form/radio_button_test.exs
index df83ae2..01b2d3d 100644
--- a/test/surface/components/form/radio_button_test.exs
+++ b/test/surface/components/form/radio_button_test.exs
@@ -7,7 +7,7 @@ defmodule Surface.Components.Form.RadioButtonTest do
     html =
       render_surface do
         ~F"""
-        <RadioButton form="user" field="role" value="admin"/>
+        <RadioButton form="user" field="role" value="admin" />
         """
       end
 
@@ -20,7 +20,7 @@ defmodule Surface.Components.Form.RadioButtonTest do
     html =
       render_surface do
         ~F"""
-        <RadioButton form="user" field={:role} value="admin"/>
+        <RadioButton form="user" field={:role} value="admin" />
         """
       end
 
@@ -113,7 +113,7 @@ defmodule Surface.Components.Form.RadioButtonConfigTest do
       html =
         render_surface do
           ~F"""
-          <RadioButton/>
+          <RadioButton />
           """
         end
 
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.RadioButtonConfigTest do
       html =
         render_surface do
           ~F"""
-          <RadioButton/>
+          <RadioButton />
           """
         end
 
@@ -140,7 +140,7 @@ defmodule Surface.Components.Form.RadioButtonConfigTest do
         html =
           render_surface do
             ~F"""
-            <RadioButton/>
+            <RadioButton />
             """
           end
 
diff --git a/test/surface/components/form/range_input_test.exs b/test/surface/components/form/range_input_test.exs
index cabef84..ffb0dd1 100644
--- a/test/surface/components/form/range_input_test.exs
+++ b/test/surface/components/form/range_input_test.exs
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.RangeInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <RangeInput/>
+          <RangeInput />
           """
         end
 
@@ -152,7 +152,7 @@ defmodule Surface.Components.Form.RangeInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <RangeInput/>
+          <RangeInput />
           """
         end
 
@@ -166,7 +166,7 @@ defmodule Surface.Components.Form.RangeInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <RangeInput/>
+            <RangeInput />
             """
           end
 
diff --git a/test/surface/components/form/search_input_test.exs b/test/surface/components/form/search_input_test.exs
index 24ea9e2..6779ce5 100644
--- a/test/surface/components/form/search_input_test.exs
+++ b/test/surface/components/form/search_input_test.exs
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.SearchInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <SearchInput/>
+          <SearchInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.SearchInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <SearchInput/>
+          <SearchInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.SearchInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <SearchInput/>
+            <SearchInput />
             """
           end
 
diff --git a/test/surface/components/form/select_test.exs b/test/surface/components/form/select_test.exs
index 5a0afd1..9b72ad4 100644
--- a/test/surface/components/form/select_test.exs
+++ b/test/surface/components/form/select_test.exs
@@ -33,7 +33,7 @@ defmodule Surface.Components.Form.SelectTest do
     html =
       render_surface do
         ~F"""
-        <Select form="user" field="role" options={["Admin": "admin", "User": "user"]} />
+        <Select form="user" field="role" options={[Admin: "admin", User: "user"]} />
         """
       end
 
@@ -49,7 +49,7 @@ defmodule Surface.Components.Form.SelectTest do
     html =
       render_surface do
         ~F"""
-        <Select form="user" field="role" options={["Admin": "admin", "User": "user"]} class="select" />
+        <Select form="user" field="role" options={[Admin: "admin", User: "user"]} class="select" />
         """
       end
 
@@ -60,7 +60,7 @@ defmodule Surface.Components.Form.SelectTest do
     html =
       render_surface do
         ~F"""
-        <Select form="user" field="role" options={["Admin": "admin", "User": "user"]} class="select primary" />
+        <Select form="user" field="role" options={[Admin: "admin", User: "user"]} class="select primary" />
         """
       end
 
@@ -71,7 +71,7 @@ defmodule Surface.Components.Form.SelectTest do
     html =
       render_surface do
         ~F"""
-        <Select form="user" field="role" options={["Admin": "admin", "User": "user"]} prompt="Pick a role"/>
+        <Select form="user" field="role" options={[Admin: "admin", User: "user"]} prompt="Pick a role" />
         """
       end
 
@@ -88,7 +88,7 @@ defmodule Surface.Components.Form.SelectTest do
     html =
       render_surface do
         ~F"""
-        <Select form="user" field="role" options={["Admin": "admin", "User": "user"]} selected="user"/>
+        <Select form="user" field="role" options={[Admin: "admin", User: "user"]} selected="user" />
         """
       end
 
@@ -104,7 +104,7 @@ defmodule Surface.Components.Form.SelectTest do
     html =
       render_surface do
         ~F"""
-        <Select form="user" field="role" options={["Admin": "admin", "User": "user"]} opts={disabled: true}/>
+        <Select form="user" field="role" options={[Admin: "admin", User: "user"]} opts={disabled: true} />
         """
       end
 
@@ -120,7 +120,7 @@ defmodule Surface.Components.Form.SelectTest do
     html =
       render_surface do
         ~F"""
-        <Select form="user" field="role" id="role" name="role" options={["Admin": "admin", "User": "user"]}/>
+        <Select form="user" field="role" id="role" name="role" options={[Admin: "admin", User: "user"]} />
         """
       end
 
diff --git a/test/surface/components/form/telephone_input_test.exs b/test/surface/components/form/telephone_input_test.exs
index 01f5c74..ea07279 100644
--- a/test/surface/components/form/telephone_input_test.exs
+++ b/test/surface/components/form/telephone_input_test.exs
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.TelephoneInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <TelephoneInput/>
+          <TelephoneInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.TelephoneInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <TelephoneInput/>
+          <TelephoneInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.TelephoneInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <TelephoneInput/>
+            <TelephoneInput />
             """
           end
 
diff --git a/test/surface/components/form/text_input_test.exs b/test/surface/components/form/text_input_test.exs
index 83c56b3..3f338c5 100644
--- a/test/surface/components/form/text_input_test.exs
+++ b/test/surface/components/form/text_input_test.exs
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.TextInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <TextInput/>
+          <TextInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.TextInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <TextInput/>
+          <TextInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.TextInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <TextInput/>
+            <TextInput />
             """
           end
 
diff --git a/test/surface/components/form/textarea_test.exs b/test/surface/components/form/textarea_test.exs
index ed6b8c6..57d47af 100644
--- a/test/surface/components/form/textarea_test.exs
+++ b/test/surface/components/form/textarea_test.exs
@@ -132,7 +132,7 @@ defmodule Surface.Components.Form.TextAreaConfigTest do
       html =
         render_surface do
           ~F"""
-          <TextArea/>
+          <TextArea />
           """
         end
 
@@ -145,7 +145,7 @@ defmodule Surface.Components.Form.TextAreaConfigTest do
       html =
         render_surface do
           ~F"""
-          <TextArea/>
+          <TextArea />
           """
         end
 
@@ -159,7 +159,7 @@ defmodule Surface.Components.Form.TextAreaConfigTest do
         html =
           render_surface do
             ~F"""
-            <TextArea/>
+            <TextArea />
             """
           end
 
diff --git a/test/surface/components/form/time_input_test.exs b/test/surface/components/form/time_input_test.exs
index 8309bb8..a557821 100644
--- a/test/surface/components/form/time_input_test.exs
+++ b/test/surface/components/form/time_input_test.exs
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.TimeInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <TimeInput/>
+          <TimeInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.TimeInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <TimeInput/>
+          <TimeInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.TimeInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <TimeInput/>
+            <TimeInput />
             """
           end
 
diff --git a/test/surface/components/form/time_select_test.exs b/test/surface/components/form/time_select_test.exs
index d331968..15e9f44 100644
--- a/test/surface/components/form/time_select_test.exs
+++ b/test/surface/components/form/time_select_test.exs
@@ -110,7 +110,7 @@ defmodule Surface.Components.Form.TimeSelectTest do
               "Minute: ",
               b.(:minute, class: "minute"),
               "Second: ",
-              b.(:second, class: "second"),
+              b.(:second, class: "second")
             ]
           end}
         />
@@ -169,13 +169,7 @@ defmodule Surface.Components.Form.TimeSelectTest do
     html =
       render_surface do
         ~F"""
-        <TimeSelect
-          form="user"
-          field="born_at"
-          second={[]}
-          id="born_at"
-          name="born_at"
-        />
+        <TimeSelect form="user" field="born_at" second={[]} id="born_at" name="born_at" />
         """
       end
 
diff --git a/test/surface/components/form/url_input_test.exs b/test/surface/components/form/url_input_test.exs
index 8aeaa77..215b4ca 100644
--- a/test/surface/components/form/url_input_test.exs
+++ b/test/surface/components/form/url_input_test.exs
@@ -126,7 +126,7 @@ defmodule Surface.Components.Form.UrlInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <UrlInput/>
+          <UrlInput />
           """
         end
 
@@ -139,7 +139,7 @@ defmodule Surface.Components.Form.UrlInputConfigTest do
       html =
         render_surface do
           ~F"""
-          <UrlInput/>
+          <UrlInput />
           """
         end
 
@@ -153,7 +153,7 @@ defmodule Surface.Components.Form.UrlInputConfigTest do
         html =
           render_surface do
             ~F"""
-            <UrlInput/>
+            <UrlInput />
             """
           end
 
diff --git a/test/surface/components/form_test.exs b/test/surface/components/form_test.exs
index e064093..6854072 100644
--- a/test/surface/components/form_test.exs
+++ b/test/surface/components/form_test.exs
@@ -201,7 +201,7 @@ defmodule Surface.Components.FormTest do
     html = render_surface(do: ~F[<Form for={%{}} as={:user} />])
     refute html =~ ~r/phx-trigger-action/
 
-    html = render_surface(do: ~F[<Form for={%{}} as={:user} trigger_action={true} />])
+    html = render_surface(do: ~F[<Form for={%{}} as={:user} trigger_action />])
     assert html =~ ~r/phx-trigger-action/
   end
 end
diff --git a/test/surface/components/link/button_test.exs b/test/surface/components/link/button_test.exs
index 1c1faf0..aa9785a 100644
--- a/test/surface/components/link/button_test.exs
+++ b/test/surface/components/link/button_test.exs
@@ -125,7 +125,7 @@ defmodule Surface.Components.Link.ButtonTest do
     html =
       render_surface do
         ~F"""
-        <ComponentWithButton id="comp"/>
+        <ComponentWithButton id="comp" />
         """
       end
 
@@ -162,7 +162,7 @@ defmodule Surface.Components.Link.ButtonTest do
       html =
         render_surface do
           ~F"""
-          <Button label="hello" to="/world"  opts={csrf_token: false} />
+          <Button label="hello" to="/world" opts={csrf_token: false} />
           """
         end
 
diff --git a/test/surface/components/live_file_input_test.exs b/test/surface/components/live_file_input_test.exs
index 62e28db..217cc97 100644
--- a/test/surface/components/live_file_input_test.exs
+++ b/test/surface/components/live_file_input_test.exs
@@ -17,7 +17,12 @@ defmodule Surface.Components.LiveFileInputTest do
     def render(assigns) do
       ~F"""
       <div>
-        <LiveFileInput upload={@uploads.avatar} class={"test_class", disabled_test: true} opts={"data-test": "test-data", name: "a name?"} values={a: "one", b: :two, c: 3} />
+        <LiveFileInput
+          upload={@uploads.avatar}
+          class={"test_class", disabled_test: true}
+          opts={"data-test": "test-data", name: "a name?"}
+          values={a: "one", b: :two, c: 3}
+        />
       </div>
       """
     end