diff --git a/styles/src/colorSchemes.ts b/styles/src/colorSchemes.ts
index e8d0687044..07eb26a591 100644
--- a/styles/src/colorSchemes.ts
+++ b/styles/src/colorSchemes.ts
@@ -4,7 +4,7 @@ import { ColorScheme, Meta } from "./themes/common/colorScheme"
 
 const THEMES_DIRECTORY = path.resolve(`${__dirname}/themes`)
 const STAFF_DIRECTORY = path.resolve(`${__dirname}/themes/staff`)
-const IGNORE_ITEMS = ["staff", "common", "template.ts"]
+const IGNORE_ITEMS = ["staff", "common", "common.ts"]
 const ACCEPT_EXTENSION = ".ts"
 
 function getAllTsFiles(directoryPath: string) {
diff --git a/styles/src/themes/common/atelier-common.ts b/styles/src/themes/atelier/common.ts
similarity index 96%
rename from styles/src/themes/common/atelier-common.ts
rename to styles/src/themes/atelier/common.ts
index 08a915d019..7fb07f7a6e 100644
--- a/styles/src/themes/common/atelier-common.ts
+++ b/styles/src/themes/atelier/common.ts
@@ -1,4 +1,4 @@
-import { License, Meta, ThemeSyntax } from "./colorScheme"
+import { License, Meta, ThemeSyntax } from "../common/colorScheme"
 
 export interface Variant {
     meta: Meta
diff --git a/styles/src/themes/ayu/ayu-dark.ts b/styles/src/themes/ayu/ayu-dark.ts
index eb837231fe..1dc663f161 100644
--- a/styles/src/themes/ayu/ayu-dark.ts
+++ b/styles/src/themes/ayu/ayu-dark.ts
@@ -1,5 +1,5 @@
 import { createColorScheme } from "../common/ramps"
-import { ayu, meta as themeMeta, buildTheme } from "../common/ayu-common"
+import { ayu, meta as themeMeta, buildTheme } from "./common"
 
 export const meta = {
     ...themeMeta,
diff --git a/styles/src/themes/ayu/ayu-light.ts b/styles/src/themes/ayu/ayu-light.ts
index 9c29449db5..2543521944 100644
--- a/styles/src/themes/ayu/ayu-light.ts
+++ b/styles/src/themes/ayu/ayu-light.ts
@@ -1,5 +1,5 @@
 import { createColorScheme } from "../common/ramps"
-import { ayu, meta as themeMeta, buildTheme } from "../common/ayu-common"
+import { ayu, meta as themeMeta, buildTheme } from "./common"
 
 export const meta = {
     ...themeMeta,
diff --git a/styles/src/themes/ayu/ayu-mirage.ts b/styles/src/themes/ayu/ayu-mirage.ts
index 52bf549392..2ada3678ee 100644
--- a/styles/src/themes/ayu/ayu-mirage.ts
+++ b/styles/src/themes/ayu/ayu-mirage.ts
@@ -1,5 +1,5 @@
 import { createColorScheme } from "../common/ramps"
-import { ayu, meta as themeMeta, buildTheme } from "../common/ayu-common"
+import { ayu, meta as themeMeta, buildTheme } from "./common"
 
 export const meta = {
     ...themeMeta,
diff --git a/styles/src/themes/common/ayu-common.ts b/styles/src/themes/ayu/common.ts
similarity index 95%
rename from styles/src/themes/common/ayu-common.ts
rename to styles/src/themes/ayu/common.ts
index f08817ef49..2d3687801f 100644
--- a/styles/src/themes/common/ayu-common.ts
+++ b/styles/src/themes/ayu/common.ts
@@ -1,8 +1,8 @@
 import { dark, light, mirage } from "ayu"
-import { ThemeSyntax } from "./syntax"
+import { ThemeSyntax } from "../common/syntax"
 import chroma from "chroma-js"
-import { colorRamp } from "./ramps"
-import { Meta } from "./colorScheme"
+import { colorRamp } from "../common/ramps"
+import { Meta } from "../common/colorScheme"
 
 export const ayu = {
     dark,