diff --git a/Moonlight.ApiServer/Implementations/Startup/CoreStartup.cs b/Moonlight.ApiServer/Implementations/Startup/CoreStartup.cs
index 88521220..dcc6531d 100644
--- a/Moonlight.ApiServer/Implementations/Startup/CoreStartup.cs
+++ b/Moonlight.ApiServer/Implementations/Startup/CoreStartup.cs
@@ -10,12 +10,10 @@ namespace Moonlight.ApiServer.Implementations.Startup;
 public class CoreStartup : IPluginStartup
 {
     private readonly AppConfiguration Configuration;
-    private readonly BundleService BundleService;
 
-    public CoreStartup(AppConfiguration configuration, BundleService bundleService)
+    public CoreStartup(AppConfiguration configuration)
     {
         Configuration = configuration;
-        BundleService = bundleService;
     }
 
     public Task BuildApplication(IHostApplicationBuilder builder)
@@ -35,15 +33,9 @@ public class CoreStartup : IPluginStartup
 
         #endregion
 
-        #region Assets
-
-        BundleService.BundleCss("css/core.min.css");
-
-        #endregion
-
         #region Database
 
-        builder.Services.AddDbContext<DbContext, CoreDataContext>();
+        builder.Services.AddDbContext<CoreDataContext>();
 
         #endregion
         
diff --git a/Moonlight.ApiServer/Moonlight.ApiServer.csproj b/Moonlight.ApiServer/Moonlight.ApiServer.csproj
index 5bdfa1dc..329d8602 100644
--- a/Moonlight.ApiServer/Moonlight.ApiServer.csproj
+++ b/Moonlight.ApiServer/Moonlight.ApiServer.csproj
@@ -25,7 +25,7 @@
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="MoonCore" Version="1.8.3" />
-        <PackageReference Include="MoonCore.Extended" Version="1.2.9" />
+        <PackageReference Include="MoonCore.Extended" Version="1.3.0" />
         <PackageReference Include="MoonCore.PluginFramework" Version="1.0.5" />
         <PackageReference Include="SharpZipLib" Version="1.4.2" />
         <PackageReference Include="Swashbuckle.AspNetCore" Version="6.4.0"/>
diff --git a/Moonlight.ApiServer/Services/BundleGenerationService.cs b/Moonlight.ApiServer/Services/BundleGenerationService.cs
index 0ae62515..b736b6d5 100644
--- a/Moonlight.ApiServer/Services/BundleGenerationService.cs
+++ b/Moonlight.ApiServer/Services/BundleGenerationService.cs
@@ -134,7 +134,7 @@ public class BundleGenerationService : IHostedService
                 if (mainStylesheet.ImportRules.Any(x => x.Text == importRule.Text))
                     continue;
 
-                content += importRule.StylesheetText.Text + "\n";
+                content = importRule.StylesheetText.Text + "\n" + content;
             }
 
             // Media Rules
diff --git a/Moonlight.ApiServer/Services/PluginService.cs b/Moonlight.ApiServer/Services/PluginService.cs
index 2892d95d..94e3c8bd 100644
--- a/Moonlight.ApiServer/Services/PluginService.cs
+++ b/Moonlight.ApiServer/Services/PluginService.cs
@@ -125,6 +125,9 @@ public class PluginService
             var wwwRootPath = Path.GetFullPath(
                 PathBuilder.Dir(pluginFolder, "wwwroot")
             );
+            
+            if(!Directory.Exists(wwwRootPath))
+                continue;
 
             wwwRootProviders.Add(
                 new PhysicalFileProvider(wwwRootPath)
diff --git a/Moonlight.ApiServer/Startup.cs b/Moonlight.ApiServer/Startup.cs
index b5d3858a..177c3291 100644
--- a/Moonlight.ApiServer/Startup.cs
+++ b/Moonlight.ApiServer/Startup.cs
@@ -69,6 +69,7 @@ public class Startup
         await CreateStorage();
         await SetupAppConfiguration();
         await SetupLogging();
+        await SetupBundling();
         await LoadPlugins();
         await InitializePlugins();
 
@@ -126,6 +127,15 @@ public class Startup
         return Task.CompletedTask;
     }
 
+    private Task SetupBundling()
+    {
+        BundleService = new();
+        
+        BundleService.BundleCss("css/core.min.css");
+        
+        return Task.CompletedTask;
+    }
+
     #region Base
 
     private Task RegisterBase()
@@ -490,6 +500,7 @@ public class Startup
     private async Task RegisterDatabase()
     {
         WebApplicationBuilder.Services.AddDatabaseMappings();
+        WebApplicationBuilder.Services.AddServiceCollectionAccessor();
         
         WebApplicationBuilder.Services.AddScoped(typeof(DatabaseRepository<>));
         WebApplicationBuilder.Services.AddScoped(typeof(CrudHelper<,>));