diff --git a/COMPONENT_INDEX.md b/COMPONENT_INDEX.md
index f572789659..236a213a1c 100644
--- a/COMPONENT_INDEX.md
+++ b/COMPONENT_INDEX.md
@@ -50,6 +50,7 @@
 - [`FormGroup`](#formgroup)
 - [`FormItem`](#formitem)
 - [`FormLabel`](#formlabel)
+- [`GlobalTheme`](#globaltheme)
 - [`Grid`](#grid)
 - [`Header`](#header)
 - [`HeaderAction`](#headeraction)
@@ -148,7 +149,6 @@
 - [`TextAreaSkeleton`](#textareaskeleton)
 - [`TextInput`](#textinput)
 - [`TextInputSkeleton`](#textinputskeleton)
-- [`Theme`](#theme)
 - [`Tile`](#tile)
 - [`TileGroup`](#tilegroup)
 - [`TimePicker`](#timepicker)
@@ -1538,6 +1538,38 @@ None.
 | mouseenter | forwarded | --     |
 | mouseleave | forwarded | --     |
 
+## `GlobalTheme`
+
+### Types
+
+```ts
+export type CarbonTheme = "white" | "g10" | "g80" | "g90" | "g100";
+```
+
+### Props
+
+| Prop name  | Required | Kind             | Reactive | Type                                                                                                           | Default value                                                                                                 | Description                                                                                                                    |
+| :--------- | :------- | :--------------- | :------- | -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
+| theme      | No       | <code>let</code> | Yes      | <code>CarbonTheme</code>                                                                                       | <code>"white"</code>                                                                                          | Set the current Carbon theme                                                                                                   |
+| tokens     | No       | <code>let</code> | No       | <code>{ [token: string]: any; }</code>                                                                         | <code>{}</code>                                                                                               | Customize a theme with your own tokens<br />@see https://carbondesignsystem.com/guidelines/themes/overview#customizing-a-theme |
+| persist    | No       | <code>let</code> | No       | <code>boolean</code>                                                                                           | <code>false</code>                                                                                            | Set to `true` to persist the theme using window.localStorage                                                                   |
+| persistKey | No       | <code>let</code> | No       | <code>string</code>                                                                                            | <code>"theme"</code>                                                                                          | Specify the local storage key                                                                                                  |
+| render     | No       | <code>let</code> | No       | <code>"toggle" &#124; "select"</code>                                                                          | <code>undefined</code>                                                                                        | Render a toggle or select dropdown to control the theme                                                                        |
+| toggle     | No       | <code>let</code> | No       | <code>import("../Toggle/Toggle").ToggleProps & { themes?: [labelA: CarbonTheme, labelB: CarbonTheme]; }</code> | <code>{ themes: ["white", "g100"], labelA: "", labelB: "", labelText: "Dark mode", hideLabel: false, }</code> | Override the default toggle props                                                                                              |
+| select     | No       | <code>let</code> | No       | <code>import("../Select/Select").SelectProps & { themes?: CarbonTheme[]; }</code>                              | <code>{ themes: themeKeys, labelText: "Themes", hideLabel: false, }</code>                                    | Override the default select props                                                                                              |
+
+### Slots
+
+| Slot name | Default | Props                                 | Fallback |
+| :-------- | :------ | :------------------------------------ | :------- |
+| --        | Yes     | <code>{ theme: CarbonTheme; } </code> | --       |
+
+### Events
+
+| Event name | Type       | Detail                               |
+| :--------- | :--------- | :----------------------------------- |
+| update     | dispatched | <code>{ theme: CarbonTheme; }</code> |
+
 ## `Grid`
 
 ### Props
@@ -4159,38 +4191,6 @@ None.
 | mouseenter | forwarded | --     |
 | mouseleave | forwarded | --     |
 
-## `Theme`
-
-### Types
-
-```ts
-export type CarbonTheme = "white" | "g10" | "g80" | "g90" | "g100";
-```
-
-### Props
-
-| Prop name  | Required | Kind             | Reactive | Type                                                                                                           | Default value                                                                                                 | Description                                                                                                                    |
-| :--------- | :------- | :--------------- | :------- | -------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
-| theme      | No       | <code>let</code> | Yes      | <code>CarbonTheme</code>                                                                                       | <code>"white"</code>                                                                                          | Set the current Carbon theme                                                                                                   |
-| tokens     | No       | <code>let</code> | No       | <code>{ [token: string]: any; }</code>                                                                         | <code>{}</code>                                                                                               | Customize a theme with your own tokens<br />@see https://carbondesignsystem.com/guidelines/themes/overview#customizing-a-theme |
-| persist    | No       | <code>let</code> | No       | <code>boolean</code>                                                                                           | <code>false</code>                                                                                            | Set to `true` to persist the theme using window.localStorage                                                                   |
-| persistKey | No       | <code>let</code> | No       | <code>string</code>                                                                                            | <code>"theme"</code>                                                                                          | Specify the local storage key                                                                                                  |
-| render     | No       | <code>let</code> | No       | <code>"toggle" &#124; "select"</code>                                                                          | <code>undefined</code>                                                                                        | Render a toggle or select dropdown to control the theme                                                                        |
-| toggle     | No       | <code>let</code> | No       | <code>import("../Toggle/Toggle").ToggleProps & { themes?: [labelA: CarbonTheme, labelB: CarbonTheme]; }</code> | <code>{ themes: ["white", "g100"], labelA: "", labelB: "", labelText: "Dark mode", hideLabel: false, }</code> | Override the default toggle props                                                                                              |
-| select     | No       | <code>let</code> | No       | <code>import("../Select/Select").SelectProps & { themes?: CarbonTheme[]; }</code>                              | <code>{ themes: themeKeys, labelText: "Themes", hideLabel: false, }</code>                                    | Override the default select props                                                                                              |
-
-### Slots
-
-| Slot name | Default | Props                                 | Fallback |
-| :-------- | :------ | :------------------------------------ | :------- |
-| --        | Yes     | <code>{ theme: CarbonTheme; } </code> | --       |
-
-### Events
-
-| Event name | Type       | Detail                               |
-| :--------- | :--------- | :----------------------------------- |
-| update     | dispatched | <code>{ theme: CarbonTheme; }</code> |
-
 ## `Tile`
 
 ### Props
diff --git a/docs/src/COMPONENT_API.json b/docs/src/COMPONENT_API.json
index 578a31d6e8..346fdfe102 100644
--- a/docs/src/COMPONENT_API.json
+++ b/docs/src/COMPONENT_API.json
@@ -4579,6 +4579,117 @@
       "typedefs": [],
       "rest_props": { "type": "Element", "name": "label" }
     },
+    {
+      "moduleName": "GlobalTheme",
+      "filePath": "src/GlobalTheme/GlobalTheme.svelte",
+      "props": [
+        {
+          "name": "theme",
+          "kind": "let",
+          "description": "Set the current Carbon theme",
+          "type": "CarbonTheme",
+          "value": "\"white\"",
+          "isFunction": false,
+          "isFunctionDeclaration": false,
+          "isRequired": false,
+          "constant": false,
+          "reactive": true
+        },
+        {
+          "name": "tokens",
+          "kind": "let",
+          "description": "Customize a theme with your own tokens\n@see https://carbondesignsystem.com/guidelines/themes/overview#customizing-a-theme",
+          "type": "{ [token: string]: any; }",
+          "value": "{}",
+          "isFunction": false,
+          "isFunctionDeclaration": false,
+          "isRequired": false,
+          "constant": false,
+          "reactive": false
+        },
+        {
+          "name": "persist",
+          "kind": "let",
+          "description": "Set to `true` to persist the theme using window.localStorage",
+          "type": "boolean",
+          "value": "false",
+          "isFunction": false,
+          "isFunctionDeclaration": false,
+          "isRequired": false,
+          "constant": false,
+          "reactive": false
+        },
+        {
+          "name": "persistKey",
+          "kind": "let",
+          "description": "Specify the local storage key",
+          "type": "string",
+          "value": "\"theme\"",
+          "isFunction": false,
+          "isFunctionDeclaration": false,
+          "isRequired": false,
+          "constant": false,
+          "reactive": false
+        },
+        {
+          "name": "render",
+          "kind": "let",
+          "description": "Render a toggle or select dropdown to control the theme",
+          "type": "\"toggle\" | \"select\"",
+          "isFunction": false,
+          "isFunctionDeclaration": false,
+          "isRequired": false,
+          "constant": false,
+          "reactive": false
+        },
+        {
+          "name": "toggle",
+          "kind": "let",
+          "description": "Override the default toggle props",
+          "type": "import(\"../Toggle/Toggle\").ToggleProps & { themes?: [labelA: CarbonTheme, labelB: CarbonTheme]; }",
+          "value": "{     themes: [\"white\", \"g100\"],     labelA: \"\",     labelB: \"\",     labelText: \"Dark mode\",     hideLabel: false,   }",
+          "isFunction": false,
+          "isFunctionDeclaration": false,
+          "isRequired": false,
+          "constant": false,
+          "reactive": false
+        },
+        {
+          "name": "select",
+          "kind": "let",
+          "description": "Override the default select props",
+          "type": "import(\"../Select/Select\").SelectProps & { themes?: CarbonTheme[]; }",
+          "value": "{     themes: themeKeys,     labelText: \"Themes\",     hideLabel: false,   }",
+          "isFunction": false,
+          "isFunctionDeclaration": false,
+          "isRequired": false,
+          "constant": false,
+          "reactive": false
+        }
+      ],
+      "moduleExports": [],
+      "slots": [
+        {
+          "name": "__default__",
+          "default": true,
+          "slot_props": "{ theme: CarbonTheme; }"
+        }
+      ],
+      "events": [
+        {
+          "type": "dispatched",
+          "name": "update",
+          "detail": "{ theme: CarbonTheme; }"
+        }
+      ],
+      "typedefs": [
+        {
+          "type": "\"white\" | \"g10\" | \"g80\" | \"g90\" | \"g100\"",
+          "name": "CarbonTheme",
+          "ts": "type CarbonTheme = \"white\" | \"g10\" | \"g80\" | \"g90\" | \"g100\""
+        }
+      ]
+    },
     {
       "moduleName": "Grid",
       "filePath": "src/Grid/Grid.svelte",
@@ -12837,117 +12948,6 @@
       "typedefs": [],
       "rest_props": { "type": "Element", "name": "div" }
     },
-    {
-      "moduleName": "Theme",
-      "filePath": "src/Theme/Theme.svelte",
-      "props": [
-        {
-          "name": "theme",
-          "kind": "let",
-          "description": "Set the current Carbon theme",
-          "type": "CarbonTheme",
-          "value": "\"white\"",
-          "isFunction": false,
-          "isFunctionDeclaration": false,
-          "isRequired": false,
-          "constant": false,
-          "reactive": true
-        },
-        {
-          "name": "tokens",
-          "kind": "let",
-          "description": "Customize a theme with your own tokens\n@see https://carbondesignsystem.com/guidelines/themes/overview#customizing-a-theme",
-          "type": "{ [token: string]: any; }",
-          "value": "{}",
-          "isFunction": false,
-          "isFunctionDeclaration": false,
-          "isRequired": false,
-          "constant": false,
-          "reactive": false
-        },
-        {
-          "name": "persist",
-          "kind": "let",
-          "description": "Set to `true` to persist the theme using window.localStorage",
-          "type": "boolean",
-          "value": "false",
-          "isFunction": false,
-          "isFunctionDeclaration": false,
-          "isRequired": false,
-          "constant": false,
-          "reactive": false
-        },
-        {
-          "name": "persistKey",
-          "kind": "let",
-          "description": "Specify the local storage key",
-          "type": "string",
-          "value": "\"theme\"",
-          "isFunction": false,
-          "isFunctionDeclaration": false,
-          "isRequired": false,
-          "constant": false,
-          "reactive": false
-        },
-        {
-          "name": "render",
-          "kind": "let",
-          "description": "Render a toggle or select dropdown to control the theme",
-          "type": "\"toggle\" | \"select\"",
-          "isFunction": false,
-          "isFunctionDeclaration": false,
-          "isRequired": false,
-          "constant": false,
-          "reactive": false
-        },
-        {
-          "name": "toggle",
-          "kind": "let",
-          "description": "Override the default toggle props",
-          "type": "import(\"../Toggle/Toggle\").ToggleProps & { themes?: [labelA: CarbonTheme, labelB: CarbonTheme]; }",
-          "value": "{     themes: [\"white\", \"g100\"],     labelA: \"\",     labelB: \"\",     labelText: \"Dark mode\",     hideLabel: false,   }",
-          "isFunction": false,
-          "isFunctionDeclaration": false,
-          "isRequired": false,
-          "constant": false,
-          "reactive": false
-        },
-        {
-          "name": "select",
-          "kind": "let",
-          "description": "Override the default select props",
-          "type": "import(\"../Select/Select\").SelectProps & { themes?: CarbonTheme[]; }",
-          "value": "{     themes: themeKeys,     labelText: \"Themes\",     hideLabel: false,   }",
-          "isFunction": false,
-          "isFunctionDeclaration": false,
-          "isRequired": false,
-          "constant": false,
-          "reactive": false
-        }
-      ],
-      "moduleExports": [],
-      "slots": [
-        {
-          "name": "__default__",
-          "default": true,
-          "slot_props": "{ theme: CarbonTheme; }"
-        }
-      ],
-      "events": [
-        {
-          "type": "dispatched",
-          "name": "update",
-          "detail": "{ theme: CarbonTheme; }"
-        }
-      ],
-      "typedefs": [
-        {
-          "type": "\"white\" | \"g10\" | \"g80\" | \"g90\" | \"g100\"",
-          "name": "CarbonTheme",
-          "ts": "type CarbonTheme = \"white\" | \"g10\" | \"g80\" | \"g90\" | \"g100\""
-        }
-      ]
-    },
     {
       "moduleName": "Tile",
       "filePath": "src/Tile/Tile.svelte",
diff --git a/docs/src/pages/_layout.svelte b/docs/src/pages/_layout.svelte
index b506dea72e..9abaa8d4d0 100644
--- a/docs/src/pages/_layout.svelte
+++ b/docs/src/pages/_layout.svelte
@@ -12,7 +12,7 @@
     SideNav,
     SideNavItems,
     SideNavMenuItem,
-    Theme,
+    GlobalTheme,
     Tag,
   } from "carbon-components-svelte";
   import LogoGithub from "carbon-icons-svelte/lib/LogoGithub.svelte";
@@ -39,7 +39,7 @@
 <!-- routify:options bundle=true -->
 <svelte:window bind:innerWidth />
 
-<Theme persist bind:theme="{$theme}">
+<GlobalTheme persist bind:theme="{$theme}">
   <Header
     aria-label="Navigation"
     href="{$url('/')}"
@@ -129,7 +129,7 @@
     </SideNavItems>
   </SideNav>
   <slot />
-</Theme>
+</GlobalTheme>
 
 <style>
   .platform-name {
diff --git a/docs/src/pages/components/Theme.svx b/docs/src/pages/components/GlobalTheme.svx
similarity index 66%
rename from docs/src/pages/components/Theme.svx
rename to docs/src/pages/components/GlobalTheme.svx
index 9a5cab2f72..74261695f4 100644
--- a/docs/src/pages/components/Theme.svx
+++ b/docs/src/pages/components/GlobalTheme.svx
@@ -5,10 +5,10 @@
   let code = `import "carbon-components-svelte/css/all.css";`;
 </script>
 
-The `Theme` component can dyanmically update the Carbon theme on the client-side. It can persist the theme locally using [window.localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage).
+The `GlobalTheme` component can dyanmically update the Carbon theme on the client-side. It can persist the theme locally using [window.localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage).
 
 <InlineNotification svx-ignore lowContrast title="Note:" kind="info" hideCloseButton>
-  <div class="body-short-01">You must use the "all.css" StyleSheet with the <code>Theme</code> component.</div>
+  <div class="body-short-01">You must use the "all.css" StyleSheet with the <code>GlobalTheme</code> component.</div>
 </InlineNotification>
 
 The `all.css` StyleSheet uses [CSS variables](https://developer.mozilla.org/en-US/docs/Web/CSS/Using_CSS_custom_properties) for dynamic theming.
@@ -17,40 +17,40 @@ The `all.css` StyleSheet uses [CSS variables](https://developer.mozilla.org/en-U
 
 ## Default
 
-<FileSource src="/framed/Theme/Theme" />
+<FileSource src="/framed/GlobalTheme/GlobalTheme" />
 
 ## Persist locally
 
 Set `persist` to `true` to persist the theme locally using the [Window.localStorage API](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage).
 
-<FileSource src="/framed/Theme/ThemePersist" />
+<FileSource src="/framed/GlobalTheme/GlobalThemePersist" />
 
 ## Custom theme
 
 Define keys and values in the `tokens` prop that override default Carbon theme tokens. Refer to the [Carbon website](https://carbondesignsystem.com/guidelines/themes/overview#customizing-a-theme) for guidance on customizing a theme using token values.
 
-<FileSource src="/framed/Theme/ThemeTokens" />
+<FileSource src="/framed/GlobalTheme/GlobalThemeTokens" />
 
 ## Theme toggle
 
 Set `render` to `"toggle"` to render a toggle switch to control the theme.
 
-<FileSource src="/framed/Theme/ThemeToggle" />
+<FileSource src="/framed/GlobalTheme/GlobalThemeToggle" />
 
 ## Theme toggle (custom)
 
 Customize the toggle using the `toggle` prop.
 
-<FileSource src="/framed/Theme/ThemeToggleCustom" />
+<FileSource src="/framed/GlobalTheme/GlobalThemeToggleCustom" />
 
 ## Theme select
 
 Set `render` to `"select"` to render a select dropdown to control the theme.
 
-<FileSource src="/framed/Theme/ThemeSelect" />
+<FileSource src="/framed/GlobalTheme/GlobalThemeSelect" />
 
 ## Theme select (custom)
 
 Customize the select using the `select` prop.
 
-<FileSource src="/framed/Theme/ThemeSelectCustom" />
\ No newline at end of file
+<FileSource src="/framed/GlobalTheme/GlobalThemeSelectCustom" />
\ No newline at end of file
diff --git a/docs/src/pages/framed/Theme/Theme.svelte b/docs/src/pages/framed/GlobalTheme/GlobalTheme.svelte
similarity index 88%
rename from docs/src/pages/framed/Theme/Theme.svelte
rename to docs/src/pages/framed/GlobalTheme/GlobalTheme.svelte
index b99cb54071..04b4e5412c 100644
--- a/docs/src/pages/framed/Theme/Theme.svelte
+++ b/docs/src/pages/framed/GlobalTheme/GlobalTheme.svelte
@@ -1,6 +1,6 @@
 <script>
   import {
-    Theme,
+    GlobalTheme,
     RadioButtonGroup,
     RadioButton,
   } from "carbon-components-svelte";
@@ -8,7 +8,7 @@
   let theme = "g90";
 </script>
 
-<Theme bind:theme />
+<GlobalTheme bind:theme />
 
 <RadioButtonGroup legendText="Carbon theme" bind:selected="{theme}">
   {#each ["white", "g10", "g80", "g90", "g100"] as value}
diff --git a/docs/src/pages/framed/Theme/ThemePersist.svelte b/docs/src/pages/framed/GlobalTheme/GlobalThemePersist.svelte
similarity index 81%
rename from docs/src/pages/framed/Theme/ThemePersist.svelte
rename to docs/src/pages/framed/GlobalTheme/GlobalThemePersist.svelte
index bd43a91a08..1726e7e318 100644
--- a/docs/src/pages/framed/Theme/ThemePersist.svelte
+++ b/docs/src/pages/framed/GlobalTheme/GlobalThemePersist.svelte
@@ -1,6 +1,6 @@
 <script>
   import {
-    Theme,
+    GlobalTheme,
     RadioButtonGroup,
     RadioButton,
   } from "carbon-components-svelte";
@@ -8,7 +8,7 @@
   let theme = "g90";
 </script>
 
-<Theme bind:theme persist persistKey="__carbon-theme" />
+<GlobalTheme bind:theme persist persistKey="__carbon-theme" />
 
 <RadioButtonGroup legendText="Carbon theme" bind:selected="{theme}">
   {#each ["white", "g10", "g80", "g90", "g100"] as value}
diff --git a/docs/src/pages/framed/GlobalTheme/GlobalThemeSelect.svelte b/docs/src/pages/framed/GlobalTheme/GlobalThemeSelect.svelte
new file mode 100644
index 0000000000..4c005d9595
--- /dev/null
+++ b/docs/src/pages/framed/GlobalTheme/GlobalThemeSelect.svelte
@@ -0,0 +1,5 @@
+<script>
+  import { GlobalTheme } from "carbon-components-svelte";
+</script>
+
+<GlobalTheme render="select" />
diff --git a/docs/src/pages/framed/Theme/ThemeSelectCustom.svelte b/docs/src/pages/framed/GlobalTheme/GlobalThemeSelectCustom.svelte
similarity index 67%
rename from docs/src/pages/framed/Theme/ThemeSelectCustom.svelte
rename to docs/src/pages/framed/GlobalTheme/GlobalThemeSelectCustom.svelte
index 0a8ad4b13e..b9f15c10f2 100644
--- a/docs/src/pages/framed/Theme/ThemeSelectCustom.svelte
+++ b/docs/src/pages/framed/GlobalTheme/GlobalThemeSelectCustom.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { Theme } from "carbon-components-svelte";
+  import { GlobalTheme } from "carbon-components-svelte";
 </script>
 
-<Theme
+<GlobalTheme
   render="select"
   select="{{
     themes: ['white', 'g90', 'g100'],
diff --git a/docs/src/pages/framed/GlobalTheme/GlobalThemeToggle.svelte b/docs/src/pages/framed/GlobalTheme/GlobalThemeToggle.svelte
new file mode 100644
index 0000000000..71e4e2d388
--- /dev/null
+++ b/docs/src/pages/framed/GlobalTheme/GlobalThemeToggle.svelte
@@ -0,0 +1,5 @@
+<script>
+  import { GlobalTheme } from "carbon-components-svelte";
+</script>
+
+<GlobalTheme render="toggle" />
diff --git a/docs/src/pages/framed/Theme/ThemeToggleCustom.svelte b/docs/src/pages/framed/GlobalTheme/GlobalThemeToggleCustom.svelte
similarity index 72%
rename from docs/src/pages/framed/Theme/ThemeToggleCustom.svelte
rename to docs/src/pages/framed/GlobalTheme/GlobalThemeToggleCustom.svelte
index 635bd7b340..7e222ec589 100644
--- a/docs/src/pages/framed/Theme/ThemeToggleCustom.svelte
+++ b/docs/src/pages/framed/GlobalTheme/GlobalThemeToggleCustom.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { Theme } from "carbon-components-svelte";
+  import { GlobalTheme } from "carbon-components-svelte";
 </script>
 
-<Theme
+<GlobalTheme
   render="toggle"
   toggle="{{
     themes: ['g10', 'g80'],
diff --git a/docs/src/pages/framed/Theme/ThemeTokens.svelte b/docs/src/pages/framed/GlobalTheme/GlobalThemeTokens.svelte
similarity index 70%
rename from docs/src/pages/framed/Theme/ThemeTokens.svelte
rename to docs/src/pages/framed/GlobalTheme/GlobalThemeTokens.svelte
index 3a2b1d2fa4..e598b62ffb 100644
--- a/docs/src/pages/framed/Theme/ThemeTokens.svelte
+++ b/docs/src/pages/framed/GlobalTheme/GlobalThemeTokens.svelte
@@ -1,8 +1,8 @@
 <script>
-  import { Theme, Button } from "carbon-components-svelte";
+  import { GlobalTheme, Button } from "carbon-components-svelte";
 </script>
 
-<Theme
+<GlobalTheme
   theme="g90"
   tokens="{{
     'interactive-01': '#d02670',
diff --git a/docs/src/pages/framed/Theme/ThemeSelect.svelte b/docs/src/pages/framed/Theme/ThemeSelect.svelte
deleted file mode 100644
index 3d96752660..0000000000
--- a/docs/src/pages/framed/Theme/ThemeSelect.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-  import { Theme } from "carbon-components-svelte";
-</script>
-
-<Theme render="select" />
diff --git a/docs/src/pages/framed/Theme/ThemeToggle.svelte b/docs/src/pages/framed/Theme/ThemeToggle.svelte
deleted file mode 100644
index f1020cff69..0000000000
--- a/docs/src/pages/framed/Theme/ThemeToggle.svelte
+++ /dev/null
@@ -1,5 +0,0 @@
-<script>
-  import { Theme } from "carbon-components-svelte";
-</script>
-
-<Theme render="toggle" />
diff --git a/src/Theme/Theme.svelte b/src/GlobalTheme/GlobalTheme.svelte
similarity index 100%
rename from src/Theme/Theme.svelte
rename to src/GlobalTheme/GlobalTheme.svelte
diff --git a/src/GlobalTheme/index.js b/src/GlobalTheme/index.js
new file mode 100644
index 0000000000..6b8b6d9aae
--- /dev/null
+++ b/src/GlobalTheme/index.js
@@ -0,0 +1 @@
+export { default as GlobalTheme } from "./GlobalTheme.svelte";
diff --git a/src/Theme/index.js b/src/Theme/index.js
deleted file mode 100644
index 79f7e13d79..0000000000
--- a/src/Theme/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as Theme } from "./Theme.svelte";
diff --git a/src/index.js b/src/index.js
index ea1a84cf46..a0ad482458 100644
--- a/src/index.js
+++ b/src/index.js
@@ -112,7 +112,7 @@ export { Tabs, Tab, TabContent, TabsSkeleton } from "./Tabs";
 export { Tag, TagSkeleton } from "./Tag";
 export { TextArea, TextAreaSkeleton } from "./TextArea";
 export { TextInput, TextInputSkeleton, PasswordInput } from "./TextInput";
-export { Theme } from "./Theme";
+export { GlobalTheme } from "./GlobalTheme";
 export {
   Tile,
   ClickableTile,
diff --git a/tests/Theme.test.svelte b/tests/GlobalTheme.test.svelte
similarity index 73%
rename from tests/Theme.test.svelte
rename to tests/GlobalTheme.test.svelte
index e20e13d862..1217995101 100644
--- a/tests/Theme.test.svelte
+++ b/tests/GlobalTheme.test.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-  import { Theme } from "../types";
-  import type { CarbonTheme } from "../types/Theme/Theme.svelte";
+  import { GlobalTheme } from "../types";
+  import type { CarbonTheme } from "../types/GlobalTheme/GlobalTheme.svelte";
 
   let theme: CarbonTheme = "g10";
 </script>
 
-<Theme
+<GlobalTheme
   bind:theme
   persist
   persistKey="carbon-theme"
diff --git a/types/Theme/Theme.svelte.d.ts b/types/GlobalTheme/GlobalTheme.svelte.d.ts
similarity index 92%
rename from types/Theme/Theme.svelte.d.ts
rename to types/GlobalTheme/GlobalTheme.svelte.d.ts
index 6dfbefbc70..858c5e6b78 100644
--- a/types/Theme/Theme.svelte.d.ts
+++ b/types/GlobalTheme/GlobalTheme.svelte.d.ts
@@ -3,7 +3,7 @@ import type { SvelteComponentTyped } from "svelte";
 
 export type CarbonTheme = "white" | "g10" | "g80" | "g90" | "g100";
 
-export interface ThemeProps {
+export interface GlobalThemeProps {
   /**
    * Set the current Carbon theme
    * @default "white"
@@ -50,8 +50,8 @@ export interface ThemeProps {
   select?: import("../Select/Select").SelectProps & { themes?: CarbonTheme[] };
 }
 
-export default class Theme extends SvelteComponentTyped<
-  ThemeProps,
+export default class GlobalTheme extends SvelteComponentTyped<
+  GlobalThemeProps,
   { update: CustomEvent<{ theme: CarbonTheme }> },
   { default: { theme: CarbonTheme } }
 > {}
diff --git a/types/index.d.ts b/types/index.d.ts
index 1174ce26c1..bb045cfa42 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -127,7 +127,7 @@ export { default as TextAreaSkeleton } from "./TextArea/TextAreaSkeleton.svelte"
 export { default as TextInput } from "./TextInput/TextInput.svelte";
 export { default as TextInputSkeleton } from "./TextInput/TextInputSkeleton.svelte";
 export { default as PasswordInput } from "./TextInput/PasswordInput.svelte";
-export { default as Theme } from "./Theme/Theme.svelte";
+export { default as GlobalTheme } from "./GlobalTheme/GlobalTheme.svelte";
 export { default as Tile } from "./Tile/Tile.svelte";
 export { default as ClickableTile } from "./Tile/ClickableTile.svelte";
 export { default as ExpandableTile } from "./Tile/ExpandableTile.svelte";