diff --git a/Moonlight.Frontend/Moonlight.Frontend.csproj b/Moonlight.Frontend/Moonlight.Frontend.csproj
index 303231da..73eb2f4e 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.8" />
-        <PackageReference Include="ShadcnBlazor.Extras" Version="1.0.8" />
+        <PackageReference Include="ShadcnBlazor" Version="1.0.9" />
+        <PackageReference Include="ShadcnBlazor.Extras" Version="1.0.9" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor
index 66b3a14a..f49da5ea 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Create.razor
@@ -7,11 +7,11 @@
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Labels
 @using ShadcnBlazor.Cards
-@using ShadcnBlazor.Checkboxes
 @using ShadcnBlazor.Extras.Editors
 @using ShadcnBlazor.Extras.FormHandlers
 @using ShadcnBlazor.Extras.Toasts
 @using ShadcnBlazor.Inputs
+@using ShadcnBlazor.Switches
 
 @attribute [Authorize(Policy = Permissions.Themes.Create)]
 
@@ -79,7 +79,7 @@
                         
                         <div class="col-span-1 grid gap-2">
                             <Label for="themeAuthor">Is Enabled</Label>
-                            <Checkbox @bind-Value="Request.IsEnabled" />
+                            <Switch @bind-Value="Request.IsEnabled" />
                         </div>
                     </div>
                     
@@ -92,7 +92,7 @@
                     
                     <div class="grid gap-2">
                         <Label for="themeAuthor">CSS Content</Label>
-                        <Editor @ref="Editor" Language="EditorLanguage.None" InitialValue="@Request.CssContent"/>
+                        <Editor @ref="Editor" Language="EditorLanguage.Css" InitialValue="@Request.CssContent"/>
                     </div>
                 </div>
             </FormHandler>
diff --git a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor
index df0b4a33..adb6111f 100644
--- a/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor
+++ b/Moonlight.Frontend/UI/Admin/Views/Sys/Themes/Update.razor
@@ -9,12 +9,12 @@
 @using ShadcnBlazor.Buttons
 @using ShadcnBlazor.Labels
 @using ShadcnBlazor.Cards
-@using ShadcnBlazor.Checkboxes
 @using ShadcnBlazor.Extras.Common
 @using ShadcnBlazor.Extras.Editors
 @using ShadcnBlazor.Extras.FormHandlers
 @using ShadcnBlazor.Extras.Toasts
 @using ShadcnBlazor.Inputs
+@using ShadcnBlazor.Switches
 
 @attribute [Authorize(Policy = Permissions.Themes.Edit)]
 
@@ -83,7 +83,7 @@
 
                             <div class="col-span-1 grid gap-2">
                                 <Label for="themeAuthor">Is Enabled</Label>
-                                <Checkbox @bind-Value="Request.IsEnabled" DefaultValue="Request.IsEnabled"/>
+                                <Switch @bind-Value="Request.IsEnabled" />
                             </div>
                         </div>
 
@@ -96,7 +96,7 @@
 
                         <div class="grid gap-2">
                             <Label for="themeAuthor">CSS Content</Label>
-                            <Editor @ref="Editor" Language="EditorLanguage.None" InitialValue="@Request.CssContent"/>
+                            <Editor @ref="Editor" Language="EditorLanguage.Css" InitialValue="@Request.CssContent"/>
                         </div>
                     </div>
                 </FormHandler>