diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 158b406..43cae81 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
         include:
           - elixir: '1.13.4'
             otp: '24.0'
-            blend: 'phoenix_live_view_0_19_0'
+            blend: 'phoenix_html_0_4_0'
           - elixir: '1.13.4'
             otp: '25.0'
           - elixir: '1.14.0'
diff --git a/blend.exs b/blend.exs
index a4206be..70d149b 100644
--- a/blend.exs
+++ b/blend.exs
@@ -7,7 +7,7 @@
     {:surface, github: "surface-ui/surface", override: true},
     {:surface_catalogue, only: :dev, github: "surface-ui/surface_catalogue"}
   ],
-  phoenix_live_view_0_19_0: [
-    {:phoenix_live_view, "0.19.0"}
+  phoenix_html_0_4_0: [
+    {:phoenix_html, "4.0.0"}
   ]
 }
diff --git a/blend/github.mix.lock b/blend/github.mix.lock
index e2bb766..f42204e 100644
--- a/blend/github.mix.lock
+++ b/blend/github.mix.lock
@@ -21,7 +21,8 @@
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.6.2", "3b83b24ab5a2eb071a20372f740d7118767c272db386831b2e77638c4dcc606d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "3f94d025f59de86be00f5f8c5dd7b5965a3298458d21ab1c328488be3b5fcd59"},
-  "phoenix_html": {:hex, :phoenix_html, "3.3.4", "42a09fc443bbc1da37e372a5c8e6755d046f22b9b11343bf885067357da21cb3", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0249d3abec3714aff3415e7ee3d9786cb325be3151e6c4b3021502c585bf53fb"},
+  "phoenix_html": {:hex, :phoenix_html, "4.1.1", "4c064fd3873d12ebb1388425a8f2a19348cef56e7289e1998e2d2fa758aa982e", [:mix], [], "hexpm", "f2f2df5a72bc9a2f510b21497fd7d2b86d932ec0598f0210fed4114adc546c6f"},
+  "phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.3", "f2161c207fda0e4fb55165f650f7f8db23f02b29e3bff00ff7ef161d6ac1f09d", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "b4ec9cd73cb01ff1bd1cac92e045d13e7030330b74164297d1aee3907b54803c"},
   "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.17", "f396bbdaf4ba227b82251eb75ac0afa6b3da5e509bc0d030206374237dfc9450", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61d741ffb78c85fdbca0de084da6a48f8ceb5261a79165b5a0b59e5f65ce98b"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
@@ -32,7 +33,7 @@
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
   "sourceror": {:hex, :sourceror, "1.0.3", "111711c147f4f1414c07a67b45ad0064a7a41569037355407eda635649507f1d", [:mix], [], "hexpm", "56c21ef146c00b51bc3bb78d1f047cb732d193256a7c4ba91eaf828d3ae826af"},
   "surface": {:git, "https://github.com/surface-ui/surface.git", "72c80e050053d1b319bb0135b69ced9ca782ec74", []},
