diff --git a/Hosts/Moonlight.Api.Host/Dockerfile b/Hosts/Moonlight.Api.Host/Dockerfile
index aa9a24be..95f7477d 100644
--- a/Hosts/Moonlight.Api.Host/Dockerfile
+++ b/Hosts/Moonlight.Api.Host/Dockerfile
@@ -34,8 +34,12 @@ RUN dotnet restore "Hosts/Moonlight.Frontend.Host/Moonlight.Frontend.Host.csproj
 COPY . .
 
 # Build styles
-WORKDIR /src/Hosts/Moonlight.Frontend.Host/Styles
-RUN npm run tailwind-build
+# We need to build it before, so the class lists get generated
+WORKDIR "/src/Hosts/Moonlight.Frontend.Host"
+RUN dotnet build "./Moonlight.Frontend.Host.csproj" -c $BUILD_CONFIGURATION -o /app/build-frontend
+
+WORKDIR "/src/Hosts/Moonlight.Frontend.Host/Styles"
+RUN npm run build
 
 # Build projects
 WORKDIR "/src/Hosts/Moonlight.Api.Host"
diff --git a/Hosts/Moonlight.Frontend.Host/Styles/package.json b/Hosts/Moonlight.Frontend.Host/Styles/package.json
index ebec5e04..1bffe0df 100644
--- a/Hosts/Moonlight.Frontend.Host/Styles/package.json
+++ b/Hosts/Moonlight.Frontend.Host/Styles/package.json
@@ -10,7 +10,6 @@
     "postcss": "^8.5.6",
     "postcss-cli": "^11.0.1",
     "postcss-selector-parser": "^7.1.1",
-    "shadcnblazor": "^1.0.5",
     "tailwindcss": "^4.1.18",
     "tw-animate-css": "^1.4.0"
   },
diff --git a/Hosts/Moonlight.Frontend.Host/Styles/styles.css b/Hosts/Moonlight.Frontend.Host/Styles/styles.css
index 90242dcf..97a69946 100644
--- a/Hosts/Moonlight.Frontend.Host/Styles/styles.css
+++ b/Hosts/Moonlight.Frontend.Host/Styles/styles.css
@@ -1,10 +1,11 @@
 @import "tailwindcss";
 @import "tw-animate-css";
 
-@import "./node_modules/shadcnblazor/scrollbar.css";
-@import "./node_modules/shadcnblazor/default-theme.css";
+@import "../../../Moonlight.Frontend/bin/ShadcnBlazor/scrollbar.css";
+@import "../../../Moonlight.Frontend/bin/ShadcnBlazor/default-theme.css";
 @import "./theme.css";
-@source "./node_modules/shadcnblazor/classes.json";
+
+@source "../../../Moonlight.Frontend/bin/ShadcnBlazor/ShadcnBlazor.map";
 
 @source "../../../Moonlight.Api/**/*.razor";
 @source "../../../Moonlight.Api/**/*.cs";
diff --git a/Moonlight.Frontend/Moonlight.Frontend.csproj b/Moonlight.Frontend/Moonlight.Frontend.csproj
index d7ceaef3..303231da 100644
--- a/Moonlight.Frontend/Moonlight.Frontend.csproj
+++ b/Moonlight.Frontend/Moonlight.Frontend.csproj
@@ -24,8 +24,8 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="10.0.1"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.1"/>
         <PackageReference Include="Riok.Mapperly" Version="4.3.1-next.0"/>
-        <PackageReference Include="ShadcnBlazor" Version="1.0.5" />
-        <PackageReference Include="ShadcnBlazor.Extras" Version="1.0.5" />
+        <PackageReference Include="ShadcnBlazor" Version="1.0.8" />
+        <PackageReference Include="ShadcnBlazor.Extras" Version="1.0.8" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Moonlight.Frontend/UI/Shared/Partials/MainLayout.razor b/Moonlight.Frontend/UI/Shared/Partials/MainLayout.razor
index 77aaa709..0d95f48b 100644
--- a/Moonlight.Frontend/UI/Shared/Partials/MainLayout.razor
+++ b/Moonlight.Frontend/UI/Shared/Partials/MainLayout.razor
@@ -2,6 +2,7 @@
 @using ShadcnBlazor.Extras.Alerts
 @using ShadcnBlazor.Extras.Dialogs
 @using ShadcnBlazor.Extras.Toasts
+@using ShadcnBlazor.Portals
 @using ShadcnBlazor.Sidebars
 
 @inherits LayoutComponentBase
@@ -21,5 +22,7 @@
         <ToastLauncher/>
         <DialogLauncher/>
         <AlertDialogLauncher/>
+        
+        <PortalOutlet />
     </SidebarInset>
 </SidebarProvider>
\ No newline at end of file