diff --git a/app/javascript/entrypoints/application.js b/app/javascript/entrypoints/application.js
index 4e607722d2d02..81faf8dbbe09a 100644
--- a/app/javascript/entrypoints/application.js
+++ b/app/javascript/entrypoints/application.js
@@ -1,9 +1,7 @@
 import { start } from '../mastodon/common';
-import { loadLocale } from '../mastodon/load_locale';
+import { loadLocale } from '../mastodon/locales/load_locale';
 import { loadPolyfills } from '../mastodon/polyfills';
 
-import 'styles/application.scss';
-
 start();
 
 loadPolyfills().then(loadLocale).then(async () => {
diff --git a/app/javascript/entrypoints/public.jsx b/app/javascript/entrypoints/public.jsx
index ed9156b9df336..0c10a36977487 100644
--- a/app/javascript/entrypoints/public.jsx
+++ b/app/javascript/entrypoints/public.jsx
@@ -15,7 +15,6 @@ import { loadLocale, getLocale } from '../mastodon/locales';
 import { loadPolyfills } from '../mastodon/polyfills';
 import ready from '../mastodon/ready';
 
-import "styles/application.scss";
 import 'cocoon-js-vanilla';
 
 start();
diff --git a/app/javascript/entrypoints/share.jsx b/app/javascript/entrypoints/share.jsx
index 8cd0a54f72eaf..f3a449cb6a4dd 100644
--- a/app/javascript/entrypoints/share.jsx
+++ b/app/javascript/entrypoints/share.jsx
@@ -4,8 +4,6 @@ import { start } from '../mastodon/common';
 import { loadPolyfills } from '../mastodon/polyfills';
 import ready from '../mastodon/ready';
 
-import 'styles/application.scss';
-
 start();
 
 async function loaded() {
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 8c0454f8a33f2..256bf67a4ac1c 100755
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -28,7 +28,9 @@
 
     = vite_client_tag
     = vite_react_refresh_tag
-    -# = vite_stylesheet_tag current_theme, media: 'all', crossorigin: 'anonymous'
+    = vite_stylesheet_tag "styles/application.scss", extname: false
+    - if current_theme != 'default'
+      = vite_stylesheet_tag "styles/#{current_theme}.scss", media: 'all', crossorigin: 'anonymous'
     = csrf_meta_tags unless skip_csrf_meta_tags?
     %meta{ name: 'style-nonce', content: request.content_security_policy_nonce }