diff --git a/styles/styleTree/app.ts b/styles/styleTree/app.ts
index a65442db07..c7edfdc270 100644
--- a/styles/styleTree/app.ts
+++ b/styles/styleTree/app.ts
@@ -1,10 +1,10 @@
-import chatPanel from "./chat-panel";
+import Theme from "../themes/theme";
+import chatPanel from "./chatPanel";
 import { backgroundColor, borderColor, text } from "./components";
 import editor from "./editor";
-import projectPanel from "./project-panel";
+import projectPanel from "./projectPanel";
 import search from "./search";
-import selectorModal from "./selector-modal";
-import Theme from "./theme";
+import selectorModal from "./selectorModal";
 import workspace from "./workspace";
 
 export const panel = {
diff --git a/styles/styleTree/chatPanel.ts b/styles/styleTree/chatPanel.ts
index c6bf0148ea..ea9a8ffe22 100644
--- a/styles/styleTree/chatPanel.ts
+++ b/styles/styleTree/chatPanel.ts
@@ -1,3 +1,4 @@
+import Theme from "../themes/theme";
 import { panel } from "./app";
 import {
   backgroundColor,
@@ -5,9 +6,8 @@ import {
   player,
   shadow,
   text,
-  TextColor,
+  TextColor
 } from "./components";
-import Theme from "./theme";
 
 export default function chatPanel(theme: Theme) {
   function channelSelectItem(
diff --git a/styles/styleTree/components.ts b/styles/styleTree/components.ts
index b54956facc..8038cdcd3b 100644
--- a/styles/styleTree/components.ts
+++ b/styles/styleTree/components.ts
@@ -1,7 +1,7 @@
 import chroma from "chroma-js";
+import Theme, { BackgroundColor, Weight } from "../themes/theme";
 import core from "../tokens/core";
 import { Color } from "../utils/color";
-import Theme, { BackgroundColor, Weight } from "../themes/theme";
 
 export type TextColor = keyof Theme["textColor"];
 
diff --git a/styles/styleTree/editor.ts b/styles/styleTree/editor.ts
index a27464eee2..5d800881e2 100644
--- a/styles/styleTree/editor.ts
+++ b/styles/styleTree/editor.ts
@@ -1,3 +1,4 @@
+import Theme from "../themes/theme";
 import {
   backgroundColor,
   border,
@@ -6,7 +7,6 @@ import {
   text,
   TextColor
 } from "./components";
-import Theme from "./theme";
 
 export default function editor(theme: Theme) {
   const autocompleteItem = {
diff --git a/styles/styleTree/search.ts b/styles/styleTree/search.ts
index ced2266ea7..fd2fd25681 100644
--- a/styles/styleTree/search.ts
+++ b/styles/styleTree/search.ts
@@ -1,5 +1,5 @@
+import Theme from "../themes/theme";
 import { backgroundColor, border, player, text } from "./components";
-import Theme from "./theme";
 
 export default function search(theme: Theme) {
   const optionButton = {
diff --git a/styles/styleTree/selectorModal.ts b/styles/styleTree/selectorModal.ts
index ddba32683a..fdebe712fa 100644
--- a/styles/styleTree/selectorModal.ts
+++ b/styles/styleTree/selectorModal.ts
@@ -1,5 +1,5 @@
+import Theme from "../themes/theme";
 import { backgroundColor, border, player, shadow, text } from "./components";
-import Theme from "./theme";
 
 export default function selectorModal(theme: Theme): Object {
   const item = {
diff --git a/styles/styleTree/workspace.ts b/styles/styleTree/workspace.ts
index 1a50fe9ee1..e8232442b6 100644
--- a/styles/styleTree/workspace.ts
+++ b/styles/styleTree/workspace.ts
@@ -1,5 +1,5 @@
+import Theme from "../themes/theme";
 import { backgroundColor, border, iconColor, text } from "./components";
-import Theme from "./theme";
 
 export default function workspace(theme: Theme) {
   const signInPrompt = {