diff --git a/archivebox/config.py b/archivebox/config.py
index 32f27dfa..68d32939 100644
--- a/archivebox/config.py
+++ b/archivebox/config.py
@@ -275,7 +275,7 @@ DERIVED_CONFIG_DEFAULTS: ConfigDefaultDict = {
     'ANSI':                     {'default': lambda c: DEFAULT_CLI_COLORS if c['USE_COLOR'] else {k: '' for k in DEFAULT_CLI_COLORS.keys()}},
 
     'PACKAGE_DIR':              {'default': lambda c: Path(__file__).resolve().parent},
-    'TEMPLATES_DIR':            {'default': lambda c: c['PACKAGE_DIR'] / TEMPLATES_DIR_NAME / 'legacy'},
+    'TEMPLATES_DIR':            {'default': lambda c: c['PACKAGE_DIR'] / TEMPLATES_DIR_NAME},
 
     'OUTPUT_DIR':               {'default': lambda c: Path(c['OUTPUT_DIR']).resolve() if c['OUTPUT_DIR'] else Path(os.curdir).resolve()},
     'ARCHIVE_DIR':              {'default': lambda c: c['OUTPUT_DIR'] / ARCHIVE_DIR_NAME},
@@ -682,7 +682,7 @@ def get_code_locations(config: ConfigDict) -> SimpleConfigValueDict:
         'TEMPLATES_DIR': {
             'path': (config['TEMPLATES_DIR']).resolve(),
             'enabled': True,
-            'is_valid': (config['TEMPLATES_DIR'] / 'static').exists(),
+            'is_valid': (config['TEMPLATES_DIR'] / config['ACTIVE_THEME'] / 'static').exists(),
         },
         # 'NODE_MODULES_DIR': {
         #     'path': ,
diff --git a/archivebox/core/settings.py b/archivebox/core/settings.py
index 43a1e153..e8ed6b16 100644
--- a/archivebox/core/settings.py
+++ b/archivebox/core/settings.py
@@ -12,6 +12,7 @@ from ..config import (
     ALLOWED_HOSTS,
     PACKAGE_DIR,
     ACTIVE_THEME,
+    TEMPLATES_DIR_NAME,
     SQL_INDEX_FILENAME,
     OUTPUT_DIR,
 )
@@ -68,14 +69,14 @@ AUTHENTICATION_BACKENDS = [
 STATIC_URL = '/static/'
 
 STATICFILES_DIRS = [
-    str(Path(PACKAGE_DIR) / 'themes' / ACTIVE_THEME / 'static'),
-    str(Path(PACKAGE_DIR) / 'themes' / 'default' / 'static'),
+    str(Path(PACKAGE_DIR) / TEMPLATES_DIR_NAME / ACTIVE_THEME / 'static'),
+    str(Path(PACKAGE_DIR) / TEMPLATES_DIR_NAME / 'default' / 'static'),
 ]
 
 TEMPLATE_DIRS = [
-    str(Path(PACKAGE_DIR) / 'themes' / ACTIVE_THEME),
-    str(Path(PACKAGE_DIR) / 'themes' / 'default'),
-    str(Path(PACKAGE_DIR) / 'themes'),
+    str(Path(PACKAGE_DIR) / TEMPLATES_DIR_NAME / ACTIVE_THEME),
+    str(Path(PACKAGE_DIR) / TEMPLATES_DIR_NAME / 'default'),
+    str(Path(PACKAGE_DIR) / TEMPLATES_DIR_NAME),
 ]
 
 TEMPLATES = [