diff --git a/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt b/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt
index 8ace1fd57..716d38ed5 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt
@@ -55,7 +55,7 @@ internal object IntUiThemeDescriptorReader {
         }.build()
 
     private val colorPaletteClassName =
-        ClassName.bestGuess("org.jetbrains.jewel.themes.intui.core.IntUiThemeColorPalette")
+        ClassName.bestGuess("org.jetbrains.jewel.intui.core.IntUiThemeColorPalette")
     private val iconDataClassName =
         ClassName.bestGuess("org.jetbrains.jewel.IntelliJThemeIconData")
 
diff --git a/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntelliJThemeGeneratorPlugin.kt b/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntelliJThemeGeneratorPlugin.kt
index 8b9ac863b..0512eeb50 100644
--- a/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntelliJThemeGeneratorPlugin.kt
+++ b/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntelliJThemeGeneratorPlugin.kt
@@ -105,8 +105,6 @@ open class IntelliJThemeGeneratorTask : DefaultTask() {
             .use { json.decodeFromStream<IntellijThemeDescriptor>(it) }
 
         val className = ClassName.bestGuess(themeClassName.get())
-
-        // TODO handle non-Int UI themes, too
         val file = IntUiThemeDescriptorReader.readThemeFrom(themeDescriptor, className, ideaVersion.get(), url)
 
         val outputFile = outputFile.get().asFile
diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeThemeColorPalette.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeThemeColorPalette.kt
index d96efce07..afd7bad0b 100644
--- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeThemeColorPalette.kt
+++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeThemeColorPalette.kt
@@ -4,7 +4,7 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.isSpecified
 import com.intellij.openapi.diagnostic.Logger
-import org.jetbrains.jewel.themes.intui.core.IntUiThemeColorPalette
+import org.jetbrains.jewel.intui.core.IntUiThemeColorPalette
 import java.util.TreeMap
 
 private val logger = Logger.getInstance("BridgeThemeColorPalette")
diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt
index d175c88f4..62ff507fe 100644
--- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt
+++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/IntUiBridge.kt
@@ -25,66 +25,66 @@ import org.jetbrains.jewel.CheckboxState
 import org.jetbrains.jewel.IntelliJComponentStyling
 import org.jetbrains.jewel.IntelliJThemeIconData
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.IntUiThemeDefinition
+import org.jetbrains.jewel.intui.standalone.styling.IntUiButtonColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiButtonMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiButtonStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiCheckboxColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiCheckboxIcons
+import org.jetbrains.jewel.intui.standalone.styling.IntUiCheckboxMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiCheckboxStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiChipColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiChipMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiChipStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiDropdownColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiDropdownIcons
+import org.jetbrains.jewel.intui.standalone.styling.IntUiDropdownMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiDropdownStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiGroupHeaderColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiGroupHeaderMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiGroupHeaderStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiHorizontalProgressBarColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiHorizontalProgressBarMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiHorizontalProgressBarStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLabelledTextFieldColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLabelledTextFieldMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLabelledTextFieldStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLabelledTextFieldTextStyles
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLazyTreeColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLazyTreeIcons
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLazyTreeMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLazyTreeStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLinkColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLinkIcons
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLinkMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLinkStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLinkTextStyles
+import org.jetbrains.jewel.intui.standalone.styling.IntUiMenuColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiMenuIcons
+import org.jetbrains.jewel.intui.standalone.styling.IntUiMenuItemColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiMenuItemMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiMenuMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiMenuStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiRadioButtonColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiRadioButtonIcons
+import org.jetbrains.jewel.intui.standalone.styling.IntUiRadioButtonMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiRadioButtonStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiScrollbarColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiScrollbarMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiScrollbarStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiSubmenuMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTabColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTabContentAlpha
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTabIcons
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTabMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTabStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTextAreaColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTextAreaMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTextAreaStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTextFieldColors
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTextFieldMetrics
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTextFieldStyle
 import org.jetbrains.jewel.styling.InputFieldStyle
-import org.jetbrains.jewel.themes.intui.core.IntUiThemeDefinition
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiButtonColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiButtonMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiButtonStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiCheckboxColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiCheckboxIcons
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiCheckboxMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiCheckboxStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiChipColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiChipMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiChipStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiDropdownColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiDropdownIcons
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiDropdownMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiDropdownStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiGroupHeaderColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiGroupHeaderMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiGroupHeaderStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiHorizontalProgressBarColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiHorizontalProgressBarMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiHorizontalProgressBarStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLabelledTextFieldColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLabelledTextFieldMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLabelledTextFieldStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLabelledTextFieldTextStyles
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLazyTreeColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLazyTreeIcons
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLazyTreeMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLazyTreeStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLinkColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLinkIcons
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLinkMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLinkStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLinkTextStyles
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiMenuColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiMenuIcons
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiMenuItemColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiMenuItemMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiMenuMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiMenuStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiRadioButtonColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiRadioButtonIcons
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiRadioButtonMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiRadioButtonStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiScrollbarColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiScrollbarMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiScrollbarStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiSubmenuMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTabColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTabContentAlpha
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTabIcons
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTabMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTabStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTextAreaColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTextAreaMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTextAreaStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTextFieldColors
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTextFieldMetrics
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTextFieldStyle
 import org.jetbrains.skiko.DependsOnJBR
 import javax.swing.UIManager
 import kotlin.time.Duration.Companion.milliseconds
diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt
index a2f1fef89..158555004 100644
--- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt
+++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt
@@ -21,8 +21,8 @@ import kotlinx.coroutines.flow.stateIn
 import org.jetbrains.jewel.IntelliJComponentStyling
 import org.jetbrains.jewel.JewelSvgLoader
 import org.jetbrains.jewel.SvgLoader
-import org.jetbrains.jewel.themes.intui.core.IntUiThemeDefinition
-import org.jetbrains.jewel.themes.intui.core.IntelliJSvgPatcher
+import org.jetbrains.jewel.intui.core.IntUiThemeDefinition
+import org.jetbrains.jewel.intui.core.IntelliJSvgPatcher
 import kotlin.time.Duration.Companion.milliseconds
 
 @Service(Level.APP)
diff --git a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeTheme.kt b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeTheme.kt
index 4b96f03dc..c172fa978 100644
--- a/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeTheme.kt
+++ b/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeTheme.kt
@@ -7,7 +7,7 @@ import androidx.compose.runtime.getValue
 import com.intellij.openapi.components.service
 import org.jetbrains.jewel.ExperimentalJewelApi
 import org.jetbrains.jewel.LocalResourceLoader
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 
 private val bridgeService = service<SwingBridgeService>()
 
diff --git a/int-ui/int-ui-core/build.gradle.kts b/int-ui/int-ui-core/build.gradle.kts
index b94a0ec85..53a0105a9 100644
--- a/int-ui/int-ui-core/build.gradle.kts
+++ b/int-ui/int-ui-core/build.gradle.kts
@@ -12,15 +12,16 @@ dependencies {
 }
 
 intelliJThemeGenerator {
+    val targetIdeaVersion = "232.9960"
     register("intUiLight") {
-        themeClassName = "org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme"
+        themeClassName = "org.jetbrains.jewel.intui.core.theme.IntUiLightTheme"
         themeFile = "platform/platform-resources/src/themes/expUI/expUI_light.theme.json"
-        ideaVersion = "232.6734"
+        ideaVersion = targetIdeaVersion
     }
     register("intUiDark") {
-        themeClassName = "org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme"
+        themeClassName = "org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme"
         themeFile = "platform/platform-resources/src/themes/expUI/expUI_dark.theme.json"
-        ideaVersion = "232.6734"
+        ideaVersion = targetIdeaVersion
     }
 }
 
diff --git a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/BaseIntUiTheme.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/BaseIntUiTheme.kt
similarity index 99%
rename from int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/BaseIntUiTheme.kt
rename to int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/BaseIntUiTheme.kt
index 0e090974e..9c00c2434 100644
--- a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/BaseIntUiTheme.kt
+++ b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/BaseIntUiTheme.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.core
+package org.jetbrains.jewel.intui.core
 
 import androidx.compose.foundation.LocalContextMenuRepresentation
 import androidx.compose.runtime.Composable
diff --git a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeColorPalette.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntUiThemeColorPalette.kt
similarity index 98%
rename from int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeColorPalette.kt
rename to int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntUiThemeColorPalette.kt
index 3406ca601..5cd4b6888 100644
--- a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeColorPalette.kt
+++ b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntUiThemeColorPalette.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.core
+package org.jetbrains.jewel.intui.core
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
diff --git a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeDefinition.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntUiThemeDefinition.kt
similarity index 97%
rename from int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeDefinition.kt
rename to int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntUiThemeDefinition.kt
index ccf43386b..cb042a0bd 100644
--- a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntUiThemeDefinition.kt
+++ b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntUiThemeDefinition.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.core
+package org.jetbrains.jewel.intui.core
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.text.TextStyle
diff --git a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntelliJSvgPatcher.kt b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntelliJSvgPatcher.kt
similarity index 99%
rename from int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntelliJSvgPatcher.kt
rename to int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntelliJSvgPatcher.kt
index 0fc82510e..7ca6db7f5 100644
--- a/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/themes/intui/core/IntelliJSvgPatcher.kt
+++ b/int-ui/int-ui-core/src/main/kotlin/org/jetbrains/jewel/intui/core/IntelliJSvgPatcher.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.core
+package org.jetbrains.jewel.intui.core
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalColors.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiGlobalColors.kt
similarity index 96%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalColors.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiGlobalColors.kt
index 1ea2411a7..4eeea0d03 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalColors.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiGlobalColors.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone
+package org.jetbrains.jewel.intui.standalone
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
@@ -6,8 +6,8 @@ import androidx.compose.ui.graphics.Color
 import org.jetbrains.jewel.BorderColors
 import org.jetbrains.jewel.GlobalColors
 import org.jetbrains.jewel.OutlineColors
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 
 @Immutable
 class IntUiGlobalColors(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalMetrics.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiGlobalMetrics.kt
similarity index 92%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalMetrics.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiGlobalMetrics.kt
index 62fb8698a..17e77e865 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiGlobalMetrics.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiGlobalMetrics.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone
+package org.jetbrains.jewel.intui.standalone
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.unit.Dp
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiTheme.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt
similarity index 84%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiTheme.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt
index 17023a8e3..0b5fb934b 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/IntUiTheme.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/IntUiTheme.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone
+package org.jetbrains.jewel.intui.standalone
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -24,6 +24,28 @@ import org.jetbrains.jewel.LocalResourceLoader
 import org.jetbrains.jewel.LocalTextStyle
 import org.jetbrains.jewel.SimpleResourceLoader
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.BaseIntUiTheme
+import org.jetbrains.jewel.intui.core.IntUiThemeColorPalette
+import org.jetbrains.jewel.intui.core.IntUiThemeDefinition
+import org.jetbrains.jewel.intui.core.IntelliJSvgPatcher
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme.defaultComponentStyling
+import org.jetbrains.jewel.intui.standalone.styling.IntUiButtonStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiCheckboxStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiChipStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiDropdownStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiGroupHeaderStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiHorizontalProgressBarStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLabelledTextFieldStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLazyTreeStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiLinkStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiMenuStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiRadioButtonStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiScrollbarStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTabStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTextAreaStyle
+import org.jetbrains.jewel.intui.standalone.styling.IntUiTextFieldStyle
 import org.jetbrains.jewel.styling.ButtonStyle
 import org.jetbrains.jewel.styling.CheckboxStyle
 import org.jetbrains.jewel.styling.ChipStyle
@@ -39,28 +61,6 @@ import org.jetbrains.jewel.styling.ScrollbarStyle
 import org.jetbrains.jewel.styling.TabStyle
 import org.jetbrains.jewel.styling.TextFieldStyle
 import org.jetbrains.jewel.themes.StandalonePaletteMapperFactory
-import org.jetbrains.jewel.themes.intui.core.BaseIntUiTheme
-import org.jetbrains.jewel.themes.intui.core.IntUiThemeColorPalette
-import org.jetbrains.jewel.themes.intui.core.IntUiThemeDefinition
-import org.jetbrains.jewel.themes.intui.core.IntelliJSvgPatcher
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme.defaultComponentStyling
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiButtonStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiCheckboxStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiChipStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiDropdownStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiGroupHeaderStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiHorizontalProgressBarStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLabelledTextFieldStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLazyTreeStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiLinkStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiMenuStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiRadioButtonStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiScrollbarStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTabStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTextAreaStyle
-import org.jetbrains.jewel.themes.intui.standalone.styling.IntUiTextFieldStyle
 
 object IntUiTheme : BaseIntUiTheme {
 
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/InterFont.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/InterFont.kt
similarity index 95%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/InterFont.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/InterFont.kt
index 5d1b8ab48..24339b67b 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/InterFont.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/InterFont.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone
+package org.jetbrains.jewel.intui.standalone
 
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiButtonStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt
similarity index 97%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiButtonStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt
index 7c7b157c4..029c45324 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiButtonStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
@@ -11,12 +11,12 @@ import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 import org.jetbrains.jewel.styling.ButtonColors
 import org.jetbrains.jewel.styling.ButtonMetrics
 import org.jetbrains.jewel.styling.ButtonStyle
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
 
 @Stable
 data class IntUiButtonStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiCheckboxStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt
similarity index 95%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiCheckboxStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt
index 44be4796e..a0a711fa5 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiCheckboxStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
@@ -11,6 +11,8 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.CheckboxState
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 import org.jetbrains.jewel.styling.CheckboxColors
 import org.jetbrains.jewel.styling.CheckboxIcons
 import org.jetbrains.jewel.styling.CheckboxMetrics
@@ -18,8 +20,6 @@ import org.jetbrains.jewel.styling.CheckboxStyle
 import org.jetbrains.jewel.styling.PainterProvider
 import org.jetbrains.jewel.styling.ResourcePainterProvider
 import org.jetbrains.jewel.styling.StatefulResourcePathPatcher
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
 
 @Immutable
 data class IntUiCheckboxStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiChipStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt
similarity index 97%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiChipStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt
index 5d0b92b0e..9937926a7 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiChipStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
@@ -10,11 +10,11 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 import org.jetbrains.jewel.styling.ChipColors
 import org.jetbrains.jewel.styling.ChipMetrics
 import org.jetbrains.jewel.styling.ChipStyle
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
 
 @Stable
 data class IntUiChipStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiDropdownStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt
similarity index 96%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiDropdownStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt
index 2d7f59dcc..b14f6f6db 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiDropdownStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
@@ -12,6 +12,9 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.DropdownState
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 import org.jetbrains.jewel.styling.DropdownColors
 import org.jetbrains.jewel.styling.DropdownIcons
 import org.jetbrains.jewel.styling.DropdownMetrics
@@ -19,9 +22,6 @@ import org.jetbrains.jewel.styling.DropdownStyle
 import org.jetbrains.jewel.styling.MenuStyle
 import org.jetbrains.jewel.styling.PainterProvider
 import org.jetbrains.jewel.styling.ResourcePainterProvider
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
 
 @Stable
 data class IntUiDropdownStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiGroupHeaderStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt
similarity index 90%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiGroupHeaderStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt
index 2bc3ad1f3..f25582164 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiGroupHeaderStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt
@@ -1,15 +1,15 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 import org.jetbrains.jewel.styling.GroupHeaderColors
 import org.jetbrains.jewel.styling.GroupHeaderMetrics
 import org.jetbrains.jewel.styling.GroupHeaderStyle
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
 
 @Immutable
 data class IntUiGroupHeaderStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt
similarity index 93%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt
index bb14b9f13..d0ffade62 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
@@ -6,11 +6,11 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 import org.jetbrains.jewel.styling.HorizontalProgressBarColors
 import org.jetbrains.jewel.styling.HorizontalProgressBarMetrics
 import org.jetbrains.jewel.styling.HorizontalProgressBarStyle
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt
similarity index 96%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt
index c9d99c01d..1ea4be9f1 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLabelledTextFieldStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
@@ -11,13 +11,13 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 import org.jetbrains.jewel.styling.LabelledTextFieldColors
 import org.jetbrains.jewel.styling.LabelledTextFieldMetrics
 import org.jetbrains.jewel.styling.LabelledTextFieldStyle
 import org.jetbrains.jewel.styling.LabelledTextFieldTextStyles
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
 
 @Stable
 data class IntUiLabelledTextFieldStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLazyTreeStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt
similarity index 96%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLazyTreeStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt
index 07f047280..1c83d7ef0 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLazyTreeStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
@@ -9,14 +9,14 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 import org.jetbrains.jewel.styling.LazyTreeColors
 import org.jetbrains.jewel.styling.LazyTreeIcons
 import org.jetbrains.jewel.styling.LazyTreeMetrics
 import org.jetbrains.jewel.styling.LazyTreeStyle
 import org.jetbrains.jewel.styling.PainterProvider
 import org.jetbrains.jewel.styling.ResourcePainterProvider
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
 
 @Stable
 data class IntUiLazyTreeStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLinkStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt
similarity index 95%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLinkStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt
index 73bebb22d..224077275 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiLinkStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
@@ -11,6 +11,9 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.LinkState
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 import org.jetbrains.jewel.styling.LinkColors
 import org.jetbrains.jewel.styling.LinkIcons
 import org.jetbrains.jewel.styling.LinkMetrics
@@ -18,9 +21,6 @@ import org.jetbrains.jewel.styling.LinkStyle
 import org.jetbrains.jewel.styling.LinkTextStyles
 import org.jetbrains.jewel.styling.PainterProvider
 import org.jetbrains.jewel.styling.ResourcePainterProvider
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
 
 @Immutable
 data class IntUiLinkStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiMenuStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt
similarity index 97%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiMenuStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt
index 1843d0ec0..9252303fa 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiMenuStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
@@ -11,6 +11,8 @@ import androidx.compose.ui.unit.DpOffset
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.MenuItemState
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 import org.jetbrains.jewel.styling.MenuColors
 import org.jetbrains.jewel.styling.MenuIcons
 import org.jetbrains.jewel.styling.MenuItemColors
@@ -20,8 +22,6 @@ import org.jetbrains.jewel.styling.MenuStyle
 import org.jetbrains.jewel.styling.PainterProvider
 import org.jetbrains.jewel.styling.ResourcePainterProvider
 import org.jetbrains.jewel.styling.SubmenuMetrics
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
 
 @Stable
 data class IntUiMenuStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiRadioButtonStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt
similarity index 93%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiRadioButtonStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt
index 58d237f51..eb109a54b 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiRadioButtonStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
@@ -8,15 +8,15 @@ import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.RadioButtonState
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 import org.jetbrains.jewel.styling.PainterProvider
 import org.jetbrains.jewel.styling.RadioButtonColors
 import org.jetbrains.jewel.styling.RadioButtonIcons
 import org.jetbrains.jewel.styling.RadioButtonMetrics
 import org.jetbrains.jewel.styling.RadioButtonStyle
 import org.jetbrains.jewel.styling.ResourcePainterProvider
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
 
 @Immutable
 data class IntUiRadioButtonStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiScrollbarStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt
similarity index 97%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiScrollbarStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt
index 48df91e6b..0d6d7b56b 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiScrollbarStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTabStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt
similarity index 98%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTabStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt
index b28b4c89b..67393d019 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTabStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
@@ -8,6 +8,8 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.ButtonState
 import org.jetbrains.jewel.SvgLoader
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 import org.jetbrains.jewel.styling.PainterProvider
 import org.jetbrains.jewel.styling.ResourcePainterProvider
 import org.jetbrains.jewel.styling.TabColors
@@ -15,8 +17,6 @@ import org.jetbrains.jewel.styling.TabContentAlpha
 import org.jetbrains.jewel.styling.TabIcons
 import org.jetbrains.jewel.styling.TabMetrics
 import org.jetbrains.jewel.styling.TabStyle
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
 
 data class IntUiTabStyle(
     override val colors: TabColors,
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextAreaStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt
similarity index 96%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextAreaStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt
index 700cf9874..030fde99a 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextAreaStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
@@ -10,12 +10,12 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 import org.jetbrains.jewel.styling.InputFieldMetrics
 import org.jetbrains.jewel.styling.TextAreaColors
 import org.jetbrains.jewel.styling.TextAreaStyle
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
 
 @Stable
 data class IntUiTextAreaStyle(
diff --git a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextFieldStyling.kt b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt
similarity index 96%
rename from int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextFieldStyling.kt
rename to int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt
index 8992fb515..c27349b67 100644
--- a/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/themes/intui/standalone/styling/IntUiTextFieldStyling.kt
+++ b/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.jewel.themes.intui.standalone.styling
+package org.jetbrains.jewel.intui.standalone.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
@@ -10,12 +10,12 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
+import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
+import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 import org.jetbrains.jewel.styling.InputFieldMetrics
 import org.jetbrains.jewel.styling.TextFieldColors
 import org.jetbrains.jewel.styling.TextFieldStyle
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiDarkTheme
-import org.jetbrains.jewel.themes.intui.core.theme.IntUiLightTheme
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
 
 @Stable
 data class IntUiTextFieldStyle(
diff --git a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindow.kt b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindow.kt
index 062763cd8..f4535ce8b 100644
--- a/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindow.kt
+++ b/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/JewelDemoToolWindow.kt
@@ -47,7 +47,7 @@ import org.jetbrains.jewel.bridge.addComposeTab
 import org.jetbrains.jewel.bridge.retrieveStatelessIcon
 import org.jetbrains.jewel.bridge.toComposeColor
 import org.jetbrains.jewel.foundation.tree.buildTree
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 
 @ExperimentalCoroutinesApi
 internal class JewelDemoToolWindow : ToolWindowFactory, DumbAware {
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt
index e74a4230f..53812b9f0 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt
@@ -31,6 +31,7 @@ import org.jetbrains.jewel.CheckboxRow
 import org.jetbrains.jewel.Divider
 import org.jetbrains.jewel.LocalResourceLoader
 import org.jetbrains.jewel.VerticalScrollbar
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 import org.jetbrains.jewel.samples.standalone.components.Borders
 import org.jetbrains.jewel.samples.standalone.components.Buttons
 import org.jetbrains.jewel.samples.standalone.components.Checkboxes
@@ -42,7 +43,6 @@ import org.jetbrains.jewel.samples.standalone.components.RadioButtons
 import org.jetbrains.jewel.samples.standalone.components.Tabs
 import org.jetbrains.jewel.samples.standalone.components.TextAreas
 import org.jetbrains.jewel.samples.standalone.components.TextFields
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
 import java.io.InputStream
 
 fun main() {
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt
index cc7b0be4c..d0b9e4557 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/Borders.kt
@@ -22,7 +22,7 @@ import org.jetbrains.jewel.RadioButtonRow
 import org.jetbrains.jewel.Text
 import org.jetbrains.jewel.foundation.Stroke
 import org.jetbrains.jewel.foundation.border
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 
 @Composable
 internal fun Borders() {
diff --git a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt
index 6205145db..e9c98a668 100644
--- a/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt
+++ b/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/components/ChipsAndTree.kt
@@ -31,7 +31,7 @@ import org.jetbrains.jewel.Text
 import org.jetbrains.jewel.ToggleableChip
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyColumn
 import org.jetbrains.jewel.foundation.tree.buildTree
-import org.jetbrains.jewel.themes.intui.standalone.IntUiTheme
+import org.jetbrains.jewel.intui.standalone.IntUiTheme
 
 @Composable
 fun ChipsAndTree() {