-  "surface_catalogue": {:git, "https://github.com/surface-ui/surface_catalogue.git", "1fca56ee5097f40e4335bb5fc987d211c25e77d9", []},
+  "surface_catalogue": {:git, "https://github.com/surface-ui/surface_catalogue.git", "3986f5ebd67c58983a0073a5f01f43c49730de9a", []},
   "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
   "websock": {:hex, :websock, "0.5.3", "2f69a6ebe810328555b6fe5c831a851f485e303a7c8ce6c5f675abeb20ebdadc", [:mix], [], "hexpm", "6105453d7fac22c712ad66fab1d45abdf049868f253cf719b625151460b8b453"},
   "websock_adapter": {:hex, :websock_adapter, "0.5.7", "65fa74042530064ef0570b75b43f5c49bb8b235d6515671b3d250022cb8a1f9e", [:mix], [{:bandit, ">= 0.6.0", [hex: :bandit, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.6", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:websock, "~> 0.5", [hex: :websock, repo: "hexpm", optional: false]}], "hexpm", "d0f478ee64deddfec64b800673fd6e0c8888b079d9f3444dd96d2a98383bdbd1"},
diff --git a/blend/local.mix.lock b/blend/local.mix.lock
index 9fb7945..5996c54 100644
--- a/blend/local.mix.lock
+++ b/blend/local.mix.lock
@@ -21,7 +21,8 @@
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.6.2", "3b83b24ab5a2eb071a20372f740d7118767c272db386831b2e77638c4dcc606d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "3f94d025f59de86be00f5f8c5dd7b5965a3298458d21ab1c328488be3b5fcd59"},
-  "phoenix_html": {:hex, :phoenix_html, "3.3.4", "42a09fc443bbc1da37e372a5c8e6755d046f22b9b11343bf885067357da21cb3", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0249d3abec3714aff3415e7ee3d9786cb325be3151e6c4b3021502c585bf53fb"},
+  "phoenix_html": {:hex, :phoenix_html, "4.1.1", "4c064fd3873d12ebb1388425a8f2a19348cef56e7289e1998e2d2fa758aa982e", [:mix], [], "hexpm", "f2f2df5a72bc9a2f510b21497fd7d2b86d932ec0598f0210fed4114adc546c6f"},
+  "phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.3", "f2161c207fda0e4fb55165f650f7f8db23f02b29e3bff00ff7ef161d6ac1f09d", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "b4ec9cd73cb01ff1bd1cac92e045d13e7030330b74164297d1aee3907b54803c"},
   "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.17", "f396bbdaf4ba227b82251eb75ac0afa6b3da5e509bc0d030206374237dfc9450", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61d741ffb78c85fdbca0de084da6a48f8ceb5261a79165b5a0b59e5f65ce98b"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
diff --git a/blend/phoenix_live_view_0_19_0.mix.lock b/blend/phoenix_html_0_4_0.mix.lock
similarity index 81%
rename from blend/phoenix_live_view_0_19_0.mix.lock
rename to blend/phoenix_html_0_4_0.mix.lock
index b6fa0c6..e37f213 100644
--- a/blend/phoenix_live_view_0_19_0.mix.lock
+++ b/blend/phoenix_html_0_4_0.mix.lock
@@ -1,6 +1,6 @@
 %{
-  "blend": {:hex, :blend, "0.4.0", "0a7e09eee28a9a92bd495aa559c0e99ea9bd7b42fd7fd4a9dc61e6f1bda294c9", [:mix], [], "hexpm", "e284dbdd4fe8db278347ff12dee3e5410b94f38e22825ce1b281d6e5b1920b31"},
-  "castore": {:hex, :castore, "1.0.8", "dedcf20ea746694647f883590b82d9e96014057aff1d44d03ec90f36a5c0dc6e", [:mix], [], "hexpm", "0b2b66d2ee742cb1d9cb8c8be3b43c3a70ee8651f37b75a8b982e036752983f1"},
+  "blend": {:hex, :blend, "0.4.1", "d81d39a1b98dddc91dd465d0d6381bc5029c02a9c2018a568f62bb55efd1f64e", [:mix], [], "hexpm", "75c9f391456fa648e973e85c86e5bb4ea9bb1d3750b7b71967e0662e837001ab"},
+  "castore": {:hex, :castore, "1.0.9", "5cc77474afadf02c7c017823f460a17daa7908e991b0cc917febc90e466a375c", [:mix], [], "hexpm", "5ea956504f1ba6f2b4eb707061d8e17870de2bee95fb59d512872c2ef06925e7"},
   "cowboy": {:hex, :cowboy, "2.12.0", "f276d521a1ff88b2b9b4c54d0e753da6c66dd7be6c9fca3d9418b561828a3731", [:make, :rebar3], [{:cowlib, "2.13.0", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "8a7abe6d183372ceb21caa2709bec928ab2b72e18a3911aa1771639bef82651e"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
   "cowlib": {:hex, :cowlib, "2.13.0", "db8f7505d8332d98ef50a3ef34b34c1afddec7506e4ee4dd4a3a266285d282ca", [:make, :rebar3], [], "hexpm", "e1e1284dc3fc030a64b1ad0d8382ae7e99da46c3246b815318a4b848873800a4"},
@@ -20,17 +20,18 @@
   "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"},
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"},
-  "phoenix_ecto": {:hex, :phoenix_ecto, "4.6.2", "3b83b24ab5a2eb071a20372f740d7118767c272db386831b2e77638c4dcc606d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "3f94d025f59de86be00f5f8c5dd7b5965a3298458d21ab1c328488be3b5fcd59"},
-  "phoenix_html": {:hex, :phoenix_html, "3.3.4", "42a09fc443bbc1da37e372a5c8e6755d046f22b9b11343bf885067357da21cb3", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0249d3abec3714aff3415e7ee3d9786cb325be3151e6c4b3021502c585bf53fb"},
+  "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"},
+  "phoenix_html": {:hex, :phoenix_html, "4.0.0", "4857ec2edaccd0934a923c2b0ba526c44a173c86b847e8db725172e9e51d11d6", [:mix], [], "hexpm", "cee794a052f243291d92fa3ccabcb4c29bb8d236f655fb03bcbdc3a8214b8d13"},
+  "phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.3", "f2161c207fda0e4fb55165f650f7f8db23f02b29e3bff00ff7ef161d6ac1f09d", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "b4ec9cd73cb01ff1bd1cac92e045d13e7030330b74164297d1aee3907b54803c"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.19.0", "de5643d03e3cdf5ff19cd45b5d14543a3b1ad8551d529f6b24246e88a6c6f1b8", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a650b6f814c4f386314b98f1aebf92f8652649166612f84ef2e60a20894addfa"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.17", "f396bbdaf4ba227b82251eb75ac0afa6b3da5e509bc0d030206374237dfc9450", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61d741ffb78c85fdbca0de084da6a48f8ceb5261a79165b5a0b59e5f65ce98b"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},
   "plug": {:hex, :plug, "1.16.1", "40c74619c12f82736d2214557dedec2e9762029b2438d6d175c5074c933edc9d", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:plug_crypto, "~> 1.1.1 or ~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.3 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a13ff6b9006b03d7e33874945b2755253841b238c34071ed85b0e86057f8cddc"},
   "plug_cowboy": {:hex, :plug_cowboy, "2.7.2", "fdadb973799ae691bf9ecad99125b16625b1c6039999da5fe544d99218e662e4", [:mix], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:cowboy_telemetry, "~> 0.3", [hex: :cowboy_telemetry, repo: "hexpm", optional: false]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "245d8a11ee2306094840c000e8816f0cbed69a23fc0ac2bcf8d7835ae019bb2f"},
   "plug_crypto": {:hex, :plug_crypto, "2.1.0", "f44309c2b06d249c27c8d3f65cfe08158ade08418cf540fd4f72d4d6863abb7b", [:mix], [], "hexpm", "131216a4b030b8f8ce0f26038bc4421ae60e4bb95c5cf5395e1421437824c4fa"},
   "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},
-  "sourceror": {:hex, :sourceror, "1.0.3", "111711c147f4f1414c07a67b45ad0064a7a41569037355407eda635649507f1d", [:mix], [], "hexpm", "56c21ef146c00b51bc3bb78d1f047cb732d193256a7c4ba91eaf828d3ae826af"},
+  "sourceror": {:hex, :sourceror, "1.6.0", "9907884e1449a4bd7dbaabe95088ed4d9a09c3c791fb0103964e6316bc9448a7", [:mix], [], "hexpm", "e90aef8c82dacf32c89c8ef83d1416fc343cd3e5556773eeffd2c1e3f991f699"},
   "surface": {:hex, :surface, "0.12.0", "e3b62a9fd263310286ecb3d3c30df5ebee4e181b8220affdcd4c73a11b0ba20a", [:mix], [{:phoenix_live_view, "~> 0.19.0 or ~> 0.20.10", [hex: :phoenix_live_view, repo: "hexpm", optional: false]}, {:sourceror, "~> 1.0", [hex: :sourceror, repo: "hexpm", optional: false]}], "hexpm", "f306ee6e570557cf1f4f3191f9f03b919329ea1e2d9a6166748c7f7d963397ba"},
   "surface_catalogue": {:hex, :surface_catalogue, "0.6.3", "52385fb198cb9907044332d487e8a004c780c67cf20b0ba6bcb6e5f0e0935e7d", [:mix], [{:earmark, "~> 1.4.21", [hex: :earmark, repo: "hexpm", optional: false]}, {:html_entities, "~> 0.4", [hex: :html_entities, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.16.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:phoenix_live_reload, "~> 1.2", [hex: :phoenix_live_reload, repo: "hexpm", optional: true]}, {:surface, "~> 0.10", [hex: :surface, repo: "hexpm", optional: false]}], "hexpm", "f90eabae7f9cf40d598f8a152e318c620dec901d81c407ea904af6869235b8b6"},
   "telemetry": {:hex, :telemetry, "1.3.0", "fedebbae410d715cf8e7062c96a1ef32ec22e764197f70cda73d82778d61e7a2", [:rebar3], [], "hexpm", "7015fc8919dbe63764f4b4b87a95b7c0996bd539e0d499be6ec9d7f3875b79e6"},
diff --git a/lib/surface/components/form.ex b/lib/surface/components/form.ex
index c2333c6..9f69b20 100644
--- a/lib/surface/components/form.ex
+++ b/lib/surface/components/form.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form do
   @moduledoc """
   Defines a **form** that lets the user submit information.
 
-  Provides a wrapper for `Phoenix.HTML.Form.form_for/3`. Additionally,
+  Provides a wrapper for `PhoenixHTMLHelpers.Form.form_for/3`. Additionally,
   adds the form instance that is returned by `form_for/3` into the context,
   making it available to any child input.
 
@@ -55,7 +55,7 @@ defmodule Surface.Components.Form do
   @doc "Keyword list of errors for the form."
   prop errors, :keyword
 
-  @doc "Keyword list with options to be passed down to `Phoenix.HTML.Tag.tag/2`"
+  @doc "Keyword list with options to be passed down to `PhoenixHTMLHelpers.Tag.tag/2`"
   prop opts, :keyword, default: []
 
   @doc "Class or classes to apply to the form"
diff --git a/lib/surface/components/form/checkbox.ex b/lib/surface/components/form/checkbox.ex
index a880741..9845e0d 100644
--- a/lib/surface/components/form/checkbox.ex
+++ b/lib/surface/components/form/checkbox.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.Checkbox do
   @moduledoc """
   Defines a checkbox.
 
-  Provides a wrapper for Phoenix.HTML.Form's `checkbox/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `checkbox/3` function.
 
   All options passed via `opts` will be sent to `checkbox/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.Checkbox do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [checkbox: 3]
+  import PhoenixHTMLHelpers.Form, only: [checkbox: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/color_input.ex b/lib/surface/components/form/color_input.ex
index d6016b7..1bc11f5 100644
--- a/lib/surface/components/form/color_input.ex
+++ b/lib/surface/components/form/color_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.ColorInput do
   An input field that let the user specify a **color**, either with a
   text field or a color picker interface.
 
-  Provides a wrapper for Phoenix.HTML.Form's `color_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `color_input/3` function.
 
   All options passed via `opts` will be sent to `color_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.ColorInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [color_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [color_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/date_input.ex b/lib/surface/components/form/date_input.ex
index 583e93b..ffeaf5b 100644
--- a/lib/surface/components/form/date_input.ex
+++ b/lib/surface/components/form/date_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.DateInput do
   An input field that let the user enter a **date**, either with a text field
   or a date picker interface.
 
-  Provides a wrapper for Phoenix.HTML.Form's `date_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `date_input/3` function.
 
   All options passed via `opts` will be sent to `date_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.DateInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [date_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [date_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/date_select.ex b/lib/surface/components/form/date_select.ex
index 49dddb5..e661441 100644
--- a/lib/surface/components/form/date_select.ex
+++ b/lib/surface/components/form/date_select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.DateSelect do
   @moduledoc """
   Generates select tags for date.
 
-  Provides a wrapper for Phoenix.HTML.Form's `date_select/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `date_select/3` function.
 
   All options passed via `opts` will be sent to `date_select/3`,
   `value`, `default`, `year`, `month`, `day` and `builder`
@@ -21,7 +21,7 @@ defmodule Surface.Components.Form.DateSelect do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [date_select: 3]
+  import PhoenixHTMLHelpers.Form, only: [date_select: 3]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/datetime_local_input.ex b/lib/surface/components/form/datetime_local_input.ex
index 2ae0599..5a2342d 100644
--- a/lib/surface/components/form/datetime_local_input.ex
+++ b/lib/surface/components/form/datetime_local_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.DateTimeLocalInput do
   An input field that let the user enter both **date** and **time**, using a
   text field and a date picker interface.
 
-  Provides a wrapper for Phoenix.HTML.Form's `datetime_local_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `datetime_local_input/3` function.
 
   All options passed via `opts` will be sent to `datetime_local_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.DateTimeLocalInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [datetime_local_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [datetime_local_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/datetime_select.ex b/lib/surface/components/form/datetime_select.ex
index 65af7c5..dd2ca28 100644
--- a/lib/surface/components/form/datetime_select.ex
+++ b/lib/surface/components/form/datetime_select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.DateTimeSelect do
   @moduledoc """
   Generates select tags for datetime.
 
-  Provides a wrapper for Phoenix.HTML.Form's `datetime_select/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `datetime_select/3` function.
 
   All options passed via `opts` will be sent to `datetime_select/3`,
   `value`, `default`, `year`, `month`, `day`, `hour`, `minute`, `second` and `builder`
@@ -21,7 +21,7 @@ defmodule Surface.Components.Form.DateTimeSelect do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [datetime_select: 3]
+  import PhoenixHTMLHelpers.Form, only: [datetime_select: 3]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/email_input.ex b/lib/surface/components/form/email_input.ex
index dc1c62c..7e8208f 100644
--- a/lib/surface/components/form/email_input.ex
+++ b/lib/surface/components/form/email_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.EmailInput do
   @moduledoc """
   An input field that let the user enter one or multiple **e-mails**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `email_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `email_input/3` function.
 
   All options passed via `opts` will be sent to `email_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.EmailInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [email_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [email_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/file_input.ex b/lib/surface/components/form/file_input.ex
index b7f6aaa..c3dd389 100644
--- a/lib/surface/components/form/file_input.ex
+++ b/lib/surface/components/form/file_input.ex
@@ -19,7 +19,7 @@ defmodule Surface.Components.Form.FileInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [file_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [file_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/hidden_input.ex b/lib/surface/components/form/hidden_input.ex
index 1e2e7df..5b6f752 100644
--- a/lib/surface/components/form/hidden_input.ex
+++ b/lib/surface/components/form/hidden_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.HiddenInput do
   @moduledoc """
   A **hidden** input field.
 
-  Provides a wrapper for Phoenix.HTML.Form's `hidden_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `hidden_input/3` function.
 
   All options passed via `opts` will be sent to `hidden_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.HiddenInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [hidden_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [hidden_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/hidden_inputs.ex b/lib/surface/components/form/hidden_inputs.ex
index 326afd1..452b658 100644
--- a/lib/surface/components/form/hidden_inputs.ex
+++ b/lib/surface/components/form/hidden_inputs.ex
@@ -1,6 +1,6 @@
 defmodule Surface.Components.Form.HiddenInputs do
   @moduledoc """
-  A wrapper for `Phoenix.HTML.Form.html.hidden_inputs_for/1`.
+  A wrapper for `PhoenixHTMLHelpers.Form.hidden_inputs_for/1`.
 
   Generates hidden inputs for the given form.
   """
diff --git a/lib/surface/components/form/inputs.ex b/lib/surface/components/form/inputs.ex
index 62774ce..285854b 100644
--- a/lib/surface/components/form/inputs.ex
+++ b/lib/surface/components/form/inputs.ex
@@ -1,6 +1,6 @@
 defmodule Surface.Components.Form.Inputs do
   @moduledoc """
-  A wrapper for `Phoenix.HTML.Form.html.inputs_for/3`.
+  A wrapper for `PhoenixHTMLHelpers.Form.inputs_for/3`.
 
   Additionally, adds the generated form instance that is returned by `inputs_for/3`
   into the context, making it available to any child input.
diff --git a/lib/surface/components/form/multiple_select.ex b/lib/surface/components/form/multiple_select.ex
index eb0b9cf..e997fb6 100644
--- a/lib/surface/components/form/multiple_select.ex
+++ b/lib/surface/components/form/multiple_select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.MultipleSelect do
   @moduledoc """
   Defines a select.
 
-  Provides a wrapper for Phoenix.HTML.Form's `multiple_select/4` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `multiple_select/4` function.
 
   All options passed via `opts` will be sent to `multiple_select/4`, `class` can
   be set directly and will override anything in `opts`.
@@ -10,7 +10,7 @@ defmodule Surface.Components.Form.MultipleSelect do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [multiple_select: 4]
+  import PhoenixHTMLHelpers.Form, only: [multiple_select: 4]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/number_input.ex b/lib/surface/components/form/number_input.ex
index 12ce314..d8e5f0f 100644
--- a/lib/surface/components/form/number_input.ex
+++ b/lib/surface/components/form/number_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.NumberInput do
   @moduledoc """
   An input field that let the user to enter a **number**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `number_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `number_input/3` function.
 
   All options passed via `opts` will be sent to `number_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.NumberInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [number_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [number_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/password_input.ex b/lib/surface/components/form/password_input.ex
index 44280bb..63705fb 100644
--- a/lib/surface/components/form/password_input.ex
+++ b/lib/surface/components/form/password_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.PasswordInput do
   @moduledoc """
   An input field that let the user securely specify a **password**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `password_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `password_input/3` function.
 
   All options passed via `opts` will be sent to `password_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.PasswordInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [password_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [password_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/radio_button.ex b/lib/surface/components/form/radio_button.ex
index ac094d4..6bf8427 100644
--- a/lib/surface/components/form/radio_button.ex
+++ b/lib/surface/components/form/radio_button.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.RadioButton do
   @moduledoc """
   Defines a radio button.
 
-  Provides a wrapper for Phoenix.HTML.Form's `radio_button/4` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `radio_button/4` function.
 
   All options passed via `opts` will be sent to `radio_button/4`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.RadioButton do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [radio_button: 4]
+  import PhoenixHTMLHelpers.Form, only: [radio_button: 4]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/range_input.ex b/lib/surface/components/form/range_input.ex
index c4dbad3..75241ed 100644
--- a/lib/surface/components/form/range_input.ex
+++ b/lib/surface/components/form/range_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.RangeInput do
   An input field that let the user specify a numeric value in a given **range**,
   usually using a slider.
 
-  Provides a wrapper for Phoenix.HTML.Form's `range_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `range_input/3` function.
 
   All options passed via `opts` will be sent to `range_input/3`, `value`, `min`, `max`
   and `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.RangeInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [range_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [range_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/reset.ex b/lib/surface/components/form/reset.ex
index 7eeb295..0d5eff7 100644
--- a/lib/surface/components/form/reset.ex
+++ b/lib/surface/components/form/reset.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.Reset do
   @moduledoc """
   Defines a reset button.
 
-  Provides a wrapper for Phoenix.HTML.Form's `reset/2` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `reset/2` function.
 
   All options passed via `opts` will be sent to `reset/2`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.Reset do
   use Surface.Component
   use Surface.Components.Events
 
-  import Phoenix.HTML.Form, only: [reset: 2]
+  import PhoenixHTMLHelpers.Form, only: [reset: 2]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/search_input.ex b/lib/surface/components/form/search_input.ex
index 3d40b68..2e39fb3 100644
--- a/lib/surface/components/form/search_input.ex
+++ b/lib/surface/components/form/search_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.SearchInput do
   @moduledoc """
   An input field that let the user enter **search** queries.
 
-  Provides a wrapper for Phoenix.HTML.Form's `search_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `search_input/3` function.
 
   All options passed via `opts` will be sent to `search_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.SearchInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [search_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [search_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/select.ex b/lib/surface/components/form/select.ex
index 6752a39..b9abe6a 100644
--- a/lib/surface/components/form/select.ex
+++ b/lib/surface/components/form/select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.Select do
   @moduledoc """
   Defines a select.
 
-  Provides a wrapper for Phoenix.HTML.Form's `select/4` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `select/4` function.
 
   All options passed via `opts` will be sent to `select/4`, `class` can
   be set directly and will override anything in `opts`.
@@ -10,7 +10,7 @@ defmodule Surface.Components.Form.Select do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [select: 4]
+  import PhoenixHTMLHelpers.Form, only: [select: 4]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/telephone_input.ex b/lib/surface/components/form/telephone_input.ex
index 3475eb9..6490fdd 100644
--- a/lib/surface/components/form/telephone_input.ex
+++ b/lib/surface/components/form/telephone_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.TelephoneInput do
   @moduledoc """
   An input field that let the user enter a **telephone number**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `telephone_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `telephone_input/3` function.
 
   All options passed via `opts` will be sent to `telephone_input/3`, `value`,
   `pattern` and `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.TelephoneInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [telephone_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [telephone_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/text_input.ex b/lib/surface/components/form/text_input.ex
index eefdba8..85cb149 100644
--- a/lib/surface/components/form/text_input.ex
+++ b/lib/surface/components/form/text_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.TextInput do
   @moduledoc """
   An input field that let the user enter a **single-line text**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `text_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `text_input/3` function.
 
   All options passed via `opts` will be sent to `text_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.TextInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [text_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [text_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/textarea.ex b/lib/surface/components/form/textarea.ex
index 48e0d4f..e002f1c 100644
--- a/lib/surface/components/form/textarea.ex
+++ b/lib/surface/components/form/textarea.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.TextArea do
   @moduledoc """
   An input field that let the user enter a **multi-line** text.
 
-  Provides a wrapper for Phoenix.HTML.Form's `textarea/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `textarea/3` function.
 
   All options passed via `opts` will be sent to `textarea/3`. Explicitly
   defined properties like `value` and `class` can be set directly and will
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.TextArea do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [textarea: 3]
+  import PhoenixHTMLHelpers.Form, only: [textarea: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/time_input.ex b/lib/surface/components/form/time_input.ex
index 1ea5eb9..8ff5689 100644
--- a/lib/surface/components/form/time_input.ex
+++ b/lib/surface/components/form/time_input.ex
@@ -3,7 +3,7 @@ defmodule Surface.Components.Form.TimeInput do
   An input field that let the user enter a **time** (hours, minutes and
   optionally seconds).
 
-  Provides a wrapper for Phoenix.HTML.Form's `time_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `time_input/3` function.
 
   All options passed via `opts` will be sent to `time_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -18,7 +18,7 @@ defmodule Surface.Components.Form.TimeInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [time_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [time_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/lib/surface/components/form/time_select.ex b/lib/surface/components/form/time_select.ex
index 838c23c..e65d927 100644
--- a/lib/surface/components/form/time_select.ex
+++ b/lib/surface/components/form/time_select.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.TimeSelect do
   @moduledoc """
   Generates select tags for time.
 
-  Provides a wrapper for Phoenix.HTML.Form's `time_select/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `time_select/3` function.
 
   All options passed via `opts` will be sent to `time_select/3`,
   `value`, `default`, `hour`, `minute`, `second` and `builder`
@@ -21,7 +21,7 @@ defmodule Surface.Components.Form.TimeSelect do
 
   use Surface.Component
 
-  import Phoenix.HTML.Form, only: [time_select: 3]
+  import PhoenixHTMLHelpers.Form, only: [time_select: 3]
   import Surface.Components.Form.Utils
 
   @doc "The form identifier"
diff --git a/lib/surface/components/form/url_input.ex b/lib/surface/components/form/url_input.ex
index 8221b42..013f3a7 100644
--- a/lib/surface/components/form/url_input.ex
+++ b/lib/surface/components/form/url_input.ex
@@ -2,7 +2,7 @@ defmodule Surface.Components.Form.UrlInput do
   @moduledoc """
   An input field that let the user enter a **URL**.
 
-  Provides a wrapper for Phoenix.HTML.Form's `url_input/3` function.
+  Provides a wrapper for PhoenixHTMLHelpers.Form's `url_input/3` function.
 
   All options passed via `opts` will be sent to `url_input/3`, `value` and
   `class` can be set directly and will override anything in `opts`.
@@ -17,7 +17,7 @@ defmodule Surface.Components.Form.UrlInput do
 
   use Surface.Components.Form.Input
 
-  import Phoenix.HTML.Form, only: [url_input: 3]
+  import PhoenixHTMLHelpers.Form, only: [url_input: 3]
   import Surface.Components.Utils, only: [events_to_opts: 1]
   import Surface.Components.Form.Utils
 
diff --git a/mix.exs b/mix.exs
index 54d1702..0a04af7 100644
--- a/mix.exs
+++ b/mix.exs
@@ -61,7 +61,8 @@ defmodule Surface.Form.MixProject do
   defp deps do
     [
       {:surface, "~> 0.12.0"},
-      {:phoenix_html, "~> 3.3.1"},
+      {:phoenix_html, "~> 4.0"},
+      {:phoenix_html_helpers, "~> 1.0"},
       {:surface_catalogue, "~> 0.6.3", only: :dev},
       {:esbuild, "~> 0.2", only: :dev},
       {:plug_cowboy, "~> 2.0", only: :dev},
diff --git a/mix.lock b/mix.lock
index d4d0ee6..2c36cf1 100644
--- a/mix.lock
+++ b/mix.lock
@@ -21,7 +21,8 @@
   "nimble_parsec": {:hex, :nimble_parsec, "1.4.0", "51f9b613ea62cfa97b25ccc2c1b4216e81df970acd8e16e8d1bdc58fef21370d", [:mix], [], "hexpm", "9c565862810fb383e9838c1dd2d7d2c437b3d13b267414ba6af33e50d2d1cf28"},
   "phoenix": {:hex, :phoenix, "1.7.14", "a7d0b3f1bc95987044ddada111e77bd7f75646a08518942c72a8440278ae7825", [:mix], [{:castore, ">= 0.0.0", [hex: :castore, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix_pubsub, "~> 2.1", [hex: :phoenix_pubsub, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.14", [hex: :plug, repo: "hexpm", optional: false]}, {:plug_cowboy, "~> 2.7", [hex: :plug_cowboy, repo: "hexpm", optional: true]}, {:plug_crypto, "~> 1.2 or ~> 2.0", [hex: :plug_crypto, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:websock_adapter, "~> 0.5.3", [hex: :websock_adapter, repo: "hexpm", optional: false]}], "hexpm", "c7859bc56cc5dfef19ecfc240775dae358cbaa530231118a9e014df392ace61a"},
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.6.2", "3b83b24ab5a2eb071a20372f740d7118767c272db386831b2e77638c4dcc606d", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.1", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.16 or ~> 1.0", [hex: :postgrex, repo: "hexpm", optional: true]}], "hexpm", "3f94d025f59de86be00f5f8c5dd7b5965a3298458d21ab1c328488be3b5fcd59"},
-  "phoenix_html": {:hex, :phoenix_html, "3.3.4", "42a09fc443bbc1da37e372a5c8e6755d046f22b9b11343bf885067357da21cb3", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "0249d3abec3714aff3415e7ee3d9786cb325be3151e6c4b3021502c585bf53fb"},
+  "phoenix_html": {:hex, :phoenix_html, "4.1.1", "4c064fd3873d12ebb1388425a8f2a19348cef56e7289e1998e2d2fa758aa982e", [:mix], [], "hexpm", "f2f2df5a72bc9a2f510b21497fd7d2b86d932ec0598f0210fed4114adc546c6f"},
+  "phoenix_html_helpers": {:hex, :phoenix_html_helpers, "1.0.1", "7eed85c52eff80a179391036931791ee5d2f713d76a81d0d2c6ebafe1e11e5ec", [:mix], [{:phoenix_html, "~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "cffd2385d1fa4f78b04432df69ab8da63dc5cf63e07b713a4dcf36a3740e3090"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.5.3", "f2161c207fda0e4fb55165f650f7f8db23f02b29e3bff00ff7ef161d6ac1f09d", [:mix], [{:file_system, "~> 0.3 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "b4ec9cd73cb01ff1bd1cac92e045d13e7030330b74164297d1aee3907b54803c"},
   "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.17", "f396bbdaf4ba227b82251eb75ac0afa6b3da5e509bc0d030206374237dfc9450", [:mix], [{:floki, "~> 0.36", [hex: :floki, repo: "hexpm", optional: true]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61d741ffb78c85fdbca0de084da6a48f8ceb5261a79165b5a0b59e5f65ce98b"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},