diff --git a/Moonlight.ApiServer/Moonlight.ApiServer.csproj b/Moonlight.ApiServer/Moonlight.ApiServer.csproj
index f6d667e8..ae027ca5 100644
--- a/Moonlight.ApiServer/Moonlight.ApiServer.csproj
+++ b/Moonlight.ApiServer/Moonlight.ApiServer.csproj
@@ -13,8 +13,6 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="MoonCore" Version="1.6.7" />
-        <PackageReference Include="MoonCore.Blazor" Version="1.2.4" />
-        <PackageReference Include="MoonCore.Blazor.Tailwind" Version="1.0.7" />
         <PackageReference Include="MoonCore.Extended" Version="1.1.2" />
         <PackageReference Include="MoonCore.PluginFramework" Version="1.0.2" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
diff --git a/Moonlight.Client/Moonlight.Client.csproj b/Moonlight.Client/Moonlight.Client.csproj
index 37f43b23..c38b3628 100644
--- a/Moonlight.Client/Moonlight.Client.csproj
+++ b/Moonlight.Client/Moonlight.Client.csproj
@@ -11,9 +11,9 @@
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.6"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.6" PrivateAssets="all"/>
         <PackageReference Include="MoonCore" Version="1.6.7" />
-        <PackageReference Include="MoonCore.Blazor" Version="1.2.4" />
+        <PackageReference Include="MoonCore.Blazor" Version="1.2.5" />
         <PackageReference Include="MoonCore.PluginFramework" Version="1.0.2" />
-        <PackageReference Include="MoonCore.Blazor.Tailwind" Version="1.0.7" />
+        <PackageReference Include="MoonCore.Blazor.Tailwind" Version="1.0.9" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/Moonlight.Client/Styles/mappings/mooncore.json b/Moonlight.Client/Styles/mappings/mooncore.map
similarity index 100%
rename from Moonlight.Client/Styles/mappings/mooncore.json
rename to Moonlight.Client/Styles/mappings/mooncore.map
diff --git a/Moonlight.Client/Styles/tailwind.config.js b/Moonlight.Client/Styles/tailwind.config.js
index 0e74054e..3eee47b5 100644
--- a/Moonlight.Client/Styles/tailwind.config.js
+++ b/Moonlight.Client/Styles/tailwind.config.js
@@ -2,7 +2,7 @@
 module.exports = {
     content: [
         '../**/*.razor',
-        'mappings/*.json'
+        'mappings/*.map'
     ],
     theme: {
         extend: {
@@ -30,11 +30,12 @@ module.exports = {
                     300: '#DBDFE9',
                     400: '#B5B5C3',
                     500: '#99A1B7',
-                    600: '#78829D',
-                    700: '#4B5675',
-                    800: '#252F4A',
-                    900: '#071437',
-                    950: '#030712',
+                    600: '#707993',
+                    700: '#444e6b',
+                    750: '#293249',
+                    800: '#1c2438',
+                    900: '#111721',
+                    950: '#0e121c',
                 },
                 tertiary: {
                     50: '#f5f3ff',
diff --git a/Moonlight.Client/UI/Screens/AuthenticationScreen.razor b/Moonlight.Client/UI/Screens/AuthenticationScreen.razor
index f4454be2..2fdc2862 100644
--- a/Moonlight.Client/UI/Screens/AuthenticationScreen.razor
+++ b/Moonlight.Client/UI/Screens/AuthenticationScreen.razor
@@ -104,7 +104,6 @@ else
             // Update UI
             IsHandlingDone = true;
             await InvokeAsync(StateHasChanged);
-            await Task.Delay(TimeSpan.FromSeconds(2));
 
             try
             {
@@ -112,6 +111,8 @@ else
             }
             finally
             {
+                await Task.Delay(TimeSpan.FromSeconds(2));
+                
                 Navigation.NavigateTo("/", true);
             }
         }