diff --git a/lib/music_library_web.ex b/lib/music_library_web.ex
index 08051550..2f4ec854 100644
--- a/lib/music_library_web.ex
+++ b/lib/music_library_web.ex
@@ -93,11 +93,12 @@ defmodule MusicLibraryWeb do
   defp html_helpers do
     quote do
       use Gettext, backend: MusicLibraryWeb.Gettext
+      use Fluxon
 
+      # Core UI components and translation
       import MusicLibraryWeb.CoreComponents
       # HTML escaping functionality
       import Phoenix.HTML
-      # Core UI components and translation
 
       # Shortcut for generating JS commands
       alias Phoenix.LiveView.JS
diff --git a/lib/music_library_web/components/core_components.ex b/lib/music_library_web/components/core_components.ex
index 773aa3e6..5bb5a27e 100644
--- a/lib/music_library_web/components/core_components.ex
+++ b/lib/music_library_web/components/core_components.ex
@@ -19,27 +19,6 @@ defmodule MusicLibraryWeb.CoreComponents do
 
   alias Phoenix.LiveView.JS
 
-  defdelegate badge(assigns), to: Fluxon.Components.Badge
-  defdelegate button(assigns), to: Fluxon.Components.Button
-  defdelegate date_time_picker(assigns), to: Fluxon.Components.DatePicker
-  defdelegate dropdown(assigns), to: Fluxon.Components.Dropdown
-  defdelegate dropdown_button(assigns), to: Fluxon.Components.Dropdown
-  defdelegate dropdown_link(assigns), to: Fluxon.Components.Dropdown
-  defdelegate dropdown_separator(assigns), to: Fluxon.Components.Dropdown
-  defdelegate input(assigns), to: Fluxon.Components.Input
-  defdelegate label(assigns), to: Fluxon.Components.Form
-  defdelegate loading(assigns), to: Fluxon.Components.Loading
-  defdelegate modal(assigns), to: Fluxon.Components.Modal
-  defdelegate select(assigns), to: Fluxon.Components.Select
-  defdelegate separator(assigns), to: Fluxon.Components.Separator
-  defdelegate sheet(assigns), to: Fluxon.Components.Sheet
-  defdelegate switch(assigns), to: Fluxon.Components.Switch
-  defdelegate tooltip(assigns), to: Fluxon.Components.Tooltip
-  defdelegate tabs(assigns), to: Fluxon.Components.Tabs
-  defdelegate tabs_list(assigns), to: Fluxon.Components.Tabs
-  defdelegate tabs_panel(assigns), to: Fluxon.Components.Tabs
-  defdelegate textarea(assigns), to: Fluxon.Components.Textarea
-
   @doc """
   Renders a simple form.