diff --git a/Groceries/Components/Layout.razor b/Groceries/Components/Layout.razor
index 6cd13c3..c9feba0 100644
--- a/Groceries/Components/Layout.razor
+++ b/Groceries/Components/Layout.razor
@@ -9,10 +9,12 @@
     <meta name="view-transition" content="same-origin" />
     <meta name="turbo-prefetch" content="false" />
 
-    <link rel="stylesheet" type="text/css" href="/css/main.css" asp-append-version="true" data-turbo-track="reload" />
+    <link rel="stylesheet" type="text/css" href="@Assets["css/main.css"]" data-turbo-track="reload" />
 
-    <script type="module" src="/js/main.js" asp-append-version="true" data-turbo-track="reload"></script>
-    <script type="module" src="/lib/hotwired/turbo/dist/turbo.es2017-esm.js"></script>
+    <ImportMap />
+
+    <script type="module" src="@Assets["js/main.js"]" data-turbo-track="reload"></script>
+    <script type="module" src="@Assets["lib/hotwired/turbo/dist/turbo.es2017-esm.js"]"></script>
 
     <HeadOutlet />
 </head>
diff --git a/Groceries/Program.cs b/Groceries/Program.cs
index f690b8e..5b0acb0 100644
--- a/Groceries/Program.cs
+++ b/Groceries/Program.cs
@@ -51,11 +51,12 @@ builder.Services.AddDbContextPool<AppDbContext>(options => options
 
 var app = builder.Build();
 
-app.UseStaticFiles();
 app.UseRouting();
 app.UseSession();
 
-app.MapControllers();
+app.MapStaticAssets();
+app.MapControllers()
+    .WithStaticAssets();
 
 await app.RunAsync();