diff --git a/Moonlight.ApiServer/Moonlight.ApiServer.csproj b/Moonlight.ApiServer/Moonlight.ApiServer.csproj
index 2d7a6404..a7883ea6 100644
--- a/Moonlight.ApiServer/Moonlight.ApiServer.csproj
+++ b/Moonlight.ApiServer/Moonlight.ApiServer.csproj
@@ -23,8 +23,8 @@
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="MoonCore" Version="1.7.9" />
-        <PackageReference Include="MoonCore.Extended" Version="1.2.2" />
+        <PackageReference Include="MoonCore" Version="1.8.0" />
+        <PackageReference Include="MoonCore.Extended" Version="1.2.4" />
         <PackageReference Include="MoonCore.PluginFramework" Version="1.0.5" />
         <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
diff --git a/Moonlight.Client/Moonlight.Client.csproj b/Moonlight.Client/Moonlight.Client.csproj
index 57e75636..ea8ddca8 100644
--- a/Moonlight.Client/Moonlight.Client.csproj
+++ b/Moonlight.Client/Moonlight.Client.csproj
@@ -24,10 +24,10 @@
         <PackageReference Include="Blazor-ApexCharts" Version="3.5.0"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.10"/>
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.10" PrivateAssets="all"/>
-        <PackageReference Include="MoonCore" Version="1.7.9"/>
-        <PackageReference Include="MoonCore.Blazor" Version="1.2.7"/>
+        <PackageReference Include="MoonCore" Version="1.8.0" />
+        <PackageReference Include="MoonCore.Blazor" Version="1.2.8" />
         <PackageReference Include="MoonCore.PluginFramework" Version="1.0.5"/>
-        <PackageReference Include="MoonCore.Blazor.Tailwind" Version="1.1.4"/>
+        <PackageReference Include="MoonCore.Blazor.Tailwind" Version="1.1.9" />
     </ItemGroup>
 
     <!-- 
