diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 30943ad..158b406 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,6 +25,8 @@ jobs:
             otp: '26.0'
           - elixir: '1.16.0'
             otp: '26.2.1'
+          - elixir: '1.17.0'
+            otp: '27.0.1'
             check_formatted: true
             warnings_as_errors: true
     env:
diff --git a/.tool-versions b/.tool-versions
index df967b0..b7c4c5b 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-elixir 1.16.1-otp-26
-erlang 26.2.2
+elixir 1.17.2-otp-27
+erlang 27.0.1
diff --git a/blend/github.mix.lock b/blend/github.mix.lock
index 6c09f56..f701d64 100644
--- a/blend/github.mix.lock
+++ b/blend/github.mix.lock
@@ -31,8 +31,8 @@
   "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"},
-  "surface": {:git, "https://github.com/surface-ui/surface.git", "6a21c82ccebbe15b49ca50f4fbd8f6f3072adf7a", []},
-  "surface_catalogue": {:git, "https://github.com/surface-ui/surface_catalogue.git", "067d028a69a1944486cd57b1af757cf337b6f024", []},
+  "surface": {:git, "https://github.com/surface-ui/surface.git", "518a471189447ccea095fb34aa348d39c1fed690", []},
+  "surface_catalogue": {:git, "https://github.com/surface-ui/surface_catalogue.git", "c3b79034a0d4a5b7378f1e9d510debd29e555f45", []},
   "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/mix.lock b/mix.lock
index 6c09f56..f701d64 100644
--- a/mix.lock
+++ b/mix.lock
@@ -31,8 +31,8 @@
   "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"},
-  "surface": {:git, "https://github.com/surface-ui/surface.git", "6a21c82ccebbe15b49ca50f4fbd8f6f3072adf7a", []},
-  "surface_catalogue": {:git, "https://github.com/surface-ui/surface_catalogue.git", "067d028a69a1944486cd57b1af757cf337b6f024", []},
+  "surface": {:git, "https://github.com/surface-ui/surface.git", "518a471189447ccea095fb34aa348d39c1fed690", []},
+  "surface_catalogue": {:git, "https://github.com/surface-ui/surface_catalogue.git", "c3b79034a0d4a5b7378f1e9d510debd29e555f45", []},
   "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"},