diff --git a/packages/highlight/src/lib/core/build-theme.ts b/packages/highlight/src/lib/core/build-theme.ts
index d0b7fa717..40019a441 100644
--- a/packages/highlight/src/lib/core/build-theme.ts
+++ b/packages/highlight/src/lib/core/build-theme.ts
@@ -31,6 +31,6 @@ export function createThemeFactory<
 }
 
 export const createTheme = createThemeFactory(
-  '@codeimage/base-highlight',
+  '@codeimage/base-theme',
   <T extends CustomTheme>(_: T): T => _,
 );
diff --git a/packages/highlight/src/lib/core/custom-theme.ts b/packages/highlight/src/lib/core/custom-theme.ts
index 4f9ff4064..f5155fb73 100644
--- a/packages/highlight/src/lib/core/custom-theme.ts
+++ b/packages/highlight/src/lib/core/custom-theme.ts
@@ -24,34 +24,34 @@ export interface TerminalThemeProperties {
 
 export interface CustomThemeProperties {
   /**
-   * @description Label of highlight box preview
+   * @description Label of theme box preview
    */
   label: string;
   /**
-   * @description Background of highlight box preview
+   * @description Background of theme box preview
    */
   previewBackground: string;
   /**
-   * @description Enable/disable dark mode highlight
+   * @description Enable/disable dark mode theme
    */
   darkMode: boolean;
   /**
-   * @description MacOsTerminal highlight properties
+   * @description MacOsTerminal theme properties
    */
   terminal: TerminalThemeProperties;
 }
 
 export interface CustomTheme {
   /**
-   * Custom highlight identifier
+   * Custom theme identifier
    */
   id: string;
   /**
-   * Custom highlight editor base highlight extension
+   * Custom theme editor base theme extension
    */
   editorTheme: Extension;
   /**
-   * Custom highlight properties
+   * Custom theme properties
    */
   properties: CustomThemeProperties;
 }
diff --git a/packages/highlight/tsconfig.json b/packages/highlight/tsconfig.json
index 9bd0ae23f..be0f7c923 100644
--- a/packages/highlight/tsconfig.json
+++ b/packages/highlight/tsconfig.json
@@ -1,10 +1,10 @@
 {
-    "extends": "../../tsconfig.json",
-    "compilerOptions": {
-      "jsx": "preserve",
-      "jsxImportSource": "solid-js",
-    },
-    "include": [
-      "./src",
-    ]
-  }
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "jsx": "preserve",
+    "jsxImportSource": "solid-js"
+  },
+  "include": [
+    "./src"
+  ]
+}