diff --git a/files/assets/css/4chan.css b/files/assets/css/themes/4chan.css
similarity index 99%
rename from files/assets/css/4chan.css
rename to files/assets/css/themes/4chan.css
index 4f1b85513..fddb4bf9a 100644
--- a/files/assets/css/4chan.css
+++ b/files/assets/css/themes/4chan.css
@@ -1,5 +1,4 @@
 @charset "UTF-8";
-
 :root {
 	--dark: #3E2C18;
 	--secondary: #FFE;
diff --git a/files/assets/css/classic.css b/files/assets/css/themes/classic.css
similarity index 100%
rename from files/assets/css/classic.css
rename to files/assets/css/themes/classic.css
diff --git a/files/assets/css/classic_dark.css b/files/assets/css/themes/classic_dark.css
similarity index 100%
rename from files/assets/css/classic_dark.css
rename to files/assets/css/themes/classic_dark.css
diff --git a/files/assets/css/coffee.css b/files/assets/css/themes/coffee.css
similarity index 100%
rename from files/assets/css/coffee.css
rename to files/assets/css/themes/coffee.css
diff --git a/files/assets/css/dark.css b/files/assets/css/themes/dark.css
similarity index 100%
rename from files/assets/css/dark.css
rename to files/assets/css/themes/dark.css
diff --git a/files/assets/css/dramblr.css b/files/assets/css/themes/dramblr.css
similarity index 100%
rename from files/assets/css/dramblr.css
rename to files/assets/css/themes/dramblr.css
diff --git a/files/assets/css/light.css b/files/assets/css/themes/light.css
similarity index 100%
rename from files/assets/css/light.css
rename to files/assets/css/themes/light.css
diff --git a/files/assets/css/midnight.css b/files/assets/css/themes/midnight.css
similarity index 100%
rename from files/assets/css/midnight.css
rename to files/assets/css/themes/midnight.css
diff --git a/files/assets/css/tron.css b/files/assets/css/themes/tron.css
similarity index 100%
rename from files/assets/css/tron.css
rename to files/assets/css/themes/tron.css
diff --git a/files/assets/css/win98.css b/files/assets/css/themes/win98.css
similarity index 100%
rename from files/assets/css/win98.css
rename to files/assets/css/themes/win98.css
diff --git a/files/templates/util/html_head.html b/files/templates/util/html_head.html
index 7b2728905..43cf5e43e 100644
--- a/files/templates/util/html_head.html
+++ b/files/templates/util/html_head.html
@@ -105,9 +105,9 @@
 		{% endif %}
 		{% if include_user_css and not IS_FISTMAS() %}
 			{% if v.theme == 'classic_dark' %}
-				<link rel="stylesheet" href="{{('css/classic.css') | asset}}">
+				<link rel="stylesheet" href="{{('css/themes/classic.css') | asset}}">
 			{% endif %}
-			<link rel="stylesheet" href="{{('css/'~v.theme~'.css') | asset}}">
+			<link rel="stylesheet" href="{{('css/themes/'~v.theme~'.css') | asset}}">
 			{% if (v.css or v.background) and not request.path.startswith('/settings') %}
 				<link rel="stylesheet" href="/@{{v.username}}/css">
 			{% endif %}
@@ -115,10 +115,10 @@
 				<link rel="stylesheet" href="{{('css/30409f.css') | asset}}">
 			{% endif %}
 		{% else %}
-			<link rel="stylesheet" href="{{('css/'~DEFAULT_THEME~'.css') | asset}}">
+			<link rel="stylesheet" href="{{('css/themes/'~DEFAULT_THEME~'.css') | asset}}">
 		{% endif %}
 	{% else %}
-		<link rel="stylesheet" href="{{('css/'~DEFAULT_THEME~'.css') | asset}}">
+		<link rel="stylesheet" href="{{('css/themes/'~DEFAULT_THEME~'.css') | asset}}">
 	{% endif %}
 
 	<link rel="stylesheet" href="{{'css/awards.css' | asset}}">