diff --git a/Moonlight.Client/Styles/additions/loaders.css b/Moonlight.Client/Styles/additions/loaders.css
new file mode 100644
index 00000000..dd5327b1
--- /dev/null
+++ b/Moonlight.Client/Styles/additions/loaders.css
@@ -0,0 +1,19 @@
+.loader {
+    width: 42px;
+    height: 42px;
+    border: 3px solid #FFF;
+    border-bottom-color: transparent;
+    border-radius: 50%;
+    display: inline-block;
+    box-sizing: border-box;
+    animation: loader-rotation 1s linear infinite;
+}
+
+@keyframes loader-rotation {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+} 
\ No newline at end of file
diff --git a/Moonlight.Client/Styles/mappings/mooncore.map b/Moonlight.Client/Styles/mappings/mooncore.map
index 8196a3ba..ce4f4dd9 100755
--- a/Moonlight.Client/Styles/mappings/mooncore.map
+++ b/Moonlight.Client/Styles/mappings/mooncore.map
@@ -1,4 +1,6 @@
 [
+  "!px-1",
+  "!py-1",
   "-m-1",
   "-m-1.5",
   "-m-2.5",
@@ -10,7 +12,7 @@
   "absolute",
   "animate-spin",
   "backdrop-blur",
-  "bg-danger-200",
+  "bg-danger-500",
   "bg-danger-600",
   "bg-gradient-to-t",
   "bg-gray-100",
@@ -18,21 +20,21 @@
   "bg-gray-400",
   "bg-gray-50",
   "bg-gray-700",
+  "bg-gray-700/60",
   "bg-gray-750",
   "bg-gray-800",
   "bg-gray-800/60",
   "bg-gray-800/80",
   "bg-gray-900",
   "bg-gray-950",
-  "bg-info-100",
+  "bg-indigo-500",
+  "bg-info-400",
   "bg-opacity-50",
   "bg-opacity-75",
-  "bg-red-50",
   "bg-slate-900",
-  "bg-success-100",
+  "bg-success-400",
   "bg-tertiary-500",
   "bg-transparent",
-  "bg-warning-100",
   "bg-warning-400",
   "bg-white",
   "block",
@@ -42,6 +44,7 @@
   "border-gray-100/10",
   "border-gray-700",
   "border-gray-700/60",
+  "border-none",
   "border-primary-500",
   "border-red-600",
   "border-slate-700",
@@ -50,9 +53,11 @@
   "bottom-0",
   "bottom-full",
   "col-span-1",
+  "col-span-2",
   "col-span-3",
   "cursor-default",
   "cursor-not-allowed",
+  "cursor-pointer",
   "dark:bg-gray-700",
   "dark:bg-gray-700/60",
   "dark:disabled:bg-gray-800",
@@ -121,6 +126,7 @@
   "grid",
   "grid-cols-1",
   "grid-cols-3",
+  "grid-cols-6",
   "grid-flow-col",
   "group-hover:text-gray-500",
   "group-hover:text-white",
@@ -188,6 +194,7 @@
   "m-1",
   "m-3",
   "max-h-56",
+  "max-w-lg",
   "max-w-sm",
   "max-w-xs",
   "mb-1",
@@ -210,6 +217,7 @@
   "ml-3",
   "ml-4",
   "ml-auto",
+  "mr-1",
   "mr-16",
   "mr-2",
   "mr-3",
@@ -222,6 +230,7 @@
   "mt-2",
   "mt-2.5",
   "mt-3",
+  "mt-4",
   "mt-5",
   "mt-8",
   "mt-auto",
@@ -240,6 +249,7 @@
   "overflow-x-scroll",
   "overflow-y-auto",
   "p-0",
+  "p-1",
   "p-1.5",
   "p-2",
   "p-2.5",
@@ -255,6 +265,7 @@
   "pl-9",
   "pointer-events-auto",
   "pointer-events-none",
+  "pr-1",
   "pr-3",
   "pr-8",
   "pt-0.5",
@@ -311,17 +322,24 @@
   "sm:justify-between",
   "sm:justify-end",
   "sm:last:pr-6",
+  "sm:max-w-2xl",
+  "sm:max-w-3xl",
+  "sm:max-w-4xl",
+  "sm:max-w-5xl",
+  "sm:max-w-6xl",
+  "sm:max-w-7xl",
   "sm:max-w-lg",
+  "sm:max-w-md",
+  "sm:max-w-xl",
   "sm:mb-0",
+  "sm:mr-3",
   "sm:mt-5",
   "sm:mt-6",
-  "sm:my-8",
   "sm:p-0",
   "sm:p-6",
   "sm:pb-4",
   "sm:px-6",
   "sm:text-sm",
-  "sm:w-full",
   "space-x-1",
   "space-x-2",
   "space-x-5",
@@ -336,6 +354,7 @@
   "table",
   "table-auto",
   "text-2xl",
+  "text-3xl",
   "text-4xl",
   "text-[0.625rem]",
   "text-base",
@@ -357,17 +376,16 @@
   "text-left",
   "text-lg",
   "text-primary-500",
-  "text-red-400",
   "text-red-500",
-  "text-red-700",
-  "text-red-800",
   "text-slate-400",
   "text-slate-600",
   "text-sm",
   "text-success-400",
   "text-success-500",
+  "text-tertiary-500",
   "text-warning-400",
   "text-white",
+  "text-xl",
   "text-xs",
   "to-gray-800",
   "to-primary-600",
@@ -399,14 +417,5 @@
   "whitespace-nowrap",
   "z-10",
   "z-40",
-  "z-50",
-  "sm:max-w-md",
-  "sm:max-w-lg",
-  "sm:max-w-xl",
-  "sm:max-w-2xl",
-  "sm:max-w-3xl",
-  "sm:max-w-4xl",
-  "sm:max-w-5xl",
-  "sm:max-w-6xl",
-  "sm:max-w-7xl"
-]
\ No newline at end of file
+  "z-50"
+]
diff --git a/Moonlight.Client/Styles/style.css b/Moonlight.Client/Styles/style.css
index 71330e96..ae019c1d 100644
--- a/Moonlight.Client/Styles/style.css
+++ b/Moonlight.Client/Styles/style.css
@@ -8,6 +8,7 @@
 @import "additions/forms.css";
 @import "additions/progress.css";
 @import "additions/scrollbar.css";
+@import "additions/loaders.css";
 
 @import "tailwindcss/utilities";