From 9ee9a5402ffa41e7859c81ea94f8895f3d714ef4 Mon Sep 17 00:00:00 2001
From: Sebastiano Poggi <rock3r@users.noreply.github.com>
Date: Thu, 2 Nov 2023 02:12:15 +0000
Subject: [PATCH] Enable explicit API mode (#232)

* Enable Explicit API mode

* Fix all Explicit API errors

* Improve missing composition local error

* Fix after rebase

* Update again after new rebase
GitOrigin-RevId: ab2ca7a0ae98743b3f5c042aa88f1f4f1a67328c
---
 platform/jewel/.idea/codeStyles/Project.xml   |   1 +
 platform/jewel/build.gradle.kts               |   5 +-
 platform/jewel/buildSrc/build.gradle.kts      |   3 +-
 platform/jewel/buildSrc/settings.gradle.kts   |   1 +
 .../src/main/kotlin/IdeaConfiguration.kt      |  14 +-
 .../src/main/kotlin/LocalProperties.kt        |   2 +-
 .../src/main/kotlin/MergeSarifTask.kt         |  52 +--
 .../src/main/kotlin/PublishConfiguration.kt   |   4 +-
 .../src/main/kotlin/ValidatePublicApiTask.kt  |   8 +-
 ...droid-studio-releases-generator.gradle.kts |  16 +-
 .../intellij-theme-generator.gradle.kts       |  30 +-
 .../kotlin/jewel-check-public-api.gradle.kts  |  20 +-
 .../main/kotlin/jewel-ij-publish.gradle.kts   |  12 +-
 .../src/main/kotlin/jewel-linting.gradle.kts  |   8 +-
 .../src/main/kotlin/jewel-publish.gradle.kts  |   4 +-
 .../buildSrc/src/main/kotlin/jewel.gradle.kts |  36 +-
 .../demodata/AndroidStudioReleases.kt         |  21 +-
 .../demodata/AndroidStudioReleasesReader.kt   | 124 ++++---
 .../demodata/ApiAndroidStudioReleases.kt      |  42 +--
 ...IdeaReleases.kt => ApiIdeaReleasesItem.kt} |   0
 .../ideversion/CheckIdeaVersionTask.kt        |  63 ++--
 .../theme/IntUiThemeDescriptorReader.kt       | 107 +++---
 .../theme/IntelliJThemeGeneratorPlugin.kt     |  17 +-
 .../jetbrains/jewel/window/DecoratedWindow.kt | 154 +++++----
 .../org/jetbrains/jewel/window/Theme.kt       |  10 +-
 .../jetbrains/jewel/window/TitleBar.Linux.kt  |  61 ++--
 .../jetbrains/jewel/window/TitleBar.MacOS.kt  |  37 +--
 .../jewel/window/TitleBar.Windows.kt          |  45 +--
 .../org/jetbrains/jewel/window/TitleBar.kt    |  73 ++--
 .../window/styling/DecoratedWindowStyling.kt  |  44 +--
 .../jewel/window/styling/TitleBarStyling.kt   |  99 +++---
 .../jewel/window/utils/DesktopPlatform.kt     |   7 +-
 .../jetbrains/jewel/window/utils/JnaLoader.kt |  10 +-
 .../jewel/window/utils/UnsafeAccessing.kt     |  27 +-
 platform/jewel/foundation/build.gradle.kts    |   3 +-
 .../jewel/foundation/Compatibility.kt         |  15 +-
 .../jewel/foundation/ExperimentalJewelApi.kt  |  16 +-
 .../jewel/foundation/GenerateDataFunctions.kt |   9 +-
 .../jewel/foundation/GlobalColors.kt          |  44 +--
 .../jewel/foundation/GlobalMetrics.kt         |  16 +-
 .../jewel/foundation/InternalJewelApi.kt      |  14 +-
 .../org/jetbrains/jewel/foundation/Stroke.kt  |  46 ++-
 .../jewel/foundation/lazy/Keybindings.kt      | 106 +++---
 .../lazy/SelectableColumnOnKeyEvent.kt        | 158 +++++----
 .../foundation/lazy/SelectableLazyColumn.kt   | 214 ++++++------
 .../lazy/SelectableLazyListScope.kt           |  36 +-
 .../lazy/SelectableLazyListState.kt           | 231 +++----------
 .../foundation/lazy/tree/BasicLazyTree.kt     | 154 +++++----
 .../jewel/foundation/lazy/tree/BuildTree.kt   | 153 +++++----
 .../lazy/tree/DefaultTreeViewKeybindings.kt   |  53 +--
 .../lazy/tree/DefaultTreeViewOnKeyEvent.kt    |  39 ++-
 .../jewel/foundation/lazy/tree/KeyActions.kt  |  68 ++--
 .../jewel/foundation/lazy/tree/Tree.kt        |  68 ++--
 .../jewel/foundation/lazy/tree/TreeState.kt   |  10 +-
 .../lazy/tree/TreeViewOnKeyEvent.kt           |  10 +-
 .../jewel/foundation/modifier/Activation.kt   | 139 ++++----
 .../jewel/foundation/modifier/Border.kt       | 314 ++++++++----------
 .../foundation/modifier/OnHoverModifier.kt    |   2 +-
 .../foundation/state/CommonStateBitMask.kt    |  18 +-
 .../state/FocusableComponentState.kt          |   8 +-
 .../state/InteractiveComponentState.kt        |  16 +-
 .../state/SelectableComponentState.kt         |   7 +-
 .../state/ToggleableComponentState.kt         |  10 +-
 .../jewel/foundation/theme/JewelTheme.kt      |  66 ++--
 .../foundation/theme/ThemeColorPalette.kt     |  82 ++---
 .../jewel/foundation/theme/ThemeDefinition.kt |  16 +-
 .../jewel/foundation/theme/ThemeDescriptor.kt |  10 +-
 .../jewel/foundation/theme/ThemeIconData.kt   |  35 +-
 .../jewel/foundation/utils/Logger.kt          |  15 +-
 .../ide-laf-bridge/api/ide-laf-bridge.api     |   5 +-
 .../jewel/ide-laf-bridge/build.gradle.kts     |   1 +
 .../jetbrains/jewel/bridge/BridgeIconData.kt  |   7 +-
 .../jetbrains/jewel/bridge/BridgeOverride.kt  |  18 +-
 .../bridge/BridgePainterHintsProvider.kt      |  28 +-
 .../jewel/bridge/UiThemeExtensions.kt         |   6 +-
 .../jetbrains/jewel/bridge/BridgeIconData.kt  |   2 +-
 .../jetbrains/jewel/bridge/BridgeOverride.kt  |   2 +-
 .../bridge/BridgePainterHintsProvider.kt      |  21 +-
 .../org/jetbrains/jewel/bridge/Bridge.kt      |   7 +-
 .../jewel/bridge/BridgeResourceResolver.kt    |   5 +-
 .../org/jetbrains/jewel/bridge/BridgeUtils.kt |  85 ++---
 .../jewel/bridge/JewelBridgeException.kt      |  16 +-
 .../jewel/bridge/SwingBridgeService.kt        |  38 +--
 .../org/jetbrains/jewel/bridge/SwingLafKey.kt |  12 -
 .../jewel/bridge/ToolWindowExtensions.kt      |  12 +-
 .../actionSystem/DataProviderElement.kt       |   4 +-
 .../bridge/actionSystem/DataProviderNode.kt   |  22 +-
 .../jewel/bridge/actionSystem/ProvideData.kt  |  32 +-
 .../jewel/bridge/theme/BridgeGlobalColors.kt  |   6 +-
 .../jewel/bridge/theme/BridgeGlobalMetrics.kt |   2 +-
 .../bridge/theme/BridgeThemeColorPalette.kt   |  25 +-
 .../jewel/bridge/theme/IntUiBridge.kt         | 247 +++++++-------
 .../jewel/bridge/theme/SwingBridgeTheme.kt    |   2 +-
 .../bridge/actionSystem/ProvideDataTest.kt    |  18 +-
 .../IntUiDecoratedWindowResourceResolver.kt   |   5 +-
 .../jewel/intui/window/IntUiTheme.kt          |  31 +-
 .../styling/IntUiDecoratedWindowStyling.kt    |  20 +-
 .../window/styling/IntUiTitleBarStyling.kt    | 109 +++---
 .../int-ui/int-ui-standalone/build.gradle.kts |   4 +-
 .../jewel/intui/standalone/InterFont.kt       |  25 +-
 .../jewel/intui/standalone/PainterProvider.kt |   6 +-
 .../StandalonePainterHintsProvider.kt         | 114 +++----
 .../standalone/styling/IntUiButtonStyling.kt  | 192 ++++++-----
 .../styling/IntUiCheckboxStyling.kt           |  47 +--
 .../standalone/styling/IntUiChipStyling.kt    | 147 ++++----
 .../styling/IntUiCircularProgressStyling.kt   |  15 +-
 .../standalone/styling/IntUiDividerStyle.kt   |  10 +-
 .../styling/IntUiDropdownStyling.kt           | 251 +++++++-------
 .../styling/IntUiGroupHeaderStyling.kt        |  25 +-
 .../IntUiHorizontalProgressBarStyling.kt      |  49 +--
 .../styling/IntUiIconButtonStyling.kt         |  23 +-
 .../styling/IntUiLazyTreeStyling.kt           |  86 ++---
 .../standalone/styling/IntUiLinkStyling.kt    |  62 ++--
 .../standalone/styling/IntUiMenuStyling.kt    | 168 +++++-----
 .../styling/IntUiRadioButtonStyling.kt        |  69 ++--
 .../styling/IntUiScrollbarStyling.kt          |  30 +-
 .../standalone/styling/IntUiTabStyling.kt     | 247 +++++++-------
 .../styling/IntUiTextAreaStyling.kt           | 113 ++++---
 .../styling/IntUiTextFieldStyling.kt          | 113 ++++---
 .../standalone/styling/IntUiTooltipStyling.kt |  32 +-
 .../standalone/theme/IntUiGlobalColors.kt     |  50 +--
 .../standalone/theme/IntUiGlobalMetrics.kt    |   5 +-
 .../intui/standalone/theme/IntUiTheme.kt      | 130 ++++----
 .../src/main/kotlin/icons/JewelIcons.kt       |   3 +-
 .../ideplugin/releasessample/ContentItem.kt   |   3 +-
 .../jewel/samples/standalone/IntUiThemes.kt   |  12 +-
 .../jewel/samples/standalone/Main.kt          |   2 +-
 .../samples/standalone/view/TitleBarView.kt   |   6 +-
 .../samples/standalone/view/WelcomeView.kt    |  78 +++--
 platform/jewel/ui/api/ui.api                  |  39 +--
 platform/jewel/ui/build.gradle.kts            |   3 +-
 .../jetbrains/jewel/ui/ComponentStyling.kt    |  22 +-
 .../jewel/ui/DefaultComponentStyling.kt       |  93 +++---
 .../jetbrains/jewel/ui/DisabledColorFilter.kt |  40 +--
 .../org/jetbrains/jewel/ui/NoIndication.kt    |   2 +-
 .../org/jetbrains/jewel/ui/Orientation.kt     |  14 +-
 .../kotlin/org/jetbrains/jewel/ui/Outline.kt  |  25 +-
 .../jetbrains/jewel/ui/component/Button.kt    |  69 ++--
 .../jetbrains/jewel/ui/component/Checkbox.kt  | 103 +++---
 .../org/jetbrains/jewel/ui/component/Chip.kt  |  91 +++--
 .../ui/component/CircularProgressIndicator.kt |  95 +++---
 .../jewel/ui/component/ContextMenu.kt         |  34 +-
 .../jetbrains/jewel/ui/component/Divider.kt   |  25 +-
 .../jetbrains/jewel/ui/component/Dropdown.kt  | 112 +++----
 .../jewel/ui/component/GroupHeader.kt         |   3 +-
 .../org/jetbrains/jewel/ui/component/Icon.kt  |  89 +++--
 .../jewel/ui/component/IconButton.kt          | 114 +++----
 .../jewel/ui/component/InputField.kt          |  61 ++--
 .../jetbrains/jewel/ui/component/LazyTree.kt  |  22 +-
 .../jewel/ui/component/LinearProgressBar.kt   |  48 +--
 .../org/jetbrains/jewel/ui/component/Link.kt  | 102 +++---
 .../org/jetbrains/jewel/ui/component/Menu.kt  | 228 ++++++-------
 .../jewel/ui/component/MenuManager.kt         |  31 +-
 .../org/jetbrains/jewel/ui/component/Popup.kt |  50 ++-
 .../jewel/ui/component/RadioButton.kt         | 103 +++---
 .../jewel/ui/component/Scrollbars.kt          |  72 ++--
 .../jewel/ui/component/SplitLayout.kt         | 193 +++++------
 .../jetbrains/jewel/ui/component/TabStrip.kt  | 159 +++------
 .../org/jetbrains/jewel/ui/component/Tabs.kt  | 114 ++++---
 .../org/jetbrains/jewel/ui/component/Text.kt  |  48 +--
 .../jetbrains/jewel/ui/component/TextArea.kt  |  74 ++---
 .../jetbrains/jewel/ui/component/TextField.kt |  55 ++-
 .../jetbrains/jewel/ui/component/Tooltip.kt   |  77 +++--
 .../ui/component/styling/ButtonStyling.kt     | 133 ++++----
 .../ui/component/styling/CheckboxStyling.kt   |  62 ++--
 .../jewel/ui/component/styling/ChipStyling.kt | 210 ++++++------
 .../styling/CircularProgressStyle.kt          |  16 +-
 .../ui/component/styling/DividerStyling.kt    |  28 +-
 .../ui/component/styling/DropdownStyling.kt   | 176 +++++-----
 .../component/styling/GroupHeaderStyling.kt   |  28 +-
 .../styling/HorizontalProgressBarStyling.kt   |  40 +--
 .../ui/component/styling/IconButtonStyling.kt | 122 +++----
 .../ui/component/styling/InputFieldStyling.kt | 145 ++++----
 .../ui/component/styling/LazyTreeStyling.kt   |  84 ++---
 .../jewel/ui/component/styling/LinkStyling.kt | 117 +++----
 .../jewel/ui/component/styling/MenuStyling.kt | 176 +++++-----
 .../component/styling/RadioButtonStyling.kt   |  68 ++--
 .../ui/component/styling/ScrollbarStyling.kt  |  38 ++-
 .../jewel/ui/component/styling/TabStyling.kt  | 231 +++++++------
 .../ui/component/styling/TextAreaStyling.kt   |  22 +-
 .../ui/component/styling/TextFieldStyling.kt  |  22 +-
 .../ui/component/styling/TooltipStyling.kt    |  67 ++--
 .../jewel/ui/painter/BadgePainter.kt          |  17 +-
 .../ui/painter/BasePainterHintsProvider.kt    |  30 +-
 .../jewel/ui/painter/DelegatePainter.kt       |   6 +-
 .../jetbrains/jewel/ui/painter/PainterHint.kt |  80 ++---
 .../jewel/ui/painter/PainterHintsProvider.kt  |  33 +-
 .../jewel/ui/painter/PainterProvider.kt       |  15 +-
 .../jewel/ui/painter/PainterProviderScope.kt  |  12 +-
 .../jewel/ui/painter/ResizedPainter.kt        |   2 +-
 .../ui/painter/ResourcePainterProvider.kt     | 108 +++---
 .../jewel/ui/painter/badge/BadgeShape.kt      |   6 +-
 .../jewel/ui/painter/badge/DotBadgeShape.kt   |  39 ++-
 .../jetbrains/jewel/ui/painter/hints/Badge.kt |  32 +-
 .../jewel/ui/painter/hints/DarkOrStroke.kt    |  29 +-
 .../jetbrains/jewel/ui/painter/hints/HiDpi.kt |   2 +-
 .../jewel/ui/painter/hints/Override.kt        |  28 +-
 .../jewel/ui/painter/hints/Palette.kt         |  22 +-
 .../jewel/ui/painter/hints/Selected.kt        |   9 +-
 .../jetbrains/jewel/ui/painter/hints/Size.kt  |  27 +-
 .../jewel/ui/painter/hints/Stateful.kt        |  17 +-
 .../jetbrains/jewel/ui/theme/JewelTheme.kt    |  48 +--
 .../jewel/ui/util/ColorExtensions.kt          |  19 +-
 .../org/jetbrains/jewel/ui/util/Debug.kt      |   6 +-
 .../jewel/ui/util/ModifierExtensions.kt       |  17 +-
 .../ui/util/SpinnerProgressIconGenerator.kt   | 102 ------
 .../org/jetbrains/jewel/PainterHintTest.kt    | 112 +++----
 207 files changed, 5521 insertions(+), 5755 deletions(-)
 rename platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/{ApiIdeaReleases.kt => ApiIdeaReleasesItem.kt} (100%)
 delete mode 100644 platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingLafKey.kt
 delete mode 100644 platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator.kt

diff --git a/platform/jewel/.idea/codeStyles/Project.xml b/platform/jewel/.idea/codeStyles/Project.xml
index 5383e2d02f005..23d15b1d51ca5 100644
--- a/platform/jewel/.idea/codeStyles/Project.xml
+++ b/platform/jewel/.idea/codeStyles/Project.xml
@@ -17,6 +17,7 @@
       <option name="CONTINUATION_INDENT_IN_IF_CONDITIONS" value="true" />
       <option name="CONTINUATION_INDENT_IN_ELVIS" value="true" />
       <option name="IF_RPAREN_ON_NEW_LINE" value="false" />
+      <option name="ALLOW_TRAILING_COMMA" value="true" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <editorconfig>
diff --git a/platform/jewel/build.gradle.kts b/platform/jewel/build.gradle.kts
index 72e638bdf0414..d60312b3a5030 100644
--- a/platform/jewel/build.gradle.kts
+++ b/platform/jewel/build.gradle.kts
@@ -21,7 +21,6 @@ tasks {
         source(configurations.outgoingSarif)
         include { it.file.extension == "sarif" }
     }
-    register("check") {
-        dependsOn(mergeSarifReports)
-    }
+
+    register("check") { dependsOn(mergeSarifReports) }
 }
diff --git a/platform/jewel/buildSrc/build.gradle.kts b/platform/jewel/buildSrc/build.gradle.kts
index 684c247eedd6a..68751fe39f43e 100644
--- a/platform/jewel/buildSrc/build.gradle.kts
+++ b/platform/jewel/buildSrc/build.gradle.kts
@@ -24,7 +24,8 @@ dependencies {
     implementation(libs.kotlinx.serialization.json)
     implementation(libs.poko.gradlePlugin)
 
-    // Enables using type-safe accessors to reference plugins from the [plugins] block defined in version catalogs.
+    // Enables using type-safe accessors to reference plugins from the [plugins] block defined in
+    // version catalogs.
     // Context: https://github.com/gradle/gradle/issues/15383#issuecomment-779893192
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
diff --git a/platform/jewel/buildSrc/settings.gradle.kts b/platform/jewel/buildSrc/settings.gradle.kts
index fa3d003c83324..f8d784c5bad09 100644
--- a/platform/jewel/buildSrc/settings.gradle.kts
+++ b/platform/jewel/buildSrc/settings.gradle.kts
@@ -10,6 +10,7 @@ dependencyResolutionManagement {
         gradlePluginPortal()
         mavenCentral()
     }
+
     versionCatalogs {
         create("libs") {
             from(files("../gradle/libs.versions.toml"))
diff --git a/platform/jewel/buildSrc/src/main/kotlin/IdeaConfiguration.kt b/platform/jewel/buildSrc/src/main/kotlin/IdeaConfiguration.kt
index c9af48d9f7987..abc014a0dfe68 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/IdeaConfiguration.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/IdeaConfiguration.kt
@@ -1,7 +1,7 @@
-import java.util.concurrent.atomic.AtomicBoolean
 import org.gradle.api.Project
 import org.gradle.api.provider.Property
 import org.gradle.jvm.toolchain.JavaLanguageVersion
+import java.util.concurrent.atomic.AtomicBoolean
 
 enum class SupportedIJVersion {
     IJ_232,
@@ -12,16 +12,17 @@ private var warned = AtomicBoolean(false)
 
 fun Project.supportedIJVersion(): SupportedIJVersion {
     val prop = kotlin.runCatching {
-        rootProject.findProperty("supported.ij.version")?.toString() ?:
-            localProperty("supported.ij.version")
+        rootProject.findProperty("supported.ij.version")?.toString()
+            ?: localProperty("supported.ij.version")
     }.getOrNull()
 
     if (prop == null) {
         if (!warned.getAndSet(true)) {
             logger.warn(
                 """
-                    No 'supported.ij.version' property provided. Falling back to IJ 233.
-                    It is recommended to provide it using local.properties file or -Psupported.ij.version to avoid unexpected behavior.
+                No 'supported.ij.version' property provided. Falling back to IJ 233.
+                It is recommended to provide it using the local.properties file or 
+                -Psupported.ij.version to avoid unexpected behavior.
                 """.trimIndent()
             )
         }
@@ -33,10 +34,11 @@ fun Project.supportedIJVersion(): SupportedIJVersion {
         "233" -> SupportedIJVersion.IJ_233
         else -> error(
             "Invalid 'supported.ij.version' with value '$prop' is provided. " +
-                "It should be in set of these values: ('232', '233')"
+                "It should be one of these values: ('232', '233')"
         )
     }
 }
 
+@Suppress("unused") // Used to set the Java toolchain version
 fun Property<JavaLanguageVersion>.assign(version: Int) =
     set(JavaLanguageVersion.of(version))
diff --git a/platform/jewel/buildSrc/src/main/kotlin/LocalProperties.kt b/platform/jewel/buildSrc/src/main/kotlin/LocalProperties.kt
index 526aa08f36063..260845cb26153 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/LocalProperties.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/LocalProperties.kt
@@ -9,4 +9,4 @@ internal fun Project.localProperty(propertyName: String): String? {
     val properties = Properties()
     localPropertiesFile.inputStream().use { properties.load(it) }
     return properties.getProperty(propertyName)
-}
\ No newline at end of file
+}
diff --git a/platform/jewel/buildSrc/src/main/kotlin/MergeSarifTask.kt b/platform/jewel/buildSrc/src/main/kotlin/MergeSarifTask.kt
index d54a7c44d9709..996796fa558b2 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/MergeSarifTask.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/MergeSarifTask.kt
@@ -9,6 +9,9 @@ import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.SourceTask
 import org.gradle.api.tasks.TaskAction
 
+private const val SARIF_SCHEMA =
+    "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json"
+
 @CacheableTask
 open class MergeSarifTask : SourceTask() {
 
@@ -17,34 +20,43 @@ open class MergeSarifTask : SourceTask() {
     }
 
     @get:OutputFile
-    val mergedSarifPath: RegularFileProperty = project.objects.fileProperty()
-        .convention(project.layout.buildDirectory.file("reports/static-analysis.sarif"))
+    val mergedSarifPath: RegularFileProperty =
+        project.objects
+            .fileProperty()
+            .convention(project.layout.buildDirectory.file("reports/static-analysis.sarif"))
 
     @TaskAction
     fun merge() {
         val json = Json { prettyPrint = true }
 
         logger.lifecycle("Merging ${source.files.size} SARIF file(s)...")
-        logger.lifecycle(source.files.joinToString("\n") { " *  ~${it.path.removePrefix(project.rootDir.path)}" })
-
-        val merged = SarifSchema210(
-            schema = "https://raw.githubusercontent.com/oasis-tcs/sarif-spec/master/Schemata/sarif-schema-2.1.0.json",
-            version = Version.The210,
-            runs = source.files
-                .asSequence()
-                .filter { it.extension == "sarif" }
-                .map { file -> file.inputStream().use { json.decodeFromStream<SarifSchema210>(it) } }
-                .flatMap { report -> report.runs }
-                .groupBy { run -> run.tool.driver.guid ?: run.tool.driver.name }
-                .values
-                .asSequence()
-                .filter { it.isNotEmpty() }
-                .map { run -> run.first().copy(results = run.flatMap { it.results ?: emptyList() }) }
-                .toList()
+        logger.lifecycle(
+            source.files.joinToString("\n") { " *  ~${it.path.removePrefix(project.rootDir.path)}" }
         )
+
+        val merged =
+            SarifSchema210(
+                schema = SARIF_SCHEMA,
+                version = Version.The210,
+                runs = source.files
+                    .asSequence()
+                    .filter { it.extension == "sarif" }
+                    .map { file ->
+                        file.inputStream().use { json.decodeFromStream<SarifSchema210>(it) }
+                    }
+                    .flatMap { report -> report.runs }
+                    .groupBy { run -> run.tool.driver.guid ?: run.tool.driver.name }
+                    .values
+                    .asSequence()
+                    .filter { it.isNotEmpty() }
+                    .map { run ->
+                        run.first().copy(results = run.flatMap { it.results ?: emptyList() })
+                    }
+                    .toList()
+            )
+
         logger.lifecycle("Merged SARIF file contains ${merged.runs.size} run(s)")
         logger.info("Writing merged SARIF file to $mergedSarifPath...")
-        mergedSarifPath.asFile.get().outputStream()
-            .use { json.encodeToStream(merged, it) }
+        mergedSarifPath.asFile.get().outputStream().use { json.encodeToStream(merged, it) }
     }
 }
diff --git a/platform/jewel/buildSrc/src/main/kotlin/PublishConfiguration.kt b/platform/jewel/buildSrc/src/main/kotlin/PublishConfiguration.kt
index b2ea7d2f8743b..0a57d38874024 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/PublishConfiguration.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/PublishConfiguration.kt
@@ -1,4 +1,4 @@
-@file:Suppress("UnstableApiUsage")
+@file:Suppress("UnstableApiUsage", "UnusedImports")
 
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPom
@@ -32,4 +32,4 @@ internal fun MavenPom.configureJewelPom() {
         developerConnection = "scm:git:https://github.com/JetBrains/jewel.git"
         url = "https://github.com/JetBrains/jewel"
     }
-}
\ No newline at end of file
+}
diff --git a/platform/jewel/buildSrc/src/main/kotlin/ValidatePublicApiTask.kt b/platform/jewel/buildSrc/src/main/kotlin/ValidatePublicApiTask.kt
index af80f3b7ebff7..c97e3c00b469e 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/ValidatePublicApiTask.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/ValidatePublicApiTask.kt
@@ -18,7 +18,8 @@ open class ValidatePublicApiTask : SourceTask() {
     private val classFqnRegex = "public (?:\\w+ )*class (\\S+)\\b".toRegex()
 
     @Suppress("ConvertToStringTemplate") // The odd concatenation is needed because of $; escapes get confused
-    private val copyMethodRegex = ("public static synthetic fun copy(-\\w+)?" + "\\$" + "default\\b").toRegex()
+    private val copyMethodRegex =
+        ("public static synthetic fun copy(-\\w+)?" + "\\$" + "default\\b").toRegex()
 
     @TaskAction
     fun validatePublicApi() {
@@ -86,8 +87,9 @@ open class ValidatePublicApiTask : SourceTask() {
             }
         }
 
-        val actualDataClasses = dataClasses.filterValues { it.hasCopyMethod && !it.isLikelyValueClass }
-            .keys
+        val actualDataClasses =
+            dataClasses.filterValues { it.hasCopyMethod && !it.isLikelyValueClass }
+                .keys
         return actualDataClasses
     }
 }
diff --git a/platform/jewel/buildSrc/src/main/kotlin/android-studio-releases-generator.gradle.kts b/platform/jewel/buildSrc/src/main/kotlin/android-studio-releases-generator.gradle.kts
index 08e93233a6052..353c57a70d413 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/android-studio-releases-generator.gradle.kts
+++ b/platform/jewel/buildSrc/src/main/kotlin/android-studio-releases-generator.gradle.kts
@@ -15,22 +15,16 @@ val extension: StudioVersionsGenerationExtension =
 val task =
     tasks.register<AndroidStudioReleasesGeneratorTask>("generateAndroidStudioReleasesList") {
         val className = ClassName.bestGuess(STUDIO_RELEASES_OUTPUT_CLASS_NAME)
-        outputFile = extension.targetDir.file(
-            className.packageName.replace(".", "/")
-                .plus("/${className.simpleName}.kt")
-        )
+        val filePath = className.packageName.replace(".", "/") +
+            "/${className.simpleName}.kt"
+        outputFile = extension.targetDir.file(filePath)
         dataUrl = extension.dataUrl
         resourcesDirs = extension.resourcesDirs
     }
 
 tasks {
-    withType<BaseKotlinCompile> {
-        dependsOn(task)
-    }
-
-    withType<Detekt> {
-        dependsOn(task)
-    }
+    withType<BaseKotlinCompile> { dependsOn(task) }
+    withType<Detekt> { dependsOn(task) }
 }
 
 pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
diff --git a/platform/jewel/buildSrc/src/main/kotlin/intellij-theme-generator.gradle.kts b/platform/jewel/buildSrc/src/main/kotlin/intellij-theme-generator.gradle.kts
index 7c758d892d796..dca065e93993e 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/intellij-theme-generator.gradle.kts
+++ b/platform/jewel/buildSrc/src/main/kotlin/intellij-theme-generator.gradle.kts
@@ -10,28 +10,26 @@ import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
 import org.jetbrains.kotlin.gradle.tasks.BaseKotlinCompile
 
 val extension = ThemeGeneratorContainer(container<ThemeGeneration> { ThemeGeneration(it, project) })
+
 extensions.add("intelliJThemeGenerator", extension)
 
 extension.all {
-    val task = tasks.register<IntelliJThemeGeneratorTask>("generate${GUtil.toCamelCase(name)}Theme") {
-        outputFile = targetDir.file(this@all.themeClassName.map {
-            val className = ClassName.bestGuess(it)
-            className.packageName.replace(".", "/")
-                .plus("/${className.simpleName}.kt")
-        })
-        themeClassName = this@all.themeClassName
-        ideaVersion = this@all.ideaVersion
-        themeFile = this@all.themeFile
-    }
+    val task =
+        tasks.register<IntelliJThemeGeneratorTask>("generate${GUtil.toCamelCase(name)}Theme") {
+            val paths = this@all.themeClassName.map {
+                val className = ClassName.bestGuess(it)
+                className.packageName.replace(".", "/") + "/${className.simpleName}.kt"
+            }
 
-    tasks {
-        withType<BaseKotlinCompile> {
-            dependsOn(task)
+            outputFile = targetDir.file(paths)
+            themeClassName = this@all.themeClassName
+            ideaVersion = this@all.ideaVersion
+            themeFile = this@all.themeFile
         }
 
-        withType<Detekt> {
-            dependsOn(task)
-        }
+    tasks {
+        withType<BaseKotlinCompile> { dependsOn(task) }
+        withType<Detekt> { dependsOn(task) }
     }
 
     pluginManager.withPlugin("org.jetbrains.kotlin.jvm") {
diff --git a/platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts b/platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts
index ac00fb5291683..a87d626618e57 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts
+++ b/platform/jewel/buildSrc/src/main/kotlin/jewel-check-public-api.gradle.kts
@@ -3,6 +3,7 @@
 plugins {
     id("org.jetbrains.kotlinx.binary-compatibility-validator")
     id("dev.drewhamilton.poko")
+    kotlin("jvm")
 }
 
 apiValidation {
@@ -18,14 +19,17 @@ poko {
     pokoAnnotation = "org.jetbrains.jewel.foundation.GenerateDataFunctions"
 }
 
+kotlin {
+    explicitApi()
+}
+
 tasks {
-    val validatePublicApi = register<ValidatePublicApiTask>("validatePublicApi") {
-        include { it.file.extension == "api" }
-        source(project.fileTree("api"))
-        dependsOn(named("apiCheck"))
-    }
+    val validatePublicApi =
+        register<ValidatePublicApiTask>("validatePublicApi") {
+            include { it.file.extension == "api" }
+            source(project.fileTree("api"))
+            dependsOn(named("apiCheck"))
+        }
 
-    named("check") {
-        dependsOn(validatePublicApi)
-    }
+    named("check") { dependsOn(validatePublicApi) }
 }
diff --git a/platform/jewel/buildSrc/src/main/kotlin/jewel-ij-publish.gradle.kts b/platform/jewel/buildSrc/src/main/kotlin/jewel-ij-publish.gradle.kts
index 1219a5a1b62e2..14cc1bbd3ebec 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/jewel-ij-publish.gradle.kts
+++ b/platform/jewel/buildSrc/src/main/kotlin/jewel-ij-publish.gradle.kts
@@ -35,9 +35,7 @@ publishing {
             }
             version = project.version.toString().withVersionSuffix("ij-$ijVersionRaw")
             artifactId = "jewel-${project.name}"
-            pom {
-                configureJewelPom()
-            }
+            pom { configureJewelPom() }
         }
     }
 }
@@ -45,17 +43,15 @@ publishing {
 /**
  * Adds suffix to the version taking SNAPSHOT suffix into account
  *
- * For example, if [this] is "0.0.1-SNAPSHOT" and [suffix] is "ij-233"
- * then result will be "0.0.1-ij-233-SNAPSHOT"
+ * For example, if [this] is "0.0.1-SNAPSHOT" and [suffix] is "ij-233" then
+ * the result will be "0.0.1-ij-233-SNAPSHOT"
  */
 fun String.withVersionSuffix(suffix: String): String {
     val splitString = this.split('-')
     val snapshotRaw = "SNAPSHOT"
     val withSnapshot = splitString.contains(snapshotRaw)
 
-    if (!withSnapshot) {
-        return "$this-$suffix"
-    }
+    if (!withSnapshot) return "$this-$suffix"
 
     val withoutSnapshot = splitString.filter { it != snapshotRaw }.joinToString("-")
 
diff --git a/platform/jewel/buildSrc/src/main/kotlin/jewel-linting.gradle.kts b/platform/jewel/buildSrc/src/main/kotlin/jewel-linting.gradle.kts
index 6780820299b44..2a9e669034075 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/jewel-linting.gradle.kts
+++ b/platform/jewel/buildSrc/src/main/kotlin/jewel-linting.gradle.kts
@@ -6,15 +6,11 @@ plugins {
 }
 
 configurations {
-    val dependencies = register("sarif") {
-        isCanBeDeclared = true
-    }
+    val dependencies = register("sarif") { isCanBeDeclared = true }
     register("outgoingSarif") {
         isCanBeConsumed = true
         isCanBeResolved = true
         extendsFrom(dependencies.get())
-        attributes {
-            attribute(Usage.USAGE_ATTRIBUTE, objects.named("sarif"))
-        }
+        attributes { attribute(Usage.USAGE_ATTRIBUTE, objects.named("sarif")) }
     }
 }
diff --git a/platform/jewel/buildSrc/src/main/kotlin/jewel-publish.gradle.kts b/platform/jewel/buildSrc/src/main/kotlin/jewel-publish.gradle.kts
index b41f71b367c1a..af41e53d4444d 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/jewel-publish.gradle.kts
+++ b/platform/jewel/buildSrc/src/main/kotlin/jewel-publish.gradle.kts
@@ -28,9 +28,7 @@ publishing {
             artifact(sourcesJar)
             version = project.version.toString()
             artifactId = "jewel-${project.name}"
-            pom {
-                configureJewelPom()
-            }
+            pom { configureJewelPom() }
         }
     }
 }
diff --git a/platform/jewel/buildSrc/src/main/kotlin/jewel.gradle.kts b/platform/jewel/buildSrc/src/main/kotlin/jewel.gradle.kts
index 07cd2a2b3bdb4..049bedff22c52 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/jewel.gradle.kts
+++ b/platform/jewel/buildSrc/src/main/kotlin/jewel.gradle.kts
@@ -6,6 +6,7 @@ plugins {
 group = "org.jetbrains.jewel"
 
 val gitHubRef: String? = System.getenv("GITHUB_REF")
+
 version = when {
     gitHubRef?.startsWith("refs/tags/") == true -> {
         gitHubRef.substringAfter("refs/tags/")
@@ -27,12 +28,9 @@ kotlin {
         vendor = JvmVendorSpec.JETBRAINS
         languageVersion = 17
     }
+
     target {
-        compilations.all {
-            kotlinOptions {
-                freeCompilerArgs += "-Xcontext-receivers"
-            }
-        }
+        compilations.all { kotlinOptions { freeCompilerArgs += "-Xcontext-receivers" } }
         sourceSets.all {
             languageSettings {
                 optIn("androidx.compose.foundation.ExperimentalFoundationApi")
@@ -51,8 +49,8 @@ detekt {
     buildUponDefaultConfig = true
 }
 
-val sarifReport: Provider<RegularFile> = layout.buildDirectory
-    .file("reports/ktlint-${project.name}.sarif")
+val sarifReport: Provider<RegularFile> =
+    layout.buildDirectory.file("reports/ktlint-${project.name}.sarif")
 
 tasks {
     detektMain {
@@ -64,9 +62,7 @@ tasks {
         }
     }
 
-    formatKotlinMain {
-        exclude { it.file.absolutePath.contains("build/generated") }
-    }
+    formatKotlinMain { exclude { it.file.absolutePath.contains("build/generated") } }
 
     lintKotlinMain {
         exclude { it.file.absolutePath.contains("build/generated") }
@@ -83,20 +79,18 @@ tasks {
 
 configurations.named("sarif") {
     outgoing {
-        artifact(tasks.detektMain.flatMap { it.sarifReportFile }) {
-            builtBy(tasks.detektMain)
-        }
-        artifact(sarifReport) {
-            builtBy(tasks.lintKotlinMain)
-        }
+        artifact(tasks.detektMain.flatMap { it.sarifReportFile }) { builtBy(tasks.detektMain) }
+        artifact(sarifReport) { builtBy(tasks.lintKotlinMain) }
     }
 }
 
 fun Task.removeAssembleDependency() {
-    setDependsOn(dependsOn.filter {
-        when {
-            it is Task && it.name == "assemble" -> false
-            else -> true
+    setDependsOn(
+        dependsOn.filter {
+            when {
+                it is Task && it.name == "assemble" -> false
+                else -> true
+            }
         }
-    })
+    )
 }
diff --git a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt
index 3116ca3da7403..cea52722b3c07 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleases.kt
@@ -21,17 +21,24 @@ import java.net.URL
 
 open class StudioVersionsGenerationExtension(project: Project) {
 
-    val targetDir: DirectoryProperty = project.objects.directoryProperty()
-        .convention(project.layout.buildDirectory.dir("generated/studio-releases/"))
+    val targetDir: DirectoryProperty =
+        project.objects
+            .directoryProperty()
+            .convention(project.layout.buildDirectory.dir("generated/studio-releases/"))
 
-    val resourcesDirs: SetProperty<File> = project.objects.setProperty<File>()
-        .convention(project.sourceSets.main.get().resources.srcDirs)
+    val resourcesDirs: SetProperty<File> =
+        project.objects
+            .setProperty<File>()
+            .convention(project.sourceSets.main.get().resources.srcDirs)
 
-    val dataUrl: Property<String> = project.objects.property<String>()
-        .convention("https://jb.gg/android-studio-releases-list.json")
+    val dataUrl: Property<String> =
+        project.objects
+            .property<String>()
+            .convention("https://jb.gg/android-studio-releases-list.json")
 }
 
-internal const val STUDIO_RELEASES_OUTPUT_CLASS_NAME = "org.jetbrains.jewel.samples.ideplugin.releasessample.AndroidStudioReleases"
+internal const val STUDIO_RELEASES_OUTPUT_CLASS_NAME =
+    "org.jetbrains.jewel.samples.ideplugin.releasessample.AndroidStudioReleases"
 
 open class AndroidStudioReleasesGeneratorTask : DefaultTask() {
 
diff --git a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleasesReader.kt b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleasesReader.kt
index 77fdc4bed74c3..57d37b6171a40 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleasesReader.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/AndroidStudioReleasesReader.kt
@@ -23,50 +23,61 @@ internal object AndroidStudioReleasesReader {
         url: String,
         resourceDirs: Set<File>,
     ) =
-        FileSpec.builder(className).apply {
-            indent("    ")
-            addFileComment("Generated by the Jewel Android Studio Releases Generator\n")
-            addFileComment("Generated from $url on ${ZonedDateTime.now()}\n")
-
-            addImport("org.jetbrains.jewel.samples.ideplugin.releasessample", "ContentItem.AndroidStudio")
-            addImport("kotlinx.datetime", "LocalDate")
-
-            addType(
-                TypeSpec.objectBuilder(className)
-                    .superclass(
-                        ClassName.bestGuess("org.jetbrains.jewel.samples.ideplugin.releasessample.ContentSource")
-                            .parameterizedBy(ContentItemClassName)
-                    )
-                    .apply {
-                        addProperty(
-                            PropertySpec.builder(
-                                name = "items",
-                                type = List::class.asClassName().parameterizedBy(ContentItemClassName),
-                                KModifier.OVERRIDE
-                            )
-                                .initializer(readReleases(releases, resourceDirs))
-                                .build()
-                        )
-
-                        addProperty(
-                            PropertySpec.builder(
-                                "displayName",
-                                type = String::class.asClassName(),
-                                KModifier.OVERRIDE
-                            )
-                                .initializer("\"%L\"", "Android Studio releases")
-                                .build()
-                        )
-                    }.build()
+        FileSpec.builder(className)
+            .apply {
+                indent("    ")
+                addFileComment("Generated by the Jewel Android Studio Releases Generator\n")
+                addFileComment("Generated from $url on ${ZonedDateTime.now()}\n")
+
+                addImport("org.jetbrains.jewel.samples.ideplugin.releasessample", "ContentItem.AndroidStudio")
+                addImport("kotlinx.datetime", "LocalDate")
+
+                addType(createBaseTypeSpec(className, releases, resourceDirs))
+            }
+            .build()
+
+    private fun createBaseTypeSpec(
+        className: ClassName,
+        releases: ApiAndroidStudioReleases,
+        resourceDirs: Set<File>,
+    ) = TypeSpec.objectBuilder(className)
+        .superclass(
+            ClassName.bestGuess("org.jetbrains.jewel.samples.ideplugin.releasessample.ContentSource")
+                .parameterizedBy(ContentItemClassName)
+        )
+        .apply {
+            addProperty(
+                PropertySpec.builder(
+                    name = "items",
+                    type =
+                    List::class.asClassName().parameterizedBy(ContentItemClassName),
+                    KModifier.OVERRIDE
+                )
+                    .initializer(readReleases(releases, resourceDirs))
+                    .build()
             )
-        }.build()
+
+            addProperty(
+                PropertySpec.builder(
+                    "displayName",
+                    type = String::class.asClassName(),
+                    KModifier.OVERRIDE
+                )
+                    .initializer("\"%L\"", "Android Studio releases")
+                    .build()
+            )
+        }
+        .build()
 
     private fun readReleases(releases: ApiAndroidStudioReleases, resourceDirs: Set<File>) =
         releases.content.item
             .map { readRelease(it, resourceDirs) }
             .joinToCode(prefix = "listOf(\n", separator = ",\n", suffix = ")")
 
-    private fun readRelease(release: ApiAndroidStudioReleases.Content.Item, resourceDirs: Set<File>) =
+    private fun readRelease(
+        release: ApiAndroidStudioReleases.Content.Item,
+        resourceDirs: Set<File>,
+    ) =
         CodeBlock.builder()
             .apply {
                 add("AndroidStudio(\n")
@@ -83,7 +94,10 @@ internal object AndroidStudioReleasesReader {
             }
             .build()
 
-    private fun imagePathForOrNull(release: ApiAndroidStudioReleases.Content.Item, resourceDirs: Set<File>): String? {
+    private fun imagePathForOrNull(
+        release: ApiAndroidStudioReleases.Content.Item,
+        resourceDirs: Set<File>,
+    ): String? {
         // Take the release animal from the name, remove spaces and voila'
         val releaseAnimal = release.name
             .substringBefore(" | ")
@@ -120,27 +134,29 @@ internal object AndroidStudioReleasesReader {
     private fun translateDate(rawDate: String): String {
         val month = rawDate.substringBefore(" ").trimStart('0')
         val year = rawDate.substringAfterLast(" ".trimStart('0'))
-        val day = rawDate.substring(month.length + 1, rawDate.length - year.length - 1).trimStart('0')
+        val day = rawDate.substring(month.length + 1, rawDate.length - year.length - 1)
+            .trimStart('0')
 
         if (day.isEmpty()) {
             println("$rawDate\nMonth: '$month'\nYear: '$year'")
         }
 
-        val monthNumber = when (month.trim().lowercase()) {
-            "january" -> 1
-            "february" -> 2
-            "march" -> 3
-            "april" -> 4
-            "may" -> 5
-            "june" -> 6
-            "july" -> 7
-            "august" -> 8
-            "september" -> 9
-            "october" -> 10
-            "november" -> 11
-            "december" -> 12
-            else -> error("Unrecognized month: $month")
-        }
+        val monthNumber =
+            when (month.trim().lowercase()) {
+                "january" -> 1
+                "february" -> 2
+                "march" -> 3
+                "april" -> 4
+                "may" -> 5
+                "june" -> 6
+                "july" -> 7
+                "august" -> 8
+                "september" -> 9
+                "october" -> 10
+                "november" -> 11
+                "december" -> 12
+                else -> error("Unrecognized month: $month")
+            }
 
         return "$year, $monthNumber, $day"
     }
diff --git a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/ApiAndroidStudioReleases.kt b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/ApiAndroidStudioReleases.kt
index 9fc61f19bf72f..b028de096fb57 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/ApiAndroidStudioReleases.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/demodata/ApiAndroidStudioReleases.kt
@@ -5,46 +5,32 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 internal data class ApiAndroidStudioReleases(
-    @SerialName("content")
-    val content: Content = Content()
+    @SerialName("content") val content: Content = Content(),
 ) {
 
     @Serializable
     internal data class Content(
-        @SerialName("item")
-        val item: List<Item> = listOf(),
-        @SerialName("version")
-        val version: Int = 0
+        @SerialName("item") val item: List<Item> = listOf(),
+        @SerialName("version") val version: Int = 0,
     ) {
 
         @Serializable
         internal data class Item(
-            @SerialName("build")
-            val build: String,
-            @SerialName("channel")
-            val channel: String,
-            @SerialName("date")
-            val date: String,
-            @SerialName("download")
-            val download: List<Download> = listOf(),
-            @SerialName("name")
-            val name: String,
-            @SerialName("platformBuild")
-            val platformBuild: String,
-            @SerialName("platformVersion")
-            val platformVersion: String,
-            @SerialName("version")
-            val version: String
+            @SerialName("build") val build: String,
+            @SerialName("channel") val channel: String,
+            @SerialName("date") val date: String,
+            @SerialName("download") val download: List<Download> = listOf(),
+            @SerialName("name") val name: String,
+            @SerialName("platformBuild") val platformBuild: String,
+            @SerialName("platformVersion") val platformVersion: String,
+            @SerialName("version") val version: String,
         ) {
 
             @Serializable
             internal data class Download(
-                @SerialName("checksum")
-                val checksum: String,
-                @SerialName("link")
-                val link: String,
-                @SerialName("size")
-                val size: String
+                @SerialName("checksum") val checksum: String,
+                @SerialName("link") val link: String,
+                @SerialName("size") val size: String,
             )
         }
     }
diff --git a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/ApiIdeaReleases.kt b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/ApiIdeaReleasesItem.kt
similarity index 100%
rename from platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/ApiIdeaReleases.kt
rename to platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/ApiIdeaReleasesItem.kt
diff --git a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/CheckIdeaVersionTask.kt b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/CheckIdeaVersionTask.kt
index 9a9a369acd8fb..d5fe7fc6e9d81 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/CheckIdeaVersionTask.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/ideversion/CheckIdeaVersionTask.kt
@@ -17,7 +17,8 @@ open class CheckIdeaVersionTask : DefaultTask() {
             "fields=code,releases,releases.version,releases.build,releases.type&" +
             "code=IC"
 
-    private val versionRegex = "2\\d{2}\\.\\d+\\.\\d+(?:-EAP-SNAPSHOT)?".toRegex(RegexOption.IGNORE_CASE)
+    private val versionRegex =
+        "2\\d{2}\\.\\d+\\.\\d+(?:-EAP-SNAPSHOT)?".toRegex(RegexOption.IGNORE_CASE)
 
     init {
         group = "jewel"
@@ -42,7 +43,8 @@ open class CheckIdeaVersionTask : DefaultTask() {
         logger.lifecycle("Fetching IntelliJ Platform releases from $releasesUrl...")
         val icReleases =
             try {
-                URL(releasesUrl).openStream()
+                URL(releasesUrl)
+                    .openStream()
                     .use { json.decodeFromStream<List<ApiIdeaReleasesItem>>(it) }
                     .first()
             } catch (e: IOException) {
@@ -64,11 +66,13 @@ open class CheckIdeaVersionTask : DefaultTask() {
         val rawPlatformBuild = readPlatformBuild(currentPlatformVersion)
 
         val isCurrentBuildStable = !rawPlatformBuild.contains("EAP")
-        val latestAvailableBuild = icReleases.releases.asSequence()
-            .filter { it.version.startsWith(majorPlatformVersion) }
-            .filter { if (isCurrentBuildStable) it.type == "release" else true }
-            .sortedWith(ReleaseComparator)
-            .last()
+        val latestAvailableBuild =
+            icReleases.releases
+                .asSequence()
+                .filter { it.version.startsWith(majorPlatformVersion) }
+                .filter { if (isCurrentBuildStable) it.type == "release" else true }
+                .sortedWith(ReleaseComparator)
+                .last()
         logger.info("The latest IntelliJ Platform $majorPlatformVersion build is ${latestAvailableBuild.build}")
 
         val currentPlatformBuild = rawPlatformBuild.substringBefore('-')
@@ -83,36 +87,37 @@ open class CheckIdeaVersionTask : DefaultTask() {
                     appendLine()
                     append("Detected channel: ")
                     appendLine(if (isCurrentBuildStable) "stable" else "non-stable (eap/beta/rc)")
-                }
-            )
+                })
         }
         logger.lifecycle("No IntelliJ Platform version updates available. Current: $currentPlatformBuild")
     }
 
-    private fun getRawPlatformVersion(currentPlatformVersion: SupportedIJVersion) = when (currentPlatformVersion) {
-        SupportedIJVersion.IJ_232 -> "2023.2"
-        SupportedIJVersion.IJ_233 -> "2023.3"
-    }
+    private fun getRawPlatformVersion(currentPlatformVersion: SupportedIJVersion) =
+        when (currentPlatformVersion) {
+            SupportedIJVersion.IJ_232 -> "2023.2"
+            SupportedIJVersion.IJ_233 -> "2023.3"
+        }
 
     private fun readPlatformBuild(platformVersion: SupportedIJVersion): String {
         val catalogFile = project.rootProject.file("gradle/libs.versions.toml")
-        val dependencyName = when (platformVersion) {
-            SupportedIJVersion.IJ_232 -> "idea232"
-            SupportedIJVersion.IJ_233 -> "idea233"
-        }
-
-        val catalogDependencyLine = catalogFile
-            .useLines { lines ->
-                lines.find { it.startsWith(dependencyName) }
+        val dependencyName =
+            when (platformVersion) {
+                SupportedIJVersion.IJ_232 -> "idea232"
+                SupportedIJVersion.IJ_233 -> "idea233"
             }
-            ?: throw GradleException(
-                "Unable to find IJP dependency '$dependencyName' in the catalog file '${catalogFile.path}'"
-            )
-
-        val dependencyVersion = catalogDependencyLine.substringAfter(dependencyName)
-            .trimStart(' ', '=')
-            .trimEnd()
-            .trim('"')
+
+        val catalogDependencyLine =
+            catalogFile.useLines { lines -> lines.find { it.startsWith(dependencyName) } }
+                ?: throw GradleException(
+                    "Unable to find IJP dependency '$dependencyName' in the catalog file '${catalogFile.path}'"
+                )
+
+        val dependencyVersion =
+            catalogDependencyLine
+                .substringAfter(dependencyName)
+                .trimStart(' ', '=')
+                .trimEnd()
+                .trim('"')
 
         if (!dependencyVersion.matches(versionRegex)) {
             throw GradleException("Invalid IJP version found in version catalog: '$dependencyVersion'")
diff --git a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt
index e1d4a04f73960..6697b039f8359 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntUiThemeDescriptorReader.kt
@@ -14,7 +14,8 @@ import kotlinx.serialization.json.JsonPrimitive
 
 internal object IntUiThemeDescriptorReader {
 
-    private val colorGroups = setOf("Grey", "Blue", "Green", "Red", "Yellow", "Orange", "Purple", "Teal")
+    private val colorGroups =
+        setOf("Grey", "Blue", "Green", "Red", "Yellow", "Orange", "Purple", "Teal")
     private val colorClassName = ClassName("androidx.compose.ui.graphics", "Color")
 
     fun readThemeFrom(
@@ -23,33 +24,41 @@ internal object IntUiThemeDescriptorReader {
         ideaVersion: String,
         descriptorUrl: String,
     ) =
-        FileSpec.builder(className).apply {
-            indent("    ")
-            addFileComment("Generated by the Jewel Int UI Palette Generator\n")
-            addFileComment("Generated from the IntelliJ Platform version $ideaVersion\n")
-            addFileComment("Source: $descriptorUrl")
-
-            addImport(colorClassName.packageName, colorClassName.simpleName)
-
-            addType(TypeSpec.objectBuilder(className).apply {
-                addSuperinterface(ClassName.bestGuess("org.jetbrains.jewel.foundation.theme.ThemeDescriptor"))
-
-                addProperty(
-                    PropertySpec.builder("isDark", Boolean::class, KModifier.OVERRIDE)
-                        .initializer("%L", themeDescriptor.dark)
-                        .build()
-                )
-
-                addProperty(
-                    PropertySpec.builder("name", String::class, KModifier.OVERRIDE)
-                        .initializer("\"%L (Int UI)\"", themeDescriptor.name)
+        FileSpec.builder(className)
+            .apply {
+                indent("    ")
+                addFileComment("Generated by the Jewel Int UI Palette Generator\n")
+                addFileComment("Generated from the IntelliJ Platform version $ideaVersion\n")
+                addFileComment("Source: $descriptorUrl")
+
+                addImport(colorClassName.packageName, colorClassName.simpleName)
+
+                addType(
+                    TypeSpec.objectBuilder(className)
+                        .apply {
+                            addSuperinterface(
+                                ClassName.bestGuess("org.jetbrains.jewel.foundation.theme.ThemeDescriptor")
+                            )
+
+                            addProperty(
+                                PropertySpec.builder("isDark", Boolean::class, KModifier.OVERRIDE)
+                                    .initializer("%L", themeDescriptor.dark)
+                                    .build()
+                            )
+
+                            addProperty(
+                                PropertySpec.builder("name", String::class, KModifier.OVERRIDE)
+                                    .initializer("\"%L (Int UI)\"", themeDescriptor.name)
+                                    .build()
+                            )
+
+                            readColors(themeDescriptor.colors)
+                            readIcons(themeDescriptor)
+                        }
                         .build()
                 )
-
-                readColors(themeDescriptor.colors)
-                readIcons(themeDescriptor)
-            }.build())
-        }.build()
+            }
+            .build()
 
     private val colorPaletteClassName =
         ClassName.bestGuess("org.jetbrains.jewel.foundation.theme.ThemeColorPalette")
@@ -57,19 +66,22 @@ internal object IntUiThemeDescriptorReader {
         ClassName.bestGuess("org.jetbrains.jewel.foundation.theme.ThemeIconData")
 
     private fun TypeSpec.Builder.readColors(colors: Map<String, String>) {
-        val colorGroups = colors.entries.groupBy {
-            it.key.replace("""\d+""".toRegex(), "")
-        }.filterKeys {
-            colorGroups.contains(it)
-        }.map { (groupName, colors) ->
-            // We assume color lists are in the same order as in colorGroups
-            colors
-                .map { (_, value) ->
-                    val colorHexString = value.replace("#", "0xFF")
-                    CodeBlock.of("Color(%L)", colorHexString)
-                }
-                .joinToCode(prefix = "\n${groupName.lowercase()} = listOf(\n", separator = ",\n", suffix = "\n)")
-        }
+        val colorGroups = colors.entries
+            .groupBy { it.key.replace("""\d+""".toRegex(), "") }
+            .filterKeys { colorGroups.contains(it) }
+            .map { (groupName, colors) ->
+                // We assume color lists are in the same order as in colorGroups
+                colors
+                    .map { (_, value) ->
+                        val colorHexString = value.replace("#", "0xFF")
+                        CodeBlock.of("Color(%L)", colorHexString)
+                    }
+                    .joinToCode(
+                        prefix = "\n${groupName.lowercase()} = listOf(\n",
+                        separator = ",\n",
+                        suffix = "\n)"
+                    )
+            }
 
         val rawMap = colors
             .map { (key, value) ->
@@ -80,11 +92,7 @@ internal object IntUiThemeDescriptorReader {
 
         addProperty(
             PropertySpec.builder("colors", colorPaletteClassName, KModifier.OVERRIDE)
-                .initializer(
-                    "ThemeColorPalette(%L,\n%L\n)",
-                    colorGroups.joinToCode(","),
-                    rawMap
-                )
+                .initializer("ThemeColorPalette(%L,\n%L\n)", colorGroups.joinToCode(","), rawMap)
                 .build()
         )
     }
@@ -126,15 +134,16 @@ internal object IntUiThemeDescriptorReader {
     }
 
     private inline fun <reified K, reified V> Map<K, V>.toMapCodeBlock() =
-        entries
-            .map { (key, value) -> CodeBlock.of("\"%L\" to \"%L\"", key, value) }
+        entries.map { (key, value) -> CodeBlock.of("\"%L\" to \"%L\"", key, value) }
             .joinToCode(prefix = "mapOf(", separator = ",\n", suffix = ")")
 
-    private inline fun <reified K, reified V> createOverrideStringMapProperty(name: String, values: Map<K, V>) =
+    private inline fun <reified K, reified V> createOverrideStringMapProperty(
+        name: String,
+        values: Map<K, V>,
+    ) =
         PropertySpec.builder(
             name = name,
-            type = Map::class.asTypeName()
-                .parameterizedBy(K::class.asTypeName(), V::class.asTypeName()),
+            type = Map::class.asTypeName().parameterizedBy(K::class.asTypeName(), V::class.asTypeName()),
             KModifier.OVERRIDE
         )
             .initializer(
diff --git a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntelliJThemeGeneratorPlugin.kt b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntelliJThemeGeneratorPlugin.kt
index f3d90876567f4..33559e23ef6a1 100644
--- a/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntelliJThemeGeneratorPlugin.kt
+++ b/platform/jewel/buildSrc/src/main/kotlin/org/jetbrains/jewel/buildlogic/theme/IntelliJThemeGeneratorPlugin.kt
@@ -16,14 +16,16 @@ import org.gradle.api.tasks.TaskAction
 import org.gradle.kotlin.dsl.property
 import java.net.URL
 
-class ThemeGeneratorContainer(container: NamedDomainObjectContainer<ThemeGeneration>) : NamedDomainObjectContainer<ThemeGeneration> by container
+class ThemeGeneratorContainer(container: NamedDomainObjectContainer<ThemeGeneration>) :
+    NamedDomainObjectContainer<ThemeGeneration> by container
 
 class ThemeGeneration(val name: String, project: Project) {
 
-    val targetDir: DirectoryProperty = project.objects.directoryProperty()
-        .convention(project.layout.buildDirectory.dir("generated/theme"))
-    val ideaVersion = project.objects.property<String>()
-        .convention("232.6734")
+    val targetDir: DirectoryProperty =
+        project.objects
+            .directoryProperty()
+            .convention(project.layout.buildDirectory.dir("generated/theme"))
+    val ideaVersion = project.objects.property<String>().convention("232.6734")
     val themeClassName = project.objects.property<String>()
     val themeFile = project.objects.property<String>()
 }
@@ -64,7 +66,10 @@ open class IntelliJThemeGeneratorTask : DefaultTask() {
         val file = IntUiThemeDescriptorReader.readThemeFrom(themeDescriptor, className, ideaVersion.get(), url)
 
         val outputFile = outputFile.get().asFile
-        logger.lifecycle("Theme descriptor for ${themeDescriptor.name} parsed and code generated into ${outputFile.path}")
+        logger.lifecycle(
+            "Theme descriptor for ${themeDescriptor.name} parsed and " +
+                "code generated into ${outputFile.path}"
+        )
         outputFile.bufferedWriter().use { file.writeTo(it) }
     }
 }
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt
index 4d685d9825ac8..6abc043863e84 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/DecoratedWindow.kt
@@ -5,6 +5,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.compositionLocalOf
 import androidx.compose.runtime.getValue
@@ -42,7 +43,8 @@ import java.awt.event.ComponentListener
 import java.awt.event.WindowAdapter
 import java.awt.event.WindowEvent
 
-@Composable fun DecoratedWindow(
+@Composable
+public fun DecoratedWindow(
     onCloseRequest: () -> Unit,
     state: WindowState = rememberWindowState(),
     visible: Boolean = true,
@@ -60,7 +62,7 @@ import java.awt.event.WindowEvent
     remember {
         if (!JBR.isAvailable()) {
             error(
-                "DecoratedWindow only can be used on JetBrainsRuntime(JBR) platform, " +
+                "DecoratedWindow can only be used on JetBrainsRuntime(JBR) platform, " +
                     "please check the document https://github.com/JetBrains/jewel#int-ui-standalone-theme",
             )
         }
@@ -76,7 +78,7 @@ import java.awt.event.WindowEvent
         title,
         icon,
         undecorated,
-        false,
+        transparent = false,
         resizable,
         enabled,
         focusable,
@@ -124,9 +126,11 @@ import java.awt.event.WindowEvent
                     // Empty
                 }
             }
+
             window.addWindowListener(adapter)
             window.addWindowStateListener(adapter)
             window.addComponentListener(adapter)
+
             onDispose {
                 window.removeWindowListener(adapter)
                 window.removeWindowStateListener(adapter)
@@ -134,48 +138,52 @@ import java.awt.event.WindowEvent
             }
         }
 
-        val undecoratedWindowBorder = if (undecorated && !decoratedWindowState.isMaximized) {
-            Modifier.border(
-                Stroke.Alignment.Inside,
-                style.metrics.borderWidth,
-                style.colors.borderFor(decoratedWindowState).value,
-                RectangleShape,
-            ).padding(style.metrics.borderWidth)
-        } else {
-            Modifier
-        }
+        val undecoratedWindowBorder =
+            if (undecorated && !decoratedWindowState.isMaximized) {
+                Modifier.border(
+                    Stroke.Alignment.Inside,
+                    style.metrics.borderWidth,
+                    style.colors.borderFor(decoratedWindowState).value,
+                    RectangleShape,
+                ).padding(style.metrics.borderWidth)
+            } else {
+                Modifier
+            }
 
         CompositionLocalProvider(
             LocalTitleBarInfo provides TitleBarInfo(title, icon),
         ) {
-            Layout({
-                val scope = object : DecoratedWindowScope {
-                    override val state: DecoratedWindowState
-                        get() = decoratedWindowState
-
-                    override val window: ComposeWindow get() = this@Window.window
-                }
-                scope.content()
-            }, modifier = undecoratedWindowBorder.trackWindowActivation(window), measurePolicy = DecoratedWindowMeasurePolicy)
+            Layout(
+                content = {
+                    val scope = object : DecoratedWindowScope {
+                        override val state: DecoratedWindowState
+                            get() = decoratedWindowState
+
+                        override val window: ComposeWindow
+                            get() = this@Window.window
+                    }
+                    scope.content()
+                },
+                modifier = undecoratedWindowBorder.trackWindowActivation(window),
+                measurePolicy = DecoratedWindowMeasurePolicy,
+            )
         }
     }
 }
 
-@Stable interface DecoratedWindowScope : FrameWindowScope {
+@Stable
+public interface DecoratedWindowScope : FrameWindowScope {
 
     override val window: ComposeWindow
 
-    val state: DecoratedWindowState
+    public val state: DecoratedWindowState
 }
 
 private object DecoratedWindowMeasurePolicy : MeasurePolicy {
 
     override fun MeasureScope.measure(measurables: List<Measurable>, constraints: Constraints): MeasureResult {
         if (measurables.isEmpty()) {
-            return layout(
-                constraints.minWidth,
-                constraints.minHeight,
-            ) {}
+            return layout(width = constraints.minWidth, height = constraints.minHeight) {}
         }
 
         val titleBars = measurables.filter { it.layoutId == TITLE_BAR_LAYOUT_ID }
@@ -197,7 +205,8 @@ private object DecoratedWindowMeasurePolicy : MeasurePolicy {
 
         for (it in measurables) {
             if (it.layoutId.toString().startsWith(TITLE_BAR_COMPONENT_LAYOUT_ID_PREFIX)) continue
-            val placeable = it.measure(contentConstraints.offset(vertical = -titleBarHeight - titleBarBorderHeight))
+            val offsetConstraints = contentConstraints.offset(vertical = -titleBarHeight - titleBarBorderHeight)
+            val placeable = it.measure(offsetConstraints)
             measuredPlaceable += placeable
         }
 
@@ -205,77 +214,76 @@ private object DecoratedWindowMeasurePolicy : MeasurePolicy {
             titleBarPlaceable?.placeRelative(0, 0)
             titleBarBorderPlaceable?.placeRelative(0, titleBarHeight)
 
-            measuredPlaceable.forEach {
-                it.placeRelative(0, titleBarHeight + titleBarBorderHeight)
-            }
+            measuredPlaceable.forEach { it.placeRelative(0, titleBarHeight + titleBarBorderHeight) }
         }
     }
 }
 
-@Immutable @JvmInline
-value class DecoratedWindowState(val state: ULong) {
+@Immutable
+@JvmInline
+public value class DecoratedWindowState(public val state: ULong) {
 
-    @Stable val isActive: Boolean
+    public val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable val isFullscreen: Boolean
+    public val isFullscreen: Boolean
         get() = state and Fullscreen != 0UL
 
-    @Stable val isMinimized: Boolean
+    public val isMinimized: Boolean
         get() = state and Minimize != 0UL
 
-    @Stable val isMaximized: Boolean
+    public val isMaximized: Boolean
         get() = state and Maximize != 0UL
 
-    fun copy(
+    public fun copy(
         fullscreen: Boolean = isFullscreen,
         minimized: Boolean = isMinimized,
         maximized: Boolean = isMaximized,
         active: Boolean = isActive,
-    ) = of(
-        fullscreen = fullscreen,
-        minimized = minimized,
-        maximized = maximized,
-        active = active,
-    )
+    ): DecoratedWindowState =
+        of(
+            fullscreen = fullscreen,
+            minimized = minimized,
+            maximized = maximized,
+            active = active,
+        )
 
-    override fun toString() = "${javaClass.simpleName}(isFullscreen=$isFullscreen, isActive=$isActive)"
+    override fun toString(): String =
+        "${javaClass.simpleName}(isFullscreen=$isFullscreen, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        val Active = 1UL shl 0
-        val Fullscreen = 1UL shl 1
-        val Minimize = 1UL shl 2
-        val Maximize = 1UL shl 3
+        public val Active: ULong = 1UL shl 0
+        public val Fullscreen: ULong = 1UL shl 1
+        public val Minimize: ULong = 1UL shl 2
+        public val Maximize: ULong = 1UL shl 3
 
-        fun of(
+        public fun of(
             fullscreen: Boolean = false,
             minimized: Boolean = false,
             maximized: Boolean = false,
             active: Boolean = true,
-        ) = DecoratedWindowState(
-            state = (if (fullscreen) Fullscreen else 0UL) or
-                (if (minimized) Minimize else 0UL) or
-                (if (maximized) Maximize else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): DecoratedWindowState =
+            DecoratedWindowState(
+                (if (fullscreen) Fullscreen else 0UL) or
+                    (if (minimized) Minimize else 0UL) or
+                    (if (maximized) Maximize else 0UL) or
+                    (if (active) Active else 0UL),
+            )
 
-        fun of(
-            window: ComposeWindow,
-        ) = of(
-            window.placement == WindowPlacement.Fullscreen,
-            window.isMinimized,
-            window.placement == WindowPlacement.Maximized,
-            window.isActive,
-        )
+        public fun of(window: ComposeWindow): DecoratedWindowState =
+            of(
+                fullscreen = window.placement == WindowPlacement.Fullscreen,
+                minimized = window.isMinimized,
+                maximized = window.placement == WindowPlacement.Maximized,
+                active = window.isActive,
+            )
     }
 }
 
-internal data class TitleBarInfo(
-    val title: String,
-    val icon: Painter?,
-)
+internal data class TitleBarInfo(val title: String, val icon: Painter?)
 
-internal val LocalTitleBarInfo = compositionLocalOf<TitleBarInfo> {
-    error("CompositionLocal LocalTitleBarInfo not provided, TitleBar must be used in DecoratedWindow")
-}
+internal val LocalTitleBarInfo: ProvidableCompositionLocal<TitleBarInfo> =
+    compositionLocalOf {
+        error("LocalTitleBarInfo not provided, TitleBar must be used in DecoratedWindow")
+    }
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/Theme.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/Theme.kt
index 9a66b25fa3494..93d672e51513b 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/Theme.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/Theme.kt
@@ -8,12 +8,10 @@ import org.jetbrains.jewel.window.styling.LocalDecoratedWindowStyle
 import org.jetbrains.jewel.window.styling.LocalTitleBarStyle
 import org.jetbrains.jewel.window.styling.TitleBarStyle
 
-val JewelTheme.Companion.defaultTitleBarStyle: TitleBarStyle
-    @Composable
-    @ReadOnlyComposable
+public val JewelTheme.Companion.defaultTitleBarStyle: TitleBarStyle
+    @Composable @ReadOnlyComposable
     get() = LocalTitleBarStyle.current
 
-val JewelTheme.Companion.defaultDecoratedWindowStyle: DecoratedWindowStyle
-    @Composable
-    @ReadOnlyComposable
+public val JewelTheme.Companion.defaultDecoratedWindowStyle: DecoratedWindowStyle
+    @Composable @ReadOnlyComposable
     get() = LocalDecoratedWindowStyle.current
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt
index c8057a29a6822..04e50248a1f26 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Linux.kt
@@ -38,9 +38,13 @@ internal fun DecoratedWindowScope.TitleBarOnLinux(
     val viewConfig = LocalViewConfiguration.current
     TitleBarImpl(
         modifier.onPointerEvent(PointerEventType.Press, PointerEventPass.Main) {
-            if (this.currentEvent.button == PointerButton.Primary && this.currentEvent.changes.any { changed -> !changed.isConsumed }) {
+            if (this.currentEvent.button == PointerButton.Primary &&
+                this.currentEvent.changes.any { changed -> !changed.isConsumed }
+            ) {
                 JBR.getWindowMove()?.startMovingTogetherWithMouse(window, MouseEvent.BUTTON1)
-                if (System.currentTimeMillis() - lastPress in viewConfig.doubleTapMinTimeMillis..viewConfig.doubleTapTimeoutMillis) {
+                if (System.currentTimeMillis() - lastPress in
+                    viewConfig.doubleTapMinTimeMillis..viewConfig.doubleTapTimeoutMillis
+                ) {
                     if (state.isMaximized) {
                         window.extendedState = Frame.NORMAL
                     } else {
@@ -54,22 +58,33 @@ internal fun DecoratedWindowScope.TitleBarOnLinux(
         style,
         { _, _ -> PaddingValues(0.dp) },
     ) { state ->
-        CloseButton({
-            window.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING))
-        }, state, style)
+        CloseButton(
+            { window.dispatchEvent(WindowEvent(window, WindowEvent.WINDOW_CLOSING)) },
+            state,
+            style,
+        )
 
         if (state.isMaximized) {
-            ControlButton({
-                window.extendedState = Frame.NORMAL
-            }, state, style.icons.restoreButton, "Restore")
+            ControlButton(
+                { window.extendedState = Frame.NORMAL },
+                state,
+                style.icons.restoreButton,
+                "Restore",
+            )
         } else {
-            ControlButton({
-                window.extendedState = Frame.MAXIMIZED_BOTH
-            }, state, style.icons.maximizeButton, "Maximize")
+            ControlButton(
+                { window.extendedState = Frame.MAXIMIZED_BOTH },
+                state,
+                style.icons.maximizeButton,
+                "Maximize",
+            )
         }
-        ControlButton({
-            window.extendedState = Frame.ICONIFIED
-        }, state, style.icons.minimizeButton, "Minimize")
+        ControlButton(
+            { window.extendedState = Frame.ICONIFIED },
+            state,
+            style.icons.minimizeButton,
+            "Minimize",
+        )
         content(state)
     }
 }
@@ -80,7 +95,14 @@ private fun TitleBarScope.CloseButton(
     state: DecoratedWindowState,
     style: TitleBarStyle = JewelTheme.defaultTitleBarStyle,
 ) {
-    ControlButton(onClick, state, style.icons.closeButton, "Close", style, style.paneCloseButtonStyle)
+    ControlButton(
+        onClick,
+        state,
+        style.icons.closeButton,
+        "Close",
+        style,
+        style.paneCloseButtonStyle,
+    )
 }
 
 @Composable
@@ -94,12 +116,13 @@ private fun TitleBarScope.ControlButton(
 ) {
     IconButton(
         onClick,
-        Modifier.align(Alignment.End)
-            .focusable(false)
-            .size(style.metrics.titlePaneButtonSize),
+        Modifier.align(Alignment.End).focusable(false).size(style.metrics.titlePaneButtonSize),
         style = iconButtonStyle,
     ) {
-        Icon(painterProvider.getPainter(if (state.isActive) PainterHint else Inactive).value, description)
+        Icon(
+            painterProvider.getPainter(if (state.isActive) PainterHint else Inactive).value,
+            description,
+        )
     }
 }
 
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.MacOS.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.MacOS.kt
index d81074faa7f18..63475e2d14360 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.MacOS.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.MacOS.kt
@@ -15,28 +15,27 @@ import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.window.styling.TitleBarStyle
 import org.jetbrains.jewel.window.utils.macos.MacUtil
 
-fun Modifier.newFullscreenControls(newControls: Boolean = true): Modifier {
-    return then(
-        NewFullscreenControlsElement(
-            newControls,
-            inspectorInfo = debugInspectorInfo {
-                name = "newFullscreenControls"
-                value = newControls
-            },
-        ),
+public fun Modifier.newFullscreenControls(newControls: Boolean = true): Modifier =
+    this then NewFullscreenControlsElement(
+        newControls,
+        debugInspectorInfo {
+            name = "newFullscreenControls"
+            value = newControls
+        },
     )
-}
 
 private class NewFullscreenControlsElement(
     val newControls: Boolean,
     val inspectorInfo: InspectorInfo.() -> Unit,
 ) : ModifierNodeElement<NewFullscreenControlsNode>() {
 
-    override fun create(): NewFullscreenControlsNode = NewFullscreenControlsNode(newControls)
+    override fun create(): NewFullscreenControlsNode =
+        NewFullscreenControlsNode(newControls)
 
     override fun equals(other: Any?): Boolean {
         if (this === other) return true
-        val otherModifier = other as? NewFullscreenControlsElement ?: return false
+        val otherModifier = other as? NewFullscreenControlsElement
+            ?: return false
         return newControls == otherModifier.newControls
     }
 
@@ -51,9 +50,7 @@ private class NewFullscreenControlsElement(
     }
 }
 
-private class NewFullscreenControlsNode(
-    var newControls: Boolean,
-) : Modifier.Node()
+private class NewFullscreenControlsNode(var newControls: Boolean) : Modifier.Node()
 
 @Composable
 internal fun DecoratedWindowScope.TitleBarOnMacOs(
@@ -85,10 +82,10 @@ internal fun DecoratedWindowScope.TitleBarOnMacOs(
     val titleBar = remember { JBR.getWindowDecorations().createCustomTitleBar() }
 
     TitleBarImpl(
-        modifier.customTitleBarMouseEventHandler(titleBar),
-        gradientStartColor,
-        style,
-        { height, state ->
+        modifier = modifier.customTitleBarMouseEventHandler(titleBar),
+        gradientStartColor = gradientStartColor,
+        style = style,
+        applyTitleBar = { height, state ->
             if (state.isFullscreen) {
                 MacUtil.updateFullScreenButtons(window)
             }
@@ -101,6 +98,6 @@ internal fun DecoratedWindowScope.TitleBarOnMacOs(
                 PaddingValues(start = titleBar.leftInset.dp, end = titleBar.rightInset.dp)
             }
         },
-        content,
+        content = content,
     )
 }
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Windows.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Windows.kt
index 6897c351b5103..e342f36baead3 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Windows.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.Windows.kt
@@ -27,38 +27,39 @@ internal fun DecoratedWindowScope.TitleBarOnWindows(
     val titleBar = remember { JBR.getWindowDecorations().createCustomTitleBar() }
 
     TitleBarImpl(
-        modifier.customTitleBarMouseEventHandler(titleBar),
-        gradientStartColor,
-        style,
-        { height, _ ->
+        modifier = modifier.customTitleBarMouseEventHandler(titleBar),
+        gradientStartColor = gradientStartColor,
+        style = style,
+        applyTitleBar = { height, _ ->
             titleBar.height = height.value
             titleBar.putProperty("controls.dark", style.colors.background.isDark())
             JBR.getWindowDecorations().setCustomTitleBar(window, titleBar)
             PaddingValues(start = titleBar.leftInset.dp, end = titleBar.rightInset.dp)
         },
-        content,
+        content = content,
     )
 }
 
-internal fun Modifier.customTitleBarMouseEventHandler(titleBar: CustomTitleBar): Modifier = this.pointerInput(Unit) {
-    val currentContext = currentCoroutineContext()
-    awaitPointerEventScope {
-        var inUserControl = false
-        while (currentContext.isActive) {
-            val event = awaitPointerEvent(PointerEventPass.Main)
-            event.changes.forEach {
-                if (!it.isConsumed && !inUserControl) {
-                    titleBar.forceHitTest(false)
-                } else {
-                    if (event.type == PointerEventType.Press) {
-                        inUserControl = true
+internal fun Modifier.customTitleBarMouseEventHandler(titleBar: CustomTitleBar): Modifier =
+    pointerInput(Unit) {
+        val currentContext = currentCoroutineContext()
+        awaitPointerEventScope {
+            var inUserControl = false
+            while (currentContext.isActive) {
+                val event = awaitPointerEvent(PointerEventPass.Main)
+                event.changes.forEach {
+                    if (!it.isConsumed && !inUserControl) {
+                        titleBar.forceHitTest(false)
+                    } else {
+                        if (event.type == PointerEventType.Press) {
+                            inUserControl = true
+                        }
+                        if (event.type == PointerEventType.Release) {
+                            inUserControl = false
+                        }
+                        titleBar.forceHitTest(true)
                     }
-                    if (event.type == PointerEventType.Release) {
-                        inUserControl = false
-                    }
-                    titleBar.forceHitTest(true)
                 }
             }
         }
     }
-}
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt
index 4a2a8174c58af..acd1218ff1642 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/TitleBar.kt
@@ -56,7 +56,8 @@ internal const val TITLE_BAR_LAYOUT_ID = "__TITLE_BAR_CONTENT__"
 
 internal const val TITLE_BAR_BORDER_LAYOUT_ID = "__TITLE_BAR_BORDER__"
 
-@Composable fun DecoratedWindowScope.TitleBar(
+@Composable
+public fun DecoratedWindowScope.TitleBar(
     modifier: Modifier = Modifier,
     gradientStartColor: Color = Color.Unspecified,
     style: TitleBarStyle = JewelTheme.defaultTitleBarStyle,
@@ -101,7 +102,7 @@ internal fun DecoratedWindowScope.TitleBarImpl(
     }
 
     Layout(
-        {
+        content = {
             CompositionLocalProvider(
                 LocalContentColor provides style.colors.content,
                 LocalIconButtonStyle provides style.iconButtonStyle,
@@ -113,15 +114,11 @@ internal fun DecoratedWindowScope.TitleBarImpl(
                 }
             }
         },
-        modifier.background(backgroundBrush)
+        modifier = modifier.background(backgroundBrush)
             .focusProperties { canFocus = false }
             .layoutId(TITLE_BAR_LAYOUT_ID)
             .height(style.metrics.height)
-            .onSizeChanged {
-                with(density) {
-                    applyTitleBar(it.height.toDp(), state)
-                }
-            }
+            .onSizeChanged { with(density) { applyTitleBar(it.height.toDp(), state) } }
             .fillMaxWidth(),
         measurePolicy = rememberTitleBarMeasurePolicy(
             window,
@@ -130,7 +127,12 @@ internal fun DecoratedWindowScope.TitleBarImpl(
         ),
     )
 
-    Spacer(Modifier.layoutId(TITLE_BAR_BORDER_LAYOUT_ID).height(1.dp).fillMaxWidth().background(style.colors.border))
+    Spacer(
+        Modifier.layoutId(TITLE_BAR_BORDER_LAYOUT_ID)
+            .height(1.dp)
+            .fillMaxWidth()
+            .background(style.colors.border),
+    )
 }
 
 internal class TitleBarMeasurePolicy(
@@ -141,10 +143,7 @@ internal class TitleBarMeasurePolicy(
 
     override fun MeasureScope.measure(measurables: List<Measurable>, constraints: Constraints): MeasureResult {
         if (measurables.isEmpty()) {
-            return layout(
-                constraints.minWidth,
-                constraints.minHeight,
-            ) {}
+            return layout(width = constraints.minWidth, height = constraints.minHeight) {}
         }
 
         var occupiedSpaceHorizontally = 0
@@ -179,9 +178,11 @@ internal class TitleBarMeasurePolicy(
             if (state.isFullscreen) {
                 MacUtil.updateFullScreenButtons(window)
             }
-            val placeableGroups = measuredPlaceable.groupBy { (measurable, _) ->
-                (measurable.parentData as? TitleBarChildDataNode)?.horizontalAlignment ?: Alignment.CenterHorizontally
-            }
+            val placeableGroups =
+                measuredPlaceable.groupBy { (measurable, _) ->
+                    (measurable.parentData as? TitleBarChildDataNode)?.horizontalAlignment
+                        ?: Alignment.CenterHorizontally
+                }
 
             var headUsedSpace = leftInset
             var trailerUsedSpace = rightInset
@@ -230,23 +231,19 @@ internal fun rememberTitleBarMeasurePolicy(
     window: Window,
     state: DecoratedWindowState,
     applyTitleBar: (Dp, DecoratedWindowState) -> PaddingValues,
-): MeasurePolicy {
-    return remember(window, state, applyTitleBar) {
-        TitleBarMeasurePolicy(
-            window,
-            state,
-            applyTitleBar,
-        )
+): MeasurePolicy =
+    remember(window, state, applyTitleBar) {
+        TitleBarMeasurePolicy(window, state, applyTitleBar)
     }
-}
 
-interface TitleBarScope {
+public interface TitleBarScope {
 
-    val title: String
+    public val title: String
 
-    val icon: Painter?
+    public val icon: Painter?
 
-    @Stable fun Modifier.align(alignment: Alignment.Horizontal): Modifier
+    @Stable
+    public fun Modifier.align(alignment: Alignment.Horizontal): Modifier
 }
 
 private class TitleBarScopeImpl(
@@ -254,17 +251,14 @@ private class TitleBarScopeImpl(
     override val icon: Painter?,
 ) : TitleBarScope {
 
-    override fun Modifier.align(alignment: Alignment.Horizontal): Modifier {
-        return then(
-            TitleBarChildDataElement(
-                alignment,
-                inspectorInfo = debugInspectorInfo {
-                    name = "align"
-                    value = alignment
-                },
-            ),
+    override fun Modifier.align(alignment: Alignment.Horizontal): Modifier =
+        this then TitleBarChildDataElement(
+            alignment,
+            debugInspectorInfo {
+                name = "align"
+                value = alignment
+            },
         )
-    }
 }
 
 private class TitleBarChildDataElement(
@@ -295,5 +289,6 @@ private class TitleBarChildDataNode(
     var horizontalAlignment: Alignment.Horizontal,
 ) : ParentDataModifierNode, Modifier.Node() {
 
-    override fun Density.modifyParentData(parentData: Any?) = this@TitleBarChildDataNode
+    override fun Density.modifyParentData(parentData: Any?) =
+        this@TitleBarChildDataNode
 }
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt
index b7ef0d0efb97d..cc15f5ac628e2 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/DecoratedWindowStyling.kt
@@ -2,6 +2,8 @@ package org.jetbrains.jewel.window.styling
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -11,39 +13,41 @@ import org.jetbrains.jewel.window.DecoratedWindowState
 
 @Immutable
 @GenerateDataFunctions
-class DecoratedWindowStyle(
-    val colors: DecoratedWindowColors,
-    val metrics: DecoratedWindowMetrics,
+public class DecoratedWindowStyle(
+    public val colors: DecoratedWindowColors,
+    public val metrics: DecoratedWindowMetrics,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class DecoratedWindowColors(
-    val border: Color,
-    val borderInactive: Color,
+public class DecoratedWindowColors(
+    public val border: Color,
+    public val borderInactive: Color,
 ) {
 
     @Composable
-    fun borderFor(state: DecoratedWindowState) = rememberUpdatedState(
-        when {
-            !state.isActive -> borderInactive
-            else -> border
-        },
-    )
-
-    companion object
+    public fun borderFor(state: DecoratedWindowState): State<Color> =
+        rememberUpdatedState(
+            when {
+                !state.isActive -> borderInactive
+                else -> border
+            },
+        )
+
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class DecoratedWindowMetrics(val borderWidth: Dp) {
+public class DecoratedWindowMetrics(public val borderWidth: Dp) {
 
-    companion object
+    public companion object
 }
 
-val LocalDecoratedWindowStyle = staticCompositionLocalOf<DecoratedWindowStyle> {
-    error("No DecoratedWindowStyle provided")
-}
+public val LocalDecoratedWindowStyle: ProvidableCompositionLocal<DecoratedWindowStyle> =
+    staticCompositionLocalOf {
+        error("No DecoratedWindowStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt
index 60e5d634e1cdb..ca0d907f2ca05 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/styling/TitleBarStyling.kt
@@ -2,7 +2,9 @@ package org.jetbrains.jewel.window.styling
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -16,82 +18,85 @@ import org.jetbrains.jewel.window.DecoratedWindowState
 
 @Stable
 @GenerateDataFunctions
-class TitleBarStyle(
-    val colors: TitleBarColors,
-    val metrics: TitleBarMetrics,
-    val icons: TitleBarIcons,
-    val dropdownStyle: DropdownStyle,
-    val iconButtonStyle: IconButtonStyle,
-    val paneButtonStyle: IconButtonStyle,
-    val paneCloseButtonStyle: IconButtonStyle,
+public class TitleBarStyle(
+    public val colors: TitleBarColors,
+    public val metrics: TitleBarMetrics,
+    public val icons: TitleBarIcons,
+    public val dropdownStyle: DropdownStyle,
+    public val iconButtonStyle: IconButtonStyle,
+    public val paneButtonStyle: IconButtonStyle,
+    public val paneCloseButtonStyle: IconButtonStyle,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class TitleBarColors(
-    val background: Color,
-    val inactiveBackground: Color,
-    val content: Color,
-    val border: Color,
+public class TitleBarColors(
+    public val background: Color,
+    public val inactiveBackground: Color,
+    public val content: Color,
+    public val border: Color,
 
-    // The background color for newControlButtons(three circles in left top corner) in MacOS fullscreen mode
-    val fullscreenControlButtonsBackground: Color,
+    // The background color for newControlButtons(three circles in left top corner) in MacOS
+    // fullscreen mode
+    public val fullscreenControlButtonsBackground: Color,
 
     // The hover and press background color for window control buttons(minimize, maximize) in Linux
-    val titlePaneButtonHoveredBackground: Color,
-    val titlePaneButtonPressedBackground: Color,
+    public val titlePaneButtonHoveredBackground: Color,
+    public val titlePaneButtonPressedBackground: Color,
 
     // The hover and press background color for window close button in Linux
-    val titlePaneCloseButtonHoveredBackground: Color,
-    val titlePaneCloseButtonPressedBackground: Color,
+    public val titlePaneCloseButtonHoveredBackground: Color,
+    public val titlePaneCloseButtonPressedBackground: Color,
 
     // The hover and press background color for IconButtons in title bar content
-    val iconButtonHoveredBackground: Color,
-    val iconButtonPressedBackground: Color,
+    public val iconButtonHoveredBackground: Color,
+    public val iconButtonPressedBackground: Color,
 
     // The hover and press background color for Dropdown in title bar content
-    val dropdownPressedBackground: Color,
-    val dropdownHoveredBackground: Color,
+    public val dropdownPressedBackground: Color,
+    public val dropdownHoveredBackground: Color,
 ) {
 
     @Composable
-    fun backgroundFor(state: DecoratedWindowState) = rememberUpdatedState(
-        when {
-            !state.isActive -> inactiveBackground
-            else -> background
-        },
-    )
-
-    companion object
+    public fun backgroundFor(state: DecoratedWindowState): State<Color> =
+        rememberUpdatedState(
+            when {
+                !state.isActive -> inactiveBackground
+                else -> background
+            },
+        )
+
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class TitleBarMetrics(
-    val height: Dp,
-    val gradientStartX: Dp,
-    val gradientEndX: Dp,
-    val titlePaneButtonSize: DpSize,
+public class TitleBarMetrics(
+    public val height: Dp,
+    public val gradientStartX: Dp,
+    public val gradientEndX: Dp,
+    public val titlePaneButtonSize: DpSize,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class TitleBarIcons(
-    val minimizeButton: PainterProvider,
-    val maximizeButton: PainterProvider,
-    val restoreButton: PainterProvider,
-    val closeButton: PainterProvider,
+public class TitleBarIcons(
+    public val minimizeButton: PainterProvider,
+    public val maximizeButton: PainterProvider,
+    public val restoreButton: PainterProvider,
+    public val closeButton: PainterProvider,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalTitleBarStyle = staticCompositionLocalOf<TitleBarStyle> {
-    error("No TitleBarStyle provided")
-}
+public val LocalTitleBarStyle: ProvidableCompositionLocal<TitleBarStyle> =
+    staticCompositionLocalOf {
+        error("No TitleBarStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/DesktopPlatform.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/DesktopPlatform.kt
index b42669349111a..51872dc474ff3 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/DesktopPlatform.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/DesktopPlatform.kt
@@ -1,14 +1,15 @@
 package org.jetbrains.jewel.window.utils
 
-enum class DesktopPlatform {
+public enum class DesktopPlatform {
     Linux,
     Windows,
     MacOS,
     Unknown,
     ;
 
-    companion object {
-        val Current: DesktopPlatform by lazy {
+    public companion object {
+
+        public val Current: DesktopPlatform by lazy {
             val name = System.getProperty("os.name")
             when {
                 name?.startsWith("Linux") == true -> Linux
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/JnaLoader.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/JnaLoader.kt
index c44cc077b24e8..7e136b0f65fd1 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/JnaLoader.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/JnaLoader.kt
@@ -10,13 +10,12 @@ internal object JnaLoader {
     private var loaded: Boolean? = null
     private val logger = Logger.getLogger(JnaLoader::class.java.simpleName)
 
-    @Synchronized fun load() {
+    @Synchronized
+    fun load() {
         if (loaded == null) {
             loaded = false
             try {
-                val time = measureTimeMillis {
-                    Native.POINTER_SIZE
-                }
+                val time = measureTimeMillis { Native.POINTER_SIZE }
                 logger.info("JNA library (${Native.POINTER_SIZE shl 3}-bit) loaded in $time ms")
                 loaded = true
             } catch (@Suppress("TooGenericExceptionCaught") t: Throwable) {
@@ -33,7 +32,8 @@ internal object JnaLoader {
         }
     }
 
-    @get:Synchronized val isLoaded: Boolean
+    @get:Synchronized
+    val isLoaded: Boolean
         get() {
             if (loaded == null) {
                 load()
diff --git a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/UnsafeAccessing.kt b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/UnsafeAccessing.kt
index 2dd553873b99a..ed0e7920a27d3 100644
--- a/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/UnsafeAccessing.kt
+++ b/platform/jewel/decorated-window/src/main/kotlin/org/jetbrains/jewel/window/utils/UnsafeAccessing.kt
@@ -20,13 +20,9 @@ internal object UnsafeAccessing {
         }
     }
 
-    val desktopModule by lazy {
-        ModuleLayer.boot().findModule("java.desktop").get()
-    }
+    val desktopModule by lazy { ModuleLayer.boot().findModule("java.desktop").get() }
 
-    val ownerModule: Module by lazy {
-        this.javaClass.module
-    }
+    val ownerModule: Module by lazy { this.javaClass.module }
 
     private val isAccessibleFieldOffset: Long? by lazy {
         try {
@@ -38,11 +34,9 @@ internal object UnsafeAccessing {
 
     private val implAddOpens by lazy {
         try {
-            Module::class.java.getDeclaredMethod(
-                "implAddOpens",
-                String::class.java,
-                Module::class.java,
-            ).accessible()
+            Module::class.java
+                .getDeclaredMethod("implAddOpens", String::class.java, Module::class.java)
+                .accessible()
         } catch (_: Throwable) {
             null
         }
@@ -60,9 +54,7 @@ internal object UnsafeAccessing {
 
     fun assignAccessibility(module: Module, packages: List<String>) {
         try {
-            packages.forEach {
-                implAddOpens?.invoke(module, it, ownerModule)
-            }
+            packages.forEach { implAddOpens?.invoke(module, it, ownerModule) }
         } catch (_: Throwable) {
             // ignore
         }
@@ -77,8 +69,5 @@ internal object UnsafeAccessing {
     }
 }
 
-internal fun <T : AccessibleObject> T.accessible(): T {
-    return apply {
-        UnsafeAccessing.assignAccessibility(this)
-    }
-}
+internal fun <T : AccessibleObject> T.accessible(): T =
+    apply { UnsafeAccessing.assignAccessibility(this) }
diff --git a/platform/jewel/foundation/build.gradle.kts b/platform/jewel/foundation/build.gradle.kts
index f8eda8d687513..1e835ea5289dc 100644
--- a/platform/jewel/foundation/build.gradle.kts
+++ b/platform/jewel/foundation/build.gradle.kts
@@ -7,7 +7,8 @@ plugins {
     alias(libs.plugins.composeDesktop)
 }
 
-private val composeVersion get() = ComposeBuildConfig.composeVersion
+private val composeVersion
+    get() = ComposeBuildConfig.composeVersion
 
 dependencies {
     api("org.jetbrains.compose.foundation:foundation-desktop:$composeVersion")
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/Compatibility.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/Compatibility.kt
index a9a89a4dd0352..18fe0c6baf7e5 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/Compatibility.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/Compatibility.kt
@@ -1,16 +1,15 @@
 package org.jetbrains.jewel.foundation
 
 /**
- * Enables the new compositing strategy for rendering directly into Swing
- * Graphics. This fixes z-order problems and artifacts on resizing, but
- * has a performance penalty when using infinitely repeating animations.
+ * Enables the new compositing strategy for rendering directly into Swing Graphics. This fixes
+ * z-order problems and artifacts on resizing, but has a performance penalty when using infinitely
+ * repeating animations.
  *
- * We assume the majority of our users will want this flag to be on, so
- * this convenience function is provided to that end. Make sure you call
- * it **before** you initialize any Compose content. The function is
- * idempotent and extremely cheap, so you can call it on any entry point.
+ * We assume the majority of our users will want this flag to be on, so this convenience function is
+ * provided to that end. Make sure you call it **before** you initialize any Compose content. The
+ * function is idempotent and extremely cheap, so you can call it on any entry point.
  */
 @ExperimentalJewelApi
-fun enableNewSwingCompositing() {
+public fun enableNewSwingCompositing() {
     System.setProperty("compose.swing.render.on.graphics", "true")
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/ExperimentalJewelApi.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/ExperimentalJewelApi.kt
index 9fb4e89038966..abb36a56fcc19 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/ExperimentalJewelApi.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/ExperimentalJewelApi.kt
@@ -1,12 +1,20 @@
 package org.jetbrains.jewel.foundation
 
+import kotlin.RequiresOptIn.Level
+
 @RequiresOptIn(
-    level = RequiresOptIn.Level.WARNING,
-    message = "This is an experimental API for Jewel and is likely to change before becoming " +
-        "stable.",
+    level = Level.WARNING,
+    message = "This is an experimental API for Jewel and is likely to change before becoming stable.",
 )
 @Target(
     AnnotationTarget.CLASS,
+    AnnotationTarget.CONSTRUCTOR,
+    AnnotationTarget.FIELD,
     AnnotationTarget.FUNCTION,
+    AnnotationTarget.PROPERTY,
+    AnnotationTarget.PROPERTY_GETTER,
+    AnnotationTarget.PROPERTY_SETTER,
+    AnnotationTarget.TYPEALIAS,
+    AnnotationTarget.VALUE_PARAMETER,
 )
-annotation class ExperimentalJewelApi
+public annotation class ExperimentalJewelApi
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GenerateDataFunctions.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GenerateDataFunctions.kt
index 2f95513f278fa..d7f1be727ee91 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GenerateDataFunctions.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GenerateDataFunctions.kt
@@ -1,10 +1,11 @@
 package org.jetbrains.jewel.foundation
 
 /**
- * Instructs the Poko compiler plugin to generate equals, hashcode,
- * and toString functions for the class it's attached to.
+ * Instructs the Poko compiler plugin to generate equals, hashcode, and
+ * toString functions for the class it's attached to.
  *
- * See https://github.com/JetBrains/jewel/issues/83
+ * See [this issue](https://github.com/JetBrains/jewel/issues/83) for
+ * details.
  */
 @Target(AnnotationTarget.CLASS)
-annotation class GenerateDataFunctions
+public annotation class GenerateDataFunctions
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt
index a531624fc0aaf..6d941f6703877 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalColors.kt
@@ -1,45 +1,47 @@
 package org.jetbrains.jewel.foundation
 
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 
 @Immutable
 @GenerateDataFunctions
-class GlobalColors(
-    val borders: BorderColors,
-    val outlines: OutlineColors,
-    val infoContent: Color,
-    val paneBackground: Color,
+public class GlobalColors(
+    public val borders: BorderColors,
+    public val outlines: OutlineColors,
+    public val infoContent: Color,
+    public val paneBackground: Color,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class BorderColors(
-    val normal: Color,
-    val focused: Color,
-    val disabled: Color,
+public class BorderColors(
+    public val normal: Color,
+    public val focused: Color,
+    public val disabled: Color,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class OutlineColors(
-    val focused: Color,
-    val focusedWarning: Color,
-    val focusedError: Color,
-    val warning: Color,
-    val error: Color,
+public class OutlineColors(
+    public val focused: Color,
+    public val focusedWarning: Color,
+    public val focusedError: Color,
+    public val warning: Color,
+    public val error: Color,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalGlobalColors = staticCompositionLocalOf<GlobalColors> {
-    error("No GlobalColors provided")
-}
+public val LocalGlobalColors: ProvidableCompositionLocal<GlobalColors> =
+    staticCompositionLocalOf {
+        error("No GlobalColors provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalMetrics.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalMetrics.kt
index ced8ecd3ff2a7..1438c785c6c57 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalMetrics.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/GlobalMetrics.kt
@@ -1,19 +1,21 @@
 package org.jetbrains.jewel.foundation
 
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.unit.Dp
 
 @Immutable
 @GenerateDataFunctions
-class GlobalMetrics(
-    val outlineWidth: Dp,
-    val rowHeight: Dp,
+public class GlobalMetrics(
+    public val outlineWidth: Dp,
+    public val rowHeight: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalGlobalMetrics = staticCompositionLocalOf<GlobalMetrics> {
-    error("No GlobalMetrics provided")
-}
+public val LocalGlobalMetrics: ProvidableCompositionLocal<GlobalMetrics> =
+    staticCompositionLocalOf {
+        error("No GlobalMetrics provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/InternalJewelApi.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/InternalJewelApi.kt
index faed75434c8bf..6c41b6823844d 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/InternalJewelApi.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/InternalJewelApi.kt
@@ -1,13 +1,21 @@
 package org.jetbrains.jewel.foundation
 
+import kotlin.RequiresOptIn.Level
+
 @RequiresOptIn(
-    level = RequiresOptIn.Level.WARNING,
+    level = Level.WARNING,
     message = "This is an internal API for Jewel and is subject to change without notice.",
 )
 @Target(
     AnnotationTarget.CLASS,
-    AnnotationTarget.FUNCTION,
     AnnotationTarget.CONSTRUCTOR,
+    AnnotationTarget.FIELD,
+    AnnotationTarget.FUNCTION,
     AnnotationTarget.PROPERTY,
+    AnnotationTarget.PROPERTY_GETTER,
+    AnnotationTarget.PROPERTY_SETTER,
+    AnnotationTarget.TYPEALIAS,
+    AnnotationTarget.VALUE_PARAMETER,
+
 )
-annotation class InternalJewelApi
+public annotation class InternalJewelApi
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/Stroke.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/Stroke.kt
index 0dd5caa67468e..cbbb0684bb67a 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/Stroke.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/Stroke.kt
@@ -7,44 +7,57 @@ import androidx.compose.ui.graphics.SolidColor
 import androidx.compose.ui.graphics.isUnspecified
 import androidx.compose.ui.unit.Dp
 
-sealed class Stroke {
+public sealed class Stroke {
+
     @Immutable
-    object None : Stroke() {
+    public object None : Stroke() {
 
         override fun toString(): String = "None"
     }
 
     @Immutable
     @GenerateDataFunctions
-    class Solid internal constructor(
-        val width: Dp,
-        val color: Color,
-        val alignment: Alignment,
-        val expand: Dp,
+    public class Solid internal constructor(
+        public val width: Dp,
+        public val color: Color,
+        public val alignment: Alignment,
+        public val expand: Dp,
     ) : Stroke()
 
     @Immutable
     @GenerateDataFunctions
-    class Brush internal constructor(
-        val width: Dp,
-        val brush: androidx.compose.ui.graphics.Brush,
-        val alignment: Alignment,
-        val expand: Dp,
+    public class Brush internal constructor(
+        public val width: Dp,
+        public val brush: androidx.compose.ui.graphics.Brush,
+        public val alignment: Alignment,
+        public val expand: Dp,
     ) : Stroke()
 
-    enum class Alignment {
-        Inside, Center, Outside
+    public enum class Alignment {
+        Inside,
+        Center,
+        Outside,
     }
 }
 
-fun Stroke(width: Dp, color: Color, alignment: Stroke.Alignment, expand: Dp = Dp.Unspecified): Stroke {
+public fun Stroke(
+    width: Dp,
+    color: Color,
+    alignment: Stroke.Alignment,
+    expand: Dp = Dp.Unspecified,
+): Stroke {
     if (width.value == 0f) return Stroke.None
     if (color.isUnspecified) return Stroke.None
 
     return Stroke.Solid(width, color, alignment, expand)
 }
 
-fun Stroke(width: Dp, brush: Brush, alignment: Stroke.Alignment, expand: Dp = Dp.Unspecified): Stroke {
+public fun Stroke(
+    width: Dp,
+    brush: Brush,
+    alignment: Stroke.Alignment,
+    expand: Dp = Dp.Unspecified,
+): Stroke {
     if (width.value == 0f) return Stroke.None
     return when (brush) {
         is SolidColor -> {
@@ -54,7 +67,6 @@ fun Stroke(width: Dp, brush: Brush, alignment: Stroke.Alignment, expand: Dp = Dp
                 Stroke.Solid(width, brush.value, alignment, expand)
             }
         }
-
         else -> Stroke.Brush(width, brush, alignment, expand)
     }
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/Keybindings.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/Keybindings.kt
index a21e00227e4ba..7916a186083fa 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/Keybindings.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/Keybindings.kt
@@ -11,90 +11,94 @@ import androidx.compose.ui.input.pointer.isCtrlPressed
 import androidx.compose.ui.input.pointer.isMetaPressed
 import androidx.compose.ui.input.pointer.isShiftPressed
 
-interface SelectableColumnKeybindings {
+public interface SelectableColumnKeybindings {
 
-    val KeyEvent.isContiguousSelectionKeyPressed: Boolean
+    public val KeyEvent.isContiguousSelectionKeyPressed: Boolean
 
-    val PointerKeyboardModifiers.isContiguousSelectionKeyPressed: Boolean
+    public val PointerKeyboardModifiers.isContiguousSelectionKeyPressed: Boolean
 
-    val KeyEvent.isMultiSelectionKeyPressed: Boolean
+    public val KeyEvent.isMultiSelectionKeyPressed: Boolean
 
-    val PointerKeyboardModifiers.isMultiSelectionKeyPressed: Boolean
+    public val PointerKeyboardModifiers.isMultiSelectionKeyPressed: Boolean
 
     /**
-     * Select First Node
+     * Select First Node.
      */
-    val KeyEvent.isSelectFirstItem: Boolean
+    public val KeyEvent.isSelectFirstItem: Boolean
 
     /**
-     * Extend Selection to First Node inherited from Move Caret to Text Start with Selection
+     * Extend Selection to First Node inherited from Move Caret to Text Start
+     * with Selection.
      */
-    val KeyEvent.isExtendSelectionToFirstItem: Boolean
+    public val KeyEvent.isExtendSelectionToFirstItem: Boolean
 
     /**
-     * Select Last Node inherited from Move Caret to Text End
+     * Select Last Node inherited from Move Caret to Text End.
      */
-    val KeyEvent.isSelectLastItem: Boolean
+    public val KeyEvent.isSelectLastItem: Boolean
 
     /**
-     * Extend Selection to Last Node inherited from Move Caret to Text End with Selection
+     * Extend Selection to Last Node inherited from Move Caret to Text End with
+     * Selection.
      */
-    val KeyEvent.isExtendSelectionToLastItem: Boolean
+    public val KeyEvent.isExtendSelectionToLastItem: Boolean
 
     /**
-     * Select Previous Node inherited from Up
+     * Select Previous Node inherited from Up.
      */
-    val KeyEvent.isSelectPreviousItem: Boolean
+    public val KeyEvent.isSelectPreviousItem: Boolean
 
     /**
-     * Extend Selection with Previous Node inherited from Up with Selection
+     * Extend Selection with Previous Node inherited from Up with Selection.
      */
-    val KeyEvent.isExtendSelectionWithPreviousItem: Boolean
+    public val KeyEvent.isExtendSelectionWithPreviousItem: Boolean
 
     /**
-     * Select Next Node inherited from Down
+     * Select Next Node inherited from Down.
      */
-    val KeyEvent.isSelectNextItem: Boolean
+    public val KeyEvent.isSelectNextItem: Boolean
 
     /**
-     * Extend Selection with Next Node inherited from Down with Selection
+     * Extend Selection with Next Node inherited from Down with Selection.
      */
-    val KeyEvent.isExtendSelectionWithNextItem: Boolean
+    public val KeyEvent.isExtendSelectionWithNextItem: Boolean
 
     /**
-     * Scroll Page Up and Select Node inherited from Page Up
+     * Scroll Page Up and Select Node inherited from Page Up.
      */
-    val KeyEvent.isScrollPageUpAndSelectItem: Boolean
+    public val KeyEvent.isScrollPageUpAndSelectItem: Boolean
 
     /**
-     * Scroll Page Up and Extend Selection inherited from Page Up with Selection
+     * Scroll Page Up and Extend Selection inherited from Page Up with
+     * Selection.
      */
-    val KeyEvent.isScrollPageUpAndExtendSelection: Boolean
+    public val KeyEvent.isScrollPageUpAndExtendSelection: Boolean
 
     /**
-     * Scroll Page Down and Select Node inherited from Page Down
+     * Scroll Page Down and Select Node inherited from Page Down.
      */
-    val KeyEvent.isScrollPageDownAndSelectItem: Boolean
+    public val KeyEvent.isScrollPageDownAndSelectItem: Boolean
 
     /**
-     * Scroll Page Down and Extend Selection inherited from Page Down with Selection
+     * Scroll Page Down and Extend Selection inherited from Page Down with
+     * Selection.
      */
-    val KeyEvent.isScrollPageDownAndExtendSelection: Boolean
+    public val KeyEvent.isScrollPageDownAndExtendSelection: Boolean
 
     /**
-     * Edit item
+     * Edit item.
      */
-    val KeyEvent.isEdit: Boolean
+    public val KeyEvent.isEdit: Boolean
 
     /**
-     * SelectAll
+     * Select all items.
      */
-    val KeyEvent.isSelectAll: Boolean
+    public val KeyEvent.isSelectAll: Boolean
 }
 
-open class DefaultMacOsSelectableColumnKeybindings : DefaultSelectableColumnKeybindings() {
+public open class DefaultMacOsSelectableColumnKeybindings : DefaultSelectableColumnKeybindings() {
 
-    companion object : DefaultMacOsSelectableColumnKeybindings()
+    public companion object : DefaultMacOsSelectableColumnKeybindings()
 
     override val KeyEvent.isMultiSelectionKeyPressed: Boolean
         get() = isMetaPressed
@@ -103,7 +107,9 @@ open class DefaultMacOsSelectableColumnKeybindings : DefaultSelectableColumnKeyb
         get() = isMetaPressed
 }
 
-open class DefaultSelectableColumnKeybindings : SelectableColumnKeybindings {
+public open class DefaultSelectableColumnKeybindings : SelectableColumnKeybindings {
+
+    public companion object : DefaultSelectableColumnKeybindings()
 
     override val KeyEvent.isContiguousSelectionKeyPressed: Boolean
         get() = isShiftPressed
@@ -117,45 +123,43 @@ open class DefaultSelectableColumnKeybindings : SelectableColumnKeybindings {
     override val PointerKeyboardModifiers.isMultiSelectionKeyPressed: Boolean
         get() = isCtrlPressed
 
-    companion object : DefaultSelectableColumnKeybindings()
-
-    override val KeyEvent.isSelectFirstItem
+    override val KeyEvent.isSelectFirstItem: Boolean
         get() = key == Key.Home && !isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isExtendSelectionToFirstItem
+    override val KeyEvent.isExtendSelectionToFirstItem: Boolean
         get() = key == Key.Home && isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isSelectLastItem
+    override val KeyEvent.isSelectLastItem: Boolean
         get() = key == Key.MoveEnd && !isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isExtendSelectionToLastItem
+    override val KeyEvent.isExtendSelectionToLastItem: Boolean
         get() = key == Key.MoveEnd && isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isSelectPreviousItem
+    override val KeyEvent.isSelectPreviousItem: Boolean
         get() = key == Key.DirectionUp && !isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isExtendSelectionWithPreviousItem
+    override val KeyEvent.isExtendSelectionWithPreviousItem: Boolean
         get() = key == Key.DirectionUp && isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isSelectNextItem
+    override val KeyEvent.isSelectNextItem: Boolean
         get() = key == Key.DirectionDown && !isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isExtendSelectionWithNextItem
+    override val KeyEvent.isExtendSelectionWithNextItem: Boolean
         get() = key == Key.DirectionDown && isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isScrollPageUpAndSelectItem
+    override val KeyEvent.isScrollPageUpAndSelectItem: Boolean
         get() = key == Key.PageUp && !isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isScrollPageUpAndExtendSelection
+    override val KeyEvent.isScrollPageUpAndExtendSelection: Boolean
         get() = key == Key.PageUp && isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isScrollPageDownAndSelectItem
+    override val KeyEvent.isScrollPageDownAndSelectItem: Boolean
         get() = key == Key.PageDown && !isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isScrollPageDownAndExtendSelection
+    override val KeyEvent.isScrollPageDownAndExtendSelection: Boolean
         get() = key == Key.PageDown && isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isEdit
+    override val KeyEvent.isEdit: Boolean
         get() = false
 
     override val KeyEvent.isSelectAll: Boolean
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt
index e23c931d84a73..0795d4fda77bb 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableColumnOnKeyEvent.kt
@@ -4,14 +4,17 @@ import org.jetbrains.jewel.foundation.lazy.SelectableLazyListKey.Selectable
 import kotlin.math.max
 import kotlin.math.min
 
-interface SelectableColumnOnKeyEvent {
+public interface SelectableColumnOnKeyEvent {
 
-    val keybindings: SelectableColumnKeybindings
+    public val keybindings: SelectableColumnKeybindings
 
     /**
-     * Select First Node
+     * Select First Node.
      */
-    fun onSelectFirstItem(allKeys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onSelectFirstItem(
+        allKeys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         val firstSelectable = allKeys.withIndex().firstOrNull { it.value is Selectable }
         if (firstSelectable != null) {
             state.selectedKeys = listOf(firstSelectable.value.key)
@@ -20,34 +23,39 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Extend Selection to First Node inherited from Move Caret to Text Start with Selection
+     * Extend Selection to First Node inherited from Move Caret to Text Start
+     * with Selection.
      */
-    fun onExtendSelectionToFirst(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
-        state.lastActiveItemIndex
-            ?.let {
-                val iterator = keys.listIterator(it)
-                val list = buildList {
-                    while (iterator.hasPrevious()) {
-                        val previous = iterator.previous()
-                        if (previous is Selectable) {
-                            add(previous.key)
-                            state.lastActiveItemIndex = (iterator.previousIndex() + 1).coerceAtMost(keys.size)
-                        }
+    public fun onExtendSelectionToFirst(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
+        state.lastActiveItemIndex?.let {
+            val iterator = keys.listIterator(it)
+            val list = buildList {
+                while (iterator.hasPrevious()) {
+                    val previous = iterator.previous()
+                    if (previous is Selectable) {
+                        add(previous.key)
+                        state.lastActiveItemIndex = (iterator.previousIndex() + 1).coerceAtMost(keys.size)
                     }
                 }
-                if (list.isNotEmpty()) {
-                    state.selectedKeys =
-                        state.selectedKeys
-                            .toMutableList()
-                            .also { selectionList -> selectionList.addAll(list) }
-                }
             }
+            if (list.isNotEmpty()) {
+                state.selectedKeys =
+                    state.selectedKeys.toMutableList()
+                        .also { selectionList -> selectionList.addAll(list) }
+            }
+        }
     }
 
     /**
-     * Select Last Node inherited from Move Caret to Text End
+     * Select Last Node inherited from Move Caret to Text End.
      */
-    fun onSelectLastItem(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onSelectLastItem(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         keys.withIndex()
             .lastOrNull { it.value is Selectable }
             ?.let {
@@ -57,9 +65,13 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Extend Selection to Last Node inherited from Move Caret to Text End with Selection
+     * Extend Selection to Last Node inherited from Move Caret to Text End with
+     * Selection.
      */
-    fun onExtendSelectionToLastItem(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onExtendSelectionToLastItem(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         state.lastActiveItemIndex?.let {
             val list = mutableListOf<Any>(state.selectedKeys)
             keys.subList(it, keys.lastIndex).forEachIndexed { index, selectableLazyListKey ->
@@ -73,13 +85,15 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Select Previous Node inherited from Up
+     * Select Previous Node inherited from Up.
      */
-    fun onSelectPreviousItem(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onSelectPreviousItem(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         state.lastActiveItemIndex?.let { lastActiveIndex ->
             if (lastActiveIndex == 0) return@let
-            keys
-                .withIndex()
+            keys.withIndex()
                 .toList()
                 .dropLastWhile { it.index >= lastActiveIndex }
                 .reversed()
@@ -92,13 +106,15 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Extend Selection with Previous Node inherited from Up with Selection
+     * Extend Selection with Previous Node inherited from Up with Selection.
      */
-    fun onExtendSelectionWithPreviousItem(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onExtendSelectionWithPreviousItem(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         state.lastActiveItemIndex?.let { lastActiveIndex ->
             if (lastActiveIndex == 0) return@let
-            keys
-                .withIndex()
+            keys.withIndex()
                 .toList()
                 .dropLastWhile { it.index >= lastActiveIndex }
                 .reversed()
@@ -111,13 +127,15 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Select Next Node inherited from Down
+     * Select Next Node inherited from Down.
      */
-    fun onSelectNextItem(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onSelectNextItem(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         state.lastActiveItemIndex?.let { lastActiveIndex ->
             if (lastActiveIndex == keys.lastIndex) return@let
-            keys
-                .withIndex()
+            keys.withIndex()
                 .dropWhile { it.index <= lastActiveIndex }
                 .firstOrNull { it.value is Selectable }
                 ?.let { (index, selectableKey) ->
@@ -128,9 +146,12 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Extend Selection with Next Node inherited from Down with Selection
+     * Extend Selection with Next Node inherited from Down with Selection.
      */
-    fun onExtendSelectionWithNextItem(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onExtendSelectionWithNextItem(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         // todo we need deselect if we are changing direction
         state.lastActiveItemIndex?.let { lastActiveIndex ->
             if (lastActiveIndex == keys.lastIndex) return@let
@@ -146,9 +167,12 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Scroll Page Up and Select Node inherited from Page Up
+     * Scroll Page Up and Select Node inherited from Page Up.
      */
-    fun onScrollPageUpAndSelectItem(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onScrollPageUpAndSelectItem(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         val visibleSize = state.layoutInfo.visibleItemsInfo.size
         val targetIndex = max((state.lastActiveItemIndex ?: 0) - visibleSize, 0)
         state.selectedKeys = listOf(keys[targetIndex].key)
@@ -156,26 +180,32 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Scroll Page Up and Extend Selection inherited from Page Up with Selection
+     * Scroll Page Up and Extend Selection inherited from Page Up with
+     * Selection.
      */
-    fun onScrollPageUpAndExtendSelection(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onScrollPageUpAndExtendSelection(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         val visibleSize = state.layoutInfo.visibleItemsInfo.size
         val targetIndex = max((state.lastActiveItemIndex ?: 0) - visibleSize, 0)
         val newSelectionList =
-            keys.subList(targetIndex, (state.lastActiveItemIndex ?: 0))
+            keys
+                .subList(targetIndex, (state.lastActiveItemIndex ?: 0))
                 .withIndex()
                 .filter { it.value is Selectable }
-                .let {
-                    state.selectedKeys + it.map { selectableKey -> selectableKey.value.key }
-                }
+                .let { state.selectedKeys + it.map { selectableKey -> selectableKey.value.key } }
         state.selectedKeys = newSelectionList
         state.lastActiveItemIndex = targetIndex
     }
 
     /**
-     * Scroll Page Down and Select Node inherited from Page Down
+     * Scroll Page Down and Select Node inherited from Page Down.
      */
-    fun onScrollPageDownAndSelectItem(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onScrollPageDownAndSelectItem(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         val visibleSize = state.layoutInfo.visibleItemsInfo.size
         val targetIndex = min((state.lastActiveItemIndex ?: 0) + visibleSize, keys.lastIndex)
         state.selectedKeys = listOf(keys[targetIndex].key)
@@ -183,40 +213,42 @@ interface SelectableColumnOnKeyEvent {
     }
 
     /**
-     * Scroll Page Down and Extend Selection inherited from Page Down with Selection
+     * Scroll Page Down and Extend Selection inherited from Page Down with
+     * Selection.
      */
-    fun onScrollPageDownAndExtendSelection(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onScrollPageDownAndExtendSelection(
+        keys: List<SelectableLazyListKey>,
+        state: SelectableLazyListState,
+    ) {
         val visibleSize = state.layoutInfo.visibleItemsInfo.size
         val targetIndex = min((state.lastActiveItemIndex ?: 0) + visibleSize, keys.lastIndex)
         val newSelectionList =
             keys.subList(state.lastActiveItemIndex ?: 0, targetIndex)
                 .filterIsInstance<Selectable>()
-                .let {
-                    state.selectedKeys + it.map { selectableKey -> selectableKey.key }
-                }
+                .let { state.selectedKeys + it.map { selectableKey -> selectableKey.key } }
         state.selectedKeys = newSelectionList
         state.lastActiveItemIndex = targetIndex
     }
 
     /**
-     * Edit In Item
+     * Edit Item.
      */
-    fun onEdit() {
-        // ij with this shortcut just focus the first element with issue
-        // unavailable here
+    public fun onEdit() {
+        // IntelliJ focuses the first element with an issue when this is pressed.
+        // It is thus unavailable here.
     }
 
     /**
-     * Select All
+     * Select All.
      */
-    fun onSelectAll(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
+    public fun onSelectAll(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
         state.selectedKeys = keys.filterIsInstance<Selectable>().map { it.key }
     }
 }
 
-open class DefaultSelectableOnKeyEvent(
+public open class DefaultSelectableOnKeyEvent(
     override val keybindings: SelectableColumnKeybindings,
 ) : SelectableColumnOnKeyEvent {
 
-    companion object : DefaultSelectableOnKeyEvent(DefaultSelectableColumnKeybindings)
+    public companion object : DefaultSelectableOnKeyEvent(DefaultSelectableColumnKeybindings)
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt
index 5bd87326a7980..a52e69d59c693 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyColumn.kt
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -35,7 +36,7 @@ import org.jetbrains.jewel.foundation.lazy.tree.PointerEventActions
  * a column arrangement.
  */
 @Composable
-fun SelectableLazyColumn(
+public fun SelectableLazyColumn(
     modifier: Modifier = Modifier,
     selectionMode: SelectionMode = SelectionMode.Multiple,
     state: SelectableLazyListState = rememberSelectableLazyListState(),
@@ -51,41 +52,29 @@ fun SelectableLazyColumn(
     content: SelectableLazyListScope.() -> Unit,
 ) {
     val scope = rememberCoroutineScope()
-    val container = SelectableLazyListScopeContainer()
-        .apply(content)
+    val container = SelectableLazyListScopeContainer().apply(content)
 
-    val keys = remember(container) {
-        container.getKeys()
-    }
+    val keys = remember(container) { container.getKeys() }
     var isFocused by remember { mutableStateOf(false) }
 
     fun evaluateIndexes(): List<Int> {
         val keyToIndexMap = keys.withIndex().associateBy({ it.value.key }, { it.index })
-        return state.selectedKeys
-            .mapNotNull { selected -> keyToIndexMap[selected] }
-            .sorted()
+        return state.selectedKeys.mapNotNull { selected -> keyToIndexMap[selected] }.sorted()
     }
 
-    remember(state.selectedKeys) {
-        onSelectedIndexesChanged(evaluateIndexes())
-    }
+    remember(state.selectedKeys) { onSelectedIndexesChanged(evaluateIndexes()) }
     val focusRequester = remember { FocusRequester() }
     LazyColumn(
-        modifier = modifier
-            .onFocusChanged { isFocused = it.hasFocus }
+        modifier = modifier.onFocusChanged { isFocused = it.hasFocus }
             .focusRequester(focusRequester)
             .focusable(interactionSource = interactionSource)
             .onPreviewKeyEvent { event ->
                 if (state.lastActiveItemIndex != null) {
-                    val actionHandled = keyActions
-                        .handleOnKeyEvent(event, keys, state, selectionMode)
-                        .invoke(event)
+                    val actionHandled =
+                        keyActions.handleOnKeyEvent(event, keys, state, selectionMode)
+                            .invoke(event)
                     if (actionHandled) {
-                        scope.launch {
-                            state.lastActiveItemIndex?.let {
-                                state.scrollToItem(it)
-                            }
-                        }
+                        scope.launch { state.lastActiveItemIndex?.let { state.scrollToItem(it) } }
                     }
                 }
                 true
@@ -98,77 +87,93 @@ fun SelectableLazyColumn(
         flingBehavior = flingBehavior,
     ) {
         container.getEntries().forEach { entry ->
-            when (entry) {
-                is Entry.Item -> item(entry.key, entry.contentType) {
-                    val itemScope = SelectableLazyItemScope(
-                        isSelected = entry.key in state.selectedKeys,
-                        isActive = isFocused,
-                    )
-                    if (keys.any { it.key == entry.key && it is SelectableLazyListKey.Selectable }) {
-                        Box(
-                            modifier = Modifier.selectable(
-                                requester = focusRequester,
-                                keybindings = keyActions.keybindings,
-                                actionHandler = pointerEventActions,
-                                selectionMode = selectionMode,
-                                selectableState = state,
-                                allKeys = keys,
-                                itemKey = entry.key,
-                            ),
-                        ) {
-                            entry.content.invoke(itemScope)
-                        }
-                    } else {
-                        entry.content.invoke(itemScope)
-                    }
+            AppendEntry(entry, state, isFocused, keys, focusRequester, keyActions, pointerEventActions, selectionMode)
+        }
+    }
+}
+
+private fun LazyListScope.AppendEntry(
+    entry: Entry,
+    state: SelectableLazyListState,
+    isFocused: Boolean,
+    keys: List<SelectableLazyListKey>,
+    focusRequester: FocusRequester,
+    keyActions: KeyActions,
+    pointerEventActions: PointerEventActions,
+    selectionMode: SelectionMode,
+) {
+    when (entry) {
+        is Entry.Item -> item(entry.key, entry.contentType) {
+            val itemScope =
+                SelectableLazyItemScope(
+                    isSelected = entry.key in state.selectedKeys,
+                    isActive = isFocused,
+                )
+            if (keys.any { it.key == entry.key && it is SelectableLazyListKey.Selectable }) {
+                Box(
+                    modifier = Modifier.selectable(
+                        requester = focusRequester,
+                        keybindings = keyActions.keybindings,
+                        actionHandler = pointerEventActions,
+                        selectionMode = selectionMode,
+                        selectableState = state,
+                        allKeys = keys,
+                        itemKey = entry.key,
+                    ),
+                ) {
+                    entry.content.invoke(itemScope)
                 }
+            } else {
+                entry.content.invoke(itemScope)
+            }
+        }
 
-                is Entry.Items -> items(
-                    count = entry.count,
-                    key = { entry.key(it) },
-                    contentType = { entry.contentType(it) },
-                ) { index ->
-                    val itemScope = SelectableLazyItemScope(entry.key(index) in state.selectedKeys, isFocused)
-                    if (keys.any { it.key == entry.key(index) && it is SelectableLazyListKey.Selectable }) {
-                        Box(
-                            modifier = Modifier.selectable(
-                                requester = focusRequester,
-                                keybindings = keyActions.keybindings,
-                                actionHandler = pointerEventActions,
-                                selectionMode = selectionMode,
-                                selectableState = state,
-                                allKeys = keys,
-                                itemKey = entry.key(index),
-                            ),
-                        ) {
-                            entry.itemContent.invoke(itemScope, index)
-                        }
-                    } else {
-                        entry.itemContent.invoke(itemScope, index)
-                    }
+        is Entry.Items -> items(
+            count = entry.count,
+            key = { entry.key(it) },
+            contentType = { entry.contentType(it) },
+        ) { index ->
+            val itemScope =
+                SelectableLazyItemScope(entry.key(index) in state.selectedKeys, isFocused)
+
+            if (keys.any { it.key == entry.key(index) && it is SelectableLazyListKey.Selectable }) {
+                Box(
+                    modifier = Modifier.selectable(
+                        requester = focusRequester,
+                        keybindings = keyActions.keybindings,
+                        actionHandler = pointerEventActions,
+                        selectionMode = selectionMode,
+                        selectableState = state,
+                        allKeys = keys,
+                        itemKey = entry.key(index),
+                    ),
+                ) {
+                    entry.itemContent.invoke(itemScope, index)
                 }
+            } else {
+                entry.itemContent.invoke(itemScope, index)
+            }
+        }
 
-                is Entry.StickyHeader -> stickyHeader(entry.key, entry.contentType) {
-                    val itemScope = SelectableLazyItemScope(entry.key in state.selectedKeys, isFocused)
-                    if (keys.any { it.key == entry.key && it is SelectableLazyListKey.Selectable }) {
-                        Box(
-                            modifier = Modifier.selectable(
-                                keybindings = keyActions.keybindings,
-                                actionHandler = pointerEventActions,
-                                selectionMode = selectionMode,
-                                selectableState = state,
-                                allKeys = keys,
-                                itemKey = entry.key,
-                            ),
-                        ) {
-                            entry.content.invoke(itemScope)
-                        }
-                    } else {
-                        SelectableLazyItemScope(entry.key in state.selectedKeys, isFocused).apply {
-                            entry.content.invoke(itemScope)
-                        }
-                    }
+        is Entry.StickyHeader -> stickyHeader(entry.key, entry.contentType) {
+            val itemScope = SelectableLazyItemScope(entry.key in state.selectedKeys, isFocused)
+
+            if (keys.any { it.key == entry.key && it is SelectableLazyListKey.Selectable }) {
+                Box(
+                    modifier = Modifier.selectable(
+                        keybindings = keyActions.keybindings,
+                        actionHandler = pointerEventActions,
+                        selectionMode = selectionMode,
+                        selectableState = state,
+                        allKeys = keys,
+                        itemKey = entry.key,
+                    ),
+                ) {
+                    entry.content.invoke(itemScope)
                 }
+            } else {
+                SelectableLazyItemScope(entry.key in state.selectedKeys, isFocused)
+                    .apply { entry.content.invoke(itemScope) }
             }
         }
     }
@@ -182,23 +187,24 @@ private fun Modifier.selectable(
     selectableState: SelectableLazyListState,
     allKeys: List<SelectableLazyListKey>,
     itemKey: Any,
-) = this.pointerInput(allKeys, itemKey) {
-    awaitPointerEventScope {
-        while (true) {
-            val event = awaitPointerEvent()
-            when (event.type) {
-                PointerEventType.Press -> {
-                    requester?.requestFocus()
-                    actionHandler.handlePointerEventPress(
-                        pointerEvent = event,
-                        keyBindings = keybindings,
-                        selectableLazyListState = selectableState,
-                        selectionMode = selectionMode,
-                        allKeys = allKeys,
-                        key = itemKey,
-                    )
+) =
+    pointerInput(allKeys, itemKey) {
+        awaitPointerEventScope {
+            while (true) {
+                val event = awaitPointerEvent()
+                when (event.type) {
+                    PointerEventType.Press -> {
+                        requester?.requestFocus()
+                        actionHandler.handlePointerEventPress(
+                            pointerEvent = event,
+                            keyBindings = keybindings,
+                            selectableLazyListState = selectableState,
+                            selectionMode = selectionMode,
+                            allKeys = allKeys,
+                            key = itemKey,
+                        )
+                    }
                 }
             }
         }
     }
-}
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListScope.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListScope.kt
index 4340785aad963..4f0907c11ef69 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListScope.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListScope.kt
@@ -6,8 +6,10 @@ import androidx.compose.runtime.Composable
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListKey.NotSelectable
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListKey.Selectable
 
-/** Interface defining the scope for building a selectable lazy list. */
-interface SelectableLazyListScope {
+/**
+ * Interface defining the scope for building a selectable lazy list.
+ */
+public interface SelectableLazyListScope {
 
     /**
      * Represents an item in a selectable lazy list.
@@ -18,7 +20,7 @@ interface SelectableLazyListScope {
      *     `true`.
      * @param content The content of the item as a composable function.
      */
-    fun item(
+    public fun item(
         key: Any,
         contentType: Any? = null,
         selectable: Boolean = true,
@@ -38,7 +40,7 @@ interface SelectableLazyListScope {
      * @param itemContent The content of each individual item, specified as a
      *     composable function that takes the item's index as a parameter.
      */
-    fun items(
+    public fun items(
         count: Int,
         key: (index: Int) -> Any,
         contentType: (index: Int) -> Any? = { null },
@@ -55,7 +57,7 @@ interface SelectableLazyListScope {
      * @param content The content to be displayed in the sticky header,
      *     provided as a composable function
      */
-    fun stickyHeader(
+    public fun stickyHeader(
         key: Any,
         contentType: Any? = null,
         selectable: Boolean = false,
@@ -64,10 +66,12 @@ interface SelectableLazyListScope {
 }
 
 internal class SelectableLazyListScopeContainer : SelectableLazyListScope {
+
     private val keys = mutableListOf<SelectableLazyListKey>()
     private val entries = mutableListOf<Entry>()
 
     fun getEntries() = entries.toList()
+
     fun getKeys() = keys.toList()
 
     internal sealed interface Entry {
@@ -108,13 +112,14 @@ internal class SelectableLazyListScopeContainer : SelectableLazyListScope {
         selectable: (index: Int) -> Boolean,
         itemContent: @Composable (SelectableLazyItemScope.(index: Int) -> Unit),
     ) {
-        val selectableKeys: List<SelectableLazyListKey> = List(count) {
-            if (selectable(it)) {
-                Selectable(key(it))
-            } else {
-                NotSelectable(key(it))
+        val selectableKeys: List<SelectableLazyListKey> =
+            List(count) {
+                if (selectable(it)) {
+                    Selectable(key(it))
+                } else {
+                    NotSelectable(key(it))
+                }
             }
-        }
         keys.addAll(selectableKeys)
         entries.add(Entry.Items(count, key, contentType, itemContent))
     }
@@ -131,7 +136,7 @@ internal class SelectableLazyListScopeContainer : SelectableLazyListScope {
     }
 }
 
-fun <T : Any> SelectableLazyListScope.items(
+public fun <T : Any> SelectableLazyListScope.items(
     items: List<T>,
     key: (item: T) -> Any = { it },
     contentType: (item: T) -> Any? = { it },
@@ -147,7 +152,7 @@ fun <T : Any> SelectableLazyListScope.items(
     )
 }
 
-fun <T : Any> SelectableLazyListScope.itemsIndexed(
+public fun <T : Any> SelectableLazyListScope.itemsIndexed(
     items: List<T>,
     key: (index: Int, item: T) -> Any = { _, item -> item },
     contentType: (index: Int, item: T) -> Any? = { _, item -> item },
@@ -164,11 +169,10 @@ fun <T : Any> SelectableLazyListScope.itemsIndexed(
 }
 
 @Composable
-fun LazyItemScope.SelectableLazyItemScope(
+public fun LazyItemScope.SelectableLazyItemScope(
     isSelected: Boolean = false,
     isActive: Boolean = false,
-): SelectableLazyItemScope =
-    SelectableLazyItemScopeDelegate(this, isSelected, isActive)
+): SelectableLazyItemScope = SelectableLazyItemScopeDelegate(this, isSelected, isActive)
 
 internal class SelectableLazyItemScopeDelegate(
     private val delegate: LazyItemScope,
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListState.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListState.kt
index 8e54675a1723c..7fb80357893a4 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListState.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/SelectableLazyListState.kt
@@ -3,6 +3,7 @@ package org.jetbrains.jewel.foundation.lazy
 import androidx.compose.foundation.gestures.ScrollableState
 import androidx.compose.foundation.interaction.InteractionSource
 import androidx.compose.foundation.lazy.LazyItemScope
+import androidx.compose.foundation.lazy.LazyListLayoutInfo
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@@ -12,38 +13,39 @@ import androidx.compose.runtime.setValue
 import kotlin.math.max
 
 @Suppress("unused")
-val LazyListState.visibleItemsRange
+public val LazyListState.visibleItemsRange: IntRange
     get() = firstVisibleItemIndex..firstVisibleItemIndex + layoutInfo.visibleItemsInfo.size
 
-val SelectableLazyListState.visibleItemsRange
+public val SelectableLazyListState.visibleItemsRange: IntRange
     get() = firstVisibleItemIndex..firstVisibleItemIndex + layoutInfo.visibleItemsInfo.size
 
-interface SelectableScope {
+public interface SelectableScope {
 
-    var selectedKeys: List<Any>
+    public var selectedKeys: List<Any>
 }
 
 /**
- * State object for a selectable lazy list, which extends [ScrollableState].
+ * State object for a selectable lazy list, which extends
+ * [ScrollableState].
  *
  * @param lazyListState The state object for the underlying lazy list.
  */
-class SelectableLazyListState(
-    val lazyListState: LazyListState,
+public class SelectableLazyListState(
+    public val lazyListState: LazyListState,
 ) : ScrollableState by lazyListState, SelectableScope {
 
     internal var lastKeyEventUsedMouse: Boolean = false
 
-    override var selectedKeys by mutableStateOf(emptyList<Any>())
-    var lastActiveItemIndex: Int? = null
+    override var selectedKeys: List<Any> by mutableStateOf(emptyList<Any>())
+
+    public var lastActiveItemIndex: Int? = null
 
     /**
-     *
      * @param itemIndex The index of the item to focus on.
      * @param animateScroll Whether to animate the scroll to the focused item.
      * @param scrollOffset The scroll offset for the focused item.
      */
-    suspend fun scrollToItem(
+    public suspend fun scrollToItem(
         itemIndex: Int,
         animateScroll: Boolean = false,
         scrollOffset: Int = 0,
@@ -57,185 +59,47 @@ class SelectableLazyListState(
                     scrollOffset,
                 )
 
-                itemIndex > visibleRange.last() -> {
-                    lazyListState.scrollToItem(max(itemIndex - (visibleRange.size + 2), 0), animateScroll, 0)
-                }
+                itemIndex > visibleRange.last() -> lazyListState.scrollToItem(
+                    index = max(itemIndex - (visibleRange.size + 2), 0),
+                    animate = animateScroll,
+                    scrollOffset = 0,
+                )
             }
         }
         lastActiveItemIndex = itemIndex
     }
 
-    val layoutInfo
+    public val layoutInfo: LazyListLayoutInfo
         get() = lazyListState.layoutInfo
 
-    /** The index of the first item that is visible */
-    val firstVisibleItemIndex: Int
+    /**
+     * The index of the first item that is visible.
+     */
+    public val firstVisibleItemIndex: Int
         get() = lazyListState.firstVisibleItemIndex
 
     /**
      * The scroll offset of the first visible item. Scrolling forward is
-     * positive - i.e., the amount that the item is offset backwards
+     * positive - i.e., the amount that the item is offset backwards.
      */
     @Suppress("unused")
-    val firstVisibleItemScrollOffset: Int
+    public val firstVisibleItemScrollOffset: Int
         get() = lazyListState.firstVisibleItemScrollOffset
 
     /**
      * [InteractionSource] that will be used to dispatch drag events when
-     * this list is being dragged. If you want to know whether the fling (or
-     * animated scroll) is in progress, use [isScrollInProgress].
+     * this list is being dragged. If you want to know whether the fling
+     * (or animated scroll) is in progress, use [isScrollInProgress].
      */
-    val interactionSource: InteractionSource
+    public val interactionSource: InteractionSource
         get() = lazyListState.interactionSource
-
-    // selection handling
-//    fun indexOfNextSelectable(currentIndex: Int): Int? {
-//        if (currentIndex + 1 > internalKeys.lastIndex) return null
-//        for (i in currentIndex + 1..internalKeys.lastIndex) { // todo iterate with instanceOF
-//            if (internalKeys[i] is Key.Selectable) return i
-//        }
-//        return null
-//    }
-//
-//    fun indexOfPreviousSelectable(currentIndex: Int): Int? {
-//        if (currentIndex - 1 < 0) return null
-//        for (i in currentIndex - 1 downTo 0) {
-//            if (internalKeys[i] is Key.Selectable) return i
-//        }
-//        return null
-//    }
-//
-//    /**
-//     * Selects a single item at the specified index within the lazy list.
-//     *
-//     * @param itemIndex The index of the item to select.
-//     * @param changeFocus Whether to change the focus to the selected item.
-//     * @param skipScroll Whether to skip the scroll to the selected item.
-//     */
-//    suspend fun selectSingleItem(itemIndex: Int, changeFocus: Boolean = true, skipScroll: Boolean = false) {
-//        if (changeFocus) scrollToItem(itemIndex, skipScroll = skipScroll)
-//        selectedIdsMap.clear()
-//        selectedIdsMap[keys[itemIndex]] = itemIndex
-//        lastSelectedIndex = itemIndex
-//    }
-//
-//    /**
-//     * Selects a single item with the specified key within the lazy list.
-//     *
-//     * @param key The key of the item to select.
-//     * @param changeFocus Whether to change the focus to the selected item.
-//     * @param skipScroll Whether to skip the scroll to the selected item.
-//     */
-//    suspend fun selectSingleKey(key: Any, changeFocus: Boolean = true, skipScroll: Boolean = false) {
-//        val index = internalKeys.indexOfFirst { it.key == key }
-//        if (index >= 0 && internalKeys[index] is Key.Selectable) selectSingleItem(index, changeFocus, skipScroll = skipScroll)
-//            lastSelectedIndex = index
-//    }
-//
-//    suspend fun deselectSingleElement(itemIndex: Int, changeFocus: Boolean = true, skipScroll: Boolean = false) {
-//        if (changeFocus) scrollToItem(itemIndex, skipScroll = skipScroll)
-//        selectedIdsMap.remove(keys[itemIndex])
-//    }
-//
-//    suspend fun toggleSelection(itemIndex: Int, skipScroll: Boolean = false) {
-//        if (selectionMode == SelectionMode.None) return
-//        selectedIdsMap[keys[itemIndex]]?.let {
-//            deselectSingleElement(itemIndex)
-//        } ?: if (!isMultiSelectionAllowed) {
-//            selectSingleItem(itemIndex, skipScroll = skipScroll)
-//        } else {
-//            addElementToSelection(itemIndex, skipScroll = skipScroll)
-//        }
-//    }
-//
-//    suspend fun toggleSelectionKey(key: Any, skipScroll: Boolean = false) {
-//        if (selectionMode == SelectionMode.None) return
-//        val index = internalKeys.indexOfFirst { it.key == key }
-//        if (index > 0 && internalKeys[index] is Key.Selectable) toggleSelection(index, skipScroll = skipScroll)
-//        lastSelectedIndex = index
-//    }
-//
-//    suspend fun onExtendSelectionToIndex(itemIndex: Int, changeFocus: Boolean = true, skipScroll: Boolean = false) {
-//        if (selectionMode == SelectionMode.None) return
-//        if (!isMultiSelectionAllowed) {
-//            selectSingleItem(itemIndex, skipScroll = skipScroll)
-//        } else {
-//            val lastFocussed = lastSelectedIndex ?: itemIndex
-//            val indexInterval = if (itemIndex > lastFocussed) {
-//                lastFocussed..itemIndex
-//            } else {
-//                lastFocussed downTo itemIndex
-//            }
-//            addElementsToSelection(indexInterval.toList())
-//            if (changeFocus) scrollToItem(itemIndex, skipScroll = skipScroll)
-//        }
-//    }
-//
-//    @Suppress("unused")
-//    internal fun addKeyToSelectionMap(keyIndex: Int) {
-//        if (selectionMode == SelectionMode.None) return
-//        if (internalKeys[keyIndex] is Key.Selectable) {
-//            selectedIdsMap[keys[keyIndex]] = keyIndex
-//        }
-//    }
-//
-//    suspend fun addElementToSelection(itemIndex: Int, changeFocus: Boolean = true, skipScroll: Boolean = false) {
-//        if (selectionMode == SelectionMode.None) return
-//        if (!isMultiSelectionAllowed) {
-//            selectSingleItem(itemIndex, false)
-//        } else {
-//            selectedIdsMap[keys[itemIndex]] = itemIndex
-//        }
-//        if (changeFocus) scrollToItem(itemIndex, skipScroll = skipScroll)
-//        lastSelectedIndex = itemIndex
-//    }
-//
-//    fun deselectAll() {
-//        if (selectionMode == SelectionMode.None) return
-//        selectedIdsMap.clear()
-//        lastSelectedIndex = null
-//    }
-//
-//    suspend fun addElementsToSelection(itemIndexes: List<Int>, itemToFocus: Int? = itemIndexes.lastOrNull()) {
-//        if (selectionMode == SelectionMode.None) return
-//        if (!isMultiSelectionAllowed) {
-//            itemIndexes.lastOrNull()?.let { selectSingleItem(it) }
-//        } else {
-//            itemIndexes.forEach {
-//                selectedIdsMap[keys[it]] = it
-//            }
-//            itemToFocus?.let { scrollToItem(it) }
-//            lastSelectedIndex = itemIndexes.lastOrNull()
-//        }
-//    }
-//
-//    @Suppress("unused")
-//    suspend fun removeElementsToSelection(itemIndexes: List<Int>, itemToFocus: Int? = itemIndexes.lastOrNull()) {
-//        if (selectionMode == SelectionMode.None) return
-//        itemIndexes.forEach {
-//            selectedIdsMap.remove(keys[it])
-//        }
-//        itemToFocus?.let { scrollToItem(it) }
-//    }
-//
-//    @Suppress("Unused")
-//    suspend fun toggleElementsToSelection(itemIndexes: List<Int>, itemToFocus: Int? = itemIndexes.lastOrNull()) {
-//        if (selectionMode == SelectionMode.None) return
-//        if (!isMultiSelectionAllowed) {
-//            toggleSelection(itemIndexes.last())
-//        } else {
-//            itemIndexes.forEach { index ->
-//                selectedIdsMap[keys[index]]?.let {
-//                    selectedIdsMap.remove(keys[index])
-//                } ?: { selectedIdsMap[keys[index]] = index }
-//            }
-//            itemToFocus?.let { scrollToItem(it) }
-//            lastSelectedIndex = itemIndexes.lastOrNull()
-//        }
-//    }
 }
 
-private suspend fun LazyListState.scrollToItem(index: Int, animate: Boolean, scrollOffset: Int = 0) {
+private suspend fun LazyListState.scrollToItem(
+    index: Int,
+    animate: Boolean,
+    scrollOffset: Int = 0,
+) {
     if (animate) {
         animateScrollToItem(index, scrollOffset)
     } else {
@@ -246,19 +110,19 @@ private suspend fun LazyListState.scrollToItem(index: Int, animate: Boolean, scr
 /**
  * Represents a selectable key used in a selectable lazy list.
  */
-sealed class SelectableLazyListKey {
+public sealed class SelectableLazyListKey {
 
     /**
      * The key associated with the item.
      */
-    abstract val key: Any
+    public abstract val key: Any
 
     /**
      * Represents a selectable item key.
      *
      * @param key The key associated with the item.
      */
-    class Selectable(
+    public class Selectable(
         override val key: Any,
     ) : SelectableLazyListKey()
 
@@ -267,7 +131,7 @@ sealed class SelectableLazyListKey {
      *
      * @param key The key associated with the item.
      */
-    class NotSelectable(
+    public class NotSelectable(
         override val key: Any,
     ) : SelectableLazyListKey()
 
@@ -283,17 +147,16 @@ sealed class SelectableLazyListKey {
     override fun hashCode(): Int = key.hashCode()
 }
 
-interface SelectableLazyItemScope : LazyItemScope {
+public interface SelectableLazyItemScope : LazyItemScope {
 
-    val isSelected: Boolean
-    val isActive: Boolean
+    public val isSelected: Boolean
+    public val isActive: Boolean
 }
 
 /**
  * Specifies the selection mode for a selectable lazy list.
  */
-@Suppress("unused")
-enum class SelectionMode {
+public enum class SelectionMode {
 
     /**
      * No selection is allowed.
@@ -315,18 +178,16 @@ enum class SelectionMode {
  * Remembers the state of a selectable lazy list.
  *
  * @param firstVisibleItemIndex The index of the first visible item.
- * @param firstVisibleItemScrollOffset The scroll offset of the first visible item.
+ * @param firstVisibleItemScrollOffset The scroll offset of the first
+ *     visible item.
  * @return The remembered state of the selectable lazy list.
  */
 @Composable
-fun rememberSelectableLazyListState(
+public fun rememberSelectableLazyListState(
     firstVisibleItemIndex: Int = 0,
     firstVisibleItemScrollOffset: Int = 0,
-) = remember {
+): SelectableLazyListState = remember {
     SelectableLazyListState(
-        LazyListState(
-            firstVisibleItemIndex,
-            firstVisibleItemScrollOffset,
-        ),
+        LazyListState(firstVisibleItemIndex, firstVisibleItemScrollOffset),
     )
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt
index b4373449ed33d..a588e8d269285 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BasicLazyTree.kt
@@ -46,32 +46,48 @@ import kotlin.time.Duration.Companion.milliseconds
  *
  * @param tree The tree structure to be rendered.
  * @param selectionMode The selection mode for the tree nodes.
- * @param onElementClick Callback function triggered when a tree node is clicked.
- * @param elementBackgroundFocused The background color of a tree node when focused.
- * @param elementBackgroundSelectedFocused The background color of a selected tree node when focused.
- * @param elementBackgroundSelected The background color of a selected tree node.
- * @param indentSize The size of the indent for each level of the tree node.
- * @param elementBackgroundCornerSize The corner size of the background shape of a tree node.
+ * @param onElementClick Callback function triggered when a tree node is
+ *     clicked.
+ * @param elementBackgroundFocused The background color of a tree node when
+ *     focused.
+ * @param elementBackgroundSelectedFocused The background color of a
+ *     selected tree node when focused.
+ * @param elementBackgroundSelected The background color of a selected tree
+ *     node.
+ * @param indentSize The size of the indent for each level of the tree
+ *     node.
+ * @param elementBackgroundCornerSize The corner size of the background
+ *     shape of a tree node.
  * @param elementPadding The padding for the entire tree node.
- * @param elementContentPadding The padding for the content within a tree node.
+ * @param elementContentPadding The padding for the content within a tree
+ *     node.
  * @param elementMinHeight The minimum height of a tree node.
- * @param chevronContentGap The gap between the chevron icon and the node content.
+ * @param chevronContentGap The gap between the chevron icon and the node
+ *     content.
  * @param treeState The state object for managing the tree view state.
- * @param modifier Optional modifier for styling or positioning the tree view.
- * @param onElementDoubleClick Callback function triggered when a tree node is double-clicked.
- * @param onSelectionChange Callback function triggered when the selected tree nodes change.
- * @param platformDoubleClickDelay The duration between two consecutive clicks to be considered a double-click.
+ * @param modifier Optional modifier for styling or positioning the tree
+ *     view.
+ * @param onElementDoubleClick Callback function triggered when a tree node
+ *     is double-clicked.
+ * @param onSelectionChange Callback function triggered when the selected
+ *     tree nodes change.
+ * @param platformDoubleClickDelay The duration between two consecutive
+ *     clicks to be considered a double-click.
  * @param keyActions The key binding actions for the tree view.
- * @param pointerEventScopedActions The pointer event actions for the tree view.
- * @param chevronContent The composable function responsible for rendering the chevron icon.
- * @param nodeContent The composable function responsible for rendering the content of a tree node.
+ * @param pointerEventScopedActions The pointer event actions for the tree
+ *     view.
+ * @param chevronContent The composable function responsible for rendering
+ *     the chevron icon.
+ * @param nodeContent The composable function responsible for rendering the
+ *     content of a tree node.
  *
  * @suppress("UNCHECKED_CAST")
- * @Composable
+ *
+ * @composable
  */
 @Suppress("UNCHECKED_CAST")
 @Composable
-fun <T> BasicLazyTree(
+public fun <T> BasicLazyTree(
     tree: Tree<T>,
     selectionMode: SelectionMode = SelectionMode.Multiple,
     onElementClick: (Tree.Element<T>) -> Unit,
@@ -90,21 +106,19 @@ fun <T> BasicLazyTree(
     onSelectionChange: (List<Tree.Element<T>>) -> Unit,
     platformDoubleClickDelay: Duration = 500.milliseconds,
     keyActions: KeyActions = DefaultTreeViewKeyActions(treeState),
-    pointerEventScopedActions: PointerEventActions = remember {
-        DefaultTreeViewPointerEventAction(treeState)
-    },
+    pointerEventScopedActions: PointerEventActions = remember { DefaultTreeViewPointerEventAction(treeState) },
     chevronContent: @Composable (nodeState: TreeElementState) -> Unit,
     nodeContent: @Composable (SelectableLazyItemScope.(Tree.Element<T>) -> Unit),
 ) {
     val scope = rememberCoroutineScope()
 
-    val flattenedTree =
-        remember(tree, treeState.openNodes, treeState.allNodes) { tree.roots.flatMap { it.flattenTree(treeState) } }
+    val flattenedTree = remember(tree, treeState.openNodes, treeState.allNodes) {
+        tree.roots.flatMap { it.flattenTree(treeState) }
+    }
 
     remember(tree) { // if tree changes we need to update selection changes
         onSelectionChange(
-            flattenedTree
-                .asSequence()
+            flattenedTree.asSequence()
                 .filter { it.id in treeState.delegate.selectedKeys }
                 .map { element -> element as Tree.Element<T> }
                 .toList(),
@@ -127,16 +141,22 @@ fun <T> BasicLazyTree(
             key = { _, item -> item.id },
             contentType = { _, item -> item.data },
         ) { index, element ->
-            val elementState = TreeElementState.of(
-                active = isActive,
-                selected = isSelected,
-                expanded = (element as? Tree.Element.Node)?.let { it.id in treeState.openNodes } ?: false,
-            )
+            val elementState =
+                TreeElementState.of(
+                    active = isActive,
+                    selected = isSelected,
+                    expanded = (element as? Tree.Element.Node)
+                        ?.let { it.id in treeState.openNodes }
+                        ?: false,
+                )
 
-            val backgroundShape by remember { mutableStateOf(RoundedCornerShape(elementBackgroundCornerSize)) }
+            val backgroundShape by remember {
+                mutableStateOf(RoundedCornerShape(elementBackgroundCornerSize))
+            }
             Row(
                 verticalAlignment = Alignment.CenterVertically,
-                modifier = Modifier.defaultMinSize(minHeight = elementMinHeight)
+                modifier =
+                Modifier.defaultMinSize(minHeight = elementMinHeight)
                     .padding(elementPadding)
                     .elementBackground(
                         state = elementState,
@@ -151,13 +171,14 @@ fun <T> BasicLazyTree(
                         interactionSource = remember { MutableInteractionSource() },
                         indication = null,
                     ) {
-                        (pointerEventScopedActions as? DefaultTreeViewPointerEventAction)?.notifyItemClicked(
-                            item = flattenedTree[index] as Tree.Element<T>,
-                            scope = scope,
-                            doubleClickTimeDelayMillis = platformDoubleClickDelay.inWholeMilliseconds,
-                            onElementClick = onElementClick,
-                            onElementDoubleClick = onElementDoubleClick,
-                        )
+                        (pointerEventScopedActions as? DefaultTreeViewPointerEventAction)
+                            ?.notifyItemClicked(
+                                item = flattenedTree[index] as Tree.Element<T>,
+                                scope = scope,
+                                doubleClickTimeDelayMillis = platformDoubleClickDelay.inWholeMilliseconds,
+                                onElementClick = onElementClick,
+                                onElementDoubleClick = onElementDoubleClick,
+                            )
                         treeState.delegate.lastActiveItemIndex = index
                     },
             ) {
@@ -200,7 +221,8 @@ private fun Modifier.elementBackground(
 
 @Immutable
 @JvmInline
-value class TreeElementState(val state: ULong) : FocusableComponentState, SelectableComponentState {
+public value class TreeElementState(public val state: ULong) :
+    FocusableComponentState, SelectableComponentState {
 
     @Stable
     override val isActive: Boolean
@@ -227,14 +249,14 @@ value class TreeElementState(val state: ULong) : FocusableComponentState, Select
         get() = state and Selected != 0UL
 
     @Stable
-    val isExpanded: Boolean
+    public val isExpanded: Boolean
         get() = state and Expanded != 0UL
 
     override fun toString(): String =
         "${javaClass.simpleName}(enabled=$isEnabled, focused=$isFocused, expanded=$isExpanded, " +
             "pressed=$isPressed, hovered=$isHovered, active=$isActive, selected=$isSelected)"
 
-    fun copy(
+    public fun copy(
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         expanded: Boolean = isExpanded,
@@ -242,23 +264,24 @@ value class TreeElementState(val state: ULong) : FocusableComponentState, Select
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
         selected: Boolean = isSelected,
-    ) = of(
-        enabled = enabled,
-        focused = focused,
-        expanded = expanded,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-        selected = selected,
-    )
+    ): TreeElementState =
+        of(
+            enabled = enabled,
+            focused = focused,
+            expanded = expanded,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+            selected = selected,
+        )
 
-    companion object {
+    public companion object {
 
         private const val EXPANDED_BIT_OFFSET = CommonStateBitMask.FIRST_AVAILABLE_OFFSET
 
         private val Expanded = 1UL shl EXPANDED_BIT_OFFSET
 
-        fun of(
+        public fun of(
             enabled: Boolean = true,
             focused: Boolean = false,
             expanded: Boolean = false,
@@ -266,15 +289,16 @@ value class TreeElementState(val state: ULong) : FocusableComponentState, Select
             pressed: Boolean = false,
             active: Boolean = false,
             selected: Boolean = false,
-        ) = TreeElementState(
-            (if (expanded) Expanded else 0UL) or
-                (if (enabled) Enabled else 0UL) or
-                (if (focused) Focused else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (selected) Selected else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): TreeElementState =
+            TreeElementState(
+                (if (expanded) Expanded else 0UL) or
+                    (if (enabled) Enabled else 0UL) or
+                    (if (focused) Focused else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (selected) Selected else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
 
@@ -288,17 +312,13 @@ private fun Tree.Element<*>.flattenTree(state: TreeState): MutableList<Tree.Elem
                 return orderedChildren.also {
                     close()
                     // remove all children key from openNodes
-                    state.openNodes -= buildSet {
-                        getAllSubNodes(this@flattenTree)
-                    }
+                    state.openNodes -= buildSet { getAllSubNodes(this@flattenTree) }
                 }
             }
             Log.w("the node is open, loading children for $id")
             Log.w("children size: ${children?.size}")
             open(true)
-            children?.forEach { child ->
-                orderedChildren.addAll(child.flattenTree(state))
-            }
+            children?.forEach { child -> orderedChildren.addAll(child.flattenTree(state)) }
         }
 
         is Tree.Element.Leaf<*> -> {
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BuildTree.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BuildTree.kt
index 8d88ae786d95f..eed3bfb0d7101 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BuildTree.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/BuildTree.kt
@@ -4,22 +4,23 @@ import org.jetbrains.jewel.foundation.GenerateDataFunctions
 import java.io.File
 import java.nio.file.Path
 
-fun <T> buildTree(builder: TreeBuilder<T>.() -> Unit): Tree<T> =
+public fun <T> buildTree(builder: TreeBuilder<T>.() -> Unit): Tree<T> =
     TreeBuilder<T>().apply(builder).build()
 
-class TreeBuilder<T> : TreeGeneratorScope<T> {
-    sealed class Element<T> {
+public class TreeBuilder<T> : TreeGeneratorScope<T> {
 
-        abstract val id: Any?
+    public sealed class Element<T> {
+
+        public abstract val id: Any?
 
         @GenerateDataFunctions
-        class Leaf<T>(val data: T, override val id: Any?) : Element<T>()
+        public class Leaf<T>(public val data: T, override val id: Any?) : Element<T>()
 
         @GenerateDataFunctions
-        class Node<T>(
-            val data: T,
+        public class Node<T>(
+            public val data: T,
             override val id: Any?,
-            val childrenGenerator: ChildrenGeneratorScope<T>.() -> Unit,
+            public val childrenGenerator: ChildrenGeneratorScope<T>.() -> Unit,
         ) : Element<T>()
     }
 
@@ -41,103 +42,113 @@ class TreeBuilder<T> : TreeGeneratorScope<T> {
         heads.add(element)
     }
 
-    fun build(): Tree<T> {
+    public fun build(): Tree<T> {
         val elements = mutableListOf<Tree.Element<T>>()
         for (index in heads.indices) {
-            val previous: Tree.Element<T>? = elements.getOrNull(index - 1)?.let { evaluatePrevious(it) }
-            val current = when (val elementBuilder = heads[index]) {
-                is Element.Leaf -> Tree.Element.Leaf(
-                    data = elementBuilder.data,
-                    depth = 0,
-                    childIndex = index,
-                    parent = null,
-                    previous = previous,
-                    next = null,
-                    id = elementBuilder.id ?: "$index",
-                )
+            val previous: Tree.Element<T>? = elements.getOrNull(index - 1)
+                ?.let { evaluatePrevious(it) }
 
-                is Element.Node -> Tree.Element.Node(
-                    data = elementBuilder.data,
-                    depth = 0,
-                    childIndex = index,
-                    parent = null,
-                    childrenGenerator = { parent -> generateElements(parent, elementBuilder) },
-                    previous = previous,
-                    next = null,
-                    id = elementBuilder.id ?: "$index",
-                )
-            }
+            val current = getCurrentTreeElement(index, previous)
             elements.add(current)
             previous?.also { it.next = current }
         }
         return Tree(elements)
     }
-}
 
-private fun <T> generateElements(
-    parent: Tree.Element.Node<T>,
-    parentElementBuilder: TreeBuilder.Element.Node<T>,
-): List<Tree.Element<T>> {
-    val childrenGeneratorScope = ChildrenGeneratorScope(parent)
-    parentElementBuilder.childrenGenerator(childrenGeneratorScope)
-    val elements = mutableListOf<Tree.Element<T>>()
-    for (index in childrenGeneratorScope.elements.indices) {
-        val previous = if (index == 0) parent else elements[index - 1]
-        val current = when (val elementBuilder = childrenGeneratorScope.elements[index]) {
-            is TreeBuilder.Element.Leaf -> Tree.Element.Leaf(
+    private fun getCurrentTreeElement(index: Int, previous: Tree.Element<T>?) =
+        when (val elementBuilder = heads[index]) {
+            is Element.Leaf -> Tree.Element.Leaf(
                 data = elementBuilder.data,
-                depth = parent.depth + 1,
+                depth = 0,
                 childIndex = index,
-                parent = parent,
+                parent = null,
                 previous = previous,
                 next = null,
-                id = elementBuilder.id ?: (parent.id.toString() + "." + index),
+                id = elementBuilder.id ?: "$index",
             )
 
-            is TreeBuilder.Element.Node -> Tree.Element.Node(
+            is Element.Node -> Tree.Element.Node(
                 data = elementBuilder.data,
-                depth = parent.depth + 1,
+                depth = 0,
                 childIndex = index,
-                parent = parent,
-                childrenGenerator = { generateElements(it, elementBuilder) },
+                parent = null,
+                childrenGenerator = { parent -> generateElements(parent, elementBuilder) },
                 previous = previous,
                 next = null,
-                id = elementBuilder.id ?: (parent.id.toString() + "." + index),
+                id = elementBuilder.id ?: "$index",
             )
         }
+}
+
+private fun <T> generateElements(
+    parent: Tree.Element.Node<T>,
+    parentElementBuilder: TreeBuilder.Element.Node<T>,
+): List<Tree.Element<T>> {
+    val childrenGeneratorScope = ChildrenGeneratorScope(parent)
+    parentElementBuilder.childrenGenerator(childrenGeneratorScope)
+    val elements = mutableListOf<Tree.Element<T>>()
+    for (index in childrenGeneratorScope.elements.indices) {
+        val previous = if (index == 0) parent else elements[index - 1]
+        val current =
+            when (val elementBuilder = childrenGeneratorScope.elements[index]) {
+                is TreeBuilder.Element.Leaf -> Tree.Element.Leaf(
+                    data = elementBuilder.data,
+                    depth = parent.depth + 1,
+                    childIndex = index,
+                    parent = parent,
+                    previous = previous,
+                    next = null,
+                    id = elementBuilder.id ?: (parent.id.toString() + "." + index),
+                )
+
+                is TreeBuilder.Element.Node -> Tree.Element.Node(
+                    data = elementBuilder.data,
+                    depth = parent.depth + 1,
+                    childIndex = index,
+                    parent = parent,
+                    childrenGenerator = { generateElements(it, elementBuilder) },
+                    previous = previous,
+                    next = null,
+                    id = elementBuilder.id ?: (parent.id.toString() + "." + index),
+                )
+            }
         previous.next = current
         elements.add(current)
     }
     return elements
 }
 
-private fun <T> evaluatePrevious(element: Tree.Element<T>): Tree.Element<T> = when (element) {
-    is Tree.Element.Leaf -> element
-    is Tree.Element.Node -> when (val nephews = element.children) {
-        null -> element
-        else -> if (nephews.isEmpty()) element else evaluatePrevious(nephews.last())
+private fun <T> evaluatePrevious(element: Tree.Element<T>): Tree.Element<T> =
+    when (element) {
+        is Tree.Element.Leaf -> element
+        is Tree.Element.Node ->
+            when (val nephews = element.children) {
+                null -> element
+                else -> if (nephews.isEmpty()) element else evaluatePrevious(nephews.last())
+            }
     }
-}
 
-interface TreeGeneratorScope<T> {
+public interface TreeGeneratorScope<T> {
 
-    fun addNode(
+    public fun addNode(
         data: T,
         id: Any? = null,
-        childrenGenerator: ChildrenGeneratorScope<T>.() -> Unit = { },
+        childrenGenerator: ChildrenGeneratorScope<T>.() -> Unit = {},
     )
 
-    fun addLeaf(data: T, id: Any? = null)
+    public fun addLeaf(data: T, id: Any? = null)
 
-    fun add(element: TreeBuilder.Element<T>)
+    public fun add(element: TreeBuilder.Element<T>)
 }
 
-class ChildrenGeneratorScope<T>(private val parentElement: Tree.Element.Node<T>) : TreeGeneratorScope<T> {
+public class ChildrenGeneratorScope<T>(private val parentElement: Tree.Element.Node<T>) : TreeGeneratorScope<T> {
 
     @GenerateDataFunctions
-    class ParentInfo<T>(val data: T, val depth: Int, val index: Int)
+    public class ParentInfo<T>(public val data: T, public val depth: Int, public val index: Int)
 
-    val parent by lazy { ParentInfo(parentElement.data, parentElement.depth, parentElement.childIndex) }
+    public val parent: ParentInfo<T> by lazy {
+        ParentInfo(parentElement.data, parentElement.depth, parentElement.childIndex)
+    }
 
     internal val elements = mutableListOf<TreeBuilder.Element<T>>()
 
@@ -158,13 +169,15 @@ class ChildrenGeneratorScope<T>(private val parentElement: Tree.Element.Node<T>)
     }
 }
 
-fun Path.asTree(isOpen: (File) -> Boolean = { false }) = toFile().asTree(isOpen)
+public fun Path.asTree(isOpen: (File) -> Boolean = { false }): Tree<File> =
+    toFile().asTree(isOpen)
 
-fun File.asTree(isOpen: (File) -> Boolean = { false }) = buildTree {
-    addNode(this@asTree, isOpen(this@asTree)) {
-        generateFileNodes(isOpen)
+public fun File.asTree(isOpen: (File) -> Boolean = { false }): Tree<File> =
+    buildTree {
+        addNode(this@asTree, isOpen(this@asTree)) {
+            generateFileNodes(isOpen)
+        }
     }
-}
 
 private fun ChildrenGeneratorScope<File>.generateFileNodes(isOpen: (File) -> Boolean) {
     val files = parent.data.listFiles() ?: return
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/DefaultTreeViewKeybindings.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/DefaultTreeViewKeybindings.kt
index 0f6528fa3a7a9..a9de90bbabe3a 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/DefaultTreeViewKeybindings.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/DefaultTreeViewKeybindings.kt
@@ -11,66 +11,67 @@ import org.jetbrains.jewel.foundation.lazy.DefaultSelectableColumnKeybindings
 import org.jetbrains.jewel.foundation.lazy.SelectableColumnKeybindings
 import org.jetbrains.skiko.hostOs
 
-open class DefaultTreeViewKeybindings : DefaultSelectableColumnKeybindings(), TreeViewKeybindings {
+public open class DefaultTreeViewKeybindings : DefaultSelectableColumnKeybindings(), TreeViewKeybindings {
 
-    companion object : DefaultTreeViewKeybindings()
+    public companion object : DefaultTreeViewKeybindings()
 
-    override val KeyEvent.isSelectParent
+    override val KeyEvent.isSelectParent: Boolean
         get() = key == Key.DirectionLeft && !isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isExtendSelectionToParent
+    override val KeyEvent.isExtendSelectionToParent: Boolean
         get() = key == Key.DirectionLeft && isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isSelectChild
+    override val KeyEvent.isSelectChild: Boolean
         get() = key == Key.DirectionRight && !isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isExtendSelectionToChild
+    override val KeyEvent.isExtendSelectionToChild: Boolean
         get() = key == Key.DirectionRight && isContiguousSelectionKeyPressed
 
-    override val KeyEvent.isSelectNextSibling
+    override val KeyEvent.isSelectNextSibling: Boolean
         get() = false
 
-    override val KeyEvent.isSelectPreviousSibling
+    override val KeyEvent.isSelectPreviousSibling: Boolean
         get() = false
 
-    override val KeyEvent.isEdit get() = key == Key.F2 && !isContiguousSelectionKeyPressed
+    override val KeyEvent.isEdit: Boolean
+        get() = key == Key.F2 && !isContiguousSelectionKeyPressed
 }
 
-interface TreeViewKeybindings : SelectableColumnKeybindings {
+public interface TreeViewKeybindings : SelectableColumnKeybindings {
 
     /**
-     * Select Parent Node
+     * Select Parent Node.
      */
-    val KeyEvent.isSelectParent: Boolean
+    public val KeyEvent.isSelectParent: Boolean
 
     /**
-     * Extend Selection to Parent Node inherited from Left with Selection
+     * Extend Selection to Parent Node inherited from Left with Selection.
      */
-    val KeyEvent.isExtendSelectionToParent: Boolean
+    public val KeyEvent.isExtendSelectionToParent: Boolean
 
     /**
-     * Select Child Node inherited from Right
+     * Select Child Node inherited from Right.
      */
-    val KeyEvent.isSelectChild: Boolean
+    public val KeyEvent.isSelectChild: Boolean
 
     /**
-     * Extend Selection to Child Node inherited from Right with Selection
+     * Extend Selection to Child Node inherited from Right with Selection.
      */
-    val KeyEvent.isExtendSelectionToChild: Boolean
+    public val KeyEvent.isExtendSelectionToChild: Boolean
 
     /**
-     * Select Next Sibling Node
+     * Select Next Sibling Node.
      */
-    val KeyEvent.isSelectNextSibling: Boolean
+    public val KeyEvent.isSelectNextSibling: Boolean
 
     /**
-     * Select Previous Sibling Node
+     * Select Previous Sibling Node.
      */
-    val KeyEvent.isSelectPreviousSibling: Boolean
+    public val KeyEvent.isSelectPreviousSibling: Boolean
 }
 
 @Suppress("unused")
-val DefaultWindowsTreeViewClickModifierHandler: TreeViewClickModifierHandler
+public val DefaultWindowsTreeViewClickModifierHandler: TreeViewClickModifierHandler
     get() = {
         when {
             hostOs.isWindows || hostOs.isLinux -> isCtrlPressed
@@ -79,10 +80,10 @@ val DefaultWindowsTreeViewClickModifierHandler: TreeViewClickModifierHandler
         }
     }
 
-typealias TreeViewClickModifierHandler = PointerKeyboardModifiers.() -> Boolean
+public typealias TreeViewClickModifierHandler = PointerKeyboardModifiers.() -> Boolean
 
-open class DefaultMacOsTreeColumnKeybindings : DefaultTreeViewKeybindings() {
-    companion object : DefaultMacOsTreeColumnKeybindings()
+public open class DefaultMacOsTreeColumnKeybindings : DefaultTreeViewKeybindings() {
+    public companion object : DefaultMacOsTreeColumnKeybindings()
 
     override val KeyEvent.isMultiSelectionKeyPressed: Boolean
         get() = isMetaPressed
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/DefaultTreeViewOnKeyEvent.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/DefaultTreeViewOnKeyEvent.kt
index c4d4bc9376df7..33bfd4d868890 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/DefaultTreeViewOnKeyEvent.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/DefaultTreeViewOnKeyEvent.kt
@@ -3,7 +3,7 @@ package org.jetbrains.jewel.foundation.lazy.tree
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListKey
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListState
 
-open class DefaultTreeViewOnKeyEvent(
+public open class DefaultTreeViewOnKeyEvent(
     override val keybindings: TreeViewKeybindings,
     private val treeState: TreeState,
 ) : TreeViewOnKeyEvent {
@@ -28,21 +28,23 @@ open class DefaultTreeViewOnKeyEvent(
             treeState.toggleNode(currentKey)
             return
         }
-        treeState.allNodes.first { it.first == currentKey }.let { currentNode ->
-            treeState.allNodes
-                .subList(0, treeState.allNodes.indexOf(currentNode))
-                .reversed()
-                .firstOrNull { it.second < currentNode.second }
-                ?.let { (parentNodeKey, _) ->
-                    keys.first { it.key == parentNodeKey }
-                        .takeIf { it is SelectableLazyListKey.Selectable }
-                        ?.let {
-                            state.lastActiveItemIndex =
-                                keys.indexOfFirst { selectableKey -> selectableKey.key == parentNodeKey }
-                            state.selectedKeys = listOf(parentNodeKey)
-                        }
-                }
-        }
+        treeState.allNodes
+            .first { it.first == currentKey }
+            .let { currentNode ->
+                treeState.allNodes
+                    .subList(0, treeState.allNodes.indexOf(currentNode))
+                    .reversed()
+                    .firstOrNull { it.second < currentNode.second }
+                    ?.let { (parentNodeKey, _) ->
+                        keys.first { it.key == parentNodeKey }
+                            .takeIf { it is SelectableLazyListKey.Selectable }
+                            ?.let {
+                                state.lastActiveItemIndex =
+                                    keys.indexOfFirst { selectableKey -> selectableKey.key == parentNodeKey }
+                                state.selectedKeys = listOf(parentNodeKey)
+                            }
+                    }
+            }
     }
 
     private fun handleLeafCase(
@@ -66,7 +68,10 @@ open class DefaultTreeViewOnKeyEvent(
 
     override fun onSelectChild(keys: List<SelectableLazyListKey>, state: SelectableLazyListState) {
         val currentKey = keys[state.lastActiveItemIndex ?: 0].key
-        if (currentKey in treeState.allNodes.map { it.first } && currentKey !in treeState.openNodes) {
+        if (
+            currentKey in treeState.allNodes.map { it.first } &&
+            currentKey !in treeState.openNodes
+        ) {
             treeState.toggleNode(currentKey)
         } else {
             super.onSelectNextItem(keys, state)
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/KeyActions.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/KeyActions.kt
index f252120a570ba..d91fa13dc57a1 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/KeyActions.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/KeyActions.kt
@@ -20,12 +20,12 @@ import org.jetbrains.jewel.foundation.lazy.SelectionMode
 import org.jetbrains.jewel.foundation.utils.Log
 import org.jetbrains.skiko.hostOs
 
-interface KeyActions {
+public interface KeyActions {
 
-    val keybindings: SelectableColumnKeybindings
-    val actions: SelectableColumnOnKeyEvent
+    public val keybindings: SelectableColumnKeybindings
+    public val actions: SelectableColumnOnKeyEvent
 
-    fun handleOnKeyEvent(
+    public fun handleOnKeyEvent(
         event: KeyEvent,
         keys: List<SelectableLazyListKey>,
         state: SelectableLazyListState,
@@ -33,9 +33,9 @@ interface KeyActions {
     ): KeyEvent.() -> Boolean
 }
 
-interface PointerEventActions {
+public interface PointerEventActions {
 
-    fun handlePointerEventPress(
+    public fun handlePointerEventPress(
         pointerEvent: PointerEvent,
         keyBindings: SelectableColumnKeybindings,
         selectableLazyListState: SelectableLazyListState,
@@ -44,13 +44,13 @@ interface PointerEventActions {
         key: Any,
     )
 
-    fun toggleKeySelection(
+    public fun toggleKeySelection(
         key: Any,
         allKeys: List<SelectableLazyListKey>,
         selectableLazyListState: SelectableLazyListState,
     )
 
-    fun onExtendSelectionToKey(
+    public fun onExtendSelectionToKey(
         key: Any,
         allKeys: List<SelectableLazyListKey>,
         state: SelectableLazyListState,
@@ -58,7 +58,7 @@ interface PointerEventActions {
     )
 }
 
-open class DefaultSelectableLazyColumnEventAction : PointerEventActions {
+public open class DefaultSelectableLazyColumnEventAction : PointerEventActions {
 
     override fun handlePointerEventPress(
         pointerEvent: PointerEvent,
@@ -70,7 +70,8 @@ open class DefaultSelectableLazyColumnEventAction : PointerEventActions {
     ) {
         with(keyBindings) {
             when {
-                pointerEvent.keyboardModifiers.isContiguousSelectionKeyPressed && pointerEvent.keyboardModifiers.isCtrlPressed -> {
+                pointerEvent.keyboardModifiers.isContiguousSelectionKeyPressed &&
+                    pointerEvent.keyboardModifiers.isCtrlPressed -> {
                     Log.i("ctrl and shift pressed on click")
                     // do nothing
                 }
@@ -121,15 +122,19 @@ open class DefaultSelectableLazyColumnEventAction : PointerEventActions {
         } else {
             val currentIndex = allKeys.indexOfFirst { it.key == key }.coerceAtLeast(0)
             val lastFocussed = state.lastActiveItemIndex ?: currentIndex
-            val indexInterval = if (currentIndex > lastFocussed) {
-                lastFocussed..currentIndex
-            } else {
-                lastFocussed downTo currentIndex
-            }
+            val indexInterval =
+                if (currentIndex > lastFocussed) {
+                    lastFocussed..currentIndex
+                } else {
+                    lastFocussed downTo currentIndex
+                }
             val keys = buildList {
                 for (i in indexInterval) {
                     val currentKey = allKeys[i]
-                    if (currentKey is SelectableLazyListKey.Selectable && !state.selectedKeys.contains(allKeys[i].key)) {
+                    if (
+                        currentKey is SelectableLazyListKey.Selectable &&
+                        !state.selectedKeys.contains(allKeys[i].key)
+                    ) {
                         add(currentKey.key)
                     }
                 }
@@ -140,7 +145,7 @@ open class DefaultSelectableLazyColumnEventAction : PointerEventActions {
     }
 }
 
-class DefaultTreeViewPointerEventAction(
+public class DefaultTreeViewPointerEventAction(
     private val treeState: TreeState,
 ) : DefaultSelectableLazyColumnEventAction() {
 
@@ -154,7 +159,8 @@ class DefaultTreeViewPointerEventAction(
     ) {
         with(keyBindings) {
             when {
-                pointerEvent.keyboardModifiers.isContiguousSelectionKeyPressed && pointerEvent.keyboardModifiers.isCtrlPressed -> {
+                pointerEvent.keyboardModifiers.isContiguousSelectionKeyPressed &&
+                    pointerEvent.keyboardModifiers.isCtrlPressed -> {
                     Log.t("ctrl and shift pressed on click")
                 }
 
@@ -178,6 +184,7 @@ class DefaultTreeViewPointerEventAction(
     // todo warning: move this away from here
     // for item click that lose focus and fail to match if a operation is a double-click
     private var elementClickedTmpHolder: Any? = null
+
     internal fun <T> notifyItemClicked(
         item: Tree.Element<T>,
         scope: CoroutineScope,
@@ -207,7 +214,7 @@ class DefaultTreeViewPointerEventAction(
     }
 }
 
-fun DefaultTreeViewKeyActions(treeState: TreeState): DefaultTreeViewKeyActions {
+public fun DefaultTreeViewKeyActions(treeState: TreeState): DefaultTreeViewKeyActions {
     val keybindings = when {
         hostOs.isMacOS -> DefaultMacOsTreeColumnKeybindings
         else -> DefaultTreeViewKeybindings
@@ -215,7 +222,7 @@ fun DefaultTreeViewKeyActions(treeState: TreeState): DefaultTreeViewKeyActions {
     return DefaultTreeViewKeyActions(keybindings, DefaultTreeViewOnKeyEvent(keybindings, treeState))
 }
 
-class DefaultTreeViewKeyActions(
+public class DefaultTreeViewKeyActions(
     override val keybindings: TreeViewKeybindings,
     override val actions: DefaultTreeViewOnKeyEvent,
 ) : DefaultSelectableLazyColumnKeyActions(keybindings, actions) {
@@ -235,8 +242,8 @@ class DefaultTreeViewKeyActions(
                 when {
                     isSelectParent -> onSelectParent(keys, state)
                     isSelectChild -> onSelectChild(keys, state)
-                    super.handleOnKeyEvent(event, keys, state, selectionMode)
-                        .invoke(keyEvent) -> return@lambda true
+                    super.handleOnKeyEvent(event, keys, state, selectionMode).invoke(keyEvent) ->
+                        return@lambda true
 
                     else -> return@lambda false
                 }
@@ -246,12 +253,12 @@ class DefaultTreeViewKeyActions(
     }
 }
 
-open class DefaultSelectableLazyColumnKeyActions(
+public open class DefaultSelectableLazyColumnKeyActions(
     override val keybindings: SelectableColumnKeybindings,
     override val actions: SelectableColumnOnKeyEvent = DefaultSelectableOnKeyEvent(keybindings),
 ) : KeyActions {
 
-    companion object : DefaultSelectableLazyColumnKeyActions(
+    public companion object : DefaultSelectableLazyColumnKeyActions(
         when {
             hostOs.isMacOS -> DefaultMacOsSelectableColumnKeybindings
             else -> DefaultSelectableColumnKeybindings
@@ -263,15 +270,10 @@ open class DefaultSelectableLazyColumnKeyActions(
         keys: List<SelectableLazyListKey>,
         state: SelectableLazyListState,
         selectionMode: SelectionMode,
-    ): KeyEvent.() -> Boolean =
-        lambda@{
-            if (type == KeyEventType.KeyUp || selectionMode == SelectionMode.None) return@lambda false
-            with(keybindings) {
-                with(actions) {
-                    execute(keys, state, selectionMode)
-                }
-            }
-        }
+    ): KeyEvent.() -> Boolean = lambda@{
+        if (type == KeyEventType.KeyUp || selectionMode == SelectionMode.None) return@lambda false
+        with(keybindings) { with(actions) { execute(keys, state, selectionMode) } }
+    }
 
     context(SelectableColumnKeybindings, SelectableColumnOnKeyEvent)
     private fun KeyEvent.execute(
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/Tree.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/Tree.kt
index 927dc5927e219..d36244a935d40 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/Tree.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/Tree.kt
@@ -3,15 +3,16 @@ package org.jetbrains.jewel.foundation.lazy.tree
 import org.jetbrains.jewel.foundation.lazy.tree.Tree.Element.Node
 
 @Suppress("UNCHECKED_CAST")
-fun <T> emptyTree() = Tree.EMPTY as Tree<T>
+public fun <T> emptyTree(): Tree<T> = Tree.EMPTY as Tree<T>
 
-class Tree<T> internal constructor(val roots: List<Element<T>>) {
+public class Tree<T> internal constructor(public val roots: List<Element<T>>) {
+
+    public companion object {
 
-    companion object {
         internal val EMPTY = Tree(roots = emptyList<Element<Any?>>())
     }
 
-    fun isEmpty() = roots.isEmpty()
+    public fun isEmpty(): Boolean = roots.isEmpty()
 
     private fun walk(breathFirst: Boolean) = sequence {
         val queue = roots.toMutableList()
@@ -29,31 +30,39 @@ class Tree<T> internal constructor(val roots: List<Element<T>>) {
         }
     }
 
-    fun walkBreadthFirst() = walk(true)
-    fun walkDepthFirst() = walk(false)
+    public fun walkBreadthFirst(): Sequence<Element<T>> = walk(true)
+
+    public fun walkDepthFirst(): Sequence<Element<T>> = walk(false)
 
-    sealed interface Element<T> {
+    public sealed interface Element<T> {
 
-        val data: T
-        val depth: Int
-        val parent: Element<T>?
-        val childIndex: Int
-        var next: Element<T>?
-        var previous: Element<T>?
-        val id: Any
+        public val data: T
+        public val depth: Int
+        public val parent: Element<T>?
+        public val childIndex: Int
+        public var next: Element<T>?
+        public var previous: Element<T>?
+        public val id: Any
 
-        fun path() = buildList {
-            var next: Element<T>? = this@Element
-            while (next != null) {
-                add(next)
-                next = next.parent
+        public fun path(): List<Element<T>> =
+            buildList {
+                var next: Element<T>? = this@Element
+                while (next != null) {
+                    add(next)
+                    next = next.parent
+                }
             }
-        }.reversed()
+                .reversed()
 
-        fun previousElementsIterable() = Iterable { elementIterator(previous) { it.previous } }
-        fun nextElementsIterable() = Iterable { elementIterator(next) { it.next } }
+        public fun previousElementsIterable(): Iterable<Element<T>> = Iterable {
+            elementIterator(previous) { it.previous }
+        }
+
+        public fun nextElementsIterable(): Iterable<Element<T>> = Iterable {
+            elementIterator(next) { it.next }
+        }
 
-        class Leaf<T>(
+        public class Leaf<T>(
             override val data: T,
             override val depth: Int,
             override val childIndex: Int,
@@ -63,7 +72,7 @@ class Tree<T> internal constructor(val roots: List<Element<T>>) {
             override val id: Any,
         ) : Element<T>
 
-        class Node<T>(
+        public class Node<T>(
             override val data: T,
             override val depth: Int,
             override val childIndex: Int,
@@ -74,7 +83,7 @@ class Tree<T> internal constructor(val roots: List<Element<T>>) {
             override val id: Any,
         ) : Element<T> {
 
-            var children: List<Element<T>>? = null
+            public var children: List<Element<T>>? = null
                 private set
 
             private fun evaluateChildren() {
@@ -101,12 +110,12 @@ class Tree<T> internal constructor(val roots: List<Element<T>>) {
                 }
             }
 
-            fun open(reloadChildren: Boolean = false) {
+            public fun open(reloadChildren: Boolean = false) {
                 if (reloadChildren || children == null) evaluateChildren()
                 connectChildren()
             }
 
-            fun close() {
+            public fun close() {
                 detachChildren()
                 children?.asSequence()
                     ?.filterIsInstance<Node<*>>()
@@ -120,7 +129,10 @@ class Tree<T> internal constructor(val roots: List<Element<T>>) {
     }
 }
 
-private fun <T> elementIterator(initial: Tree.Element<T>?, next: (Tree.Element<T>) -> Tree.Element<T>?) = iterator {
+private fun <T> elementIterator(
+    initial: Tree.Element<T>?,
+    next: (Tree.Element<T>) -> Tree.Element<T>?,
+) = iterator {
     var current = initial ?: return@iterator
     yield(current)
     while (true) {
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/TreeState.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/TreeState.kt
index 43bce01fa2399..7e8ee813d7203 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/TreeState.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/TreeState.kt
@@ -13,20 +13,20 @@ import org.jetbrains.jewel.foundation.lazy.SelectableScope
 import org.jetbrains.jewel.foundation.utils.Log
 
 @Composable
-fun rememberTreeState(
+public fun rememberTreeState(
     lazyListState: LazyListState = LazyListState(),
     selectableLazyListState: SelectableLazyListState = SelectableLazyListState(lazyListState),
 ): TreeState = remember { TreeState(selectableLazyListState) }
 
-class TreeState(
+public class TreeState(
     internal val delegate: SelectableLazyListState,
 ) : SelectableScope by delegate, ScrollableState by delegate {
 
     internal val allNodes = mutableStateListOf<Pair<Any, Int>>()
 
-    var openNodes by mutableStateOf<Set<Any>>(emptySet())
+    public var openNodes: Set<Any> by mutableStateOf<Set<Any>>(emptySet())
 
-    fun toggleNode(nodeId: Any) {
+    public fun toggleNode(nodeId: Any) {
         Log.d("toggleNode $nodeId")
         if (nodeId in openNodes) {
             openNodes -= nodeId
@@ -36,7 +36,7 @@ class TreeState(
         Log.d("open nodes ${openNodes.map { it.toString() }}")
     }
 
-    fun openNodes(nodes: List<Any>) {
+    public fun openNodes(nodes: List<Any>) {
         openNodes += nodes
     }
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/TreeViewOnKeyEvent.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/TreeViewOnKeyEvent.kt
index e1807eee09596..10910b6618e60 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/TreeViewOnKeyEvent.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/lazy/tree/TreeViewOnKeyEvent.kt
@@ -4,15 +4,15 @@ import org.jetbrains.jewel.foundation.lazy.SelectableColumnOnKeyEvent
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListKey
 import org.jetbrains.jewel.foundation.lazy.SelectableLazyListState
 
-interface TreeViewOnKeyEvent : SelectableColumnOnKeyEvent {
+public interface TreeViewOnKeyEvent : SelectableColumnOnKeyEvent {
 
     /**
-     * Select Parent Node
+     * Select Parent Node.
      */
-    fun onSelectParent(keys: List<SelectableLazyListKey>, state: SelectableLazyListState)
+    public fun onSelectParent(keys: List<SelectableLazyListKey>, state: SelectableLazyListState)
 
     /**
-     * Select Child Node inherited from Right
+     * Select Child Node inherited from Right.
      */
-    fun onSelectChild(keys: List<SelectableLazyListKey>, state: SelectableLazyListState)
+    public fun onSelectChild(keys: List<SelectableLazyListKey>, state: SelectableLazyListState)
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/Activation.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/Activation.kt
index f74c3b2faeafe..686f5b7d5ef4b 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/Activation.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/Activation.kt
@@ -28,77 +28,73 @@ import java.awt.event.FocusListener
 import java.awt.event.WindowAdapter
 import java.awt.event.WindowEvent
 
-fun Modifier.trackWindowActivation(window: Window) = composed(
-    inspectorInfo = debugInspectorInfo {
-        name = "activateRoot"
-        properties["window"] = window
-    },
-) {
-    var parentActivated by remember { mutableStateOf(false) }
-
-    DisposableEffect(window) {
-        val listener = object : WindowAdapter() {
-            override fun windowActivated(e: WindowEvent?) {
-                parentActivated = true
+public fun Modifier.trackWindowActivation(window: Window): Modifier =
+    composed(
+        debugInspectorInfo {
+            name = "activateRoot"
+            properties["window"] = window
+        },
+    ) {
+        var parentActivated by remember { mutableStateOf(false) }
+
+        DisposableEffect(window) {
+            val listener = object : WindowAdapter() {
+                override fun windowActivated(e: WindowEvent?) {
+                    parentActivated = true
+                }
+
+                override fun windowDeactivated(e: WindowEvent?) {
+                    parentActivated = false
+                }
             }
-
-            override fun windowDeactivated(e: WindowEvent?) {
-                parentActivated = false
-            }
-        }
-        window.addWindowListener(listener)
-        onDispose {
-            window.removeWindowListener(listener)
+            window.addWindowListener(listener)
+            onDispose { window.removeWindowListener(listener) }
         }
+        Modifier.modifierLocalProvider(ModifierLocalActivated) { parentActivated }
     }
-    Modifier.modifierLocalProvider(ModifierLocalActivated) {
-        parentActivated
-    }
-}
 
-fun Modifier.trackComponentActivation(awtParent: Component) = composed(
-    inspectorInfo = debugInspectorInfo {
-        name = "activateRoot"
-        properties["parent"] = awtParent
-    },
-) {
-    var parentActivated by remember { mutableStateOf(false) }
-
-    DisposableEffect(awtParent) {
-        val listener = object : FocusListener {
-            override fun focusGained(e: FocusEvent?) {
-                parentActivated = true
+public fun Modifier.trackComponentActivation(awtParent: Component): Modifier =
+    composed(
+        debugInspectorInfo {
+            name = "activateRoot"
+            properties["parent"] = awtParent
+        },
+    ) {
+        var parentActivated by remember { mutableStateOf(false) }
+
+        DisposableEffect(awtParent) {
+            val listener = object : FocusListener {
+                override fun focusGained(e: FocusEvent?) {
+                    parentActivated = true
+                }
+
+                override fun focusLost(e: FocusEvent?) {
+                    parentActivated = false
+                }
             }
-
-            override fun focusLost(e: FocusEvent?) {
-                parentActivated = false
-            }
-        }
-        awtParent.addFocusListener(listener)
-        onDispose {
-            awtParent.removeFocusListener(listener)
+            awtParent.addFocusListener(listener)
+            onDispose { awtParent.removeFocusListener(listener) }
         }
+
+        Modifier.modifierLocalProvider(ModifierLocalActivated) { parentActivated }
     }
-    Modifier.modifierLocalProvider(ModifierLocalActivated) {
-        parentActivated
-    }
-}
 
 @Stable
-fun Modifier.trackActivation() = composed(
-    inspectorInfo = debugInspectorInfo {
-        name = "trackActivation"
-    },
-) {
-    val activatedModifierLocal = remember { ActivatedModifierLocal() }
-    Modifier.focusGroup().onFocusChanged {
-        if (it.hasFocus) {
-            activatedModifierLocal.childGainedFocus()
-        } else {
-            activatedModifierLocal.childLostFocus()
-        }
-    }.then(activatedModifierLocal)
-}
+public fun Modifier.trackActivation(): Modifier =
+    composed(
+        debugInspectorInfo { name = "trackActivation" },
+    ) {
+        val activatedModifierLocal = remember { ActivatedModifierLocal() }
+        Modifier.focusGroup()
+            .onFocusChanged {
+                if (it.hasFocus) {
+                    activatedModifierLocal.childGainedFocus()
+                } else {
+                    activatedModifierLocal.childLostFocus()
+                }
+            }
+            .then(activatedModifierLocal)
+    }
 
 private class ActivatedModifierLocal : ModifierLocalProvider<Boolean>, ModifierLocalConsumer {
 
@@ -107,9 +103,7 @@ private class ActivatedModifierLocal : ModifierLocalProvider<Boolean>, ModifierL
     private var hasFocus: Boolean by mutableStateOf(false)
 
     override fun onModifierLocalsUpdated(scope: ModifierLocalReadScope) {
-        with(scope) {
-            parentActivated = ModifierLocalActivated.current
-        }
+        with(scope) { parentActivated = ModifierLocalActivated.current }
     }
 
     override val key: ProvidableModifierLocal<Boolean> = ModifierLocalActivated
@@ -126,26 +120,23 @@ private class ActivatedModifierLocal : ModifierLocalProvider<Boolean>, ModifierL
     }
 }
 
-val ModifierLocalActivated = modifierLocalOf {
-    false
-}
+public val ModifierLocalActivated: ProvidableModifierLocal<Boolean> = modifierLocalOf { false }
 
-fun Modifier.onActivated(
+public fun Modifier.onActivated(
     enabled: Boolean = true,
     onChanged: (Boolean) -> Unit,
-) = then(
-    if (enabled) {
+): Modifier =
+    this then if (enabled) {
         ActivateChangedModifierElement(
             onChanged,
-            inspectorInfo = debugInspectorInfo {
+            debugInspectorInfo {
                 name = "onActivated"
                 properties["onChanged"] = onChanged
             },
         )
     } else {
         Modifier
-    },
-)
+    }
 
 private class ActivateChangedModifierElement(
     private val onChanged: (Boolean) -> Unit,
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/Border.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/Border.kt
index 6d44f0add5855..af287dd59806c 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/Border.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/Border.kt
@@ -41,33 +41,33 @@ import org.jetbrains.jewel.foundation.grow
 import org.jetbrains.jewel.foundation.hasAtLeastOneNonRoundedCorner
 import org.jetbrains.jewel.foundation.shrink
 import kotlin.math.ceil
-import kotlin.math.max
 import kotlin.math.min
 
-typealias DrawScopeStroke = androidx.compose.ui.graphics.drawscope.Stroke
-
-fun Modifier.border(stroke: Stroke, shape: Shape): Modifier = when (stroke) {
-    is Stroke.None -> this
-    is Stroke.Solid -> border(stroke.alignment, stroke.width, stroke.color, shape, stroke.expand)
-    is Stroke.Brush -> border(
-        alignment = stroke.alignment,
-        width = stroke.width,
-        brush = stroke.brush,
-        shape = shape,
-        expand = stroke.expand,
-    )
-}
+public typealias DrawScopeStroke = androidx.compose.ui.graphics.drawscope.Stroke
+
+public fun Modifier.border(stroke: Stroke, shape: Shape): Modifier =
+    when (stroke) {
+        is Stroke.None -> this
+        is Stroke.Solid -> border(stroke.alignment, stroke.width, stroke.color, shape, stroke.expand)
+        is Stroke.Brush -> border(
+            alignment = stroke.alignment,
+            width = stroke.width,
+            brush = stroke.brush,
+            shape = shape,
+            expand = stroke.expand,
+        )
+    }
 
-fun Modifier.border(
+public fun Modifier.border(
     alignment: Stroke.Alignment,
     width: Dp,
     color: Color,
     shape: Shape = RectangleShape,
     expand: Dp = Dp.Unspecified,
-) =
+): Modifier =
     border(alignment, width, SolidColor(color), shape, expand)
 
-fun Modifier.border(
+public fun Modifier.border(
     alignment: Stroke.Alignment,
     width: Dp,
     brush: Brush,
@@ -75,7 +75,8 @@ fun Modifier.border(
     expand: Dp = Dp.Unspecified,
 ): Modifier =
     if (alignment == Stroke.Alignment.Inside && expand.isUnspecified) {
-        // The compose native border modifier(androidx.compose.foundation.border) draws the border inside the shape,
+        // The compose native border modifier(androidx.compose.foundation.border) draws the border
+        // inside the shape,
         // so we can just use that for getting a more native experience when drawing inside borders
         border(width, brush, shape)
     } else {
@@ -88,82 +89,98 @@ private fun Modifier.drawBorderWithAlignment(
     brush: Brush,
     shape: Shape,
     expand: Dp,
-): Modifier = composed(
-    factory = {
-        val borderCacheRef = remember { Ref<BorderCache>() }
-        this.then(
-            Modifier.drawWithCache {
+): Modifier =
+    composed(
+        factory = {
+            val borderCacheRef = remember { Ref<BorderCache>() }
+            this then Modifier.drawWithCache {
                 onDrawWithContent {
                     drawContent()
-                    val strokeWidthPx = max(
-                        min(
-                            if (width == Dp.Hairline) 1f else ceil(width.toPx()),
-                            ceil(size.minDimension / 2),
-                        ),
-                        1f,
-                    )
+
+                    val strokeWidthPx =
+                        min(if (width == Dp.Hairline) 1f else ceil(width.toPx()), ceil(size.minDimension / 2))
+                            .coerceAtLeast(1f)
 
                     val expandWidthPx = expand.takeOrElse { 0.dp }.toPx()
 
-                    when (val outline = shape.createOutline(size, layoutDirection, this)) {
-                        is Outline.Rectangle -> {
-                            when (shape) {
-                                is RoundedCornerShape -> drawRoundedBorder(
-                                    borderCacheRef,
-                                    alignment,
-                                    Outline.Rounded(RoundRect(outline.rect)),
-                                    brush,
-                                    strokeWidthPx,
-                                    expandWidthPx,
-                                )
+                    drawBorderInner(
+                        shape,
+                        borderCacheRef,
+                        alignment,
+                        brush,
+                        strokeWidthPx,
+                        expandWidthPx,
+                        cacheDrawScope = this@drawWithCache,
+                    )
+                }
+            }
+        },
+        inspectorInfo = debugInspectorInfo {
+            name = "border"
+            properties["alignment"] = alignment
+            properties["width"] = width
+            if (brush is SolidColor) {
+                properties["color"] = brush.value
+                value = brush.value
+            } else {
+                properties["brush"] = brush
+            }
+            properties["shape"] = shape
+            properties["expand"] = expand
+        },
+    )
 
-                                else -> drawRectBorder(
-                                    borderCacheRef,
-                                    alignment,
-                                    outline,
-                                    brush,
-                                    strokeWidthPx,
-                                    expandWidthPx,
-                                )
-                            }
-                        }
+private fun ContentDrawScope.drawBorderInner(
+    shape: Shape,
+    borderCacheRef: Ref<BorderCache>,
+    alignment: Stroke.Alignment,
+    brush: Brush,
+    strokeWidthPx: Float,
+    expandWidthPx: Float,
+    cacheDrawScope: CacheDrawScope,
+) {
+    when (val outline = shape.createOutline(size, layoutDirection, cacheDrawScope)) {
+        is Outline.Rectangle -> {
+            when (shape) {
+                is RoundedCornerShape -> drawRoundedBorder(
+                    borderCacheRef = borderCacheRef,
+                    alignment = alignment,
+                    outline = Outline.Rounded(RoundRect(outline.rect)),
+                    brush = brush,
+                    strokeWidthPx = strokeWidthPx,
+                    expandWidthPx = expandWidthPx,
+                )
+
+                else -> drawRectBorder(
+                    borderCacheRef,
+                    alignment,
+                    outline,
+                    brush,
+                    strokeWidthPx,
+                    expandWidthPx,
+                )
+            }
+        }
 
-                        is Outline.Rounded -> drawRoundedBorder(
-                            borderCacheRef,
-                            alignment,
-                            outline,
-                            brush,
-                            strokeWidthPx,
-                            expandWidthPx,
-                        )
-
-                        is Outline.Generic -> drawGenericBorder(
-                            borderCacheRef,
-                            alignment,
-                            outline,
-                            brush,
-                            strokeWidthPx,
-                            expandWidthPx,
-                        )
-                    }
-                }
-            },
+        is Outline.Rounded -> drawRoundedBorder(
+            borderCacheRef,
+            alignment,
+            outline,
+            brush,
+            strokeWidthPx,
+            expandWidthPx,
         )
-    },
-    inspectorInfo = debugInspectorInfo {
-        name = "border"
-        properties["alignment"] = alignment
-        properties["width"] = width
-        if (brush is SolidColor) {
-            properties["color"] = brush.value
-            value = brush.value
-        } else {
-            properties["brush"] = brush
-        }
-        properties["shape"] = shape
-        properties["expand"] = expand
-    },
-)
+
+        is Outline.Generic -> cacheDrawScope.drawGenericBorder(
+            borderCacheRef,
+            alignment,
+            outline,
+            brush,
+            strokeWidthPx,
+            expandWidthPx,
+        )
+    }
+}
 
 private class BorderCache(
     private var imageBitmap: ImageBitmap? = null,
@@ -179,8 +196,10 @@ private class BorderCache(
     ): ImageBitmap {
         var targetImageBitmap = imageBitmap
         var targetCanvas = canvas
-        val compatibleConfig = targetImageBitmap?.config == ImageBitmapConfig.Argb8888 ||
-            config == targetImageBitmap?.config
+        val compatibleConfig =
+            targetImageBitmap?.config == ImageBitmapConfig.Argb8888 ||
+                config == targetImageBitmap?.config
+
         @Suppress("ComplexCondition")
         if (targetImageBitmap == null ||
             targetCanvas == null ||
@@ -188,43 +207,26 @@ private class BorderCache(
             size.height > targetImageBitmap.height ||
             !compatibleConfig
         ) {
-            targetImageBitmap = ImageBitmap(
-                borderSize.width,
-                borderSize.height,
-                config = config,
-            ).also {
-                imageBitmap = it
-            }
-            targetCanvas = Canvas(targetImageBitmap).also {
-                canvas = it
-            }
+            targetImageBitmap =
+                ImageBitmap(borderSize.width, borderSize.height, config = config)
+                    .also { imageBitmap = it }
+            targetCanvas = Canvas(targetImageBitmap).also { canvas = it }
         }
 
         val targetDrawScope = canvasDrawScope ?: CanvasDrawScope().also { canvasDrawScope = it }
         val drawSize = borderSize.toSize()
-        targetDrawScope.draw(
-            this,
-            layoutDirection,
-            targetCanvas,
-            drawSize,
-        ) {
-            drawRect(
-                color = Color.Black,
-                size = drawSize,
-                blendMode = BlendMode.Clear,
-            )
+        targetDrawScope.draw(this, layoutDirection, targetCanvas, drawSize) {
+            drawRect(color = Color.Black, size = drawSize, blendMode = BlendMode.Clear)
             block()
         }
         targetImageBitmap.prepareToDraw()
         return targetImageBitmap
     }
 
-    fun obtainPath(): Path =
-        borderPath ?: Path().also { borderPath = it }
+    public fun obtainPath(): Path = borderPath ?: Path().also { borderPath = it }
 }
 
-private fun Ref<BorderCache>.obtain(): BorderCache =
-    this.value ?: BorderCache().also { value = it }
+private fun Ref<BorderCache>.obtain(): BorderCache = this.value ?: BorderCache().also { value = it }
 
 @Suppress("UNUSED_PARAMETER")
 private fun ContentDrawScope.drawRectBorder(
@@ -236,18 +238,11 @@ private fun ContentDrawScope.drawRectBorder(
     expandWidthPx: Float,
 ) {
     val rect = when (alignment) {
-        Stroke.Alignment.Inside -> {
-            outline.rect.inflate(expandWidthPx - strokeWidthPx / 2f)
-        }
-
-        Stroke.Alignment.Center -> {
-            outline.rect.inflate(expandWidthPx)
-        }
-
-        Stroke.Alignment.Outside -> {
-            outline.rect.inflate(expandWidthPx + strokeWidthPx / 2f)
-        }
+        Stroke.Alignment.Inside -> outline.rect.inflate(expandWidthPx - strokeWidthPx / 2f)
+        Stroke.Alignment.Center -> outline.rect.inflate(expandWidthPx)
+        Stroke.Alignment.Outside -> outline.rect.inflate(expandWidthPx + strokeWidthPx / 2f)
     }
+
     drawRect(brush, rect.topLeft, rect.size, style = DrawScopeStroke(strokeWidthPx))
 }
 
@@ -268,19 +263,16 @@ private fun ContentDrawScope.drawRoundedBorder(
     if (roundRect.hasAtLeastOneNonRoundedCorner()) {
         // Note: why do we need this? The Outline API can handle it just fine
         val cache = borderCacheRef.obtain()
-        val borderPath = cache.obtainPath().apply {
-            reset()
-            fillType = PathFillType.EvenOdd
-            addRoundRect(roundRect.shrink(strokeWidthPx / 2f))
-            addRoundRect(roundRect.grow(strokeWidthPx / 2f))
-        }
+        val borderPath = cache.obtainPath()
+            .apply {
+                reset()
+                fillType = PathFillType.EvenOdd
+                addRoundRect(roundRect.shrink(strokeWidthPx / 2f))
+                addRoundRect(roundRect.grow(strokeWidthPx / 2f))
+            }
         drawPath(borderPath, brush)
     } else {
-        drawOutline(
-            outline = Outline.Rounded(roundRect),
-            brush = brush,
-            style = DrawScopeStroke(strokeWidthPx),
-        )
+        drawOutline(Outline.Rounded(roundRect), brush, style = DrawScopeStroke(strokeWidthPx))
     }
 }
 
@@ -297,32 +289,18 @@ private fun CacheDrawScope.drawGenericBorder(
     // Get the outer border and inner border inflate delta,
     // the part between inner and outer is the border that
     // needs to be drawn
-    val (outer, inner) = when (alignment) {
-        Stroke.Alignment.Inside -> {
+    val (outer, inner) =
+        when (alignment) {
             // Inside border means the outer border inflate delta is 0
-            0f + expandWidthPx to -strokeWidth + expandWidthPx
-        }
-
-        Stroke.Alignment.Center -> {
-            strokeWidth / 2f + expandWidthPx to -strokeWidth / 2f + expandWidthPx
-        }
-
-        Stroke.Alignment.Outside -> {
-            strokeWidth + expandWidthPx to 0f + expandWidthPx
+            Stroke.Alignment.Inside -> 0f + expandWidthPx to -strokeWidth + expandWidthPx
+            Stroke.Alignment.Center -> strokeWidth / 2f + expandWidthPx to -strokeWidth / 2f + expandWidthPx
+            Stroke.Alignment.Outside -> strokeWidth + expandWidthPx to 0f + expandWidthPx
         }
-    }
 
-    // Nothing need to draw
     when (outer) {
-        inner -> {
-            return@onDrawWithContent
-        }
-
-        -inner -> {
-            // Samply draw the outline when abs(outer) and abs(inner) are the same
-            drawOutline(outline, brush, style = DrawScopeStroke(outer * 2f))
-        }
-
+        inner -> return@onDrawWithContent
+        // Simply draw the outline when abs(outer) and abs(inner) are the same
+        -inner -> drawOutline(outline, brush, style = DrawScopeStroke(outer * 2f))
         else -> {
             val config: ImageBitmapConfig
             val colorFilter: ColorFilter?
@@ -335,16 +313,18 @@ private fun CacheDrawScope.drawGenericBorder(
             }
             val pathBounds = outline.path.getBounds().inflate(outer)
             val borderCache = borderCacheRef.obtain()
-            val outerMaskPath = borderCache.obtainPath().apply {
-                reset()
-                addRect(pathBounds)
-                op(this, outline.path, PathOperation.Difference)
-            }
+            val outerMaskPath =
+                borderCache.obtainPath().apply {
+                    reset()
+                    addRect(pathBounds)
+                    op(this, outline.path, PathOperation.Difference)
+                }
             val cacheImageBitmap: ImageBitmap
-            val pathBoundsSize = IntSize(
-                ceil(pathBounds.width).toInt(),
-                ceil(pathBounds.height).toInt(),
-            )
+            val pathBoundsSize =
+                IntSize(
+                    ceil(pathBounds.width).toInt(),
+                    ceil(pathBounds.height).toInt(),
+                )
 
             with(borderCache) {
                 cacheImageBitmap = drawBorderCache(
@@ -357,7 +337,7 @@ private fun CacheDrawScope.drawGenericBorder(
                         }
 
                         if (outer > 0f && inner >= 0f) {
-                            drawPath(path = outline.path, brush = brush, style = DrawScopeStroke(outer * 2f))
+                            drawPath(outline.path, brush, style = DrawScopeStroke(outer * 2f))
 
                             if (inner > 0f) {
                                 drawPath(
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/OnHoverModifier.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/OnHoverModifier.kt
index 41d4b16d2ab1e..b3b3851447dbf 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/OnHoverModifier.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/modifier/OnHoverModifier.kt
@@ -4,7 +4,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.PointerEventType
 import androidx.compose.ui.input.pointer.pointerInput
 
-fun Modifier.onHover(onHover: (Boolean) -> Unit): Modifier =
+public fun Modifier.onHover(onHover: (Boolean) -> Unit): Modifier =
     pointerInput(Unit) {
         awaitPointerEventScope {
             while (true) {
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/CommonStateBitMask.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/CommonStateBitMask.kt
index 432bb74dcb7a8..d7545335c8fa4 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/CommonStateBitMask.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/CommonStateBitMask.kt
@@ -1,14 +1,14 @@
 package org.jetbrains.jewel.foundation.state
 
-object CommonStateBitMask {
+public object CommonStateBitMask {
 
-    val Enabled = 1UL shl 0
-    val Focused = 1UL shl 1
-    val Hovered = 1UL shl 2
-    val Pressed = 1UL shl 3
-    val Active = 1UL shl 4
-    val Selected = 1UL shl 5
-    val Indeterminate = 1UL shl 6
+    public val Enabled: ULong = 1UL shl 0
+    public val Focused: ULong = 1UL shl 1
+    public val Hovered: ULong = 1UL shl 2
+    public val Pressed: ULong = 1UL shl 3
+    public val Active: ULong = 1UL shl 4
+    public val Selected: ULong = 1UL shl 5
+    public val Indeterminate: ULong = 1UL shl 6
 
-    const val FIRST_AVAILABLE_OFFSET = 7
+    public const val FIRST_AVAILABLE_OFFSET: Int = 7
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/FocusableComponentState.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/FocusableComponentState.kt
index 2f8a55c72b061..eb86fca20a1eb 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/FocusableComponentState.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/FocusableComponentState.kt
@@ -1,16 +1,14 @@
 package org.jetbrains.jewel.foundation.state
 
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.Stable
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 
-interface FocusableComponentState : InteractiveComponentState {
+public interface FocusableComponentState : InteractiveComponentState {
 
-    @Stable
-    val isFocused: Boolean
+    public val isFocused: Boolean
 
     @Composable
-    fun <T> chooseValue(
+    public fun <T> chooseValue(
         normal: T,
         disabled: T,
         focused: T,
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/InteractiveComponentState.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/InteractiveComponentState.kt
index 33e84904d4d2f..1142d4a5f0b73 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/InteractiveComponentState.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/InteractiveComponentState.kt
@@ -1,18 +1,12 @@
 package org.jetbrains.jewel.foundation.state
 
-import androidx.compose.runtime.Stable
+public interface InteractiveComponentState {
 
-interface InteractiveComponentState {
+    public val isActive: Boolean
 
-    @Stable
-    val isActive: Boolean
+    public val isEnabled: Boolean
 
-    @Stable
-    val isEnabled: Boolean
+    public val isHovered: Boolean
 
-    @Stable
-    val isHovered: Boolean
-
-    @Stable
-    val isPressed: Boolean
+    public val isPressed: Boolean
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/SelectableComponentState.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/SelectableComponentState.kt
index f971b17b4eb73..7eb145a8ec829 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/SelectableComponentState.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/SelectableComponentState.kt
@@ -1,9 +1,6 @@
 package org.jetbrains.jewel.foundation.state
 
-import androidx.compose.runtime.Stable
+public interface SelectableComponentState : InteractiveComponentState {
 
-interface SelectableComponentState : InteractiveComponentState {
-
-    @Stable
-    val isSelected: Boolean
+    public val isSelected: Boolean
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/ToggleableComponentState.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/ToggleableComponentState.kt
index c446226361904..a0378a432555b 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/ToggleableComponentState.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/state/ToggleableComponentState.kt
@@ -1,18 +1,16 @@
 package org.jetbrains.jewel.foundation.state
 
-import androidx.compose.runtime.Stable
 import androidx.compose.ui.state.ToggleableState
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Indeterminate
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask.Selected
 
-interface ToggleableComponentState : SelectableComponentState {
+public interface ToggleableComponentState : SelectableComponentState {
 
-    @Stable
-    val toggleableState: ToggleableState
+    public val toggleableState: ToggleableState
 
-    companion object {
+    public companion object {
 
-        fun ULong.readToggleableState(): ToggleableState {
+        public fun ULong.readToggleableState(): ToggleableState {
             val selected = this and Selected != 0UL
             val indeterminate = this and Indeterminate != 0UL
 
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/JewelTheme.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/JewelTheme.kt
index 463338fed446a..cbfd661fac22e 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/JewelTheme.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/JewelTheme.kt
@@ -2,6 +2,7 @@ package org.jetbrains.jewel.foundation.theme
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -11,36 +12,36 @@ import org.jetbrains.jewel.foundation.GlobalMetrics
 import org.jetbrains.jewel.foundation.LocalGlobalColors
 import org.jetbrains.jewel.foundation.LocalGlobalMetrics
 
-interface JewelTheme {
+public interface JewelTheme {
 
-    companion object {
+    public companion object {
 
-        val globalColors: GlobalColors
+        public val globalColors: GlobalColors
             @Composable
             @ReadOnlyComposable
             get() = LocalGlobalColors.current
 
-        val globalMetrics: GlobalMetrics
+        public val globalMetrics: GlobalMetrics
             @Composable
             @ReadOnlyComposable
             get() = LocalGlobalMetrics.current
 
-        val textStyle: TextStyle
+        public val textStyle: TextStyle
             @Composable
             @ReadOnlyComposable
             get() = LocalTextStyle.current
 
-        val contentColor: Color
+        public val contentColor: Color
             @Composable
             @ReadOnlyComposable
             get() = LocalContentColor.current
 
-        val isDark: Boolean
+        public val isDark: Boolean
             @Composable
             @ReadOnlyComposable
             get() = LocalIsDarkTheme.current
 
-        val isSwingCompatMode
+        public val isSwingCompatMode: Boolean
             @Composable
             @ReadOnlyComposable
             get() = LocalSwingCompatMode.current
@@ -48,7 +49,7 @@ interface JewelTheme {
 }
 
 @Composable
-fun JewelTheme(
+public fun JewelTheme(
     theme: ThemeDefinition,
     swingCompatMode: Boolean,
     content: @Composable () -> Unit,
@@ -59,7 +60,7 @@ fun JewelTheme(
 }
 
 @Composable
-fun JewelTheme(theme: ThemeDefinition, content: @Composable () -> Unit) {
+public fun JewelTheme(theme: ThemeDefinition, content: @Composable () -> Unit) {
     CompositionLocalProvider(
         LocalIsDarkTheme provides theme.isDark,
         LocalContentColor provides theme.contentColor,
@@ -70,33 +71,40 @@ fun JewelTheme(theme: ThemeDefinition, content: @Composable () -> Unit) {
     )
 }
 
-val LocalContentColor = staticCompositionLocalOf<Color> {
-    error("No ContentColor provided")
-}
+public val LocalContentColor: ProvidableCompositionLocal<Color> =
+    staticCompositionLocalOf {
+        error("No ContentColor provided. Have you forgotten the theme?")
+    }
 
-internal val LocalIsDarkTheme = staticCompositionLocalOf<Boolean> {
-    error("No IsDarkTheme provided")
-}
+internal val LocalIsDarkTheme: ProvidableCompositionLocal<Boolean> =
+    staticCompositionLocalOf {
+        error("No IsDarkTheme provided. Have you forgotten the theme?")
+    }
 
-internal val LocalSwingCompatMode = staticCompositionLocalOf {
-    // By default, Swing compat is not enabled
-    false
-}
+internal val LocalSwingCompatMode: ProvidableCompositionLocal<Boolean> =
+    staticCompositionLocalOf {
+        // By default, Swing compat is not enabled
+        false
+    }
 
-val LocalColorPalette = staticCompositionLocalOf {
-    ThemeColorPalette.Empty
-}
+public val LocalColorPalette: ProvidableCompositionLocal<ThemeColorPalette> =
+    staticCompositionLocalOf {
+        ThemeColorPalette.Empty
+    }
 
-val LocalIconData = staticCompositionLocalOf {
+public val LocalIconData: ProvidableCompositionLocal<ThemeIconData> = staticCompositionLocalOf {
     ThemeIconData.Empty
 }
 
-val LocalTextStyle = staticCompositionLocalOf<TextStyle> {
-    error("No TextStyle provided")
-}
+public val LocalTextStyle: ProvidableCompositionLocal<TextStyle> =
+    staticCompositionLocalOf {
+        error("No TextStyle provided. Have you forgotten the theme?")
+    }
 
-/** Overrides the dark mode for the current composition scope. */
+/**
+ * Overrides the dark mode for the current composition scope.
+ */
 @Composable
-fun OverrideDarkMode(isDark: Boolean, content: @Composable () -> Unit) {
+public fun OverrideDarkMode(isDark: Boolean, content: @Composable () -> Unit) {
     CompositionLocalProvider(LocalIsDarkTheme provides isDark, content = content)
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeColorPalette.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeColorPalette.kt
index 9001d15354f62..3d6e3f4e6e187 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeColorPalette.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeColorPalette.kt
@@ -9,50 +9,51 @@ private val colorKeyRegex: Regex
 
 @Immutable
 @GenerateDataFunctions
-class ThemeColorPalette(
-    val grey: List<Color>,
-    val blue: List<Color>,
-    val green: List<Color>,
-    val red: List<Color>,
-    val yellow: List<Color>,
-    val orange: List<Color>,
-    val purple: List<Color>,
-    val teal: List<Color>,
-    val rawMap: Map<String, Color>,
+public class ThemeColorPalette(
+    public val grey: List<Color>,
+    public val blue: List<Color>,
+    public val green: List<Color>,
+    public val red: List<Color>,
+    public val yellow: List<Color>,
+    public val orange: List<Color>,
+    public val purple: List<Color>,
+    public val teal: List<Color>,
+    public val rawMap: Map<String, Color>,
 ) {
 
-    fun grey(index: Int): Color = grey[index - 1]
+    public fun grey(index: Int): Color = grey[index - 1]
 
-    fun greyOrNull(index: Int): Color? = grey.getOrNull(index - 1)
+    public fun greyOrNull(index: Int): Color? = grey.getOrNull(index - 1)
 
-    fun blue(index: Int): Color = blue[index - 1]
+    public fun blue(index: Int): Color = blue[index - 1]
 
-    fun blueOrNull(index: Int): Color? = blue.getOrNull(index - 1)
+    public fun blueOrNull(index: Int): Color? = blue.getOrNull(index - 1)
 
-    fun green(index: Int): Color = green[index - 1]
+    public fun green(index: Int): Color = green[index - 1]
 
-    fun greenOrNull(index: Int): Color? = green.getOrNull(index - 1)
+    public fun greenOrNull(index: Int): Color? = green.getOrNull(index - 1)
 
-    fun red(index: Int): Color = red[index - 1]
+    public fun red(index: Int): Color = red[index - 1]
 
-    fun redOrNull(index: Int): Color? = red.getOrNull(index - 1)
+    public fun redOrNull(index: Int): Color? = red.getOrNull(index - 1)
 
-    fun yellow(index: Int): Color = yellow[index - 1]
+    public fun yellow(index: Int): Color = yellow[index - 1]
 
-    fun yellowOrNull(index: Int): Color? = yellow.getOrNull(index - 1)
+    public fun yellowOrNull(index: Int): Color? = yellow.getOrNull(index - 1)
 
-    fun orange(index: Int): Color = orange[index - 1]
-    fun orangeOrNull(index: Int): Color? = orange.getOrNull(index - 1)
+    public fun orange(index: Int): Color = orange[index - 1]
 
-    fun purple(index: Int): Color = purple[index - 1]
+    public fun orangeOrNull(index: Int): Color? = orange.getOrNull(index - 1)
 
-    fun purpleOrNull(index: Int): Color? = purple.getOrNull(index - 1)
+    public fun purple(index: Int): Color = purple[index - 1]
 
-    fun teal(index: Int): Color = teal[index - 1]
+    public fun purpleOrNull(index: Int): Color? = purple.getOrNull(index - 1)
 
-    fun tealOrNull(index: Int): Color? = teal.getOrNull(index - 1)
+    public fun teal(index: Int): Color = teal[index - 1]
 
-    fun lookup(colorKey: String): Color? {
+    public fun tealOrNull(index: Int): Color? = teal.getOrNull(index - 1)
+
+    public fun lookup(colorKey: String): Color? {
         val result = colorKeyRegex.matchEntire(colorKey.trim())
         val colorGroup = result?.groupValues?.get(1)?.lowercase()
         val colorIndex = result?.groupValues?.get(2)?.toIntOrNull()
@@ -74,18 +75,19 @@ class ThemeColorPalette(
         }
     }
 
-    companion object {
-
-        val Empty = ThemeColorPalette(
-            grey = emptyList(),
-            blue = emptyList(),
-            green = emptyList(),
-            red = emptyList(),
-            yellow = emptyList(),
-            orange = emptyList(),
-            purple = emptyList(),
-            teal = emptyList(),
-            rawMap = emptyMap(),
-        )
+    public companion object {
+
+        public val Empty: ThemeColorPalette =
+            ThemeColorPalette(
+                grey = emptyList(),
+                blue = emptyList(),
+                green = emptyList(),
+                red = emptyList(),
+                yellow = emptyList(),
+                orange = emptyList(),
+                purple = emptyList(),
+                teal = emptyList(),
+                rawMap = emptyMap(),
+            )
     }
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDefinition.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDefinition.kt
index 0268e4fcec22e..aded92dc59e1b 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDefinition.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDefinition.kt
@@ -9,12 +9,12 @@ import org.jetbrains.jewel.foundation.GlobalMetrics
 
 @Immutable
 @GenerateDataFunctions
-class ThemeDefinition(
-    val isDark: Boolean,
-    val globalColors: GlobalColors,
-    val globalMetrics: GlobalMetrics,
-    val defaultTextStyle: TextStyle,
-    val contentColor: Color,
-    val colorPalette: ThemeColorPalette,
-    val iconData: ThemeIconData,
+public class ThemeDefinition(
+    public val isDark: Boolean,
+    public val globalColors: GlobalColors,
+    public val globalMetrics: GlobalMetrics,
+    public val defaultTextStyle: TextStyle,
+    public val contentColor: Color,
+    public val colorPalette: ThemeColorPalette,
+    public val iconData: ThemeIconData,
 )
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDescriptor.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDescriptor.kt
index 7b0e6caf0f735..0775abd274529 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDescriptor.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeDescriptor.kt
@@ -3,10 +3,10 @@ package org.jetbrains.jewel.foundation.theme
 import androidx.compose.runtime.Immutable
 
 @Immutable
-interface ThemeDescriptor {
+public interface ThemeDescriptor {
 
-    val name: String
-    val isDark: Boolean
-    val colors: ThemeColorPalette
-    val iconData: ThemeIconData
+    public val name: String
+    public val isDark: Boolean
+    public val colors: ThemeColorPalette
+    public val iconData: ThemeIconData
 }
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeIconData.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeIconData.kt
index 30f5816f17fad..3642f939f7423 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeIconData.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/theme/ThemeIconData.kt
@@ -4,26 +4,29 @@ import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 
 @Immutable
-class ThemeIconData(
-    val iconOverrides: Map<String, String>,
-    val colorPalette: Map<String, String?>,
-    val selectionColorPalette: Map<String, Int>,
+public class ThemeIconData(
+    public val iconOverrides: Map<String, String>,
+    public val colorPalette: Map<String, String?>,
+    public val selectionColorPalette: Map<String, Int>,
 ) {
 
-    fun selectionColorMapping() =
-        selectionColorPalette.mapNotNull { (key, value) ->
-            val keyColor = key.toColorOrNull() ?: return@mapNotNull null
-            val valueColor = Color(value)
-            keyColor to valueColor
-        }.toMap()
+    public fun selectionColorMapping(): Map<Color, Color> =
+        selectionColorPalette
+            .mapNotNull { (key, value) ->
+                val keyColor = key.toColorOrNull() ?: return@mapNotNull null
+                val valueColor = Color(value)
+                keyColor to valueColor
+            }
+            .toMap()
 
-    companion object {
+    public companion object {
 
-        val Empty = ThemeIconData(
-            iconOverrides = emptyMap(),
-            colorPalette = emptyMap(),
-            selectionColorPalette = emptyMap(),
-        )
+        public val Empty: ThemeIconData =
+            ThemeIconData(
+                iconOverrides = emptyMap(),
+                colorPalette = emptyMap(),
+                selectionColorPalette = emptyMap(),
+            )
     }
 }
 
diff --git a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/utils/Logger.kt b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/utils/Logger.kt
index 2729c7f45345c..1482f4410125d 100644
--- a/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/utils/Logger.kt
+++ b/platform/jewel/foundation/src/main/kotlin/org/jetbrains/jewel/foundation/utils/Logger.kt
@@ -15,24 +15,26 @@ internal interface Logger {
 
     // Resets previous color codes
     private fun resetColor() = "\u001b[0m"
-    fun log(level: LogLevel, msg: String)
-    fun e(msg: String) {
+
+    public fun log(level: LogLevel, msg: String)
+
+    public fun e(msg: String) {
         log(LogLevel.Error, LogLevel.Error.color + msg + resetColor())
     }
 
-    fun d(msg: String) {
+    public fun d(msg: String) {
         log(LogLevel.Debug, LogLevel.Debug.color + msg + resetColor())
     }
 
-    fun w(msg: String) {
+    public fun w(msg: String) {
         log(LogLevel.Warn, LogLevel.Warn.color + msg + resetColor())
     }
 
-    fun i(msg: String) {
+    public fun i(msg: String) {
         log(LogLevel.Info, LogLevel.Info.color + msg + resetColor())
     }
 
-    fun t(msg: String) {
+    public fun t(msg: String) {
         log(LogLevel.Trace, LogLevel.Trace.color + msg + resetColor())
     }
 }
@@ -42,6 +44,7 @@ internal interface Logger {
 internal object Log : Logger {
 
     override var currentLogLevel: LogLevel = LogLevel.Off
+
     override fun log(level: LogLevel, msg: String) {
         if (currentLogLevel.ordinal <= level.ordinal) println(msg)
     }
diff --git a/platform/jewel/ide-laf-bridge/api/ide-laf-bridge.api b/platform/jewel/ide-laf-bridge/api/ide-laf-bridge.api
index 9a8db142f0123..8df0d285ac939 100644
--- a/platform/jewel/ide-laf-bridge/api/ide-laf-bridge.api
+++ b/platform/jewel/ide-laf-bridge/api/ide-laf-bridge.api
@@ -7,6 +7,7 @@ public final class org/jetbrains/jewel/bridge/BridgeUtilsKt {
 	public static synthetic fun createVerticalBrush-8A-3gB4$default (Ljava/util/List;FFIILjava/lang/Object;)Landroidx/compose/ui/graphics/Brush;
 	public static final fun getDp (Lcom/intellij/util/ui/JBValue;)F
 	public static final fun retrieveArcAsCornerSize (Ljava/lang/String;)Landroidx/compose/foundation/shape/CornerSize;
+	public static final fun retrieveArcAsCornerSizeOrDefault (Ljava/lang/String;Landroidx/compose/foundation/shape/CornerSize;)Landroidx/compose/foundation/shape/CornerSize;
 	public static final fun retrieveArcAsCornerSizeWithFallbacks ([Ljava/lang/String;)Landroidx/compose/foundation/shape/CornerSize;
 	public static final fun retrieveColorOrNull (Ljava/lang/String;)Landroidx/compose/ui/graphics/Color;
 	public static final fun retrieveColorOrUnspecified (Ljava/lang/String;)J
@@ -43,10 +44,6 @@ public final class org/jetbrains/jewel/bridge/JewelBridgeException$KeysNotFoundE
 	public fun <init> (Ljava/util/List;Ljava/lang/String;)V
 }
 
-public abstract interface annotation class org/jetbrains/jewel/bridge/SwingLafKey : java/lang/annotation/Annotation {
-	public abstract fun key ()Ljava/lang/String;
-}
-
 public final class org/jetbrains/jewel/bridge/ToolWindowExtensionsKt {
 	public static final fun addComposeTab (Lcom/intellij/openapi/wm/ToolWindow;Ljava/lang/String;ZZLkotlin/jvm/functions/Function3;)V
 	public static synthetic fun addComposeTab$default (Lcom/intellij/openapi/wm/ToolWindow;Ljava/lang/String;ZZLkotlin/jvm/functions/Function3;ILjava/lang/Object;)V
diff --git a/platform/jewel/ide-laf-bridge/build.gradle.kts b/platform/jewel/ide-laf-bridge/build.gradle.kts
index 65f21bb6d45d5..7b7556d015984 100644
--- a/platform/jewel/ide-laf-bridge/build.gradle.kts
+++ b/platform/jewel/ide-laf-bridge/build.gradle.kts
@@ -12,6 +12,7 @@ dependencies {
     api(projects.ui) {
         exclude(group = "org.jetbrains.kotlinx")
     }
+
     when (supportedIJVersion()) {
         IJ_232 -> {
             api(projects.ideLafBridge.ideLafBridge232)
diff --git a/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeIconData.kt b/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeIconData.kt
index daf4d527646d4..fb6627088b2eb 100644
--- a/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeIconData.kt
+++ b/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeIconData.kt
@@ -6,12 +6,11 @@ import org.jetbrains.jewel.foundation.InternalJewelApi
 import org.jetbrains.jewel.foundation.theme.ThemeIconData
 
 @OptIn(InternalJewelApi::class)
-fun ThemeIconData.Companion.readFromLaF(): ThemeIconData {
+public fun ThemeIconData.Companion.readFromLaF(): ThemeIconData {
     val uiTheme = currentUiThemeOrNull()
     val iconMap = uiTheme?.icons.orEmpty()
-    val selectedIconColorPalette = uiTheme?.selectedIconColorPalette.orEmpty().mapValues {
-        ColorUtil.fromHex(it.value).rgb
-    }
+    val selectedIconColorPalette = uiTheme?.selectedIconColorPalette.orEmpty()
+        .mapValues { ColorUtil.fromHex(it.value).rgb }
 
     val colorPalette = UITheme.getColorPalette()
     return ThemeIconData(iconMap, colorPalette, selectedIconColorPalette)
diff --git a/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeOverride.kt b/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeOverride.kt
index cd5ce83c5b8ff..3651942891ff5 100644
--- a/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeOverride.kt
+++ b/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeOverride.kt
@@ -11,7 +11,8 @@ internal object BridgeOverride : PainterPathHint {
 
     private val patchIconPath by lazy {
         val clazz = Class.forName("com.intellij.ui.icons.CachedImageIconKt")
-        val patchIconPath = clazz.getMethod("patchIconPath", String::class.java, ClassLoader::class.java)
+        val patchIconPath =
+            clazz.getMethod("patchIconPath", String::class.java, ClassLoader::class.java)
         patchIconPath.isAccessible = true
         patchIconPath
     }
@@ -24,12 +25,15 @@ internal object BridgeOverride : PainterPathHint {
         // removed (the classloader is set up differently in prod IDEs and when running
         // from Gradle, and the icon could be in either place depending on the environment)
         val fallbackPath = path.removePrefix(dirProvider.dir())
-        val patchedPath = classLoaders.firstNotNullOfOrNull { classLoader ->
-            val patchedPathAndClassLoader =
-                patchIconPath.invoke(null, path.removePrefix("/"), classLoader)
-                    ?: patchIconPath.invoke(null, fallbackPath, classLoader)
-            patchedPathAndClassLoader as? Pair<*, *>
-        }?.first as? String
+        val patchedPath =
+            classLoaders
+                .firstNotNullOfOrNull { classLoader ->
+                    val patchedPathAndClassLoader =
+                        patchIconPath.invoke(null, path.removePrefix("/"), classLoader)
+                            ?: patchIconPath.invoke(null, fallbackPath, classLoader)
+                    patchedPathAndClassLoader as? Pair<*, *>
+                }
+                ?.first as? String
 
         return patchedPath ?: path
     }
diff --git a/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt b/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt
index 3f5bd9b6fc743..6f600491c770e 100644
--- a/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt
+++ b/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt
@@ -10,20 +10,15 @@ import org.jetbrains.jewel.ui.painter.BasePainterHintsProvider
 import org.jetbrains.jewel.ui.painter.PainterHint
 import org.jetbrains.jewel.ui.painter.hints.Dark
 import org.jetbrains.jewel.ui.painter.hints.HiDpi
-import org.jetbrains.jewel.ui.util.fromRGBAHexString
+import org.jetbrains.jewel.ui.util.fromRGBAHexStringOrNull
 
 @InternalJewelApi
-class BridgePainterHintsProvider private constructor(
+public class BridgePainterHintsProvider private constructor(
     isDark: Boolean,
     intellijIconPalette: Map<String, String> = emptyMap(),
     themeIconPalette: Map<String, String?> = emptyMap(),
     themeColorPalette: Map<String, Color?> = emptyMap(),
-) : BasePainterHintsProvider(
-    isDark,
-    intellijIconPalette,
-    themeIconPalette,
-    themeColorPalette,
-) {
+) : BasePainterHintsProvider(isDark, intellijIconPalette, themeIconPalette, themeColorPalette) {
 
     @Composable
     override fun hints(path: String): List<PainterHint> = buildList {
@@ -33,23 +28,24 @@ class BridgePainterHintsProvider private constructor(
         add(Dark(JewelTheme.isDark))
     }
 
-    companion object {
+    public companion object {
 
         private val logger = thisLogger()
 
-        operator fun invoke(isDark: Boolean): BasePainterHintsProvider {
+        public operator fun invoke(isDark: Boolean): BasePainterHintsProvider {
             val uiTheme = currentUiThemeOrNull() ?: return BridgePainterHintsProvider(isDark)
             logger.info("Parsing theme info from theme ${uiTheme.name} (id: ${uiTheme.id}, isDark: ${uiTheme.isDark})")
 
             val iconColorPalette = uiTheme.iconColorPalette
             val keyPalette = UITheme.getColorPalette()
-            val themeColors = uiTheme.colors.orEmpty().mapValues { (_, v) ->
-                when (v) {
-                    is Int -> Color(v)
-                    is String -> Color.fromRGBAHexString(v)
-                    else -> null
+            val themeColors = uiTheme.colors.orEmpty()
+                .mapValues { (_, v) ->
+                    when (v) {
+                        is Int -> Color(v)
+                        is String -> Color.fromRGBAHexStringOrNull(v)
+                        else -> null
+                    }
                 }
-            }
 
             return BridgePainterHintsProvider(isDark, keyPalette, iconColorPalette, themeColors)
         }
diff --git a/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/UiThemeExtensions.kt b/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/UiThemeExtensions.kt
index e1ee8ce27a315..c4a75d91aff83 100644
--- a/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/UiThemeExtensions.kt
+++ b/platform/jewel/ide-laf-bridge/ide-laf-bridge-232/src/main/kotlin/org/jetbrains/jewel/bridge/UiThemeExtensions.kt
@@ -12,23 +12,19 @@ private val logger = Logger.getInstance("UiThemeExtensions")
 private val classUITheme
     get() = UITheme::class.java
 
-@Suppress("UnstableApiUsage")
 @InternalJewelApi
 internal fun currentUiThemeOrNull() =
     (LafManager.getInstance().currentLookAndFeel as? UIThemeBasedLookAndFeelInfo)?.theme
 
-// TODO #116 replace with public API access once it's made available (IJP 233?)
 @InternalJewelApi
-val UITheme.icons: Map<String, String>
+public val UITheme.icons: Map<String, String>
     get() = readMapField<String>(classUITheme.getDeclaredField("icons"))
         .filterKeys { it != "ColorPalette" }
 
-// TODO #116 replace with public API access once it's made available (IJP 233?)
 internal val UITheme.iconColorPalette: Map<String, String>
     get() = readMapField<Map<String, String>>(classUITheme.getDeclaredField("icons"))["ColorPalette"]
         .orEmpty()
 
-// TODO #116 replace with public API access once it's made available (IJP 233?)
 internal val UITheme.selectedIconColorPalette: Map<String, String>
     get() = readMapField(classUITheme.getDeclaredField("iconColorsOnSelection"))
 
diff --git a/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeIconData.kt b/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeIconData.kt
index fce10cbfc52c4..69d1b2c759d1e 100644
--- a/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeIconData.kt
+++ b/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeIconData.kt
@@ -4,7 +4,7 @@ import com.intellij.ide.ui.UITheme
 import org.jetbrains.jewel.foundation.theme.ThemeIconData
 
 @Suppress("UnstableApiUsage")
-fun ThemeIconData.Companion.readFromLaF(): ThemeIconData {
+public fun ThemeIconData.Companion.readFromLaF(): ThemeIconData {
     val uiTheme = currentUiThemeOrNull()
     val bean = uiTheme?.describe()
     val iconMap = bean?.icons.orEmpty()
diff --git a/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeOverride.kt b/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeOverride.kt
index cedc9f37866bf..e6a9af42311a1 100644
--- a/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeOverride.kt
+++ b/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeOverride.kt
@@ -53,7 +53,7 @@ internal object BridgeOverride : PainterPathHint {
                     append(it.drop(1))
                     append('/')
                 }
-            replace(length - 1, length, "")
+            replace(length - 1, length, "") // Drop last '/'
             if (iconPath.contains("_dark")) append("_dark")
             append(".svg")
 
diff --git a/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt b/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt
index 6a2b017674a92..d7fa143f7a017 100644
--- a/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt
+++ b/platform/jewel/ide-laf-bridge/ide-laf-bridge-233/src/main/kotlin/org/jetbrains/jewel/bridge/BridgePainterHintsProvider.kt
@@ -17,12 +17,7 @@ class BridgePainterHintsProvider private constructor(
     intellijIconPalette: Map<String, String?> = emptyMap(),
     themeIconPalette: Map<String, String?> = emptyMap(),
     themeColorPalette: Map<String, Color?> = emptyMap(),
-) : BasePainterHintsProvider(
-    isDark,
-    intellijIconPalette,
-    themeIconPalette,
-    themeColorPalette,
-) {
+) : BasePainterHintsProvider(isDark, intellijIconPalette, themeIconPalette, themeColorPalette) {
 
     @Composable
     override fun hints(path: String): List<PainterHint> = buildList {
@@ -41,15 +36,15 @@ class BridgePainterHintsProvider private constructor(
             logger.info("Parsing theme info from theme ${uiTheme.name} (id: ${uiTheme.id}, isDark: ${uiTheme.isDark})")
 
             val bean = uiTheme.describe()
-            val iconColorPalette = (bean.colorPalette as Map<String, Any?>).mapValues {
-                when (val value = it.value) {
-                    is String -> value
-                    else -> null
+            val iconColorPalette =
+                (bean.colorPalette as Map<String, Any?>).mapValues {
+                    when (val value = it.value) {
+                        is String -> value
+                        else -> null
+                    }
                 }
-            }
             val keyPalette = UITheme.getColorPalette()
-            val themeColors = bean.colors
-                .mapValues { (_, v) -> Color(v) }
+            val themeColors = bean.colors.mapValues { (_, v) -> Color(v) }
 
             return BridgePainterHintsProvider(isDark, keyPalette, iconColorPalette, themeColors)
         }
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/Bridge.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/Bridge.kt
index 7af0739f9c132..96a2199d05d9d 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/Bridge.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/Bridge.kt
@@ -19,16 +19,13 @@ internal val IntelliJApplication: Application
     get() = ApplicationManager.getApplication()
 
 private val Application.lookAndFeelFlow: Flow<Unit>
-    get() = messageBus.flow(LafManagerListener.TOPIC) {
-        LafManagerListener { trySend(Unit) }
-    }
+    get() = messageBus.flow(LafManagerListener.TOPIC) { LafManagerListener { trySend(Unit) } }
 
 internal fun Application.lookAndFeelChangedFlow(
     scope: CoroutineScope,
     sharingStarted: SharingStarted = SharingStarted.Eagerly,
 ): Flow<Unit> =
-    lookAndFeelFlow
-        .onStart { emit(Unit) }
+    lookAndFeelFlow.onStart { emit(Unit) }
         .shareIn(scope, sharingStarted, replay = 1)
 
 internal fun <L : Any, K> MessageBus.flow(
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt
index b4e061b7d134d..58918c1434512 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeResourceResolver.kt
@@ -4,7 +4,8 @@ import com.intellij.util.ui.DirProvider
 import org.jetbrains.jewel.ui.painter.ResourcePainterProvider
 
 /**
- * [ResourcePainterProvider] to resolve resource in Intellij Module and Bridge module.
+ * [ResourcePainterProvider] to resolve resource in Intellij Module and
+ * Bridge module.
  */
-fun bridgePainterProvider(path: String) =
+public fun bridgePainterProvider(path: String): ResourcePainterProvider =
     ResourcePainterProvider(path, DirProvider::class.java.classLoader, SwingBridgeService::class.java.classLoader)
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt
index d0ec8855730bc..1340bd8851247 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/BridgeUtils.kt
@@ -16,6 +16,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.isUnspecified
 import androidx.compose.ui.unit.sp
 import androidx.compose.ui.unit.takeOrElse
 import com.intellij.ide.ui.UISettingsUtils
@@ -40,16 +41,13 @@ import javax.swing.UIManager
 
 private val logger = Logger.getInstance("JewelBridge")
 
-fun java.awt.Color.toComposeColor() = Color(
-    red = red,
-    green = green,
-    blue = blue,
-    alpha = alpha,
-)
+public fun java.awt.Color.toComposeColor(): Color =
+    Color(red = red, green = green, blue = blue, alpha = alpha)
 
-fun java.awt.Color?.toComposeColorOrUnspecified() = this?.toComposeColor() ?: Color.Unspecified
+public fun java.awt.Color?.toComposeColorOrUnspecified(): Color =
+    this?.toComposeColor() ?: Color.Unspecified
 
-fun retrieveColorOrNull(key: String): Color? =
+public fun retrieveColorOrNull(key: String): Color? =
     try {
         JBColor.namedColor(key, marker("JEWEL_JBCOLOR_MARKER")).toComposeColor()
     } catch (_: AssertionError) {
@@ -59,7 +57,7 @@ fun retrieveColorOrNull(key: String): Color? =
         null
     }
 
-fun retrieveColorOrUnspecified(key: String): Color {
+public fun retrieveColorOrUnspecified(key: String): Color {
     val color = retrieveColorOrNull(key)
     if (color == null) {
         logger.warn("Color with key \"$key\" not found, fallback to 'Color.Unspecified'")
@@ -67,9 +65,10 @@ fun retrieveColorOrUnspecified(key: String): Color {
     return color ?: Color.Unspecified
 }
 
-fun retrieveColorsOrUnspecified(vararg keys: String) = keys.map { retrieveColorOrUnspecified(it) }
+public fun retrieveColorsOrUnspecified(vararg keys: String): List<Color> =
+    keys.map { retrieveColorOrUnspecified(it) }
 
-fun List<Color>.createVerticalBrush(
+public fun List<Color>.createVerticalBrush(
     startY: Float = 0.0f,
     endY: Float = Float.POSITIVE_INFINITY,
     tileMode: TileMode = TileMode.Clamp,
@@ -83,30 +82,29 @@ fun List<Color>.createVerticalBrush(
     return Brush.verticalGradient(this, startY, endY, tileMode)
 }
 
-fun retrieveIntAsDp(key: String): Dp {
+public fun retrieveIntAsDp(key: String): Dp {
     val rawValue = UIManager.get(key)
     if (rawValue is Int) rawValue.dp
 
     keyNotFound(key, "Int")
 }
 
-fun retrieveIntAsDpOrUnspecified(key: String) =
+public fun retrieveIntAsDpOrUnspecified(key: String): Dp =
     try {
         retrieveIntAsDp(key)
     } catch (ignored: JewelBridgeException) {
         Dp.Unspecified
     }
 
-fun retrieveInsetsAsPaddingValues(key: String) =
-    UIManager.getInsets(key)?.toPaddingValues()
-        ?: keyNotFound(key, "Insets")
+public fun retrieveInsetsAsPaddingValues(key: String): PaddingValues =
+    UIManager.getInsets(key)?.toPaddingValues() ?: keyNotFound(key, "Insets")
 
 /**
  * Converts a [Insets] to [PaddingValues]. If the receiver is a [JBInsets]
  * instance, this function delegates to the specific [toPaddingValues] for
  * it, which is scaling-aware.
  */
-fun Insets.toPaddingValues() =
+public fun Insets.toPaddingValues(): PaddingValues =
     if (this is JBInsets) {
         toPaddingValues()
     } else {
@@ -116,9 +114,10 @@ fun Insets.toPaddingValues() =
 /**
  * Converts a [JBInsets] to [PaddingValues], in a scaling-aware way. This
  * means that the resulting [PaddingValues] will be constructed from the
- * [JBInsets.getUnscaled] values, treated as [Dp]. This avoids double scaling.
+ * [JBInsets.getUnscaled] values, treated as [Dp]. This avoids double
+ * scaling.
  */
-fun JBInsets.toPaddingValues() =
+public fun JBInsets.toPaddingValues(): PaddingValues =
     PaddingValues(unscaled.left.dp, unscaled.top.dp, unscaled.right.dp, unscaled.bottom.dp)
 
 /**
@@ -126,22 +125,27 @@ fun JBInsets.toPaddingValues() =
  * instance, this function delegates to the specific [toDpSize] for it,
  * which is scaling-aware.
  */
-fun Dimension.toDpSize() = DpSize(width.dp, height.dp)
+public fun Dimension.toDpSize(): DpSize = DpSize(width.dp, height.dp)
 
 /**
  * Converts a [JBDimension] to [DpSize], in a scaling-aware way. This means
  * that the resulting [DpSize] will be constructed by first obtaining the
  * unscaled values. This avoids double scaling.
  */
-fun JBDimension.toDpSize(): DpSize {
+public fun JBDimension.toDpSize(): DpSize {
     val scaleFactor = scale(1f)
     return DpSize((width2d() / scaleFactor).dp, (height2d() / scaleFactor).dp)
 }
 
-fun retrieveArcAsCornerSize(key: String) =
-    CornerSize(retrieveIntAsDp(key) / 2)
+public fun retrieveArcAsCornerSize(key: String): CornerSize = CornerSize(retrieveIntAsDp(key) / 2)
 
-fun retrieveArcAsCornerSizeWithFallbacks(vararg keys: String): CornerSize {
+public fun retrieveArcAsCornerSizeOrDefault(key: String, default: CornerSize): CornerSize {
+    val intValue = retrieveIntAsDpOrUnspecified(key)
+    if (intValue.isUnspecified) return default
+    return CornerSize(intValue / 2)
+}
+
+public fun retrieveArcAsCornerSizeWithFallbacks(vararg keys: String): CornerSize {
     for (key in keys) {
         val rawValue = UIManager.get(key)
         if (rawValue is Int) {
@@ -159,13 +163,13 @@ fun retrieveArcAsCornerSizeWithFallbacks(vararg keys: String): CornerSize {
 private val awtFontManager = AwtFontManager()
 
 @DependsOnJBR
-suspend fun retrieveTextStyle(fontKey: String, colorKey: String? = null): TextStyle {
+public suspend fun retrieveTextStyle(fontKey: String, colorKey: String? = null): TextStyle {
     val baseColor = colorKey?.let { retrieveColorOrUnspecified(colorKey) } ?: Color.Unspecified
     return retrieveTextStyle(fontKey, color = baseColor)
 }
 
 @DependsOnJBR
-suspend fun retrieveTextStyle(
+public suspend fun retrieveTextStyle(
     key: String,
     color: Color = Color.Unspecified,
     lineHeight: TextUnit = TextUnit.Unspecified,
@@ -173,22 +177,19 @@ suspend fun retrieveTextStyle(
     fontStyle: FontStyle = FontStyle.Normal,
     size: TextUnit = TextUnit.Unspecified,
 ): TextStyle {
-    val font = JBFont.create(
-        UIManager.getFont(key) ?: keyNotFound(key, "Font"),
-        false,
-    )
+    val lafFont = UIManager.getFont(key) ?: keyNotFound(key, "Font")
+    val jbFont = JBFont.create(lafFont, false)
 
-    val derivedFont = font.let { if (bold) it.asBold() else it.asPlain() }
+    val derivedFont = jbFont.let { if (bold) it.asBold() else it.asPlain() }
         .let { if (fontStyle == FontStyle.Italic) it.asItalic() else it }
 
     val typeface = derivedFont.toSkikoTypefaceOrNull(awtFontManager)
-        ?: Typeface.makeDefault()
-            .also {
-                logger.warn(
-                    "Unable to convert font ${font.fontName} into a Skiko typeface, " +
-                        "fallback to 'Typeface.makeDefault()'",
-                )
-            }
+        ?: Typeface.makeDefault().also {
+            logger.warn(
+                "Unable to convert font ${jbFont.fontName} into a Skiko typeface, " +
+                    "fallback to 'Typeface.makeDefault()'",
+            )
+        }
 
     return TextStyle(
         color = color,
@@ -202,19 +203,19 @@ suspend fun retrieveTextStyle(
 }
 
 @DependsOnJBR
-fun Font.toFontFamily(): FontFamily {
+public fun Font.toFontFamily(): FontFamily {
     val typeface = runBlocking { toSkikoTypefaceOrNull(awtFontManager) }
         ?: error("Can't turn $this into a Typeface")
 
     return FontFamily(Typeface(typeface))
 }
 
-val JBValue.dp
+public val JBValue.dp: Dp
     get() = unscaled.dp
 
-internal operator fun TextUnit.minus(delta: Float) = plus(-delta)
+internal operator fun TextUnit.minus(delta: Float): TextUnit = plus(-delta)
 
-internal operator fun TextUnit.plus(delta: Float) =
+internal operator fun TextUnit.plus(delta: Float): TextUnit =
     when {
         isSp -> TextUnit(value + delta, type)
         isEm -> TextUnit(value + delta, type)
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/JewelBridgeException.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/JewelBridgeException.kt
index 2b5308e801938..3b5d6fa80184b 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/JewelBridgeException.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/JewelBridgeException.kt
@@ -1,15 +1,15 @@
 package org.jetbrains.jewel.bridge
 
-sealed class JewelBridgeException(override val message: String?) : RuntimeException(message) {
+public sealed class JewelBridgeException(override val message: String?) : RuntimeException(message) {
 
-    class KeyNotFoundException(key: String, type: String) : JewelBridgeException(
-        "Key '$key' not found in Swing LaF, was expecting a value of type $type",
-    )
+    public class KeyNotFoundException(key: String, type: String) :
+        JewelBridgeException("Key '$key' not found in Swing LaF, was expecting a value of type $type")
 
-    class KeysNotFoundException(keys: List<String>, type: String) : JewelBridgeException(
-        "Keys ${keys.joinToString(", ") { "'$it'" }} not found in Swing LaF, " +
-            "was expecting a value of type $type",
-    )
+    public class KeysNotFoundException(keys: List<String>, type: String) :
+        JewelBridgeException(
+            "Keys ${keys.joinToString(", ") { "'$it'" }} not found in Swing LaF, " +
+                "was expecting a value of type $type",
+        )
 }
 
 @Suppress("NOTHING_TO_INLINE") // Same implementation as error()
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt
index c4e3f35a08370..703e4e9c779f6 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingBridgeService.kt
@@ -2,15 +2,9 @@ package org.jetbrains.jewel.bridge
 
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.Density
-import com.intellij.openapi.Disposable
 import com.intellij.openapi.components.Service
 import com.intellij.openapi.components.Service.Level
-import com.intellij.openapi.diagnostic.thisLogger
-import com.intellij.ui.NewUI
-import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
@@ -23,18 +17,12 @@ import org.jetbrains.jewel.ui.ComponentStyling
 import kotlin.time.Duration.Companion.milliseconds
 
 @Service(Level.APP)
-internal class SwingBridgeService : Disposable {
-
-    private val logger = thisLogger()
-
-    // TODO use constructor injection when min IJ is 232+
-    private val coroutineScope: CoroutineScope =
-        CoroutineScope(SupervisorJob() + CoroutineName("JewelSwingBridge"))
+internal class SwingBridgeService(scope: CoroutineScope) {
 
     internal val currentBridgeThemeData: StateFlow<BridgeThemeData> =
-        IntelliJApplication.lookAndFeelChangedFlow(coroutineScope)
+        IntelliJApplication.lookAndFeelChangedFlow(scope)
             .mapLatest { tryGettingThemeData() }
-            .stateIn(coroutineScope, SharingStarted.Eagerly, BridgeThemeData.DEFAULT)
+            .stateIn(scope, SharingStarted.Eagerly, BridgeThemeData.DEFAULT)
 
     private suspend fun tryGettingThemeData(): BridgeThemeData {
         var counter = 0
@@ -42,18 +30,14 @@ internal class SwingBridgeService : Disposable {
             delay(20.milliseconds)
             counter++
             runCatching { readThemeData() }
-                .onSuccess { return it }
+                .onSuccess {
+                    return it
+                }
         }
         return readThemeData()
     }
 
     private suspend fun readThemeData(): BridgeThemeData {
-        val isIntUi = NewUI.isEnabled()
-        if (!isIntUi) {
-            // TODO return Darcula/IntelliJ Light theme instead
-            logger.warn("Darcula LaFs (aka \"old UI\") are not supported yet, falling back to Int UI")
-        }
-
         val themeDefinition = createBridgeThemeDefinition()
         return BridgeThemeData(
             themeDefinition = createBridgeThemeDefinition(),
@@ -62,23 +46,21 @@ internal class SwingBridgeService : Disposable {
         )
     }
 
-    override fun dispose() {
-        coroutineScope.cancel("Disposing Application...")
-    }
-
     internal data class BridgeThemeData(
         val themeDefinition: ThemeDefinition,
         val componentStyling: ComponentStyling,
         val density: Density,
     ) {
 
-        companion object {
+        public companion object {
 
             val DEFAULT = run {
                 val themeDefinition = createBridgeThemeDefinition(TextStyle.Default)
+
                 BridgeThemeData(
                     themeDefinition = createBridgeThemeDefinition(TextStyle.Default),
-                    componentStyling = createBridgeComponentStyling(
+                    componentStyling =
+                    createBridgeComponentStyling(
                         theme = themeDefinition,
                         textFieldTextStyle = TextStyle.Default,
                         textAreaTextStyle = TextStyle.Default,
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingLafKey.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingLafKey.kt
deleted file mode 100644
index 03d3cc25cc93a..0000000000000
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/SwingLafKey.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.jetbrains.jewel.bridge
-
-@Retention(AnnotationRetention.SOURCE)
-@Target(
-    AnnotationTarget.PROPERTY,
-    AnnotationTarget.PROPERTY_GETTER,
-    AnnotationTarget.VALUE_PARAMETER,
-    AnnotationTarget.EXPRESSION,
-)
-annotation class SwingLafKey(
-    val key: String,
-)
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/ToolWindowExtensions.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/ToolWindowExtensions.kt
index c3fd042e7a12d..d3fa7d91a8bd5 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/ToolWindowExtensions.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/ToolWindowExtensions.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.awt.ComposePanel
 import com.intellij.openapi.wm.ToolWindow
 import org.jetbrains.jewel.foundation.enableNewSwingCompositing
 
-fun ToolWindow.addComposeTab(
+public fun ToolWindow.addComposeTab(
     tabDisplayName: String,
     isLockable: Boolean = true,
     isCloseable: Boolean = false,
@@ -22,17 +22,15 @@ fun ToolWindow.addComposeTab(
         override val panel: ComposePanel = composePanel
     }
 
-    composePanel.setContent {
-        scope.content()
-    }
+    composePanel.setContent { scope.content() }
     val tabContent = contentManager.factory.createContent(composePanel, tabDisplayName, isLockable)
     tabContent.isCloseable = isCloseable
     contentManager.addContent(tabContent)
 }
 
-interface ToolWindowScope {
+public interface ToolWindowScope {
 
-    val toolWindow: ToolWindow
+    public val toolWindow: ToolWindow
 
-    val panel: ComposePanel
+    public val panel: ComposePanel
 }
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/DataProviderElement.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/DataProviderElement.kt
index 3ecffabda19d9..ffe2c6658d599 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/DataProviderElement.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/DataProviderElement.kt
@@ -2,7 +2,9 @@ package org.jetbrains.jewel.bridge.actionSystem
 
 import androidx.compose.ui.node.ModifierNodeElement
 
-internal class DataProviderElement(val dataProvider: (dataId: String) -> Any?) : ModifierNodeElement<DataProviderNode>() {
+internal class DataProviderElement(
+    val dataProvider: (dataId: String) -> Any?,
+) : ModifierNodeElement<DataProviderNode>() {
 
     override fun create(): DataProviderNode = DataProviderNode(dataProvider)
 
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/DataProviderNode.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/DataProviderNode.kt
index 4101b8f8f18e2..09354e282c9c1 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/DataProviderNode.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/DataProviderNode.kt
@@ -9,22 +9,20 @@ import androidx.compose.ui.modifier.modifierLocalMapOf
 import androidx.compose.ui.modifier.modifierLocalOf
 
 /**
- * Holder for parent node of current [DataProviderNode].
- * So, each [DataProviderNode] provides itself and read parent node.
- * It allows building tree of [DataProviderNode] and traverse it later on.
+ * Holder for parent node of current [DataProviderNode]. So, each
+ * [DataProviderNode] provides itself and read parent node. It allows
+ * building tree of [DataProviderNode] and traverse it later on.
  *
  * @see ModifierLocalModifierNode
  */
-private val LocalDataProviderNode = modifierLocalOf<DataProviderNode?> {
-    null
-}
+private val LocalDataProviderNode = modifierLocalOf<DataProviderNode?> { null }
 
-internal class DataProviderNode(var dataProvider: (dataId: String) -> Any?) :
-    Modifier.Node(),
-    ModifierLocalModifierNode,
-    FocusEventModifierNode {
+internal class DataProviderNode(
+    var dataProvider: (dataId: String) -> Any?,
+) : Modifier.Node(), ModifierLocalModifierNode, FocusEventModifierNode {
 
-    // TODO: should we use state here and in parent with children for thread safety? Will it trigger recompositions?
+    // TODO: should we use state here and in parent with children for thread safety? Will it trigger
+    // recompositions?
     var hasFocus = false
 
     var parent: DataProviderNode? = null
@@ -52,7 +50,7 @@ internal class DataProviderNode(var dataProvider: (dataId: String) -> Any?) :
         hasFocus = focusState.hasFocus
     }
 
-    fun updateParent() {
+    public fun updateParent() {
         parent = LocalDataProviderNode.current
     }
 }
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/ProvideData.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/ProvideData.kt
index 1bc1805ab0ea9..bdf0e1fc6cd32 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/ProvideData.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/actionSystem/ProvideData.kt
@@ -15,16 +15,18 @@ import org.jetbrains.annotations.VisibleForTesting
 import javax.swing.JComponent
 
 /**
- * Layout composable that create the bridge between [Modifier.provideData] used inside [content] and
- * [component]. So, IntelliJ's [DataManager] can use [component] as [DataProvider].
+ * Layout composable that create the bridge between [Modifier.provideData]
+ * used inside [content] and [component]. So, IntelliJ's [DataManager] can
+ * use [component] as [DataProvider].
  *
- * When IntelliJ requests [getData] from [component] Compose will traverse [DataProviderNode] hierarchy
- * and collect it according [DataProvider] rules (see javadoc).
+ * When IntelliJ requests [getData] from [component] Compose will traverse
+ * [DataProviderNode] hierarchy and collect it according [DataProvider]
+ * rules (see javadoc).
  */
 // TODO: choose better naming?
 @Suppress("unused", "FunctionName")
 @Composable
-fun ComponentDataProviderBridge(
+public fun ComponentDataProviderBridge(
     component: JComponent,
     modifier: Modifier = Modifier,
     content: @Composable () -> Unit,
@@ -38,9 +40,7 @@ fun ComponentDataProviderBridge(
     DisposableEffect(component) {
         DataManager.registerDataProvider(component, rootDataProviderModifier.dataProvider)
 
-        onDispose {
-            DataManager.removeDataProvider(component)
-        }
+        onDispose { DataManager.removeDataProvider(component) }
     }
 }
 
@@ -48,28 +48,26 @@ fun ComponentDataProviderBridge(
  * Configure component to provide data for IntelliJ Actions system.
  *
  * Use this modifier to provide context related data that can be used by
- * IntelliJ Actions functionality such as Search Everywhere, Action Popups etc.
+ * IntelliJ Actions functionality such as Search Everywhere, Action Popups
+ * etc.
  *
- * Important note: modifiers order is important, so be careful with order of [focusable] and [provideData]
- * (see [FocusEventModifierNode]).
+ * Important note: modifiers order is important, so be careful with order
+ * of [focusable] and [provideData] (see [FocusEventModifierNode]).
  *
  * @see DataProvider
  * @see DataContext
  * @see ComponentDataProviderBridge
  */
 @Suppress("unused")
-fun Modifier.provideData(dataProvider: (dataId: String) -> Any?) = this.then(
-    DataProviderElement(dataProvider),
-)
+public fun Modifier.provideData(dataProvider: (dataId: String) -> Any?): Modifier =
+    this then DataProviderElement(dataProvider)
 
 @VisibleForTesting
 internal class RootDataProviderModifier : ModifierNodeElement<DataProviderNode>() {
 
     private val rootNode = DataProviderNode { null }
 
-    val dataProvider: (String) -> Any? = {
-        rootNode.getData(it)
-    }
+    val dataProvider: (String) -> Any? = { rootNode.getData(it) }
 
     override fun create() = rootNode
 
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalColors.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalColors.kt
index cde1139a662af..7d95301246851 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalColors.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalColors.kt
@@ -8,7 +8,7 @@ import org.jetbrains.jewel.foundation.BorderColors
 import org.jetbrains.jewel.foundation.GlobalColors
 import org.jetbrains.jewel.foundation.OutlineColors
 
-fun GlobalColors.Companion.readFromLaF() =
+public fun GlobalColors.Companion.readFromLaF(): GlobalColors =
     GlobalColors(
         borders = BorderColors.readFromLaF(),
         outlines = OutlineColors.readFromLaF(),
@@ -16,14 +16,14 @@ fun GlobalColors.Companion.readFromLaF() =
         paneBackground = retrieveColorOrUnspecified("Panel.background"),
     )
 
-fun BorderColors.Companion.readFromLaF() =
+public fun BorderColors.Companion.readFromLaF(): BorderColors =
     BorderColors(
         normal = JBColor.border().toComposeColorOrUnspecified(),
         focused = DarculaUIUtil.getOutlineColor(true, true).toComposeColorOrUnspecified(),
         disabled = DarculaUIUtil.getOutlineColor(false, false).toComposeColorOrUnspecified(),
     )
 
-fun OutlineColors.Companion.readFromLaF() =
+public fun OutlineColors.Companion.readFromLaF(): OutlineColors =
     OutlineColors(
         focused = retrieveColorOrUnspecified("*.focusColor"),
         focusedWarning = retrieveColorOrUnspecified("Component.warningFocusColor"),
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalMetrics.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalMetrics.kt
index 495886c09d034..3e8bd0d778f3b 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalMetrics.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeGlobalMetrics.kt
@@ -7,7 +7,7 @@ import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.UIUtil
 import org.jetbrains.jewel.foundation.GlobalMetrics
 
-fun GlobalMetrics.Companion.readFromLaF(): GlobalMetrics {
+public fun GlobalMetrics.Companion.readFromLaF(): GlobalMetrics {
     // Copied from DarculaUIUtil.doPaint(java.awt.Graphics2D, int, int, float, float, boolean)
     // except that scaling is all moved into the .dp operation below
     val f = if (UIUtil.isRetina()) 0.5f else 1.0f
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeThemeColorPalette.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeThemeColorPalette.kt
index 746272dd4ea6e..cca4cfba0327f 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeThemeColorPalette.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/BridgeThemeColorPalette.kt
@@ -9,10 +9,10 @@ import java.util.TreeMap
 
 private val logger = Logger.getInstance("BridgeThemeColorPalette")
 
-val ThemeColorPalette.windowsPopupBorder
+public val ThemeColorPalette.windowsPopupBorder: Color?
     get() = lookup("windowsPopupBorder")
 
-fun ThemeColorPalette.Companion.readFromLaF(): ThemeColorPalette {
+public fun ThemeColorPalette.Companion.readFromLaF(): ThemeColorPalette {
     val grey = readPaletteColors("Grey")
     val blue = readPaletteColors("Blue")
     val green = readPaletteColors("Green")
@@ -54,14 +54,16 @@ private fun readPaletteColors(colorName: String): Map<String, Color> {
     val colorNameKeyPrefix = "ColorPalette.$colorName"
     val colorNameKeyPrefixLength = colorNameKeyPrefix.length
 
-    val lastColorIndex = allKeys.asSequence()
-        .filterIsInstance(String::class.java)
-        .filter { it.startsWith(colorNameKeyPrefix) }
-        .mapNotNull {
-            val afterName = it.substring(colorNameKeyPrefixLength)
-            afterName.toIntOrNull()
-        }
-        .maxOrNull() ?: return TreeMap()
+    val lastColorIndex =
+        allKeys
+            .asSequence()
+            .filterIsInstance(String::class.java)
+            .filter { it.startsWith(colorNameKeyPrefix) }
+            .mapNotNull {
+                val afterName = it.substring(colorNameKeyPrefixLength)
+                afterName.toIntOrNull()
+            }
+            .maxOrNull() ?: return TreeMap()
 
     return buildMap {
         for (i in 1..lastColorIndex) {
@@ -80,6 +82,5 @@ private fun readPaletteColors(colorName: String): Map<String, Color> {
 private fun readPaletteColor(colorName: String): Color {
     val defaults = uiDefaults
     val colorNameKey = "ColorPalette.$colorName"
-    return (defaults[colorNameKey] as? java.awt.Color)
-        ?.toComposeColor() ?: Color.Unspecified
+    return (defaults[colorNameKey] as? java.awt.Color)?.toComposeColor() ?: Color.Unspecified
 }
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridge.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridge.kt
index 834ac32d88bc8..bf7bc407be2ad 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridge.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/IntUiBridge.kt
@@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.SolidColor
-import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.unit.DpOffset
@@ -15,7 +14,6 @@ import com.intellij.ide.ui.laf.darcula.DarculaUIUtil
 import com.intellij.ide.ui.laf.darcula.ui.DarculaCheckBoxUI
 import com.intellij.ide.ui.laf.intellij.IdeaPopupMenuUI
 import com.intellij.openapi.diagnostic.Logger
-import com.intellij.openapi.util.registry.Registry
 import com.intellij.ui.JBColor
 import com.intellij.util.ui.DirProvider
 import com.intellij.util.ui.JBUI
@@ -24,6 +22,7 @@ import org.jetbrains.jewel.bridge.bridgePainterProvider
 import org.jetbrains.jewel.bridge.createVerticalBrush
 import org.jetbrains.jewel.bridge.dp
 import org.jetbrains.jewel.bridge.readFromLaF
+import org.jetbrains.jewel.bridge.retrieveArcAsCornerSizeOrDefault
 import org.jetbrains.jewel.bridge.retrieveArcAsCornerSizeWithFallbacks
 import org.jetbrains.jewel.bridge.retrieveColorOrUnspecified
 import org.jetbrains.jewel.bridge.retrieveColorsOrUnspecified
@@ -140,13 +139,14 @@ internal fun createBridgeThemeDefinition(textStyle: TextStyle): ThemeDefinition
 @OptIn(DependsOnJBR::class)
 internal suspend fun createBridgeComponentStyling(
     theme: ThemeDefinition,
-) = createBridgeComponentStyling(
-    theme = theme,
-    textFieldTextStyle = retrieveTextStyle("TextField.font", "TextField.foreground"),
-    textAreaTextStyle = retrieveTextStyle("TextArea.font", "TextArea.foreground"),
-    dropdownTextStyle = retrieveTextStyle("ComboBox.font"),
-    linkTextStyle = retrieveTextStyle("Label.font"),
-)
+) =
+    createBridgeComponentStyling(
+        theme = theme,
+        textFieldTextStyle = retrieveTextStyle("TextField.font", "TextField.foreground"),
+        textAreaTextStyle = retrieveTextStyle("TextArea.font", "TextArea.foreground"),
+        dropdownTextStyle = retrieveTextStyle("ComboBox.font"),
+        linkTextStyle = retrieveTextStyle("Label.font"),
+    )
 
 internal fun createBridgeComponentStyling(
     theme: ThemeDefinition,
@@ -186,37 +186,36 @@ internal fun createBridgeComponentStyling(
 }
 
 private fun readDefaultButtonStyle(): ButtonStyle {
-    val normalBackground =
-        listOf(
-            JBUI.CurrentTheme.Button.defaultButtonColorStart().toComposeColor(),
-            JBUI.CurrentTheme.Button.defaultButtonColorEnd().toComposeColor(),
-        ).createVerticalBrush()
+    val normalBackground = listOf(
+        JBUI.CurrentTheme.Button.defaultButtonColorStart().toComposeColor(),
+        JBUI.CurrentTheme.Button.defaultButtonColorEnd().toComposeColor(),
+    ).createVerticalBrush()
 
     val normalContent = retrieveColorOrUnspecified("Button.default.foreground")
 
-    val normalBorder =
-        listOf(
-            JBUI.CurrentTheme.Button.buttonOutlineColorStart(true).toComposeColor(),
-            JBUI.CurrentTheme.Button.buttonOutlineColorEnd(true).toComposeColor(),
-        ).createVerticalBrush()
-
-    val colors = ButtonColors(
-        background = normalBackground,
-        backgroundDisabled = SolidColor(Color.Transparent),
-        backgroundFocused = normalBackground,
-        backgroundPressed = normalBackground,
-        backgroundHovered = normalBackground,
-        content = normalContent,
-        contentDisabled = retrieveColorOrUnspecified("Button.disabledText"),
-        contentFocused = normalContent,
-        contentPressed = normalContent,
-        contentHovered = normalContent,
-        border = normalBorder,
-        borderDisabled = SolidColor(JBUI.CurrentTheme.Button.disabledOutlineColor().toComposeColor()),
-        borderFocused = SolidColor(retrieveColorOrUnspecified("Button.default.focusedBorderColor")),
-        borderPressed = normalBorder,
-        borderHovered = normalBorder,
-    )
+    val normalBorder = listOf(
+        JBUI.CurrentTheme.Button.buttonOutlineColorStart(true).toComposeColor(),
+        JBUI.CurrentTheme.Button.buttonOutlineColorEnd(true).toComposeColor(),
+    ).createVerticalBrush()
+
+    val colors =
+        ButtonColors(
+            background = normalBackground,
+            backgroundDisabled = SolidColor(Color.Transparent),
+            backgroundFocused = normalBackground,
+            backgroundPressed = normalBackground,
+            backgroundHovered = normalBackground,
+            content = normalContent,
+            contentDisabled = retrieveColorOrUnspecified("Button.disabledText"),
+            contentFocused = normalContent,
+            contentPressed = normalContent,
+            contentHovered = normalContent,
+            border = normalBorder,
+            borderDisabled = SolidColor(JBUI.CurrentTheme.Button.disabledOutlineColor().toComposeColor()),
+            borderFocused = SolidColor(retrieveColorOrUnspecified("Button.default.focusedBorderColor")),
+            borderPressed = normalBorder,
+            borderHovered = normalBorder,
+        )
 
     return ButtonStyle(
         colors = colors,
@@ -230,19 +229,17 @@ private fun readDefaultButtonStyle(): ButtonStyle {
 }
 
 private fun readOutlinedButtonStyle(): ButtonStyle {
-    val normalBackground =
-        listOf(
-            JBUI.CurrentTheme.Button.buttonColorStart().toComposeColor(),
-            JBUI.CurrentTheme.Button.buttonColorEnd().toComposeColor(),
-        ).createVerticalBrush()
+    val normalBackground = listOf(
+        JBUI.CurrentTheme.Button.buttonColorStart().toComposeColor(),
+        JBUI.CurrentTheme.Button.buttonColorEnd().toComposeColor(),
+    ).createVerticalBrush()
 
     val normalContent = retrieveColorOrUnspecified("Button.foreground")
 
-    val normalBorder =
-        listOf(
-            JBUI.CurrentTheme.Button.buttonOutlineColorStart(false).toComposeColor(),
-            JBUI.CurrentTheme.Button.buttonOutlineColorEnd(false).toComposeColor(),
-        ).createVerticalBrush()
+    val normalBorder = listOf(
+        JBUI.CurrentTheme.Button.buttonOutlineColorStart(false).toComposeColor(),
+        JBUI.CurrentTheme.Button.buttonOutlineColorEnd(false).toComposeColor(),
+    ).createVerticalBrush()
 
     val colors = ButtonColors(
         background = normalBackground,
@@ -264,7 +261,8 @@ private fun readOutlinedButtonStyle(): ButtonStyle {
 
     return ButtonStyle(
         colors = colors,
-        metrics = ButtonMetrics(
+        metrics =
+        ButtonMetrics(
             cornerSize = CornerSize(DarculaUIUtil.BUTTON_ARC.dp / 2),
             padding = PaddingValues(horizontal = 14.dp), // see DarculaButtonUI.HORIZONTAL_PADDING
             minSize = DpSize(DarculaUIUtil.MINIMUM_WIDTH.dp, DarculaUIUtil.MINIMUM_HEIGHT.dp),
@@ -290,9 +288,7 @@ private fun readCheckboxStyle(): CheckboxStyle {
             outlineOffset = DpOffset(2.5.dp, 1.5.dp), // Extrapolated from SVG
             iconContentGap = 5.dp, // See DarculaCheckBoxUI#textIconGap
         ),
-        icons = CheckboxIcons(
-            checkbox = bridgePainterProvider("${iconsBasePath}checkBox.svg"),
-        ),
+        icons = CheckboxIcons(checkbox = bridgePainterProvider("${iconsBasePath}checkBox.svg")),
     )
 }
 
@@ -343,6 +339,7 @@ private fun readChipStyle(): ChipStyle {
         borderSelectedFocused = selectedBorder,
         borderSelectedHovered = selectedBorder,
     )
+
     return ChipStyle(
         colors = colors,
         metrics = ChipMetrics(
@@ -397,17 +394,12 @@ private fun readDefaultDropdownStyle(
         colors = colors,
         metrics = DropdownMetrics(
             arrowMinSize = DpSize(arrowWidth, DarculaUIUtil.MINIMUM_HEIGHT.dp),
-            minSize = DpSize(
-                DarculaUIUtil.MINIMUM_WIDTH.dp + arrowWidth,
-                DarculaUIUtil.MINIMUM_HEIGHT.dp,
-            ),
+            minSize = DpSize(DarculaUIUtil.MINIMUM_WIDTH.dp + arrowWidth, DarculaUIUtil.MINIMUM_HEIGHT.dp),
             cornerSize = CornerSize(DarculaUIUtil.COMPONENT_ARC.dp),
             contentPadding = retrieveInsetsAsPaddingValues("ComboBox.padding"),
             borderWidth = DarculaUIUtil.BW.dp,
         ),
-        icons = DropdownIcons(
-            chevronDown = bridgePainterProvider("general/chevron-down.svg"),
-        ),
+        icons = DropdownIcons(chevronDown = bridgePainterProvider("general/chevron-down.svg")),
         textStyle = dropdownTextStyle,
         menuStyle = menuStyle,
     )
@@ -449,17 +441,12 @@ private fun readUndecoratedDropdownStyle(
         colors = colors,
         metrics = DropdownMetrics(
             arrowMinSize = DpSize(arrowWidth, DarculaUIUtil.MINIMUM_HEIGHT.dp),
-            minSize = DpSize(
-                DarculaUIUtil.MINIMUM_WIDTH.dp + arrowWidth,
-                DarculaUIUtil.MINIMUM_HEIGHT.dp,
-            ),
+            minSize = DpSize(DarculaUIUtil.MINIMUM_WIDTH.dp + arrowWidth, DarculaUIUtil.MINIMUM_HEIGHT.dp),
             cornerSize = CornerSize(JBUI.CurrentTheme.MainToolbar.Dropdown.hoverArc().dp),
             contentPadding = JBUI.CurrentTheme.MainToolbar.Dropdown.borderInsets().toPaddingValues(),
             borderWidth = 0.dp,
         ),
-        icons = DropdownIcons(
-            chevronDown = bridgePainterProvider("general/chevron-down.svg"),
-        ),
+        icons = DropdownIcons(chevronDown = bridgePainterProvider("general/chevron-down.svg")),
         textStyle = dropdownTextStyle,
         menuStyle = menuStyle,
     )
@@ -467,55 +454,59 @@ private fun readUndecoratedDropdownStyle(
 
 private fun readGroupHeaderStyle() =
     GroupHeaderStyle(
-        colors = GroupHeaderColors(
-            divider = retrieveColorOrUnspecified("Separator.separatorColor"),
-        ),
+        colors = GroupHeaderColors(divider = retrieveColorOrUnspecified("Separator.separatorColor")),
         metrics = GroupHeaderMetrics(
             dividerThickness = 1.dp, // see DarculaSeparatorUI
             indent = 1.dp, // see DarculaSeparatorUI
         ),
     )
 
-private fun readHorizontalProgressBarStyle() = HorizontalProgressBarStyle(
-    colors = HorizontalProgressBarColors(
-        track = retrieveColorOrUnspecified("ProgressBar.trackColor"),
-        progress = retrieveColorOrUnspecified("ProgressBar.progressColor"),
-        indeterminateBase = retrieveColorOrUnspecified("ProgressBar.indeterminateStartColor"),
-        indeterminateHighlight = retrieveColorOrUnspecified("ProgressBar.indeterminateEndColor"),
-    ),
-    metrics = HorizontalProgressBarMetrics(
-        cornerSize = CornerSize(100),
-        minHeight = 4.dp, // See DarculaProgressBarUI.DEFAULT_WIDTH
-        // See DarculaProgressBarUI.CYCLE_TIME_DEFAULT, DarculaProgressBarUI.REPAINT_INTERVAL_DEFAULT,
-        // and the "step" constant in DarculaProgressBarUI#paintIndeterminate
-        indeterminateHighlightWidth = (800 / 50 * 6).dp,
-    ),
-    indeterminateCycleDuration = 800.milliseconds, // See DarculaProgressBarUI.CYCLE_TIME_DEFAULT
-)
+private fun readHorizontalProgressBarStyle() =
+    HorizontalProgressBarStyle(
+        colors = HorizontalProgressBarColors(
+            track = retrieveColorOrUnspecified("ProgressBar.trackColor"),
+            progress = retrieveColorOrUnspecified("ProgressBar.progressColor"),
+            indeterminateBase = retrieveColorOrUnspecified("ProgressBar.indeterminateStartColor"),
+            indeterminateHighlight = retrieveColorOrUnspecified("ProgressBar.indeterminateEndColor"),
+        ),
+        metrics = HorizontalProgressBarMetrics(
+            cornerSize = CornerSize(100),
+            minHeight = 4.dp, // See DarculaProgressBarUI.DEFAULT_WIDTH
+            // See DarculaProgressBarUI.CYCLE_TIME_DEFAULT,
+            // DarculaProgressBarUI.REPAINT_INTERVAL_DEFAULT,
+            // and the "step" constant in DarculaProgressBarUI#paintIndeterminate
+            indeterminateHighlightWidth = (800 / 50 * 6).dp,
+        ),
+        indeterminateCycleDuration = 800.milliseconds, // See DarculaProgressBarUI.CYCLE_TIME_DEFAULT
+    )
 
 private fun readLinkStyle(
     linkTextStyle: TextStyle,
 ): LinkStyle {
-    val normalContent =
-        retrieveColorOrUnspecified("Link.activeForeground").takeOrElse { retrieveColorOrUnspecified("Link.activeForeground") }
-
-    val colors = LinkColors(
-        content = normalContent,
-        contentDisabled = retrieveColorOrUnspecified("Link.disabledForeground").takeOrElse {
-            retrieveColorOrUnspecified(
-                "Label.disabledForeground",
-            )
-        },
-        contentFocused = normalContent,
-        contentPressed = retrieveColorOrUnspecified("Link.pressedForeground").takeOrElse { retrieveColorOrUnspecified("link.pressed.foreground") },
-        contentHovered = retrieveColorOrUnspecified("Link.hoverForeground").takeOrElse { retrieveColorOrUnspecified("link.hover.foreground") },
-        contentVisited = retrieveColorOrUnspecified("Link.visitedForeground").takeOrElse { retrieveColorOrUnspecified("link.visited.foreground") },
-    )
+    val normalContent = retrieveColorOrUnspecified("Link.activeForeground")
+        .takeOrElse { retrieveColorOrUnspecified("Link.activeForeground") }
+
+    val colors =
+        LinkColors(
+            content = normalContent,
+            contentDisabled = retrieveColorOrUnspecified("Link.disabledForeground")
+                .takeOrElse { retrieveColorOrUnspecified("Label.disabledForeground") },
+            contentFocused = normalContent,
+            contentPressed = retrieveColorOrUnspecified("Link.pressedForeground")
+                .takeOrElse { retrieveColorOrUnspecified("link.pressed.foreground") },
+            contentHovered = retrieveColorOrUnspecified("Link.hoverForeground")
+                .takeOrElse { retrieveColorOrUnspecified("link.hover.foreground") },
+            contentVisited = retrieveColorOrUnspecified("Link.visitedForeground")
+                .takeOrElse { retrieveColorOrUnspecified("link.visited.foreground") },
+        )
 
     return LinkStyle(
         colors = colors,
         metrics = LinkMetrics(
-            focusHaloCornerSize = CornerSize(Registry.intValue("ide.link.button.focus.round.arc", 4).dp),
+            focusHaloCornerSize = retrieveArcAsCornerSizeOrDefault(
+                key = "ide.link.button.focus.round.arc",
+                default = CornerSize(4.dp),
+            ),
             textIconGap = 4.dp,
             iconSize = DpSize(16.dp, 16.dp),
         ),
@@ -540,7 +531,8 @@ private fun readMenuStyle(): MenuStyle {
 
     val colors = MenuColors(
         background = retrieveColorOrUnspecified("PopupMenu.background"),
-        border = retrieveColorOrUnspecified("Popup.borderColor").takeOrElse { retrieveColorOrUnspecified("Popup.Border.color") },
+        border = retrieveColorOrUnspecified("Popup.borderColor")
+            .takeOrElse { retrieveColorOrUnspecified("Popup.Border.color") },
         shadow = Color.Black.copy(alpha = .6f),
         itemColors = MenuItemColors(
             background = retrieveColorOrUnspecified("MenuItem.background"),
@@ -577,18 +569,17 @@ private fun readMenuStyle(): MenuStyle {
                 outerPadding = PaddingValues(horizontal = 6.dp),
                 contentPadding = PaddingValues(horizontal = 10.dp, vertical = 4.dp),
                 separatorPadding = PaddingValues(
-                    horizontal = retrieveIntAsDpOrUnspecified("PopupMenuSeparator.withToEdge").takeOrElse { 0.dp },
-                    vertical = retrieveIntAsDpOrUnspecified("PopupMenuSeparator.stripeIndent").takeOrElse { 0.dp },
+                    horizontal = retrieveIntAsDpOrUnspecified("PopupMenuSeparator.withToEdge")
+                        .takeOrElse { 0.dp },
+                    vertical = retrieveIntAsDpOrUnspecified("PopupMenuSeparator.stripeIndent")
+                        .takeOrElse { 0.dp },
                 ),
-                separatorThickness = retrieveIntAsDpOrUnspecified("PopupMenuSeparator.stripeWidth").takeOrElse { 0.dp },
-            ),
-            submenuMetrics = SubmenuMetrics(
-                offset = DpOffset(0.dp, (-8).dp),
+                separatorThickness = retrieveIntAsDpOrUnspecified("PopupMenuSeparator.stripeWidth")
+                    .takeOrElse { 0.dp },
             ),
+            submenuMetrics = SubmenuMetrics(offset = DpOffset(0.dp, (-8).dp)),
         ),
-        icons = MenuIcons(
-            submenuChevron = bridgePainterProvider("general/chevron-right.svg"),
-        ),
+        icons = MenuIcons(submenuChevron = bridgePainterProvider("general/chevron-right.svg")),
     )
 }
 
@@ -608,11 +599,10 @@ private fun readRadioButtonStyle(): RadioButtonStyle {
         colors = colors,
         metrics = RadioButtonMetrics(
             radioButtonSize = DpSize(19.dp, 19.dp),
-            iconContentGap = retrieveIntAsDpOrUnspecified("RadioButton.textIconGap").takeOrElse { 4.dp },
-        ),
-        icons = RadioButtonIcons(
-            radioButton = bridgePainterProvider("${iconsBasePath}radio.svg"),
+            iconContentGap = retrieveIntAsDpOrUnspecified("RadioButton.textIconGap")
+                .takeOrElse { 4.dp },
         ),
+        icons = RadioButtonIcons(radioButton = bridgePainterProvider("${iconsBasePath}radio.svg")),
     )
 }
 
@@ -740,11 +730,12 @@ private fun readLazyTreeStyle(): LazyTreeStyle {
     val chevronCollapsed = bridgePainterProvider("general/chevron-right.svg")
     val chevronExpanded = bridgePainterProvider("general/chevron-down.svg")
 
+    val leftIndent = retrieveIntAsDpOrUnspecified("Tree.leftChildIndent").takeOrElse { 7.dp }
+    val rightIndent = retrieveIntAsDpOrUnspecified("Tree.rightChildIndent").takeOrElse { 11.dp }
     return LazyTreeStyle(
         colors = colors,
         metrics = LazyTreeMetrics(
-            indentSize = retrieveIntAsDpOrUnspecified("Tree.leftChildIndent").takeOrElse { 7.dp } +
-                retrieveIntAsDpOrUnspecified("Tree.rightChildIndent").takeOrElse { 11.dp },
+            indentSize = leftIndent + rightIndent,
             elementBackgroundCornerSize = CornerSize(JBUI.CurrentTheme.Tree.ARC.dp / 2),
             elementPadding = PaddingValues(horizontal = 12.dp),
             elementContentPadding = PaddingValues(4.dp),
@@ -788,14 +779,13 @@ private fun readDefaultTabStyle(): TabStyle {
     return TabStyle(
         colors = colors,
         metrics = TabMetrics(
-            underlineThickness = retrieveIntAsDpOrUnspecified("TabbedPane.tabSelectionHeight").takeOrElse { 2.dp },
+            underlineThickness = retrieveIntAsDpOrUnspecified("TabbedPane.tabSelectionHeight")
+                .takeOrElse { 2.dp },
             tabPadding = retrieveInsetsAsPaddingValues("TabbedPane.tabInsets"),
             closeContentGap = 4.dp,
             tabHeight = retrieveIntAsDpOrUnspecified("TabbedPane.tabHeight").takeOrElse { 24.dp },
         ),
-        icons = TabIcons(
-            close = bridgePainterProvider("expui/general/closeSmall.svg"),
-        ),
+        icons = TabIcons(close = bridgePainterProvider("expui/general/closeSmall.svg")),
         contentAlpha = TabContentAlpha(
             iconNormal = 1f,
             iconDisabled = 1f,
@@ -838,14 +828,14 @@ private fun readEditorTabStyle(): TabStyle {
     return TabStyle(
         colors = colors,
         metrics = TabMetrics(
-            underlineThickness = retrieveIntAsDpOrUnspecified("TabbedPane.tabSelectionHeight").takeOrElse { 2.dp },
+            underlineThickness = retrieveIntAsDpOrUnspecified("TabbedPane.tabSelectionHeight")
+                .takeOrElse { 2.dp },
             tabPadding = retrieveInsetsAsPaddingValues("TabbedPane.tabInsets"),
             closeContentGap = 4.dp,
-            tabHeight = retrieveIntAsDpOrUnspecified("TabbedPane.tabHeight").takeOrElse { 24.dp },
-        ),
-        icons = TabIcons(
-            close = bridgePainterProvider("expui/general/closeSmall.svg"),
+            tabHeight = retrieveIntAsDpOrUnspecified("TabbedPane.tabHeight")
+                .takeOrElse { 24.dp },
         ),
+        icons = TabIcons(close = bridgePainterProvider("expui/general/closeSmall.svg")),
         contentAlpha = TabContentAlpha(
             iconNormal = .7f,
             iconDisabled = .7f,
@@ -861,14 +851,11 @@ private fun readEditorTabStyle(): TabStyle {
     )
 }
 
-private fun readCircularProgressStyle(
-    isDark: Boolean,
-) =
+private fun readCircularProgressStyle(isDark: Boolean) =
     CircularProgressStyle(
         frameTime = 125.milliseconds,
         color = retrieveColorOrUnspecified("ProgressIcon.color")
-            .takeIf { it.isSpecified }
-            ?: if (isDark) Color(0xFF6F737A) else Color(0xFFA8ADBD),
+            .takeOrElse { if (isDark) Color(0xFF6F737A) else Color(0xFFA8ADBD) },
     )
 
 private fun readTooltipStyle() =
diff --git a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/SwingBridgeTheme.kt b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/SwingBridgeTheme.kt
index 484103d283b25..5c541b110e2e8 100644
--- a/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/SwingBridgeTheme.kt
+++ b/platform/jewel/ide-laf-bridge/src/main/kotlin/org/jetbrains/jewel/bridge/theme/SwingBridgeTheme.kt
@@ -18,7 +18,7 @@ private val bridgeService
 
 @ExperimentalJewelApi
 @Composable
-fun SwingBridgeTheme(content: @Composable () -> Unit) {
+public fun SwingBridgeTheme(content: @Composable () -> Unit) {
     val themeData by bridgeService.currentBridgeThemeData.collectAsState()
 
     BaseJewelTheme(
diff --git a/platform/jewel/ide-laf-bridge/src/test/kotlin/org/jetbrains/jewel/bridge/actionSystem/ProvideDataTest.kt b/platform/jewel/ide-laf-bridge/src/test/kotlin/org/jetbrains/jewel/bridge/actionSystem/ProvideDataTest.kt
index e3e078e8b129a..cc2afeadebf5a 100644
--- a/platform/jewel/ide-laf-bridge/src/test/kotlin/org/jetbrains/jewel/bridge/actionSystem/ProvideDataTest.kt
+++ b/platform/jewel/ide-laf-bridge/src/test/kotlin/org/jetbrains/jewel/bridge/actionSystem/ProvideDataTest.kt
@@ -17,8 +17,7 @@ import org.junit.Test
 
 class ProvideDataTest {
 
-    @JvmField
-    @Rule
+    @JvmField @Rule
     val rule = createComposeRule()
 
     @Test
@@ -29,9 +28,7 @@ class ProvideDataTest {
             rule.setContent {
                 focusManager = LocalFocusManager.current
                 Box(
-                    modifier = Modifier
-                        .then(rootDataProviderModifier)
-                        .testTag("provider")
+                    modifier = rootDataProviderModifier.testTag("provider")
                         .provideData {
                             when (it) {
                                 "data" -> "ok"
@@ -60,9 +57,7 @@ class ProvideDataTest {
             rule.setContent {
                 focusManager = LocalFocusManager.current
                 Box(
-                    modifier = Modifier
-                        .then(rootDataProviderModifier)
-                        .testTag("root_provider")
+                    modifier = rootDataProviderModifier.testTag("root_provider")
                         .provideData {
                             when (it) {
                                 "isRoot" -> "yes"
@@ -73,14 +68,15 @@ class ProvideDataTest {
                 ) {
                     Box(modifier = Modifier.testTag("non_data_provider").focusable()) {
                         Box(
-                            modifier = Modifier
-                                .testTag("data_provider_item")
+                            modifier =
+                            Modifier.testTag("data_provider_item")
                                 .provideData {
                                     when (it) {
                                         "data" -> "ok"
                                         else -> null
                                     }
-                                }.focusable(),
+                                }
+                                .focusable(),
                         )
                     }
                 }
diff --git a/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiDecoratedWindowResourceResolver.kt b/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiDecoratedWindowResourceResolver.kt
index d4b7f000385e5..359dd64c5adc6 100644
--- a/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiDecoratedWindowResourceResolver.kt
+++ b/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiDecoratedWindowResourceResolver.kt
@@ -5,7 +5,8 @@ import org.jetbrains.jewel.ui.painter.ResourcePainterProvider
 import org.jetbrains.jewel.window.styling.DecoratedWindowStyle
 
 /**
- * Create [PainterProvider][org.jetbrains.jewel.painter.PainterProvider] for decorated window module resource.
+ * Create a [PainterProvider][org.jetbrains.jewel.painter.PainterProvider]
+ * for loading a decorated window module resource.
  */
-fun decoratedWindowPainterProvider(path: String) =
+public fun decoratedWindowPainterProvider(path: String): ResourcePainterProvider =
     ResourcePainterProvider(path, DecoratedWindowStyle::class.java.classLoader, JewelTheme::class.java.classLoader)
diff --git a/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiTheme.kt b/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiTheme.kt
index 1a919b9b7f86f..857983f390cea 100644
--- a/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiTheme.kt
+++ b/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/IntUiTheme.kt
@@ -9,25 +9,20 @@ import org.jetbrains.jewel.window.styling.LocalDecoratedWindowStyle
 import org.jetbrains.jewel.window.styling.LocalTitleBarStyle
 import org.jetbrains.jewel.window.styling.TitleBarStyle
 
-fun ComponentStyling.decoratedWindow(
+public fun ComponentStyling.decoratedWindow(
     windowStyle: DecoratedWindowStyle? = null,
     titleBarStyle: TitleBarStyle? = null,
-): ComponentStyling = provide {
-    val isDark = JewelTheme.isDark
+): ComponentStyling =
+    provide {
+        val isDark = JewelTheme.isDark
 
-    val currentWindowStyle = windowStyle ?: if (isDark) {
-        DecoratedWindowStyle.dark()
-    } else {
-        DecoratedWindowStyle.light()
-    }
-    val currentTitleBarStyle = titleBarStyle ?: if (isDark) {
-        TitleBarStyle.dark()
-    } else {
-        TitleBarStyle.light()
-    }
+        val currentWindowStyle = windowStyle
+            ?: if (isDark) DecoratedWindowStyle.dark() else DecoratedWindowStyle.light()
+        val currentTitleBarStyle = titleBarStyle
+            ?: if (isDark) TitleBarStyle.dark() else TitleBarStyle.light()
 
-    arrayOf(
-        LocalDecoratedWindowStyle provides currentWindowStyle,
-        LocalTitleBarStyle provides currentTitleBarStyle,
-    )
-}
+        arrayOf(
+            LocalDecoratedWindowStyle provides currentWindowStyle,
+            LocalTitleBarStyle provides currentTitleBarStyle,
+        )
+    }
diff --git a/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiDecoratedWindowStyling.kt b/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiDecoratedWindowStyling.kt
index b470c3f2e4a8a..50d573eae8906 100644
--- a/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiDecoratedWindowStyling.kt
+++ b/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiDecoratedWindowStyling.kt
@@ -7,28 +7,28 @@ import org.jetbrains.jewel.window.styling.DecoratedWindowColors
 import org.jetbrains.jewel.window.styling.DecoratedWindowMetrics
 import org.jetbrains.jewel.window.styling.DecoratedWindowStyle
 
-fun DecoratedWindowStyle.Companion.light(
+public fun DecoratedWindowStyle.Companion.light(
     colors: DecoratedWindowColors = DecoratedWindowColors.light(),
     metrics: DecoratedWindowMetrics = DecoratedWindowMetrics.defaults(),
-) = DecoratedWindowStyle(colors, metrics)
+): DecoratedWindowStyle = DecoratedWindowStyle(colors, metrics)
 
-fun DecoratedWindowStyle.Companion.dark(
+public fun DecoratedWindowStyle.Companion.dark(
     colors: DecoratedWindowColors = DecoratedWindowColors.dark(),
     metrics: DecoratedWindowMetrics = DecoratedWindowMetrics.defaults(),
-) = DecoratedWindowStyle(colors, metrics)
+): DecoratedWindowStyle = DecoratedWindowStyle(colors, metrics)
 
-fun DecoratedWindowColors.Companion.light(
+public fun DecoratedWindowColors.Companion.light(
     // from Window.undecorated.border
     borderColor: Color = Color(0xFF5A5D6B),
     inactiveBorderColor: Color = borderColor,
-) = DecoratedWindowColors(borderColor, inactiveBorderColor)
+): DecoratedWindowColors = DecoratedWindowColors(borderColor, inactiveBorderColor)
 
-fun DecoratedWindowColors.Companion.dark(
+public fun DecoratedWindowColors.Companion.dark(
     // from Window.undecorated.border
     borderColor: Color = Color(0xFF5A5D63),
     inactiveBorderColor: Color = borderColor,
-) = DecoratedWindowColors(borderColor, inactiveBorderColor)
+): DecoratedWindowColors = DecoratedWindowColors(borderColor, inactiveBorderColor)
 
-fun DecoratedWindowMetrics.Companion.defaults(
+public fun DecoratedWindowMetrics.Companion.defaults(
     borderWidth: Dp = 1.dp,
-) = DecoratedWindowMetrics(borderWidth)
+): DecoratedWindowMetrics = DecoratedWindowMetrics(borderWidth)
diff --git a/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiTitleBarStyling.kt b/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiTitleBarStyling.kt
index 704a455047826..40befb1a161a9 100644
--- a/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiTitleBarStyling.kt
+++ b/platform/jewel/int-ui/int-ui-decorated-window/src/main/kotlin/org/jetbrains/jewel/intui/window/styling/IntUiTitleBarStyling.kt
@@ -28,11 +28,11 @@ import org.jetbrains.jewel.window.styling.TitleBarMetrics
 import org.jetbrains.jewel.window.styling.TitleBarStyle
 
 @Composable
-fun TitleBarStyle.Companion.light(
+public fun TitleBarStyle.Companion.light(
     colors: TitleBarColors = TitleBarColors.light(),
     metrics: TitleBarMetrics = TitleBarMetrics.defaults(),
     icons: TitleBarIcons = TitleBarIcons.defaults(),
-) =
+): TitleBarStyle =
     TitleBarStyle(
         colors = colors,
         metrics = metrics,
@@ -73,11 +73,11 @@ fun TitleBarStyle.Companion.light(
     )
 
 @Composable
-fun TitleBarStyle.Companion.lightWithLightHeader(
+public fun TitleBarStyle.Companion.lightWithLightHeader(
     colors: TitleBarColors = TitleBarColors.lightWithLightHeader(),
     metrics: TitleBarMetrics = TitleBarMetrics.defaults(),
     icons: TitleBarIcons = TitleBarIcons.defaults(),
-) =
+): TitleBarStyle =
     TitleBarStyle(
         colors = colors,
         metrics = metrics,
@@ -117,11 +117,11 @@ fun TitleBarStyle.Companion.lightWithLightHeader(
     )
 
 @Composable
-fun TitleBarStyle.Companion.dark(
+public fun TitleBarStyle.Companion.dark(
     colors: TitleBarColors = TitleBarColors.dark(),
     metrics: TitleBarMetrics = TitleBarMetrics.defaults(),
     icons: TitleBarIcons = TitleBarIcons.defaults(),
-) =
+): TitleBarStyle =
     TitleBarStyle(
         colors = colors,
         metrics = metrics,
@@ -164,29 +164,30 @@ private fun titleBarIconButtonStyle(
     hoveredBackground: Color,
     pressedBackground: Color,
     metrics: IconButtonMetrics,
-) = IconButtonStyle(
-    IconButtonColors(
-        foregroundSelectedActivated = Color.Unspecified,
-        background = Color.Unspecified,
-        backgroundDisabled = Color.Unspecified,
-        backgroundSelected = Color.Unspecified,
-        backgroundSelectedActivated = Color.Unspecified,
-        backgroundFocused = Color.Unspecified,
-        backgroundPressed = hoveredBackground,
-        backgroundHovered = pressedBackground,
-        border = Color.Unspecified,
-        borderDisabled = Color.Unspecified,
-        borderSelected = Color.Unspecified,
-        borderSelectedActivated = Color.Unspecified,
-        borderFocused = hoveredBackground,
-        borderPressed = pressedBackground,
-        borderHovered = Color.Unspecified,
-    ),
-    metrics,
-)
+) =
+    IconButtonStyle(
+        IconButtonColors(
+            foregroundSelectedActivated = Color.Unspecified,
+            background = Color.Unspecified,
+            backgroundDisabled = Color.Unspecified,
+            backgroundSelected = Color.Unspecified,
+            backgroundSelectedActivated = Color.Unspecified,
+            backgroundFocused = Color.Unspecified,
+            backgroundPressed = hoveredBackground,
+            backgroundHovered = pressedBackground,
+            border = Color.Unspecified,
+            borderDisabled = Color.Unspecified,
+            borderSelected = Color.Unspecified,
+            borderSelectedActivated = Color.Unspecified,
+            borderFocused = hoveredBackground,
+            borderPressed = pressedBackground,
+            borderHovered = Color.Unspecified,
+        ),
+        metrics,
+    )
 
 @Composable
-fun TitleBarColors.Companion.light(
+public fun TitleBarColors.Companion.light(
     backgroundColor: Color = IntUiLightTheme.colors.grey(2),
     inactiveBackground: Color = IntUiLightTheme.colors.grey(3),
     contentColor: Color = IntUiLightTheme.colors.grey(12),
@@ -202,19 +203,20 @@ fun TitleBarColors.Companion.light(
     // com.intellij.openapi.wm.impl.customFrameDecorations.CustomFrameTitleButtons.closeStyleBuilder
     titlePaneCloseButtonHoveredBackground: Color = Color(0xFFE81123),
     titlePaneCloseButtonPressedBackground: Color = Color(0xFFF1707A),
-
     iconButtonHoveredBackground: Color = IntUiLightTheme.colors.grey(3),
     iconButtonPressedBackground: Color = IntUiLightTheme.colors.grey(3),
 
     // There are two fields in theme.json: transparentHoveredBackground and hoveredBackground,
     // but in com.intellij.ide.ui.laf.darcula.ui.ToolbarComboWidgetUI#paintBackground,
-    // transparentHoveredBackground is used first, which is guessed to be due to the gradient background
+    // transparentHoveredBackground is used first, which is guessed to be due to the gradient
+    // background
     // caused by the project color of the titlebar, which makes the pure color background look strange
-    // in the area. In order to simplify the use in Jewel, here directly use transparentHoveredBackground
+    // in the area. In order to simplify the use in Jewel, here directly use
+    // transparentHoveredBackground
     // as hoveredBackground.
     dropdownHoveredBackground: Color = Color(0x1AFFFFFF),
     dropdownPressedBackground: Color = dropdownHoveredBackground,
-) =
+): TitleBarColors =
     TitleBarColors(
         background = backgroundColor,
         inactiveBackground = inactiveBackground,
@@ -232,7 +234,7 @@ fun TitleBarColors.Companion.light(
     )
 
 @Composable
-fun TitleBarColors.Companion.lightWithLightHeader(
+public fun TitleBarColors.Companion.lightWithLightHeader(
     backgroundColor: Color = IntUiLightTheme.colors.grey(13),
     inactiveBackground: Color = IntUiLightTheme.colors.grey(12),
     fullscreenControlButtonsBackground: Color = Color(0xFF7A7B80),
@@ -246,7 +248,7 @@ fun TitleBarColors.Companion.lightWithLightHeader(
     iconButtonPressedBackground: Color = IntUiLightTheme.colors.grey(11),
     dropdownHoveredBackground: Color = Color(0x0D000000),
     dropdownPressedBackground: Color = dropdownHoveredBackground,
-) =
+): TitleBarColors =
     TitleBarColors(
         background = backgroundColor,
         inactiveBackground = inactiveBackground,
@@ -264,7 +266,7 @@ fun TitleBarColors.Companion.lightWithLightHeader(
     )
 
 @Composable
-fun TitleBarColors.Companion.dark(
+public fun TitleBarColors.Companion.dark(
     backgroundColor: Color = IntUiDarkTheme.colors.grey(2),
     inactiveBackground: Color = IntUiDarkTheme.colors.grey(3),
     fullscreenControlButtonsBackground: Color = Color(0xFF575A5C),
@@ -278,32 +280,33 @@ fun TitleBarColors.Companion.dark(
     iconButtonPressedBackground: Color = IntUiLightTheme.colors.grey(3),
     dropdownHoveredBackground: Color = Color(0x1AFFFFFF),
     dropdownPressedBackground: Color = dropdownHoveredBackground,
-) = TitleBarColors(
-    background = backgroundColor,
-    inactiveBackground = inactiveBackground,
-    content = contentColor,
-    border = borderColor,
-    fullscreenControlButtonsBackground = fullscreenControlButtonsBackground,
-    titlePaneButtonHoveredBackground = titlePaneButtonHoveredBackground,
-    titlePaneButtonPressedBackground = titlePaneButtonPressedBackground,
-    titlePaneCloseButtonHoveredBackground = titlePaneCloseButtonHoveredBackground,
-    titlePaneCloseButtonPressedBackground = titlePaneCloseButtonPressedBackground,
-    iconButtonHoveredBackground = iconButtonHoveredBackground,
-    iconButtonPressedBackground = iconButtonPressedBackground,
-    dropdownHoveredBackground = dropdownHoveredBackground,
-    dropdownPressedBackground = dropdownPressedBackground,
-)
+): TitleBarColors =
+    TitleBarColors(
+        background = backgroundColor,
+        inactiveBackground = inactiveBackground,
+        content = contentColor,
+        border = borderColor,
+        fullscreenControlButtonsBackground = fullscreenControlButtonsBackground,
+        titlePaneButtonHoveredBackground = titlePaneButtonHoveredBackground,
+        titlePaneButtonPressedBackground = titlePaneButtonPressedBackground,
+        titlePaneCloseButtonHoveredBackground = titlePaneCloseButtonHoveredBackground,
+        titlePaneCloseButtonPressedBackground = titlePaneCloseButtonPressedBackground,
+        iconButtonHoveredBackground = iconButtonHoveredBackground,
+        iconButtonPressedBackground = iconButtonPressedBackground,
+        dropdownHoveredBackground = dropdownHoveredBackground,
+        dropdownPressedBackground = dropdownPressedBackground,
+    )
 
-fun TitleBarMetrics.Companion.defaults(
+public fun TitleBarMetrics.Companion.defaults(
     height: Dp = 40.dp,
     gradientStartX: Dp = (-100).dp,
     gradientEndX: Dp = 400.dp,
     titlePaneButtonSize: DpSize = DpSize(40.dp, 40.dp),
-) = TitleBarMetrics(height, gradientStartX, gradientEndX, titlePaneButtonSize)
+): TitleBarMetrics = TitleBarMetrics(height, gradientStartX, gradientEndX, titlePaneButtonSize)
 
-fun TitleBarIcons.Companion.defaults(
+public fun TitleBarIcons.Companion.defaults(
     minimizeButton: PainterProvider = decoratedWindowPainterProvider("icons/intui/window/minimize.svg"),
     maximizeButton: PainterProvider = decoratedWindowPainterProvider("icons/intui/window/maximize.svg"),
     restoreButton: PainterProvider = decoratedWindowPainterProvider("icons/intui/window/restore.svg"),
     closeButton: PainterProvider = decoratedWindowPainterProvider("icons/intui/window/close.svg"),
-) = TitleBarIcons(minimizeButton, maximizeButton, restoreButton, closeButton)
+): TitleBarIcons = TitleBarIcons(minimizeButton, maximizeButton, restoreButton, closeButton)
diff --git a/platform/jewel/int-ui/int-ui-standalone/build.gradle.kts b/platform/jewel/int-ui/int-ui-standalone/build.gradle.kts
index 0f1f5ea929423..3abdbd4e568df 100644
--- a/platform/jewel/int-ui/int-ui-standalone/build.gradle.kts
+++ b/platform/jewel/int-ui/int-ui-standalone/build.gradle.kts
@@ -6,9 +6,7 @@ plugins {
     `intellij-theme-generator`
 }
 
-dependencies {
-    api(projects.ui)
-}
+dependencies { api(projects.ui) }
 
 intelliJThemeGenerator {
     val targetIdeaVersion = "232.9960"
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/InterFont.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/InterFont.kt
index 24339b67bc6e1..86e863800d234 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/InterFont.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/InterFont.kt
@@ -4,17 +4,18 @@ import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.platform.Font
 
-private val InterFontFamily = FontFamily(
-    Font(resource = "/fonts/inter/Inter-Thin.ttf", weight = FontWeight.Thin),
-    Font(resource = "/fonts/inter/Inter-ExtraLight.ttf", weight = FontWeight.ExtraLight),
-    Font(resource = "/fonts/inter/Inter-Light.ttf", weight = FontWeight.Light),
-    Font(resource = "/fonts/inter/Inter-Regular.ttf", weight = FontWeight.Normal),
-    Font(resource = "/fonts/inter/Inter-Medium.ttf", weight = FontWeight.Medium),
-    Font(resource = "/fonts/inter/Inter-SemiBold.ttf", weight = FontWeight.SemiBold),
-    Font(resource = "/fonts/inter/Inter-Bold.ttf", weight = FontWeight.Bold),
-    Font(resource = "/fonts/inter/Inter-ExtraBold.ttf", weight = FontWeight.ExtraBold),
-    Font(resource = "/fonts/inter/Inter-Black.ttf", weight = FontWeight.Black),
-)
+private val InterFontFamily =
+    FontFamily(
+        Font(resource = "/fonts/inter/Inter-Thin.ttf", weight = FontWeight.Thin),
+        Font(resource = "/fonts/inter/Inter-ExtraLight.ttf", weight = FontWeight.ExtraLight),
+        Font(resource = "/fonts/inter/Inter-Light.ttf", weight = FontWeight.Light),
+        Font(resource = "/fonts/inter/Inter-Regular.ttf", weight = FontWeight.Normal),
+        Font(resource = "/fonts/inter/Inter-Medium.ttf", weight = FontWeight.Medium),
+        Font(resource = "/fonts/inter/Inter-SemiBold.ttf", weight = FontWeight.SemiBold),
+        Font(resource = "/fonts/inter/Inter-Bold.ttf", weight = FontWeight.Bold),
+        Font(resource = "/fonts/inter/Inter-ExtraBold.ttf", weight = FontWeight.ExtraBold),
+        Font(resource = "/fonts/inter/Inter-Black.ttf", weight = FontWeight.Black),
+    )
 
-val FontFamily.Companion.Inter
+public val FontFamily.Companion.Inter: FontFamily
     get() = InterFontFamily
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/PainterProvider.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/PainterProvider.kt
index 8ecbd3f7c62e1..e244f806be05c 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/PainterProvider.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/PainterProvider.kt
@@ -4,8 +4,8 @@ import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.painter.ResourcePainterProvider
 
 /**
- * Create a [PainterProvider][org.jetbrains.jewel.painter.PainterProvider] to load a
- * resource from the classpath.
+ * Create a [PainterProvider][org.jetbrains.jewel.painter.PainterProvider] to load a resource from
+ * the classpath.
  */
-fun standalonePainterProvider(path: String) =
+public fun standalonePainterProvider(path: String): ResourcePainterProvider =
     ResourcePainterProvider(path, JewelTheme::class.java.classLoader)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/StandalonePainterHintsProvider.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/StandalonePainterHintsProvider.kt
index d54c3e2f20a82..052c067222736 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/StandalonePainterHintsProvider.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/StandalonePainterHintsProvider.kt
@@ -9,7 +9,7 @@ import org.jetbrains.jewel.ui.painter.hints.Dark
 import org.jetbrains.jewel.ui.painter.hints.HiDpi
 import org.jetbrains.jewel.ui.painter.hints.Override
 
-class StandalonePainterHintsProvider(
+public class StandalonePainterHintsProvider(
     theme: ThemeDefinition,
 ) : BasePainterHintsProvider(
     theme.isDark,
@@ -18,11 +18,12 @@ class StandalonePainterHintsProvider(
     theme.colorPalette.rawMap,
 ) {
 
-    private val overrideHint: PainterHint = Override(
-        theme.iconData.iconOverrides.entries.associate { (k, v) ->
-            k.removePrefix("/") to v.removePrefix("/")
-        },
-    )
+    private val overrideHint: PainterHint =
+        Override(
+            theme.iconData.iconOverrides.entries.associate { (k, v) ->
+                k.removePrefix("/") to v.removePrefix("/")
+            },
+        )
 
     @Composable
     override fun hints(path: String): List<PainterHint> = buildList {
@@ -32,57 +33,58 @@ class StandalonePainterHintsProvider(
         add(Dark(JewelTheme.isDark))
     }
 
-    companion object {
+    public companion object {
 
         // Extracted from com.intellij.ide.ui.UITheme#colorPalette
-        private val intellijColorPalette = mapOf(
-            "Actions.Red" to "#DB5860",
-            "Actions.Red.Dark" to "#C75450",
-            "Actions.Yellow" to "#EDA200",
-            "Actions.Yellow.Dark" to "#F0A732",
-            "Actions.Green" to "#59A869",
-            "Actions.Green.Dark" to "#499C54",
-            "Actions.Blue" to "#389FD6",
-            "Actions.Blue.Dark" to "#3592C4",
-            "Actions.Grey" to "#6E6E6E",
-            "Actions.Grey.Dark" to "#AFB1B3",
-            "Actions.GreyInline" to "#7F8B91",
-            "Actions.GreyInline.Dark" to "#7F8B91",
-            "Objects.Grey" to "#9AA7B0",
-            "Objects.Blue" to "#40B6E0",
-            "Objects.Green" to "#62B543",
-            "Objects.Yellow" to "#F4AF3D",
-            "Objects.YellowDark" to "#D9A343",
-            "Objects.Purple" to "#B99BF8",
-            "Objects.Pink" to "#F98B9E",
-            "Objects.Red" to "#F26522",
-            "Objects.RedStatus" to "#E05555",
-            "Objects.GreenAndroid" to "#3DDC84",
-            "Objects.BlackText" to "#231F20",
-            "Checkbox.Background.Default" to "#FFFFFF",
-            "Checkbox.Background.Default.Dark" to "#43494A",
-            "Checkbox.Background.Disabled" to "#F2F2F2",
-            "Checkbox.Background.Disabled.Dark" to "#3C3F41",
-            "Checkbox.Border.Default" to "#b0b0b0",
-            "Checkbox.Border.Default.Dark" to "#6B6B6B",
-            "Checkbox.Border.Disabled" to "#BDBDBD",
-            "Checkbox.Border.Disabled.Dark" to "#545556",
-            "Checkbox.Focus.Thin.Default" to "#7B9FC7",
-            "Checkbox.Focus.Thin.Default.Dark" to "#466D94",
-            "Checkbox.Focus.Wide" to "#97C3F3",
-            "Checkbox.Focus.Wide.Dark" to "#3D6185",
-            "Checkbox.Foreground.Disabled" to "#ABABAB",
-            "Checkbox.Foreground.Disabled.Dark" to "#606060",
-            "Checkbox.Background.Selected" to "#4F9EE3",
-            "Checkbox.Background.Selected.Dark" to "#43494A",
-            "Checkbox.Border.Selected" to "#4B97D9",
-            "Checkbox.Border.Selected.Dark" to "#6B6B6B",
-            "Checkbox.Foreground.Selected" to "#FEFEFE",
-            "Checkbox.Foreground.Selected.Dark" to "#A7A7A7",
-            "Checkbox.Focus.Thin.Selected" to "#ACCFF7",
-            "Checkbox.Focus.Thin.Selected.Dark" to "#466D94",
-            "Tree.iconColor" to "#808080",
-            "Tree.iconColor.Dark" to "#AFB1B3",
-        )
+        private val intellijColorPalette =
+            mapOf(
+                "Actions.Red" to "#DB5860",
+                "Actions.Red.Dark" to "#C75450",
+                "Actions.Yellow" to "#EDA200",
+                "Actions.Yellow.Dark" to "#F0A732",
+                "Actions.Green" to "#59A869",
+                "Actions.Green.Dark" to "#499C54",
+                "Actions.Blue" to "#389FD6",
+                "Actions.Blue.Dark" to "#3592C4",
+                "Actions.Grey" to "#6E6E6E",
+                "Actions.Grey.Dark" to "#AFB1B3",
+                "Actions.GreyInline" to "#7F8B91",
+                "Actions.GreyInline.Dark" to "#7F8B91",
+                "Objects.Grey" to "#9AA7B0",
+                "Objects.Blue" to "#40B6E0",
+                "Objects.Green" to "#62B543",
+                "Objects.Yellow" to "#F4AF3D",
+                "Objects.YellowDark" to "#D9A343",
+                "Objects.Purple" to "#B99BF8",
+                "Objects.Pink" to "#F98B9E",
+                "Objects.Red" to "#F26522",
+                "Objects.RedStatus" to "#E05555",
+                "Objects.GreenAndroid" to "#3DDC84",
+                "Objects.BlackText" to "#231F20",
+                "Checkbox.Background.Default" to "#FFFFFF",
+                "Checkbox.Background.Default.Dark" to "#43494A",
+                "Checkbox.Background.Disabled" to "#F2F2F2",
+                "Checkbox.Background.Disabled.Dark" to "#3C3F41",
+                "Checkbox.Border.Default" to "#b0b0b0",
+                "Checkbox.Border.Default.Dark" to "#6B6B6B",
+                "Checkbox.Border.Disabled" to "#BDBDBD",
+                "Checkbox.Border.Disabled.Dark" to "#545556",
+                "Checkbox.Focus.Thin.Default" to "#7B9FC7",
+                "Checkbox.Focus.Thin.Default.Dark" to "#466D94",
+                "Checkbox.Focus.Wide" to "#97C3F3",
+                "Checkbox.Focus.Wide.Dark" to "#3D6185",
+                "Checkbox.Foreground.Disabled" to "#ABABAB",
+                "Checkbox.Foreground.Disabled.Dark" to "#606060",
+                "Checkbox.Background.Selected" to "#4F9EE3",
+                "Checkbox.Background.Selected.Dark" to "#43494A",
+                "Checkbox.Border.Selected" to "#4B97D9",
+                "Checkbox.Border.Selected.Dark" to "#6B6B6B",
+                "Checkbox.Foreground.Selected" to "#FEFEFE",
+                "Checkbox.Foreground.Selected.Dark" to "#A7A7A7",
+                "Checkbox.Focus.Thin.Selected" to "#ACCFF7",
+                "Checkbox.Focus.Thin.Selected.Dark" to "#466D94",
+                "Tree.iconColor" to "#808080",
+                "Tree.iconColor.Dark" to "#AFB1B3",
+            )
     }
 }
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt
index c2e39a4d7387a..f6c4cdd7594ab 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiButtonStyling.kt
@@ -15,49 +15,51 @@ import org.jetbrains.jewel.ui.component.styling.ButtonColors
 import org.jetbrains.jewel.ui.component.styling.ButtonMetrics
 import org.jetbrains.jewel.ui.component.styling.ButtonStyle
 
-val ButtonStyle.Companion.Default: IntUiDefaultButtonStyleFactory
+public val ButtonStyle.Companion.Default: IntUiDefaultButtonStyleFactory
     get() = IntUiDefaultButtonStyleFactory
 
-object IntUiDefaultButtonStyleFactory {
+public object IntUiDefaultButtonStyleFactory {
 
     @Composable
-    fun light(
+    public fun light(
         colors: ButtonColors = ButtonColors.Default.light(),
         metrics: ButtonMetrics = ButtonMetrics.default(),
-    ) = ButtonStyle(colors, metrics)
+    ): ButtonStyle = ButtonStyle(colors, metrics)
 
     @Composable
-    fun dark(
+    public fun dark(
         colors: ButtonColors = ButtonColors.Default.dark(),
         metrics: ButtonMetrics = ButtonMetrics.default(),
-    ) = ButtonStyle(colors, metrics)
+    ): ButtonStyle = ButtonStyle(colors, metrics)
 }
 
-val ButtonStyle.Companion.Outlined: IntUiOutlinedButtonStyleFactory
+public val ButtonStyle.Companion.Outlined: IntUiOutlinedButtonStyleFactory
     get() = IntUiOutlinedButtonStyleFactory
 
-object IntUiOutlinedButtonStyleFactory {
+public object IntUiOutlinedButtonStyleFactory {
 
     @Composable
-    fun light(
+    public fun light(
         colors: ButtonColors = ButtonColors.Outlined.light(),
         metrics: ButtonMetrics = ButtonMetrics.outlined(),
-    ) = ButtonStyle(colors, metrics)
+    ): ButtonStyle =
+        ButtonStyle(colors, metrics)
 
     @Composable
-    fun dark(
+    public fun dark(
         colors: ButtonColors = ButtonColors.Outlined.dark(),
         metrics: ButtonMetrics = ButtonMetrics.outlined(),
-    ) = ButtonStyle(colors, metrics)
+    ): ButtonStyle =
+        ButtonStyle(colors, metrics)
 }
 
-val ButtonColors.Companion.Default: IntUiDefaultButtonColorFactory
+public val ButtonColors.Companion.Default: IntUiDefaultButtonColorFactory
     get() = IntUiDefaultButtonColorFactory
 
-object IntUiDefaultButtonColorFactory {
+public object IntUiDefaultButtonColorFactory {
 
     @Composable
-    fun light(
+    public fun light(
         background: Brush = SolidColor(IntUiLightTheme.colors.blue(4)),
         backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(12)),
         backgroundFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(4)),
@@ -73,26 +75,27 @@ object IntUiDefaultButtonColorFactory {
         borderFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(4)),
         borderPressed: Brush = border,
         borderHovered: Brush = border,
-    ) = ButtonColors(
-        background,
-        backgroundDisabled,
-        backgroundFocused,
-        backgroundPressed,
-        backgroundHovered,
-        content,
-        contentDisabled,
-        contentFocused,
-        contentPressed,
-        contentHovered,
-        border,
-        borderDisabled,
-        borderFocused,
-        borderPressed,
-        borderHovered,
-    )
+    ): ButtonColors =
+        ButtonColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundFocused = backgroundFocused,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentFocused = contentFocused,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            border = border,
+            borderDisabled = borderDisabled,
+            borderFocused = borderFocused,
+            borderPressed = borderPressed,
+            borderHovered = borderHovered,
+        )
 
     @Composable
-    fun dark(
+    public fun dark(
         background: Brush = SolidColor(IntUiDarkTheme.colors.blue(6)),
         backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)),
         backgroundFocused: Brush = SolidColor(IntUiDarkTheme.colors.blue(6)),
@@ -108,32 +111,33 @@ object IntUiDefaultButtonColorFactory {
         borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(1)),
         borderPressed: Brush = border,
         borderHovered: Brush = border,
-    ) = ButtonColors(
-        background,
-        backgroundDisabled,
-        backgroundFocused,
-        backgroundPressed,
-        backgroundHovered,
-        content,
-        contentDisabled,
-        contentFocused,
-        contentPressed,
-        contentHovered,
-        border,
-        borderDisabled,
-        borderFocused,
-        borderPressed,
-        borderHovered,
-    )
+    ): ButtonColors =
+        ButtonColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundFocused = backgroundFocused,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentFocused = contentFocused,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            border = border,
+            borderDisabled = borderDisabled,
+            borderFocused = borderFocused,
+            borderPressed = borderPressed,
+            borderHovered = borderHovered,
+        )
 }
 
-val ButtonColors.Companion.Outlined: IntUiOutlinedButtonColorFactory
+public val ButtonColors.Companion.Outlined: IntUiOutlinedButtonColorFactory
     get() = IntUiOutlinedButtonColorFactory
 
-object IntUiOutlinedButtonColorFactory {
+public object IntUiOutlinedButtonColorFactory {
 
     @Composable
-    fun light(
+    public fun light(
         background: Brush = SolidColor(Color.Transparent),
         backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(12)),
         backgroundFocused: Brush = SolidColor(Color.Transparent),
@@ -149,26 +153,27 @@ object IntUiOutlinedButtonColorFactory {
         borderFocused: Brush = SolidColor(IntUiLightTheme.colors.blue(4)),
         borderPressed: Brush = SolidColor(IntUiLightTheme.colors.grey(7)),
         borderHovered: Brush = SolidColor(IntUiLightTheme.colors.grey(8)),
-    ) = ButtonColors(
-        background,
-        backgroundDisabled,
-        backgroundFocused,
-        backgroundPressed,
-        backgroundHovered,
-        content,
-        contentDisabled,
-        contentFocused,
-        contentPressed,
-        contentHovered,
-        border,
-        borderDisabled,
-        borderFocused,
-        borderPressed,
-        borderHovered,
-    )
+    ): ButtonColors =
+        ButtonColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundFocused = backgroundFocused,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentFocused = contentFocused,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            border = border,
+            borderDisabled = borderDisabled,
+            borderFocused = borderFocused,
+            borderPressed = borderPressed,
+            borderHovered = borderHovered,
+        )
 
     @Composable
-    fun dark(
+    public fun dark(
         background: Brush = SolidColor(Color.Transparent),
         backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)),
         backgroundFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(6)),
@@ -184,35 +189,38 @@ object IntUiOutlinedButtonColorFactory {
         borderFocused: Brush = SolidColor(IntUiDarkTheme.colors.grey(2)),
         borderPressed: Brush = SolidColor(IntUiDarkTheme.colors.grey(7)),
         borderHovered: Brush = SolidColor(IntUiDarkTheme.colors.grey(7)),
-    ) = ButtonColors(
-        background,
-        backgroundDisabled,
-        backgroundFocused,
-        backgroundPressed,
-        backgroundHovered,
-        content,
-        contentDisabled,
-        contentFocused,
-        contentPressed,
-        contentHovered,
-        border,
-        borderDisabled,
-        borderFocused,
-        borderPressed,
-        borderHovered,
-    )
+    ): ButtonColors =
+        ButtonColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundFocused = backgroundFocused,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentFocused = contentFocused,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            border = border,
+            borderDisabled = borderDisabled,
+            borderFocused = borderFocused,
+            borderPressed = borderPressed,
+            borderHovered = borderHovered,
+        )
 }
 
-fun ButtonMetrics.Companion.default(
+public fun ButtonMetrics.Companion.default(
     cornerSize: CornerSize = CornerSize(4.dp),
     padding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 6.dp),
     minSize: DpSize = DpSize(72.dp, 28.dp),
     borderWidth: Dp = 0.dp,
-) = ButtonMetrics(cornerSize, padding, minSize, borderWidth)
+): ButtonMetrics =
+    ButtonMetrics(cornerSize, padding, minSize, borderWidth)
 
-fun ButtonMetrics.Companion.outlined(
+public fun ButtonMetrics.Companion.outlined(
     cornerSize: CornerSize = CornerSize(4.dp),
     padding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 6.dp),
     minSize: DpSize = DpSize(72.dp, 28.dp),
     borderWidth: Dp = 1.dp,
-) = ButtonMetrics(cornerSize, padding, minSize, borderWidth)
+): ButtonMetrics =
+    ButtonMetrics(cornerSize, padding, minSize, borderWidth)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt
index 4a1b8c82fc7f7..f4729f20fcb18 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCheckboxStyling.kt
@@ -17,53 +17,60 @@ import org.jetbrains.jewel.ui.component.styling.CheckboxStyle
 import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Composable
-fun CheckboxStyle.Companion.light(
+public fun CheckboxStyle.Companion.light(
     colors: CheckboxColors = CheckboxColors.light(),
     metrics: CheckboxMetrics = CheckboxMetrics.defaults(),
     icons: CheckboxIcons = CheckboxIcons.light(),
-) = CheckboxStyle(colors, metrics, icons)
+): CheckboxStyle =
+    CheckboxStyle(colors, metrics, icons)
 
 @Composable
-fun CheckboxStyle.Companion.dark(
+public fun CheckboxStyle.Companion.dark(
     colors: CheckboxColors = CheckboxColors.dark(),
     metrics: CheckboxMetrics = CheckboxMetrics.defaults(),
     icons: CheckboxIcons = CheckboxIcons.dark(),
-) = CheckboxStyle(colors, metrics, icons)
+): CheckboxStyle =
+    CheckboxStyle(colors, metrics, icons)
 
 @Composable
-fun CheckboxColors.Companion.light(
+public fun CheckboxColors.Companion.light(
     content: Color = Color.Unspecified,
     contentDisabled: Color = IntUiLightTheme.colors.grey(8),
     contentSelected: Color = content,
-) = CheckboxColors(content, contentDisabled, contentSelected)
+): CheckboxColors =
+    CheckboxColors(content, contentDisabled, contentSelected)
 
 @Composable
-fun CheckboxColors.Companion.dark(
+public fun CheckboxColors.Companion.dark(
     content: Color = Color.Unspecified,
     contentDisabled: Color = IntUiDarkTheme.colors.grey(7),
     contentSelected: Color = content,
-) = CheckboxColors(content, contentDisabled, contentSelected)
+): CheckboxColors =
+    CheckboxColors(content, contentDisabled, contentSelected)
 
-fun CheckboxMetrics.Companion.defaults(
+public fun CheckboxMetrics.Companion.defaults(
     checkboxSize: DpSize = DpSize(19.dp, 19.dp),
     checkboxCornerSize: CornerSize = CornerSize(3.dp),
     outlineSize: DpSize = DpSize(15.dp, 15.dp),
     outlineOffset: DpOffset = DpOffset(2.5.dp, 1.5.dp),
     iconContentGap: Dp = 5.dp,
-) = CheckboxMetrics(
-    checkboxSize,
-    checkboxCornerSize,
-    outlineSize,
-    outlineOffset,
-    iconContentGap,
-)
+): CheckboxMetrics =
+    CheckboxMetrics(
+        checkboxSize,
+        checkboxCornerSize,
+        outlineSize,
+        outlineOffset,
+        iconContentGap,
+    )
 
 @Composable
-fun CheckboxIcons.Companion.light(
+public fun CheckboxIcons.Companion.light(
     checkbox: PainterProvider = standalonePainterProvider("com/intellij/ide/ui/laf/icons/intellij/checkBox.svg"),
-) = CheckboxIcons(checkbox)
+): CheckboxIcons =
+    CheckboxIcons(checkbox)
 
 @Composable
-fun CheckboxIcons.Companion.dark(
+public fun CheckboxIcons.Companion.dark(
     checkbox: PainterProvider = standalonePainterProvider("com/intellij/ide/ui/laf/icons/darcula/checkBox.svg"),
-) = CheckboxIcons(checkbox)
+): CheckboxIcons =
+    CheckboxIcons(checkbox)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt
index 97742f4eaf657..54f57bf53571b 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiChipStyling.kt
@@ -15,19 +15,19 @@ import org.jetbrains.jewel.ui.component.styling.ChipMetrics
 import org.jetbrains.jewel.ui.component.styling.ChipStyle
 
 @Composable
-fun ChipStyle.Companion.light(
+public fun ChipStyle.Companion.light(
     colors: ChipColors = ChipColors.light(),
     metrics: ChipMetrics = ChipMetrics.defaults(),
-) = ChipStyle(colors, metrics)
+): ChipStyle = ChipStyle(colors, metrics)
 
 @Composable
-fun ChipStyle.Companion.dark(
+public fun ChipStyle.Companion.dark(
     colors: ChipColors = ChipColors.dark(),
     metrics: ChipMetrics = ChipMetrics.defaults(),
-) = ChipStyle(colors, metrics)
+): ChipStyle = ChipStyle(colors, metrics)
 
 @Composable
-fun ChipColors.Companion.light(
+public fun ChipColors.Companion.light(
     background: Brush = SolidColor(IntUiLightTheme.colors.grey(14)),
     backgroundDisabled: Brush = SolidColor(IntUiLightTheme.colors.grey(12)),
     backgroundFocused: Brush = background,
@@ -58,41 +58,42 @@ fun ChipColors.Companion.light(
     borderSelectedFocused: Color = borderSelected,
     borderSelectedPressed: Color = borderSelected,
     borderSelectedHovered: Color = borderSelected,
-) = ChipColors(
-    background,
-    backgroundDisabled,
-    backgroundFocused,
-    backgroundPressed,
-    backgroundHovered,
-    backgroundSelected,
-    backgroundSelectedDisabled,
-    backgroundSelectedPressed,
-    backgroundSelectedFocused,
-    backgroundSelectedHovered,
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    contentSelected,
-    contentSelectedDisabled,
-    contentSelectedPressed,
-    contentSelectedFocused,
-    contentSelectedHovered,
-    border,
-    borderDisabled,
-    borderFocused,
-    borderPressed,
-    borderHovered,
-    borderSelected,
-    borderSelectedDisabled,
-    borderSelectedPressed,
-    borderSelectedFocused,
-    borderSelectedHovered,
-)
+): ChipColors =
+    ChipColors(
+        background = background,
+        backgroundDisabled = backgroundDisabled,
+        backgroundFocused = backgroundFocused,
+        backgroundPressed = backgroundPressed,
+        backgroundHovered = backgroundHovered,
+        backgroundSelected = backgroundSelected,
+        backgroundSelectedDisabled = backgroundSelectedDisabled,
+        backgroundSelectedPressed = backgroundSelectedPressed,
+        backgroundSelectedFocused = backgroundSelectedFocused,
+        backgroundSelectedHovered = backgroundSelectedHovered,
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        contentSelected = contentSelected,
+        contentSelectedDisabled = contentSelectedDisabled,
+        contentSelectedPressed = contentSelectedPressed,
+        contentSelectedFocused = contentSelectedFocused,
+        contentSelectedHovered = contentSelectedHovered,
+        border = border,
+        borderDisabled = borderDisabled,
+        borderFocused = borderFocused,
+        borderPressed = borderPressed,
+        borderHovered = borderHovered,
+        borderSelected = borderSelected,
+        borderSelectedDisabled = borderSelectedDisabled,
+        borderSelectedPressed = borderSelectedPressed,
+        borderSelectedFocused = borderSelectedFocused,
+        borderSelectedHovered = borderSelectedHovered,
+    )
 
 @Composable
-fun ChipColors.Companion.dark(
+public fun ChipColors.Companion.dark(
     background: Brush = SolidColor(IntUiDarkTheme.colors.grey(2)),
     backgroundDisabled: Brush = SolidColor(IntUiDarkTheme.colors.grey(5)),
     backgroundFocused: Brush = background,
@@ -123,42 +124,44 @@ fun ChipColors.Companion.dark(
     borderSelectedFocused: Color = borderSelected,
     borderSelectedPressed: Color = borderSelected,
     borderSelectedHovered: Color = borderSelected,
-) = ChipColors(
-    background,
-    backgroundDisabled,
-    backgroundFocused,
-    backgroundPressed,
-    backgroundHovered,
-    backgroundSelected,
-    backgroundSelectedDisabled,
-    backgroundSelectedPressed,
-    backgroundSelectedFocused,
-    backgroundSelectedHovered,
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    contentSelected,
-    contentSelectedDisabled,
-    contentSelectedPressed,
-    contentSelectedFocused,
-    contentSelectedHovered,
-    border,
-    borderDisabled,
-    borderFocused,
-    borderPressed,
-    borderHovered,
-    borderSelected,
-    borderSelectedDisabled,
-    borderSelectedPressed,
-    borderSelectedFocused,
-    borderSelectedHovered,
-)
+): ChipColors =
+    ChipColors(
+        background = background,
+        backgroundDisabled = backgroundDisabled,
+        backgroundFocused = backgroundFocused,
+        backgroundPressed = backgroundPressed,
+        backgroundHovered = backgroundHovered,
+        backgroundSelected = backgroundSelected,
+        backgroundSelectedDisabled = backgroundSelectedDisabled,
+        backgroundSelectedPressed = backgroundSelectedPressed,
+        backgroundSelectedFocused = backgroundSelectedFocused,
+        backgroundSelectedHovered = backgroundSelectedHovered,
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        contentSelected = contentSelected,
+        contentSelectedDisabled = contentSelectedDisabled,
+        contentSelectedPressed = contentSelectedPressed,
+        contentSelectedFocused = contentSelectedFocused,
+        contentSelectedHovered = contentSelectedHovered,
+        border = border,
+        borderDisabled = borderDisabled,
+        borderFocused = borderFocused,
+        borderPressed = borderPressed,
+        borderHovered = borderHovered,
+        borderSelected = borderSelected,
+        borderSelectedDisabled = borderSelectedDisabled,
+        borderSelectedPressed = borderSelectedPressed,
+        borderSelectedFocused = borderSelectedFocused,
+        borderSelectedHovered = borderSelectedHovered,
+    )
 
-fun ChipMetrics.Companion.defaults(
+public fun ChipMetrics.Companion.defaults(
     cornerSize: CornerSize = CornerSize(100),
     padding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 8.dp),
     borderWidth: Dp = 1.dp,
     borderWidthSelected: Dp = 2.dp,
-) = ChipMetrics(cornerSize, padding, borderWidth, borderWidthSelected)
+): ChipMetrics =
+    ChipMetrics(cornerSize, padding, borderWidth, borderWidthSelected)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyling.kt
index 8cf7ae581b3f3..81a1c4ab32663 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiCircularProgressStyling.kt
@@ -1,4 +1,7 @@
-@file:Suppress("MatchingDeclarationName", "ktlint:standard:filename") // Going for consistency with other files
+@file:Suppress(
+    "MatchingDeclarationName",
+    "ktlint:standard:filename",
+) // Going for consistency with other files
 
 package org.jetbrains.jewel.intui.standalone.styling
 
@@ -7,12 +10,14 @@ import org.jetbrains.jewel.ui.component.styling.CircularProgressStyle
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
-fun CircularProgressStyle.Companion.dark(
+public fun CircularProgressStyle.Companion.dark(
     frameTime: Duration = 125.milliseconds,
     color: Color = Color(0xFF6F737A),
-) = CircularProgressStyle(frameTime, color)
+): CircularProgressStyle =
+    CircularProgressStyle(frameTime, color)
 
-fun CircularProgressStyle.Companion.light(
+public fun CircularProgressStyle.Companion.light(
     frameTime: Duration = 125.milliseconds,
     color: Color = Color(0xFFA8ADBD),
-) = CircularProgressStyle(frameTime, color)
+): CircularProgressStyle =
+    CircularProgressStyle(frameTime, color)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDividerStyle.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDividerStyle.kt
index 3cfeaa00b2eac..8702a39538000 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDividerStyle.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDividerStyle.kt
@@ -8,13 +8,15 @@ import org.jetbrains.jewel.ui.component.styling.DividerMetrics
 import org.jetbrains.jewel.ui.component.styling.DividerStyle
 
 @Composable
-fun DividerStyle.Companion.light(
+public fun DividerStyle.Companion.light(
     color: Color = IntUiLightTheme.colors.grey(12),
     metrics: DividerMetrics = DividerMetrics.defaults(),
-) = DividerStyle(color, metrics)
+): DividerStyle =
+    DividerStyle(color, metrics)
 
 @Composable
-fun DividerStyle.Companion.dark(
+public fun DividerStyle.Companion.dark(
     color: Color = IntUiDarkTheme.colors.grey(1),
     metrics: DividerMetrics = DividerMetrics.defaults(),
-) = DividerStyle(color, metrics)
+): DividerStyle =
+    DividerStyle(color, metrics)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt
index e3f089a075a3a..dc600cfd7acdc 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiDropdownStyling.kt
@@ -20,61 +20,65 @@ import org.jetbrains.jewel.ui.component.styling.DropdownStyle
 import org.jetbrains.jewel.ui.component.styling.MenuStyle
 import org.jetbrains.jewel.ui.painter.PainterProvider
 
-val DropdownStyle.Companion.Default: IntUiDefaultDropdownStyleFactory
+public val DropdownStyle.Companion.Default: IntUiDefaultDropdownStyleFactory
     get() = IntUiDefaultDropdownStyleFactory
 
-object IntUiDefaultDropdownStyleFactory {
+public object IntUiDefaultDropdownStyleFactory {
 
     @Composable
-    fun light(
+    public fun light(
         colors: DropdownColors = DropdownColors.Default.light(),
         metrics: DropdownMetrics = DropdownMetrics.default(),
         icons: DropdownIcons = DropdownIcons.defaults(),
         textStyle: TextStyle = JewelTheme.defaultTextStyle,
         menuStyle: MenuStyle = MenuStyle.light(),
-    ) = DropdownStyle(colors, metrics, icons, textStyle, menuStyle)
+    ): DropdownStyle =
+        DropdownStyle(colors, metrics, icons, textStyle, menuStyle)
 
     @Composable
-    fun dark(
+    public fun dark(
         colors: DropdownColors = DropdownColors.Default.dark(),
         metrics: DropdownMetrics = DropdownMetrics.default(),
         icons: DropdownIcons = DropdownIcons.defaults(),
         textStyle: TextStyle = JewelTheme.defaultTextStyle,
         menuStyle: MenuStyle = MenuStyle.dark(),
-    ) = DropdownStyle(colors, metrics, icons, textStyle, menuStyle)
+    ): DropdownStyle =
+        DropdownStyle(colors, metrics, icons, textStyle, menuStyle)
 }
 
-val DropdownStyle.Companion.Undecorated: IntUiUndecoratedDropdownStyleFactory
+public val DropdownStyle.Companion.Undecorated: IntUiUndecoratedDropdownStyleFactory
     get() = IntUiUndecoratedDropdownStyleFactory
 
-object IntUiUndecoratedDropdownStyleFactory {
+public object IntUiUndecoratedDropdownStyleFactory {
 
     @Composable
-    fun light(
+    public fun light(
         colors: DropdownColors = DropdownColors.Undecorated.light(),
         metrics: DropdownMetrics = DropdownMetrics.undecorated(),
         icons: DropdownIcons = DropdownIcons.defaults(),
         textStyle: TextStyle = JewelTheme.defaultTextStyle,
         menuStyle: MenuStyle = MenuStyle.light(),
-    ) = DropdownStyle(colors, metrics, icons, textStyle, menuStyle)
+    ): DropdownStyle =
+        DropdownStyle(colors, metrics, icons, textStyle, menuStyle)
 
     @Composable
-    fun dark(
+    public fun dark(
         colors: DropdownColors = DropdownColors.Undecorated.dark(),
         metrics: DropdownMetrics = DropdownMetrics.undecorated(),
         icons: DropdownIcons = DropdownIcons.defaults(),
         textStyle: TextStyle = JewelTheme.defaultTextStyle,
         menuStyle: MenuStyle = MenuStyle.dark(),
-    ) = DropdownStyle(colors, metrics, icons, textStyle, menuStyle)
+    ): DropdownStyle =
+        DropdownStyle(colors, metrics, icons, textStyle, menuStyle)
 }
 
-val DropdownColors.Companion.Default: IntUiDefaultDropdownColorsFactory
+public val DropdownColors.Companion.Default: IntUiDefaultDropdownColorsFactory
     get() = IntUiDefaultDropdownColorsFactory
 
-object IntUiDefaultDropdownColorsFactory {
+public object IntUiDefaultDropdownColorsFactory {
 
     @Composable
-    fun light(
+    public fun light(
         background: Color = IntUiLightTheme.colors.grey(14),
         backgroundDisabled: Color = IntUiLightTheme.colors.grey(13),
         backgroundFocused: Color = background,
@@ -95,31 +99,32 @@ object IntUiDefaultDropdownColorsFactory {
         iconTintFocused: Color = iconTint,
         iconTintPressed: Color = iconTint,
         iconTintHovered: Color = iconTint,
-    ) = DropdownColors(
-        background,
-        backgroundDisabled,
-        backgroundFocused,
-        backgroundPressed,
-        backgroundHovered,
-        content,
-        contentDisabled,
-        contentFocused,
-        contentPressed,
-        contentHovered,
-        border,
-        borderDisabled,
-        borderFocused,
-        borderPressed,
-        borderHovered,
-        iconTint,
-        iconTintDisabled,
-        iconTintFocused,
-        iconTintPressed,
-        iconTintHovered,
-    )
+    ): DropdownColors =
+        DropdownColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundFocused = backgroundFocused,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentFocused = contentFocused,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            border = border,
+            borderDisabled = borderDisabled,
+            borderFocused = borderFocused,
+            borderPressed = borderPressed,
+            borderHovered = borderHovered,
+            iconTint = iconTint,
+            iconTintDisabled = iconTintDisabled,
+            iconTintFocused = iconTintFocused,
+            iconTintPressed = iconTintPressed,
+            iconTintHovered = iconTintHovered,
+        )
 
     @Composable
-    fun dark(
+    public fun dark(
         background: Color = IntUiDarkTheme.colors.grey(2),
         backgroundDisabled: Color = background,
         backgroundFocused: Color = background,
@@ -140,37 +145,38 @@ object IntUiDefaultDropdownColorsFactory {
         iconTintFocused: Color = iconTint,
         iconTintPressed: Color = iconTint,
         iconTintHovered: Color = iconTint,
-    ) = DropdownColors(
-        background,
-        backgroundDisabled,
-        backgroundFocused,
-        backgroundPressed,
-        backgroundHovered,
-        content,
-        contentDisabled,
-        contentFocused,
-        contentPressed,
-        contentHovered,
-        border,
-        borderDisabled,
-        borderFocused,
-        borderPressed,
-        borderHovered,
-        iconTint,
-        iconTintDisabled,
-        iconTintFocused,
-        iconTintPressed,
-        iconTintHovered,
-    )
+    ): DropdownColors =
+        DropdownColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundFocused = backgroundFocused,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentFocused = contentFocused,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            border = border,
+            borderDisabled = borderDisabled,
+            borderFocused = borderFocused,
+            borderPressed = borderPressed,
+            borderHovered = borderHovered,
+            iconTint = iconTint,
+            iconTintDisabled = iconTintDisabled,
+            iconTintFocused = iconTintFocused,
+            iconTintPressed = iconTintPressed,
+            iconTintHovered = iconTintHovered,
+        )
 }
 
-val DropdownColors.Companion.Undecorated: IntUiUndecoratedDropdownColorsFactory
+public val DropdownColors.Companion.Undecorated: IntUiUndecoratedDropdownColorsFactory
     get() = IntUiUndecoratedDropdownColorsFactory
 
-object IntUiUndecoratedDropdownColorsFactory {
+public object IntUiUndecoratedDropdownColorsFactory {
 
     @Composable
-    fun light(
+    public fun light(
         background: Color = Color.Transparent,
         backgroundDisabled: Color = background,
         backgroundFocused: Color = background,
@@ -186,31 +192,32 @@ object IntUiUndecoratedDropdownColorsFactory {
         iconTintFocused: Color = iconTint,
         iconTintPressed: Color = iconTint,
         iconTintHovered: Color = iconTint,
-    ) = DropdownColors(
-        background,
-        backgroundDisabled,
-        backgroundFocused,
-        backgroundPressed,
-        backgroundHovered,
-        content,
-        contentDisabled,
-        contentFocused,
-        contentPressed,
-        contentHovered,
-        border = Color.Transparent,
-        borderDisabled = Color.Transparent,
-        borderFocused = Color.Transparent,
-        borderPressed = Color.Transparent,
-        borderHovered = Color.Transparent,
-        iconTint,
-        iconTintDisabled,
-        iconTintFocused,
-        iconTintPressed,
-        iconTintHovered,
-    )
+    ): DropdownColors =
+        DropdownColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundFocused = backgroundFocused,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentFocused = contentFocused,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            border = Color.Transparent,
+            borderDisabled = Color.Transparent,
+            borderFocused = Color.Transparent,
+            borderPressed = Color.Transparent,
+            borderHovered = Color.Transparent,
+            iconTint = iconTint,
+            iconTintDisabled = iconTintDisabled,
+            iconTintFocused = iconTintFocused,
+            iconTintPressed = iconTintPressed,
+            iconTintHovered = iconTintHovered,
+        )
 
     @Composable
-    fun dark(
+    public fun dark(
         background: Color = Color.Transparent,
         backgroundDisabled: Color = background,
         backgroundFocused: Color = background,
@@ -226,58 +233,50 @@ object IntUiUndecoratedDropdownColorsFactory {
         iconTintFocused: Color = iconTint,
         iconTintPressed: Color = iconTint,
         iconTintHovered: Color = iconTint,
-    ) = DropdownColors(
-        background,
-        backgroundDisabled,
-        backgroundFocused,
-        backgroundPressed,
-        backgroundHovered,
-        content,
-        contentDisabled,
-        contentFocused,
-        contentPressed,
-        contentHovered,
-        border = Color.Transparent,
-        borderDisabled = Color.Transparent,
-        borderFocused = Color.Transparent,
-        borderPressed = Color.Transparent,
-        borderHovered = Color.Transparent,
-        iconTint,
-        iconTintDisabled,
-        iconTintFocused,
-        iconTintPressed,
-        iconTintHovered,
-    )
+    ): DropdownColors =
+        DropdownColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundFocused = backgroundFocused,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentFocused = contentFocused,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            border = Color.Transparent,
+            borderDisabled = Color.Transparent,
+            borderFocused = Color.Transparent,
+            borderPressed = Color.Transparent,
+            borderHovered = Color.Transparent,
+            iconTint = iconTint,
+            iconTintDisabled = iconTintDisabled,
+            iconTintFocused = iconTintFocused,
+            iconTintPressed = iconTintPressed,
+            iconTintHovered = iconTintHovered,
+        )
 }
 
-fun DropdownMetrics.Companion.default(
+public fun DropdownMetrics.Companion.default(
     arrowMinSize: DpSize = DpSize((23 + 3).dp, 24.dp),
     minSize: DpSize = DpSize((49 + 23 + 6).dp, 24.dp),
     cornerSize: CornerSize = CornerSize(4.dp),
     contentPadding: PaddingValues = PaddingValues(horizontal = 6.dp, vertical = 3.dp),
     borderWidth: Dp = 1.dp,
-) = DropdownMetrics(
-    arrowMinSize,
-    minSize,
-    cornerSize,
-    contentPadding,
-    borderWidth,
-)
+): DropdownMetrics =
+    DropdownMetrics(arrowMinSize, minSize, cornerSize, contentPadding, borderWidth)
 
-fun DropdownMetrics.Companion.undecorated(
+public fun DropdownMetrics.Companion.undecorated(
     arrowMinSize: DpSize = DpSize((23 + 3).dp, 24.dp),
     minSize: DpSize = DpSize((49 + 23 + 6).dp, 24.dp),
     cornerSize: CornerSize = CornerSize(4.dp),
     contentPadding: PaddingValues = PaddingValues(horizontal = 6.dp, vertical = 3.dp),
     borderWidth: Dp = 0.dp,
-) = DropdownMetrics(
-    arrowMinSize,
-    minSize,
-    cornerSize,
-    contentPadding,
-    borderWidth,
-)
+): DropdownMetrics =
+    DropdownMetrics(arrowMinSize, minSize, cornerSize, contentPadding, borderWidth)
 
-fun DropdownIcons.Companion.defaults(
+public fun DropdownIcons.Companion.defaults(
     chevronDown: PainterProvider = standalonePainterProvider("expui/general/chevronDown.svg"),
-) = DropdownIcons(chevronDown)
+): DropdownIcons =
+    DropdownIcons(chevronDown)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt
index a5e1ffc1a4d3c..f5431e6e719bf 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiGroupHeaderStyling.kt
@@ -11,28 +11,33 @@ import org.jetbrains.jewel.ui.component.styling.GroupHeaderMetrics
 import org.jetbrains.jewel.ui.component.styling.GroupHeaderStyle
 
 @Composable
-fun GroupHeaderStyle.Companion.light(
+public fun GroupHeaderStyle.Companion.light(
     colors: GroupHeaderColors = GroupHeaderColors.light(),
     metrics: GroupHeaderMetrics = GroupHeaderMetrics.defaults(),
-) = GroupHeaderStyle(colors, metrics)
+): GroupHeaderStyle =
+    GroupHeaderStyle(colors, metrics)
 
 @Composable
-fun GroupHeaderStyle.Companion.dark(
+public fun GroupHeaderStyle.Companion.dark(
     colors: GroupHeaderColors = GroupHeaderColors.dark(),
     metrics: GroupHeaderMetrics = GroupHeaderMetrics.defaults(),
-) = GroupHeaderStyle(colors, metrics)
+): GroupHeaderStyle =
+    GroupHeaderStyle(colors, metrics)
 
 @Composable
-fun GroupHeaderColors.Companion.light(
+public fun GroupHeaderColors.Companion.light(
     divider: Color = IntUiLightTheme.colors.grey(12),
-) = GroupHeaderColors(divider)
+): GroupHeaderColors =
+    GroupHeaderColors(divider)
 
 @Composable
-fun GroupHeaderColors.Companion.dark(
+public fun GroupHeaderColors.Companion.dark(
     divider: Color = IntUiDarkTheme.colors.grey(3),
-) = GroupHeaderColors(divider)
+): GroupHeaderColors =
+    GroupHeaderColors(divider)
 
-fun GroupHeaderMetrics.Companion.defaults(
+public fun GroupHeaderMetrics.Companion.defaults(
     dividerThickness: Dp = 1.dp,
     indent: Dp = 8.dp,
-) = GroupHeaderMetrics(dividerThickness, indent)
+): GroupHeaderMetrics =
+    GroupHeaderMetrics(dividerThickness, indent)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt
index ca5fd961c37e2..a935bc8196daa 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiHorizontalProgressBarStyling.kt
@@ -14,51 +14,52 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
 @Composable
-fun HorizontalProgressBarStyle.Companion.light(
+public fun HorizontalProgressBarStyle.Companion.light(
     colors: HorizontalProgressBarColors = HorizontalProgressBarColors.light(),
     metrics: HorizontalProgressBarMetrics = HorizontalProgressBarMetrics.defaults(),
     indeterminateCycleDuration: Duration = 800.milliseconds,
-) = HorizontalProgressBarStyle(colors, metrics, indeterminateCycleDuration)
+): HorizontalProgressBarStyle =
+    HorizontalProgressBarStyle(colors, metrics, indeterminateCycleDuration)
 
 @Composable
-fun HorizontalProgressBarStyle.Companion.dark(
+public fun HorizontalProgressBarStyle.Companion.dark(
     colors: HorizontalProgressBarColors = HorizontalProgressBarColors.dark(),
     metrics: HorizontalProgressBarMetrics = HorizontalProgressBarMetrics.defaults(),
     indeterminateCycleDuration: Duration = 800.milliseconds,
-) = HorizontalProgressBarStyle(colors, metrics, indeterminateCycleDuration)
+): HorizontalProgressBarStyle =
+    HorizontalProgressBarStyle(colors, metrics, indeterminateCycleDuration)
 
 @Composable
-fun HorizontalProgressBarColors.Companion.light(
+public fun HorizontalProgressBarColors.Companion.light(
     track: Color = IntUiLightTheme.colors.grey(11),
     progress: Color = IntUiLightTheme.colors.blue(4),
     indeterminateBase: Color = IntUiLightTheme.colors.blue(9),
     indeterminateHighlight: Color = IntUiLightTheme.colors.blue(4),
-) = HorizontalProgressBarColors(
-    track,
-    progress,
-    indeterminateBase,
-    indeterminateHighlight,
-)
+): HorizontalProgressBarColors =
+    HorizontalProgressBarColors(
+        track = track,
+        progress = progress,
+        indeterminateBase = indeterminateBase,
+        indeterminateHighlight = indeterminateHighlight,
+    )
 
 @Composable
-fun HorizontalProgressBarColors.Companion.dark(
+public fun HorizontalProgressBarColors.Companion.dark(
     track: Color = IntUiDarkTheme.colors.grey(4),
     progress: Color = IntUiDarkTheme.colors.blue(7),
     indeterminateBase: Color = IntUiDarkTheme.colors.blue(9),
     indeterminateHighlight: Color = IntUiDarkTheme.colors.blue(5),
-) = HorizontalProgressBarColors(
-    track,
-    progress,
-    indeterminateBase,
-    indeterminateHighlight,
-)
+): HorizontalProgressBarColors =
+    HorizontalProgressBarColors(
+        track = track,
+        progress = progress,
+        indeterminateBase = indeterminateBase,
+        indeterminateHighlight = indeterminateHighlight,
+    )
 
-fun HorizontalProgressBarMetrics.Companion.defaults(
+public fun HorizontalProgressBarMetrics.Companion.defaults(
     cornerSize: CornerSize = CornerSize(100),
     minHeight: Dp = 4.dp,
     indeterminateHighlightWidth: Dp = 140.dp,
-) = HorizontalProgressBarMetrics(
-    cornerSize,
-    minHeight,
-    indeterminateHighlightWidth,
-)
+): HorizontalProgressBarMetrics =
+    HorizontalProgressBarMetrics(cornerSize, minHeight, indeterminateHighlightWidth)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiIconButtonStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiIconButtonStyling.kt
index aed40e0d06203..4ecae089bdbab 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiIconButtonStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiIconButtonStyling.kt
@@ -14,19 +14,21 @@ import org.jetbrains.jewel.ui.component.styling.IconButtonMetrics
 import org.jetbrains.jewel.ui.component.styling.IconButtonStyle
 
 @Composable
-fun IconButtonStyle.Companion.light(
+public fun IconButtonStyle.Companion.light(
     colors: IconButtonColors = IconButtonColors.light(),
     metrics: IconButtonMetrics = IconButtonMetrics.defaults(),
-) = IconButtonStyle(colors, metrics)
+): IconButtonStyle =
+    IconButtonStyle(colors, metrics)
 
 @Composable
-fun IconButtonStyle.Companion.dark(
+public fun IconButtonStyle.Companion.dark(
     colors: IconButtonColors = IconButtonColors.dark(),
     metrics: IconButtonMetrics = IconButtonMetrics.defaults(),
-) = IconButtonStyle(colors, metrics)
+): IconButtonStyle =
+    IconButtonStyle(colors, metrics)
 
 @Composable
-fun IconButtonColors.Companion.light(
+public fun IconButtonColors.Companion.light(
     foregroundSelectedActivated: Color = IntUiLightTheme.colors.grey(14),
     background: Color = Color.Unspecified,
     backgroundDisabled: Color = background,
@@ -42,7 +44,7 @@ fun IconButtonColors.Companion.light(
     borderFocused: Color = backgroundFocused,
     borderPressed: Color = backgroundPressed,
     borderHovered: Color = backgroundHovered,
-) =
+): IconButtonColors =
     IconButtonColors(
         foregroundSelectedActivated = foregroundSelectedActivated,
         background = background,
@@ -62,7 +64,7 @@ fun IconButtonColors.Companion.light(
     )
 
 @Composable
-fun IconButtonColors.Companion.dark(
+public fun IconButtonColors.Companion.dark(
     foregroundSelectedActivated: Color = IntUiDarkTheme.colors.grey(14),
     background: Color = Color.Unspecified,
     backgroundDisabled: Color = background,
@@ -78,7 +80,7 @@ fun IconButtonColors.Companion.dark(
     borderFocused: Color = backgroundFocused,
     borderPressed: Color = backgroundPressed,
     borderHovered: Color = backgroundHovered,
-) =
+): IconButtonColors =
     IconButtonColors(
         foregroundSelectedActivated = foregroundSelectedActivated,
         background = background,
@@ -97,9 +99,10 @@ fun IconButtonColors.Companion.dark(
         borderHovered = borderHovered,
     )
 
-fun IconButtonMetrics.Companion.defaults(
+public fun IconButtonMetrics.Companion.defaults(
     cornerSize: CornerSize = CornerSize(4.dp),
     borderWidth: Dp = 1.dp,
     padding: PaddingValues = PaddingValues(0.dp),
     minSize: DpSize = DpSize(16.dp, 16.dp),
-) = IconButtonMetrics(cornerSize, borderWidth, padding, minSize)
+): IconButtonMetrics =
+    IconButtonMetrics(cornerSize, borderWidth, padding, minSize)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt
index 7dac76e4c840f..2a44e456db018 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLazyTreeStyling.kt
@@ -16,21 +16,23 @@ import org.jetbrains.jewel.ui.component.styling.LazyTreeStyle
 import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Composable
-fun LazyTreeStyle.Companion.light(
+public fun LazyTreeStyle.Companion.light(
     colors: LazyTreeColors = LazyTreeColors.light(),
     metrics: LazyTreeMetrics = LazyTreeMetrics.defaults(),
     icons: LazyTreeIcons = LazyTreeIcons.defaults(),
-) = LazyTreeStyle(colors, metrics, icons)
+): LazyTreeStyle =
+    LazyTreeStyle(colors, metrics, icons)
 
 @Composable
-fun LazyTreeStyle.Companion.dark(
+public fun LazyTreeStyle.Companion.dark(
     colors: LazyTreeColors = LazyTreeColors.dark(),
     metrics: LazyTreeMetrics = LazyTreeMetrics.defaults(),
     icons: LazyTreeIcons = LazyTreeIcons.defaults(),
-) = LazyTreeStyle(colors, metrics, icons)
+): LazyTreeStyle =
+    LazyTreeStyle(colors, metrics, icons)
 
 @Composable
-fun LazyTreeColors.Companion.light(
+public fun LazyTreeColors.Companion.light(
     content: Color = Color.Unspecified,
     contentFocused: Color = content,
     contentSelected: Color = content,
@@ -38,18 +40,19 @@ fun LazyTreeColors.Companion.light(
     nodeBackgroundFocused: Color = Color.Unspecified,
     nodeBackgroundSelected: Color = IntUiLightTheme.colors.grey(11),
     nodeBackgroundSelectedFocused: Color = IntUiLightTheme.colors.blue(11),
-) = LazyTreeColors(
-    content,
-    contentFocused,
-    contentSelected,
-    contentSelectedFocused,
-    nodeBackgroundFocused,
-    nodeBackgroundSelected,
-    nodeBackgroundSelectedFocused,
-)
+): LazyTreeColors =
+    LazyTreeColors(
+        elementBackgroundFocused = content,
+        elementBackgroundSelected = contentFocused,
+        elementBackgroundSelectedFocused = contentSelected,
+        content = contentSelectedFocused,
+        contentFocused = nodeBackgroundFocused,
+        contentSelected = nodeBackgroundSelected,
+        contentSelectedFocused = nodeBackgroundSelectedFocused,
+    )
 
 @Composable
-fun LazyTreeColors.Companion.dark(
+public fun LazyTreeColors.Companion.dark(
     content: Color = Color.Unspecified,
     contentFocused: Color = content,
     contentSelected: Color = content,
@@ -57,40 +60,43 @@ fun LazyTreeColors.Companion.dark(
     nodeBackgroundFocused: Color = Color.Unspecified,
     nodeBackgroundSelected: Color = IntUiDarkTheme.colors.grey(4),
     nodeBackgroundSelectedFocused: Color = IntUiDarkTheme.colors.blue(2),
-) = LazyTreeColors(
-    content,
-    contentFocused,
-    contentSelected,
-    contentSelectedFocused,
-    nodeBackgroundFocused,
-    nodeBackgroundSelected,
-    nodeBackgroundSelectedFocused,
-)
+): LazyTreeColors =
+    LazyTreeColors(
+        elementBackgroundFocused = content,
+        elementBackgroundSelected = contentFocused,
+        elementBackgroundSelectedFocused = contentSelected,
+        content = contentSelectedFocused,
+        contentFocused = nodeBackgroundFocused,
+        contentSelected = nodeBackgroundSelected,
+        contentSelectedFocused = nodeBackgroundSelectedFocused,
+    )
 
-fun LazyTreeMetrics.Companion.defaults(
+public fun LazyTreeMetrics.Companion.defaults(
     indentSize: Dp = 7.dp + 16.dp,
     elementBackgroundCornerSize: CornerSize = CornerSize(2.dp),
     elementPadding: PaddingValues = PaddingValues(horizontal = 12.dp),
     elementContentPadding: PaddingValues = PaddingValues(4.dp),
     elementMinHeight: Dp = 24.dp,
     chevronContentGap: Dp = 2.dp,
-) = LazyTreeMetrics(
-    indentSize,
-    elementBackgroundCornerSize,
-    elementPadding,
-    elementContentPadding,
-    elementMinHeight,
-    chevronContentGap,
-)
+): LazyTreeMetrics =
+    LazyTreeMetrics(
+        indentSize,
+        elementBackgroundCornerSize,
+        elementPadding,
+        elementContentPadding,
+        elementMinHeight,
+        chevronContentGap,
+    )
 
-fun LazyTreeIcons.Companion.defaults(
+public fun LazyTreeIcons.Companion.defaults(
     chevronCollapsed: PainterProvider = standalonePainterProvider("expui/general/chevronRight.svg"),
     chevronExpanded: PainterProvider = standalonePainterProvider("expui/general/chevronDown.svg"),
     chevronSelectedCollapsed: PainterProvider = chevronCollapsed,
     chevronSelectedExpanded: PainterProvider = chevronExpanded,
-) = LazyTreeIcons(
-    chevronCollapsed,
-    chevronExpanded,
-    chevronSelectedCollapsed,
-    chevronSelectedExpanded,
-)
+): LazyTreeIcons =
+    LazyTreeIcons(
+        chevronCollapsed,
+        chevronExpanded,
+        chevronSelectedCollapsed,
+        chevronSelectedExpanded,
+    )
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt
index cc95ecfc67186..4e06d48fefccb 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiLinkStyling.kt
@@ -21,68 +21,74 @@ import org.jetbrains.jewel.ui.component.styling.LinkTextStyles
 import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Composable
-fun LinkStyle.Companion.light(
+public fun LinkStyle.Companion.light(
     colors: LinkColors = LinkColors.light(),
     metrics: LinkMetrics = LinkMetrics.defaults(),
     icons: LinkIcons = LinkIcons.defaults(),
     textStyles: LinkTextStyles = LinkTextStyles.light(),
-) = LinkStyle(colors, metrics, icons, textStyles)
+): LinkStyle =
+    LinkStyle(colors, metrics, icons, textStyles)
 
 @Composable
-fun LinkStyle.Companion.dark(
+public fun LinkStyle.Companion.dark(
     colors: LinkColors = LinkColors.dark(),
     metrics: LinkMetrics = LinkMetrics.defaults(),
     icons: LinkIcons = LinkIcons.defaults(),
     textStyles: LinkTextStyles = LinkTextStyles.dark(),
-) = LinkStyle(colors, metrics, icons, textStyles)
+): LinkStyle =
+    LinkStyle(colors, metrics, icons, textStyles)
 
 @Composable
-fun LinkColors.Companion.light(
+public fun LinkColors.Companion.light(
     content: Color = IntUiLightTheme.colors.blue(2),
     contentDisabled: Color = IntUiLightTheme.colors.grey(8),
     contentFocused: Color = content,
     contentPressed: Color = content,
     contentHovered: Color = content,
     contentVisited: Color = content,
-) = LinkColors(
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    contentVisited,
-)
+): LinkColors =
+    LinkColors(
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        contentVisited = contentVisited,
+    )
 
 @Composable
-fun LinkColors.Companion.dark(
+public fun LinkColors.Companion.dark(
     content: Color = IntUiDarkTheme.colors.blue(9),
     contentDisabled: Color = IntUiDarkTheme.colors.grey(7),
     contentFocused: Color = content,
     contentPressed: Color = content,
     contentHovered: Color = content,
     contentVisited: Color = content,
-) = LinkColors(
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    contentVisited,
-)
+): LinkColors =
+    LinkColors(
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        contentVisited = contentVisited,
+    )
 
-fun LinkMetrics.Companion.defaults(
+public fun LinkMetrics.Companion.defaults(
     focusHaloCornerSize: CornerSize = CornerSize(2.dp),
     textIconGap: Dp = 0.dp,
     iconSize: DpSize = DpSize(16.dp, 16.dp),
-) = LinkMetrics(focusHaloCornerSize, textIconGap, iconSize)
+): LinkMetrics =
+    LinkMetrics(focusHaloCornerSize, textIconGap, iconSize)
 
-fun LinkIcons.Companion.defaults(
+public fun LinkIcons.Companion.defaults(
     dropdownChevron: PainterProvider = standalonePainterProvider("expui/general/chevronDown.svg"),
     externalLink: PainterProvider = standalonePainterProvider("expui/ide/externalLink.svg"),
-) = LinkIcons(dropdownChevron, externalLink)
+): LinkIcons =
+    LinkIcons(dropdownChevron, externalLink)
 
 @Composable
-fun LinkTextStyles.Companion.light(
+public fun LinkTextStyles.Companion.light(
     normal: TextStyle = JewelTheme.defaultTextStyle.copy(textDecoration = TextDecoration.Underline),
     disabled: TextStyle = JewelTheme.defaultTextStyle,
     focused: TextStyle = normal,
@@ -93,7 +99,7 @@ fun LinkTextStyles.Companion.light(
     LinkTextStyles(normal, disabled, focused, pressed, hovered, visited)
 
 @Composable
-fun LinkTextStyles.Companion.dark(
+public fun LinkTextStyles.Companion.dark(
     normal: TextStyle = JewelTheme.defaultTextStyle.copy(textDecoration = TextDecoration.Underline),
     disabled: TextStyle = JewelTheme.defaultTextStyle,
     focused: TextStyle = normal,
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt
index 0f1629198de03..2eac84e45c3db 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiMenuStyling.kt
@@ -20,47 +20,51 @@ import org.jetbrains.jewel.ui.component.styling.SubmenuMetrics
 import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Composable
-fun MenuStyle.Companion.light(
+public fun MenuStyle.Companion.light(
     colors: MenuColors = MenuColors.light(),
     metrics: MenuMetrics = MenuMetrics.defaults(),
     icons: MenuIcons = MenuIcons.defaults(),
-) = MenuStyle(
-    isDark = false,
-    colors = colors,
-    metrics = metrics,
-    icons = icons,
-)
+): MenuStyle =
+    MenuStyle(isDark = false, colors, metrics, icons)
 
 @Composable
-fun MenuStyle.Companion.dark(
+public fun MenuStyle.Companion.dark(
     colors: MenuColors = MenuColors.dark(),
     metrics: MenuMetrics = MenuMetrics.defaults(),
     icons: MenuIcons = MenuIcons.defaults(),
-) = MenuStyle(
-    isDark = true,
-    colors = colors,
-    metrics = metrics,
-    icons = icons,
-)
+): MenuStyle =
+    MenuStyle(isDark = true, colors, metrics, icons)
 
 @Composable
-fun MenuColors.Companion.light(
+public fun MenuColors.Companion.light(
     background: Color = IntUiLightTheme.colors.grey(14),
     border: Color = IntUiLightTheme.colors.grey(9),
     shadow: Color = Color(0x78919191), // Not a palette color
     itemColors: MenuItemColors = MenuItemColors.light(),
-) = MenuColors(background, border, shadow, itemColors)
+): MenuColors =
+    MenuColors(
+        background = background,
+        border = border,
+        shadow = shadow,
+        itemColors = itemColors,
+    )
 
 @Composable
-fun MenuColors.Companion.dark(
+public fun MenuColors.Companion.dark(
     background: Color = IntUiDarkTheme.colors.grey(2),
     border: Color = IntUiDarkTheme.colors.grey(3),
     shadow: Color = Color(0x66000000), // Not a palette color
     itemColors: MenuItemColors = MenuItemColors.dark(),
-) = MenuColors(background, border, shadow, itemColors)
+): MenuColors =
+    MenuColors(
+        background = background,
+        border = border,
+        shadow = shadow,
+        itemColors = itemColors,
+    )
 
 @Composable
-fun MenuItemColors.Companion.light(
+public fun MenuItemColors.Companion.light(
     background: Color = IntUiLightTheme.colors.grey(14),
     backgroundDisabled: Color = IntUiLightTheme.colors.grey(14),
     backgroundFocused: Color = IntUiLightTheme.colors.blue(11),
@@ -77,27 +81,28 @@ fun MenuItemColors.Companion.light(
     iconTintPressed: Color = iconTint,
     iconTintHovered: Color = iconTint,
     separator: Color = IntUiLightTheme.colors.grey(12),
-) = MenuItemColors(
-    background,
-    backgroundDisabled,
-    backgroundFocused,
-    backgroundPressed,
-    backgroundHovered,
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    iconTint,
-    iconTintDisabled,
-    iconTintFocused,
-    iconTintPressed,
-    iconTintHovered,
-    separator,
-)
+): MenuItemColors =
+    MenuItemColors(
+        background = background,
+        backgroundDisabled = backgroundDisabled,
+        backgroundFocused = backgroundFocused,
+        backgroundPressed = backgroundPressed,
+        backgroundHovered = backgroundHovered,
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        iconTint = iconTint,
+        iconTintDisabled = iconTintDisabled,
+        iconTintFocused = iconTintFocused,
+        iconTintPressed = iconTintPressed,
+        iconTintHovered = iconTintHovered,
+        separator = separator,
+    )
 
 @Composable
-fun MenuItemColors.Companion.dark(
+public fun MenuItemColors.Companion.dark(
     background: Color = IntUiDarkTheme.colors.grey(2),
     backgroundDisabled: Color = IntUiDarkTheme.colors.grey(2),
     backgroundFocused: Color = IntUiDarkTheme.colors.blue(2),
@@ -114,26 +119,27 @@ fun MenuItemColors.Companion.dark(
     iconTintPressed: Color = iconTint,
     iconTintHovered: Color = iconTint,
     separator: Color = IntUiDarkTheme.colors.grey(3),
-) = MenuItemColors(
-    background,
-    backgroundDisabled,
-    backgroundFocused,
-    backgroundPressed,
-    backgroundHovered,
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    iconTint,
-    iconTintDisabled,
-    iconTintFocused,
-    iconTintPressed,
-    iconTintHovered,
-    separator,
-)
+): MenuItemColors =
+    MenuItemColors(
+        background = background,
+        backgroundDisabled = backgroundDisabled,
+        backgroundFocused = backgroundFocused,
+        backgroundPressed = backgroundPressed,
+        backgroundHovered = backgroundHovered,
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        iconTint = iconTint,
+        iconTintDisabled = iconTintDisabled,
+        iconTintFocused = iconTintFocused,
+        iconTintPressed = iconTintPressed,
+        iconTintHovered = iconTintHovered,
+        separator = separator,
+    )
 
-fun MenuMetrics.Companion.defaults(
+public fun MenuMetrics.Companion.defaults(
     cornerSize: CornerSize = CornerSize(8.dp),
     menuMargin: PaddingValues = PaddingValues(vertical = 6.dp),
     contentPadding: PaddingValues = PaddingValues(vertical = 8.dp),
@@ -142,35 +148,39 @@ fun MenuMetrics.Companion.defaults(
     borderWidth: Dp = 1.dp,
     itemMetrics: MenuItemMetrics = MenuItemMetrics.defaults(),
     submenuMetrics: SubmenuMetrics = SubmenuMetrics.defaults(),
-) = MenuMetrics(
-    cornerSize,
-    menuMargin,
-    contentPadding,
-    offset,
-    shadowSize,
-    borderWidth,
-    itemMetrics,
-    submenuMetrics,
-)
+): MenuMetrics =
+    MenuMetrics(
+        cornerSize,
+        menuMargin,
+        contentPadding,
+        offset,
+        shadowSize,
+        borderWidth,
+        itemMetrics,
+        submenuMetrics,
+    )
 
-fun MenuItemMetrics.Companion.defaults(
+public fun MenuItemMetrics.Companion.defaults(
     selectionCornerSize: CornerSize = CornerSize(4.dp),
     outerPadding: PaddingValues = PaddingValues(horizontal = 4.dp),
     contentPadding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
     separatorPadding: PaddingValues = PaddingValues(horizontal = 12.dp, vertical = 4.dp),
     separatorThickness: Dp = 1.dp,
-) = MenuItemMetrics(
-    selectionCornerSize,
-    outerPadding,
-    contentPadding,
-    separatorPadding,
-    separatorThickness,
-)
+): MenuItemMetrics =
+    MenuItemMetrics(
+        selectionCornerSize,
+        outerPadding,
+        contentPadding,
+        separatorPadding,
+        separatorThickness,
+    )
 
-fun SubmenuMetrics.Companion.defaults(
+public fun SubmenuMetrics.Companion.defaults(
     offset: DpOffset = DpOffset(0.dp, (-8).dp),
-) = SubmenuMetrics(offset)
+): SubmenuMetrics =
+    SubmenuMetrics(offset)
 
-fun MenuIcons.Companion.defaults(
+public fun MenuIcons.Companion.defaults(
     submenuChevron: PainterProvider = standalonePainterProvider("expui/general/chevronRight.svg"),
-) = MenuIcons(submenuChevron)
+): MenuIcons =
+    MenuIcons(submenuChevron)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt
index f6a3f0bd32632..0f683234ce248 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiRadioButtonStyling.kt
@@ -15,62 +15,71 @@ import org.jetbrains.jewel.ui.component.styling.RadioButtonStyle
 import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Composable
-fun RadioButtonStyle.Companion.light(
+public fun RadioButtonStyle.Companion.light(
     colors: RadioButtonColors = RadioButtonColors.light(),
     metrics: RadioButtonMetrics = RadioButtonMetrics.defaults(),
     icons: RadioButtonIcons = RadioButtonIcons.light(),
-) = RadioButtonStyle(colors, metrics, icons)
+): RadioButtonStyle =
+    RadioButtonStyle(colors, metrics, icons)
 
 @Composable
-fun RadioButtonStyle.Companion.dark(
+public fun RadioButtonStyle.Companion.dark(
     colors: RadioButtonColors = RadioButtonColors.dark(),
     metrics: RadioButtonMetrics = RadioButtonMetrics.defaults(),
     icons: RadioButtonIcons = RadioButtonIcons.dark(),
-) = RadioButtonStyle(colors, metrics, icons)
+): RadioButtonStyle =
+    RadioButtonStyle(colors, metrics, icons)
 
 @Composable
-fun RadioButtonColors.Companion.light(
+public fun RadioButtonColors.Companion.light(
     content: Color = Color.Unspecified,
     contentHovered: Color = content,
     contentDisabled: Color = IntUiLightTheme.colors.grey(8),
     contentSelected: Color = content,
     contentSelectedHovered: Color = content,
     contentSelectedDisabled: Color = contentDisabled,
-) = RadioButtonColors(
-    content,
-    contentHovered,
-    contentDisabled,
-    contentSelected,
-    contentSelectedHovered,
-    contentSelectedDisabled,
-)
+): RadioButtonColors =
+    RadioButtonColors(
+        content = content,
+        contentHovered = contentHovered,
+        contentDisabled = contentDisabled,
+        contentSelected = contentSelected,
+        contentSelectedHovered = contentSelectedHovered,
+        contentSelectedDisabled = contentSelectedDisabled,
+    )
 
 @Composable
-fun RadioButtonColors.Companion.dark(
+public fun RadioButtonColors.Companion.dark(
     content: Color = Color.Unspecified,
     contentHovered: Color = content,
     contentDisabled: Color = IntUiDarkTheme.colors.grey(8),
     contentSelected: Color = content,
     contentSelectedHovered: Color = content,
     contentSelectedDisabled: Color = contentDisabled,
-) = RadioButtonColors(
-    content,
-    contentHovered,
-    contentDisabled,
-    contentSelected,
-    contentSelectedHovered,
-    contentSelectedDisabled,
-)
+): RadioButtonColors =
+    RadioButtonColors(
+        content = content,
+        contentHovered = contentHovered,
+        contentDisabled = contentDisabled,
+        contentSelected = contentSelected,
+        contentSelectedHovered = contentSelectedHovered,
+        contentSelectedDisabled = contentSelectedDisabled,
+    )
 
-fun RadioButtonMetrics.Companion.defaults(
+public fun RadioButtonMetrics.Companion.defaults(
     radioButtonSize: DpSize = DpSize(19.dp, 19.dp),
     iconContentGap: Dp = 8.dp,
-) = RadioButtonMetrics(radioButtonSize, iconContentGap)
+): RadioButtonMetrics =
+    RadioButtonMetrics(radioButtonSize, iconContentGap)
 
-fun RadioButtonIcons.Companion.light(
-    radioButton: PainterProvider = standalonePainterProvider("com/intellij/ide/ui/laf/icons/intellij/radio.svg"),
-) = RadioButtonIcons(radioButton)
+public fun RadioButtonIcons.Companion.light(
+    radioButton: PainterProvider =
+        standalonePainterProvider("com/intellij/ide/ui/laf/icons/intellij/radio.svg"),
+): RadioButtonIcons =
+    RadioButtonIcons(radioButton)
 
-fun RadioButtonIcons.Companion.dark(
-    radioButton: PainterProvider = standalonePainterProvider("com/intellij/ide/ui/laf/icons/darcula/radio.svg"),
-) = RadioButtonIcons(radioButton)
+public fun RadioButtonIcons.Companion.dark(
+    radioButton: PainterProvider =
+        standalonePainterProvider("com/intellij/ide/ui/laf/icons/darcula/radio.svg"),
+): RadioButtonIcons =
+    RadioButtonIcons(radioButton)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt
index be4c914f18d60..f55ccf83c9292 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiScrollbarStyling.kt
@@ -13,39 +13,39 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
 @Composable
-fun ScrollbarStyle.Companion.light(
+public fun ScrollbarStyle.Companion.light(
     colors: ScrollbarColors = ScrollbarColors.light(),
     metrics: ScrollbarMetrics = ScrollbarMetrics.defaults(),
     hoverDuration: Duration = 300.milliseconds,
-) = ScrollbarStyle(colors, metrics, hoverDuration)
+): ScrollbarStyle =
+    ScrollbarStyle(colors, metrics, hoverDuration)
 
 @Composable
-fun ScrollbarStyle.Companion.dark(
+public fun ScrollbarStyle.Companion.dark(
     colors: ScrollbarColors = ScrollbarColors.dark(),
     metrics: ScrollbarMetrics = ScrollbarMetrics.defaults(),
     hoverDuration: Duration = 300.milliseconds,
-) = ScrollbarStyle(colors, metrics, hoverDuration)
+): ScrollbarStyle =
+    ScrollbarStyle(colors, metrics, hoverDuration)
 
 @Composable
-fun ScrollbarColors.Companion.light(
+public fun ScrollbarColors.Companion.light(
     thumbBackground: Color = Color(0x33000000),
     thumbBackgroundHovered: Color = Color(0x80000000),
-) = ScrollbarColors(thumbBackground, thumbBackgroundHovered)
+): ScrollbarColors =
+    ScrollbarColors(thumbBackground, thumbBackgroundHovered)
 
 @Composable
-fun ScrollbarColors.Companion.dark(
+public fun ScrollbarColors.Companion.dark(
     thumbBackground: Color = Color(0x59808080),
     thumbBackgroundHovered: Color = Color(0x8C808080),
-) = ScrollbarColors(thumbBackground, thumbBackgroundHovered)
+): ScrollbarColors =
+    ScrollbarColors(thumbBackground, thumbBackgroundHovered)
 
-fun ScrollbarMetrics.Companion.defaults(
+public fun ScrollbarMetrics.Companion.defaults(
     thumbCornerSize: CornerSize = CornerSize(100),
     thumbThickness: Dp = 8.dp,
     minThumbLength: Dp = 16.dp,
     trackPadding: PaddingValues = PaddingValues(start = 7.dp, end = 3.dp),
-) = ScrollbarMetrics(
-    thumbCornerSize,
-    thumbThickness,
-    minThumbLength,
-    trackPadding,
-)
+): ScrollbarMetrics =
+    ScrollbarMetrics(thumbCornerSize, thumbThickness, minThumbLength, trackPadding)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt
index 6789ace4595f7..c7e2b4cad256f 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTabStyling.kt
@@ -15,56 +15,60 @@ import org.jetbrains.jewel.ui.component.styling.TabMetrics
 import org.jetbrains.jewel.ui.component.styling.TabStyle
 import org.jetbrains.jewel.ui.painter.PainterProvider
 
-val TabStyle.Companion.Default
+public val TabStyle.Companion.Default: IntUiDefaultTabStyleFactory
     get() = IntUiDefaultTabStyleFactory
 
-object IntUiDefaultTabStyleFactory {
+public object IntUiDefaultTabStyleFactory {
 
     @Composable
-    fun light(
+    public fun light(
         colors: TabColors = TabColors.Default.light(),
         metrics: TabMetrics = TabMetrics.defaults(),
         icons: TabIcons = TabIcons.defaults(),
         contentAlpha: TabContentAlpha = TabContentAlpha.default(),
-    ) = TabStyle(colors, metrics, icons, contentAlpha)
+    ): TabStyle =
+        TabStyle(colors, metrics, icons, contentAlpha)
 
     @Composable
-    fun dark(
+    public fun dark(
         colors: TabColors = TabColors.Default.dark(),
         metrics: TabMetrics = TabMetrics.defaults(),
         icons: TabIcons = TabIcons.defaults(),
         contentAlpha: TabContentAlpha = TabContentAlpha.default(),
-    ) = TabStyle(colors, metrics, icons, contentAlpha)
+    ): TabStyle =
+        TabStyle(colors, metrics, icons, contentAlpha)
 }
 
-val TabStyle.Companion.Editor
+public val TabStyle.Companion.Editor: IntUiEditorTabStyleFactory
     get() = IntUiEditorTabStyleFactory
 
-object IntUiEditorTabStyleFactory {
+public object IntUiEditorTabStyleFactory {
 
     @Composable
-    fun light(
+    public fun light(
         colors: TabColors = TabColors.Editor.light(),
         metrics: TabMetrics = TabMetrics.defaults(),
         icons: TabIcons = TabIcons.defaults(),
         contentAlpha: TabContentAlpha = TabContentAlpha.editor(),
-    ) = TabStyle(colors, metrics, icons, contentAlpha)
+    ): TabStyle =
+        TabStyle(colors, metrics, icons, contentAlpha)
 
     @Composable
-    fun dark(
+    public fun dark(
         colors: TabColors = TabColors.Editor.dark(),
         metrics: TabMetrics = TabMetrics.defaults(),
         icons: TabIcons = TabIcons.defaults(),
         contentAlpha: TabContentAlpha = TabContentAlpha.editor(),
-    ) = TabStyle(colors, metrics, icons, contentAlpha)
+    ): TabStyle =
+        TabStyle(colors, metrics, icons, contentAlpha)
 }
 
-val TabColors.Companion.Default
+public val TabColors.Companion.Default: IntUiDefaultTabColorsFactory
     get() = IntUiDefaultTabColorsFactory
 
-object IntUiDefaultTabColorsFactory {
+public object IntUiDefaultTabColorsFactory {
 
-    fun light(
+    public fun light(
         background: Color = IntUiLightTheme.colors.grey(14),
         backgroundHovered: Color = IntUiLightTheme.colors.grey(12),
         backgroundPressed: Color = backgroundHovered,
@@ -80,25 +84,26 @@ object IntUiDefaultTabColorsFactory {
         underlineDisabled: Color = underline,
         underlinePressed: Color = underline,
         underlineSelected: Color = IntUiLightTheme.colors.blue(4),
-    ) = TabColors(
-        background,
-        backgroundDisabled,
-        backgroundPressed,
-        backgroundHovered,
-        backgroundSelected,
-        content,
-        contentDisabled,
-        contentPressed,
-        contentHovered,
-        contentSelected,
-        underline,
-        underlineDisabled,
-        underlinePressed,
-        underlineHovered,
-        underlineSelected,
-    )
+    ): TabColors =
+        TabColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            backgroundSelected = backgroundSelected,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            contentSelected = contentSelected,
+            underline = underline,
+            underlineDisabled = underlineDisabled,
+            underlinePressed = underlinePressed,
+            underlineHovered = underlineHovered,
+            underlineSelected = underlineSelected,
+        )
 
-    fun dark(
+    public fun dark(
         background: Color = Color.Unspecified,
         backgroundHovered: Color = IntUiDarkTheme.colors.grey(4),
         backgroundPressed: Color = backgroundHovered,
@@ -114,31 +119,32 @@ object IntUiDefaultTabColorsFactory {
         underlineDisabled: Color = underline,
         underlinePressed: Color = underline,
         underlineSelected: Color = IntUiDarkTheme.colors.blue(6),
-    ) = TabColors(
-        background,
-        backgroundDisabled,
-        backgroundPressed,
-        backgroundHovered,
-        backgroundSelected,
-        content,
-        contentDisabled,
-        contentPressed,
-        contentHovered,
-        contentSelected,
-        underline,
-        underlineDisabled,
-        underlinePressed,
-        underlineHovered,
-        underlineSelected,
-    )
+    ): TabColors =
+        TabColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            backgroundSelected = backgroundSelected,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            contentSelected = contentSelected,
+            underline = underline,
+            underlineDisabled = underlineDisabled,
+            underlinePressed = underlinePressed,
+            underlineHovered = underlineHovered,
+            underlineSelected = underlineSelected,
+        )
 }
 
-val TabColors.Companion.Editor
+public val TabColors.Companion.Editor: IntUiEditorTabColorsFactory
     get() = IntUiEditorTabColorsFactory
 
-object IntUiEditorTabColorsFactory {
+public object IntUiEditorTabColorsFactory {
 
-    fun light(
+    public fun light(
         background: Color = Color.Transparent,
         backgroundHovered: Color = background,
         backgroundPressed: Color = background,
@@ -154,69 +160,70 @@ object IntUiEditorTabColorsFactory {
         underlineDisabled: Color = underline,
         underlinePressed: Color = underline,
         underlineSelected: Color = IntUiLightTheme.colors.blue(4),
-    ) = TabColors(
-        background,
-        backgroundDisabled,
-        backgroundPressed,
-        backgroundHovered,
-        backgroundSelected,
-        content,
-        contentDisabled,
-        contentPressed,
-        contentHovered,
-        contentSelected,
-        underline,
-        underlineDisabled,
-        underlinePressed,
-        underlineHovered,
-        underlineSelected,
-    )
+    ): TabColors =
+        TabColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            backgroundSelected = backgroundSelected,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            contentSelected = contentSelected,
+            underline = underline,
+            underlineDisabled = underlineDisabled,
+            underlinePressed = underlinePressed,
+            underlineHovered = underlineHovered,
+            underlineSelected = underlineSelected,
+        )
 
-    fun dark(
+    public fun dark(
         background: Color = Color.Unspecified,
         backgroundHovered: Color = background,
         backgroundPressed: Color = background,
         backgroundSelected: Color = background,
         backgroundDisabled: Color = background,
-
         content: Color = Color.Unspecified,
         contentHovered: Color = content,
         contentDisabled: Color = content,
         contentPressed: Color = content,
         contentSelected: Color = content,
-
         underline: Color = Color.Unspecified,
         underlineHovered: Color = underline,
         underlineDisabled: Color = underline,
         underlinePressed: Color = underline,
         underlineSelected: Color = IntUiDarkTheme.colors.blue(6),
-    ) = TabColors(
-        background,
-        backgroundDisabled,
-        backgroundPressed,
-        backgroundHovered,
-        backgroundSelected,
-        content,
-        contentDisabled,
-        contentPressed,
-        contentHovered,
-        contentSelected,
-        underline,
-        underlineDisabled,
-        underlinePressed,
-        underlineHovered,
-        underlineSelected,
-    )
+    ): TabColors =
+        TabColors(
+            background = background,
+            backgroundDisabled = backgroundDisabled,
+            backgroundPressed = backgroundPressed,
+            backgroundHovered = backgroundHovered,
+            backgroundSelected = backgroundSelected,
+            content = content,
+            contentDisabled = contentDisabled,
+            contentPressed = contentPressed,
+            contentHovered = contentHovered,
+            contentSelected = contentSelected,
+            underline = underline,
+            underlineDisabled = underlineDisabled,
+            underlinePressed = underlinePressed,
+            underlineHovered = underlineHovered,
+            underlineSelected = underlineSelected,
+        )
 }
 
-fun TabMetrics.Companion.defaults(
+public fun TabMetrics.Companion.defaults(
     underlineThickness: Dp = 3.dp,
     tabPadding: PaddingValues = PaddingValues(horizontal = 8.dp),
     closeContentGap: Dp = 8.dp,
     tabHeight: Dp = 40.dp,
-) = TabMetrics(underlineThickness, tabPadding, tabHeight, closeContentGap)
+): TabMetrics =
+    TabMetrics(underlineThickness, tabPadding, tabHeight, closeContentGap)
 
-fun TabContentAlpha.Companion.default(
+public fun TabContentAlpha.Companion.default(
     iconNormal: Float = 1f,
     iconDisabled: Float = iconNormal,
     iconPressed: Float = iconNormal,
@@ -227,20 +234,21 @@ fun TabContentAlpha.Companion.default(
     labelPressed: Float = iconNormal,
     labelHovered: Float = iconNormal,
     labelSelected: Float = iconNormal,
-) = TabContentAlpha(
-    iconNormal,
-    iconDisabled,
-    iconPressed,
-    iconHovered,
-    iconSelected,
-    labelNormal,
-    labelDisabled,
-    labelPressed,
-    labelHovered,
-    labelSelected,
-)
+): TabContentAlpha =
+    TabContentAlpha(
+        iconNormal = iconNormal,
+        iconDisabled = iconDisabled,
+        iconPressed = iconPressed,
+        iconHovered = iconHovered,
+        iconSelected = iconSelected,
+        labelNormal = labelNormal,
+        labelDisabled = labelDisabled,
+        labelPressed = labelPressed,
+        labelHovered = labelHovered,
+        labelSelected = labelSelected,
+    )
 
-fun TabContentAlpha.Companion.editor(
+public fun TabContentAlpha.Companion.editor(
     iconNormal: Float = .7f,
     iconDisabled: Float = iconNormal,
     iconPressed: Float = 1f,
@@ -251,20 +259,21 @@ fun TabContentAlpha.Companion.editor(
     labelPressed: Float = 1f,
     labelHovered: Float = labelPressed,
     labelSelected: Float = labelPressed,
-) =
+): TabContentAlpha =
     TabContentAlpha(
-        iconNormal,
-        iconDisabled,
-        iconPressed,
-        iconHovered,
-        iconSelected,
-        labelNormal,
-        labelDisabled,
-        labelPressed,
-        labelHovered,
-        labelSelected,
+        iconNormal = iconNormal,
+        iconDisabled = iconDisabled,
+        iconPressed = iconPressed,
+        iconHovered = iconHovered,
+        iconSelected = iconSelected,
+        labelNormal = labelNormal,
+        labelDisabled = labelDisabled,
+        labelPressed = labelPressed,
+        labelHovered = labelHovered,
+        labelSelected = labelSelected,
     )
 
-fun TabIcons.Companion.defaults(
+public fun TabIcons.Companion.defaults(
     close: PainterProvider = standalonePainterProvider("expui/general/closeSmall.svg"),
-) = TabIcons(close)
+): TabIcons =
+    TabIcons(close)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt
index 2bf17dc3cbfeb..77bdeaeec99c0 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextAreaStyling.kt
@@ -17,21 +17,23 @@ import org.jetbrains.jewel.ui.component.styling.TextAreaMetrics
 import org.jetbrains.jewel.ui.component.styling.TextAreaStyle
 
 @Composable
-fun TextAreaStyle.Companion.light(
+public fun TextAreaStyle.Companion.light(
     colors: TextAreaColors = TextAreaColors.light(),
     metrics: TextAreaMetrics = TextAreaMetrics.defaults(),
     textStyle: TextStyle = JewelTheme.defaultTextStyle,
-) = TextAreaStyle(colors, metrics, textStyle)
+): TextAreaStyle =
+    TextAreaStyle(colors, metrics, textStyle)
 
 @Composable
-fun TextAreaStyle.Companion.dark(
+public fun TextAreaStyle.Companion.dark(
     colors: TextAreaColors = TextAreaColors.dark(),
     metrics: TextAreaMetrics = TextAreaMetrics.defaults(),
     textStyle: TextStyle = JewelTheme.defaultTextStyle,
-) = TextAreaStyle(colors, metrics, textStyle)
+): TextAreaStyle =
+    TextAreaStyle(colors, metrics, textStyle)
 
 @Composable
-fun TextAreaColors.Companion.light(
+public fun TextAreaColors.Companion.light(
     background: Color = IntUiLightTheme.colors.grey(14),
     backgroundDisabled: Color = IntUiLightTheme.colors.grey(13),
     backgroundFocused: Color = background,
@@ -53,32 +55,33 @@ fun TextAreaColors.Companion.light(
     caretPressed: Color = caret,
     caretHovered: Color = caret,
     placeholder: Color = IntUiLightTheme.colors.grey(8),
-) = TextAreaColors(
-    background,
-    backgroundDisabled,
-    backgroundFocused,
-    backgroundPressed,
-    backgroundHovered,
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    border,
-    borderDisabled,
-    borderFocused,
-    borderPressed,
-    borderHovered,
-    caret,
-    caretDisabled,
-    caretFocused,
-    caretPressed,
-    caretHovered,
-    placeholder,
-)
+): TextAreaColors =
+    TextAreaColors(
+        background = background,
+        backgroundDisabled = backgroundDisabled,
+        backgroundFocused = backgroundFocused,
+        backgroundPressed = backgroundPressed,
+        backgroundHovered = backgroundHovered,
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        border = border,
+        borderDisabled = borderDisabled,
+        borderFocused = borderFocused,
+        borderPressed = borderPressed,
+        borderHovered = borderHovered,
+        caret = caret,
+        caretDisabled = caretDisabled,
+        caretFocused = caretFocused,
+        caretPressed = caretPressed,
+        caretHovered = caretHovered,
+        placeholder = placeholder,
+    )
 
 @Composable
-fun TextAreaColors.Companion.dark(
+public fun TextAreaColors.Companion.dark(
     background: Color = IntUiDarkTheme.colors.grey(2),
     backgroundDisabled: Color = background,
     backgroundFocused: Color = background,
@@ -100,33 +103,35 @@ fun TextAreaColors.Companion.dark(
     caretPressed: Color = caret,
     caretHovered: Color = caret,
     placeholder: Color = IntUiDarkTheme.colors.grey(7),
-) = TextAreaColors(
-    background,
-    backgroundDisabled,
-    backgroundFocused,
-    backgroundPressed,
-    backgroundHovered,
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    border,
-    borderDisabled,
-    borderFocused,
-    borderPressed,
-    borderHovered,
-    caret,
-    caretDisabled,
-    caretFocused,
-    caretPressed,
-    caretHovered,
-    placeholder,
-)
+): TextAreaColors =
+    TextAreaColors(
+        background = background,
+        backgroundDisabled = backgroundDisabled,
+        backgroundFocused = backgroundFocused,
+        backgroundPressed = backgroundPressed,
+        backgroundHovered = backgroundHovered,
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        border = border,
+        borderDisabled = borderDisabled,
+        borderFocused = borderFocused,
+        borderPressed = borderPressed,
+        borderHovered = borderHovered,
+        caret = caret,
+        caretDisabled = caretDisabled,
+        caretFocused = caretFocused,
+        caretPressed = caretPressed,
+        caretHovered = caretHovered,
+        placeholder = placeholder,
+    )
 
-fun TextAreaMetrics.Companion.defaults(
+public fun TextAreaMetrics.Companion.defaults(
     cornerSize: CornerSize = CornerSize(4.dp),
     contentPadding: PaddingValues = PaddingValues(horizontal = 6.dp, vertical = 2.dp),
     minSize: DpSize = DpSize(144.dp, 28.dp),
     borderWidth: Dp = 1.dp,
-) = TextAreaMetrics(borderWidth, contentPadding, cornerSize, minSize)
+): TextAreaMetrics =
+    TextAreaMetrics(borderWidth, contentPadding, cornerSize, minSize)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt
index 6cd2c30fee32e..7939f3c8117b9 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTextFieldStyling.kt
@@ -17,21 +17,23 @@ import org.jetbrains.jewel.ui.component.styling.TextFieldMetrics
 import org.jetbrains.jewel.ui.component.styling.TextFieldStyle
 
 @Composable
-fun TextFieldStyle.Companion.light(
+public fun TextFieldStyle.Companion.light(
     colors: TextFieldColors = TextFieldColors.light(),
     metrics: TextFieldMetrics = TextFieldMetrics.defaults(),
     textStyle: TextStyle = JewelTheme.defaultTextStyle,
-) = TextFieldStyle(colors, metrics, textStyle)
+): TextFieldStyle =
+    TextFieldStyle(colors, metrics, textStyle)
 
 @Composable
-fun TextFieldStyle.Companion.dark(
+public fun TextFieldStyle.Companion.dark(
     colors: TextFieldColors = TextFieldColors.dark(),
     metrics: TextFieldMetrics = TextFieldMetrics.defaults(),
     textStyle: TextStyle = JewelTheme.defaultTextStyle,
-) = TextFieldStyle(colors, metrics, textStyle)
+): TextFieldStyle =
+    TextFieldStyle(colors, metrics, textStyle)
 
 @Composable
-fun TextFieldColors.Companion.light(
+public fun TextFieldColors.Companion.light(
     background: Color = IntUiLightTheme.colors.grey(14),
     backgroundDisabled: Color = IntUiLightTheme.colors.grey(13),
     backgroundFocused: Color = background,
@@ -53,32 +55,33 @@ fun TextFieldColors.Companion.light(
     caretPressed: Color = caret,
     caretHovered: Color = caret,
     placeholder: Color = IntUiLightTheme.colors.grey(8),
-) = TextFieldColors(
-    background,
-    backgroundDisabled,
-    backgroundFocused,
-    backgroundPressed,
-    backgroundHovered,
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    border,
-    borderDisabled,
-    borderFocused,
-    borderPressed,
-    borderHovered,
-    caret,
-    caretDisabled,
-    caretFocused,
-    caretPressed,
-    caretHovered,
-    placeholder,
-)
+): TextFieldColors =
+    TextFieldColors(
+        background = background,
+        backgroundDisabled = backgroundDisabled,
+        backgroundFocused = backgroundFocused,
+        backgroundPressed = backgroundPressed,
+        backgroundHovered = backgroundHovered,
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        border = border,
+        borderDisabled = borderDisabled,
+        borderFocused = borderFocused,
+        borderPressed = borderPressed,
+        borderHovered = borderHovered,
+        caret = caret,
+        caretDisabled = caretDisabled,
+        caretFocused = caretFocused,
+        caretPressed = caretPressed,
+        caretHovered = caretHovered,
+        placeholder = placeholder,
+    )
 
 @Composable
-fun TextFieldColors.Companion.dark(
+public fun TextFieldColors.Companion.dark(
     background: Color = IntUiDarkTheme.colors.grey(2),
     backgroundDisabled: Color = background,
     backgroundFocused: Color = background,
@@ -100,33 +103,35 @@ fun TextFieldColors.Companion.dark(
     caretPressed: Color = caret,
     caretHovered: Color = caret,
     placeholder: Color = IntUiDarkTheme.colors.grey(7),
-) = TextFieldColors(
-    background,
-    backgroundDisabled,
-    backgroundFocused,
-    backgroundPressed,
-    backgroundHovered,
-    content,
-    contentDisabled,
-    contentFocused,
-    contentPressed,
-    contentHovered,
-    border,
-    borderDisabled,
-    borderFocused,
-    borderPressed,
-    borderHovered,
-    caret,
-    caretDisabled,
-    caretFocused,
-    caretPressed,
-    caretHovered,
-    placeholder,
-)
+): TextFieldColors =
+    TextFieldColors(
+        background = background,
+        backgroundDisabled = backgroundDisabled,
+        backgroundFocused = backgroundFocused,
+        backgroundPressed = backgroundPressed,
+        backgroundHovered = backgroundHovered,
+        content = content,
+        contentDisabled = contentDisabled,
+        contentFocused = contentFocused,
+        contentPressed = contentPressed,
+        contentHovered = contentHovered,
+        border = border,
+        borderDisabled = borderDisabled,
+        borderFocused = borderFocused,
+        borderPressed = borderPressed,
+        borderHovered = borderHovered,
+        caret = caret,
+        caretDisabled = caretDisabled,
+        caretFocused = caretFocused,
+        caretPressed = caretPressed,
+        caretHovered = caretHovered,
+        placeholder = placeholder,
+    )
 
-fun TextFieldMetrics.Companion.defaults(
+public fun TextFieldMetrics.Companion.defaults(
     cornerSize: CornerSize = CornerSize(4.dp),
     contentPadding: PaddingValues = PaddingValues(horizontal = 9.dp, vertical = 6.dp),
     minSize: DpSize = DpSize(144.dp, 28.dp),
     borderWidth: Dp = 1.dp,
-) = TextFieldMetrics(borderWidth, contentPadding, cornerSize, minSize)
+): TextFieldMetrics =
+    TextFieldMetrics(borderWidth, contentPadding, cornerSize, minSize)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt
index 3f5745e99b93f..41b56f8a3992b 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/styling/IntUiTooltipStyling.kt
@@ -9,35 +9,39 @@ import org.jetbrains.jewel.ui.component.styling.TooltipMetrics
 import org.jetbrains.jewel.ui.component.styling.TooltipStyle
 
 @Composable
-fun TooltipStyle.Companion.light(
+public fun TooltipStyle.Companion.light(
     intUiTooltipColors: TooltipColors = TooltipColors.light(),
     intUiTooltipMetrics: TooltipMetrics = TooltipMetrics.defaults(),
-): TooltipStyle = TooltipStyle(
-    colors = intUiTooltipColors,
-    metrics = intUiTooltipMetrics,
-)
+): TooltipStyle =
+    TooltipStyle(
+        colors = intUiTooltipColors,
+        metrics = intUiTooltipMetrics,
+    )
 
 @Composable
-fun TooltipStyle.Companion.dark(
+public fun TooltipStyle.Companion.dark(
     intUiTooltipColors: TooltipColors = TooltipColors.dark(),
     intUiTooltipMetrics: TooltipMetrics = TooltipMetrics.defaults(),
-): TooltipStyle = TooltipStyle(
-    colors = intUiTooltipColors,
-    metrics = intUiTooltipMetrics,
-)
+): TooltipStyle =
+    TooltipStyle(
+        colors = intUiTooltipColors,
+        metrics = intUiTooltipMetrics,
+    )
 
 @Composable
-fun TooltipColors.Companion.light(
+public fun TooltipColors.Companion.light(
     backgroundColor: Color = IntUiLightTheme.colors.grey(2),
     contentColor: Color = IntUiLightTheme.colors.grey(12),
     borderColor: Color = backgroundColor,
     shadow: Color = Color(0x78919191), // Not a palette color
-) = TooltipColors(backgroundColor, contentColor, borderColor, shadow)
+): TooltipColors =
+    TooltipColors(backgroundColor, contentColor, borderColor, shadow)
 
 @Composable
-fun TooltipColors.Companion.dark(
+public fun TooltipColors.Companion.dark(
     backgroundColor: Color = IntUiDarkTheme.colors.grey(2),
     contentColor: Color = IntUiDarkTheme.colors.grey(12),
     borderColor: Color = IntUiDarkTheme.colors.grey(3),
     shadow: Color = Color(0x66000000), // Not a palette color
-) = TooltipColors(backgroundColor, contentColor, borderColor, shadow)
+): TooltipColors =
+    TooltipColors(backgroundColor, contentColor, borderColor, shadow)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt
index b0a42dc067566..00674a2d3dd51 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalColors.kt
@@ -9,59 +9,65 @@ import org.jetbrains.jewel.intui.core.theme.IntUiDarkTheme
 import org.jetbrains.jewel.intui.core.theme.IntUiLightTheme
 
 @Composable
-fun GlobalColors.Companion.light(
+public fun GlobalColors.Companion.light(
     borders: BorderColors = BorderColors.light(),
     outlines: OutlineColors = OutlineColors.light(),
     infoContent: Color = IntUiLightTheme.colors.grey(7),
     paneBackground: Color = IntUiLightTheme.colors.grey(13),
-) = GlobalColors(
-    borders = borders,
-    outlines = outlines,
-    infoContent = infoContent,
-    paneBackground = paneBackground,
-)
+): GlobalColors =
+    GlobalColors(
+        borders = borders,
+        outlines = outlines,
+        infoContent = infoContent,
+        paneBackground = paneBackground,
+    )
 
 @Composable
-fun GlobalColors.Companion.dark(
+public fun GlobalColors.Companion.dark(
     borders: BorderColors = BorderColors.dark(),
     outlines: OutlineColors = OutlineColors.dark(),
     infoContent: Color = IntUiDarkTheme.colors.grey(7),
     paneBackground: Color = IntUiDarkTheme.colors.grey(2),
-) = GlobalColors(
-    borders = borders,
-    outlines = outlines,
-    infoContent = infoContent,
-    paneBackground = paneBackground,
-)
+): GlobalColors =
+    GlobalColors(
+        borders = borders,
+        outlines = outlines,
+        infoContent = infoContent,
+        paneBackground = paneBackground,
+    )
 
 @Composable
-fun BorderColors.Companion.light(
+public fun BorderColors.Companion.light(
     normal: Color = IntUiLightTheme.colors.grey(9),
     focused: Color = IntUiLightTheme.colors.grey(14),
     disabled: Color = IntUiLightTheme.colors.grey(11),
-) = BorderColors(normal, focused, disabled)
+): BorderColors =
+    BorderColors(normal, focused, disabled)
 
 @Composable
-fun BorderColors.Companion.dark(
+public fun BorderColors.Companion.dark(
     normal: Color = IntUiDarkTheme.colors.grey(5),
     focused: Color = IntUiDarkTheme.colors.grey(2),
     disabled: Color = IntUiDarkTheme.colors.grey(4),
-) = BorderColors(normal, focused, disabled)
+): BorderColors =
+    BorderColors(normal, focused, disabled)
 
 @Composable
-fun OutlineColors.Companion.light(
+public fun OutlineColors.Companion.light(
     focused: Color = IntUiLightTheme.colors.blue(4),
     focusedWarning: Color = IntUiLightTheme.colors.yellow(4),
     focusedError: Color = IntUiLightTheme.colors.red(4),
     warning: Color = IntUiLightTheme.colors.yellow(7),
     error: Color = IntUiLightTheme.colors.red(9),
-) = OutlineColors(focused, focusedWarning, focusedError, warning, error)
+): OutlineColors =
+    OutlineColors(focused, focusedWarning, focusedError, warning, error)
 
 @Composable
-fun OutlineColors.Companion.dark(
+public fun OutlineColors.Companion.dark(
     focused: Color = IntUiDarkTheme.colors.blue(6),
     focusedWarning: Color = IntUiDarkTheme.colors.yellow(4),
     focusedError: Color = IntUiDarkTheme.colors.red(4),
     warning: Color = IntUiDarkTheme.colors.yellow(2),
     error: Color = IntUiDarkTheme.colors.red(2),
-) = OutlineColors(focused, focusedWarning, focusedError, warning, error)
+): OutlineColors =
+    OutlineColors(focused, focusedWarning, focusedError, warning, error)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalMetrics.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalMetrics.kt
index d682605dce20a..8b009b8aa6fae 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalMetrics.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiGlobalMetrics.kt
@@ -4,7 +4,8 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.foundation.GlobalMetrics
 
-fun GlobalMetrics.Companion.defaults(
+public fun GlobalMetrics.Companion.defaults(
     outlineWidth: Dp = 2.dp,
     rowHeight: Dp = 24.dp,
-) = GlobalMetrics(outlineWidth, rowHeight)
+): GlobalMetrics =
+    GlobalMetrics(outlineWidth, rowHeight)
diff --git a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiTheme.kt b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiTheme.kt
index 625a39f3ca923..554ed00ff683b 100644
--- a/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiTheme.kt
+++ b/platform/jewel/int-ui/int-ui-standalone/src/main/kotlin/org/jetbrains/jewel/intui/standalone/theme/IntUiTheme.kt
@@ -47,7 +47,7 @@ import org.jetbrains.jewel.ui.component.styling.TooltipStyle
 import org.jetbrains.jewel.ui.painter.LocalPainterHintsProvider
 import org.jetbrains.jewel.ui.theme.BaseJewelTheme
 
-val JewelTheme.Companion.defaultTextStyle
+public val JewelTheme.Companion.defaultTextStyle: TextStyle
     get() = TextStyle.Default.copy(
         fontFamily = FontFamily.Inter,
         fontSize = 13.sp,
@@ -56,33 +56,35 @@ val JewelTheme.Companion.defaultTextStyle
     )
 
 @Composable
-fun JewelTheme.Companion.lightThemeDefinition(
+public fun JewelTheme.Companion.lightThemeDefinition(
     colors: GlobalColors = GlobalColors.light(),
     metrics: GlobalMetrics = GlobalMetrics.defaults(),
     palette: ThemeColorPalette = IntUiLightTheme.colors,
     iconData: ThemeIconData = IntUiLightTheme.iconData,
     defaultTextStyle: TextStyle = JewelTheme.defaultTextStyle,
     contentColor: Color = IntUiLightTheme.colors.grey(1),
-) = ThemeDefinition(isDark = false, colors, metrics, defaultTextStyle, contentColor, palette, iconData)
+): ThemeDefinition =
+    ThemeDefinition(isDark = false, colors, metrics, defaultTextStyle, contentColor, palette, iconData)
 
 @Composable
-fun JewelTheme.Companion.darkThemeDefinition(
+public fun JewelTheme.Companion.darkThemeDefinition(
     colors: GlobalColors = GlobalColors.dark(),
     metrics: GlobalMetrics = GlobalMetrics.defaults(),
     palette: ThemeColorPalette = IntUiDarkTheme.colors,
     iconData: ThemeIconData = IntUiDarkTheme.iconData,
     defaultTextStyle: TextStyle = JewelTheme.defaultTextStyle,
     contentColor: Color = IntUiDarkTheme.colors.grey(12),
-) = ThemeDefinition(isDark = true, colors, metrics, defaultTextStyle, contentColor, palette, iconData)
+): ThemeDefinition =
+    ThemeDefinition(isDark = true, colors, metrics, defaultTextStyle, contentColor, palette, iconData)
 
 @Composable
-fun ComponentStyling.default(): ComponentStyling = with {
+public fun ComponentStyling.default(): ComponentStyling = with {
     val isDark = JewelTheme.isDark
     if (isDark) dark() else light()
 }
 
 @Composable
-fun ComponentStyling.dark(
+public fun ComponentStyling.dark(
     checkboxStyle: CheckboxStyle = CheckboxStyle.dark(),
     chipStyle: ChipStyle = ChipStyle.dark(),
     circularProgressStyle: CircularProgressStyle = CircularProgressStyle.dark(),
@@ -104,34 +106,35 @@ fun ComponentStyling.dark(
     textFieldStyle: TextFieldStyle = TextFieldStyle.dark(),
     tooltipStyle: TooltipStyle = TooltipStyle.dark(),
     undecoratedDropdownStyle: DropdownStyle = DropdownStyle.Undecorated.dark(),
-) = with(
-    DefaultComponentStyling(
-        checkboxStyle = checkboxStyle,
-        chipStyle = chipStyle,
-        circularProgressStyle = circularProgressStyle,
-        defaultButtonStyle = defaultButtonStyle,
-        defaultDropdownStyle = dropdownStyle,
-        defaultTabStyle = defaultTabStyle,
-        dividerStyle = dividerStyle,
-        editorTabStyle = editorTabStyle,
-        groupHeaderStyle = groupHeaderStyle,
-        horizontalProgressBarStyle = horizontalProgressBarStyle,
-        iconButtonStyle = iconButtonStyle,
-        lazyTreeStyle = lazyTreeStyle,
-        linkStyle = linkStyle,
-        menuStyle = menuStyle,
-        outlinedButtonStyle = outlinedButtonStyle,
-        radioButtonStyle = radioButtonStyle,
-        scrollbarStyle = scrollbarStyle,
-        textAreaStyle = textAreaStyle,
-        textFieldStyle = textFieldStyle,
-        tooltipStyle = tooltipStyle,
-        undecoratedDropdownStyle = undecoratedDropdownStyle,
-    ),
-)
+): ComponentStyling =
+    with(
+        DefaultComponentStyling(
+            checkboxStyle = checkboxStyle,
+            chipStyle = chipStyle,
+            circularProgressStyle = circularProgressStyle,
+            defaultButtonStyle = defaultButtonStyle,
+            defaultDropdownStyle = dropdownStyle,
+            defaultTabStyle = defaultTabStyle,
+            dividerStyle = dividerStyle,
+            editorTabStyle = editorTabStyle,
+            groupHeaderStyle = groupHeaderStyle,
+            horizontalProgressBarStyle = horizontalProgressBarStyle,
+            iconButtonStyle = iconButtonStyle,
+            lazyTreeStyle = lazyTreeStyle,
+            linkStyle = linkStyle,
+            menuStyle = menuStyle,
+            outlinedButtonStyle = outlinedButtonStyle,
+            radioButtonStyle = radioButtonStyle,
+            scrollbarStyle = scrollbarStyle,
+            textAreaStyle = textAreaStyle,
+            textFieldStyle = textFieldStyle,
+            tooltipStyle = tooltipStyle,
+            undecoratedDropdownStyle = undecoratedDropdownStyle,
+        ),
+    )
 
 @Composable
-fun ComponentStyling.light(
+public fun ComponentStyling.light(
     checkboxStyle: CheckboxStyle = CheckboxStyle.light(),
     chipStyle: ChipStyle = ChipStyle.light(),
     circularProgressStyle: CircularProgressStyle = CircularProgressStyle.light(),
@@ -153,44 +156,41 @@ fun ComponentStyling.light(
     textFieldStyle: TextFieldStyle = TextFieldStyle.light(),
     tooltipStyle: TooltipStyle = TooltipStyle.light(),
     undecoratedDropdownStyle: DropdownStyle = DropdownStyle.Undecorated.light(),
-) = with(
-    DefaultComponentStyling(
-        checkboxStyle = checkboxStyle,
-        chipStyle = chipStyle,
-        circularProgressStyle = circularProgressStyle,
-        defaultButtonStyle = defaultButtonStyle,
-        defaultDropdownStyle = dropdownStyle,
-        defaultTabStyle = defaultTabStyle,
-        dividerStyle = dividerStyle,
-        editorTabStyle = editorTabStyle,
-        groupHeaderStyle = groupHeaderStyle,
-        horizontalProgressBarStyle = horizontalProgressBarStyle,
-        iconButtonStyle = iconButtonStyle,
-        lazyTreeStyle = lazyTreeStyle,
-        linkStyle = linkStyle,
-        menuStyle = menuStyle,
-        outlinedButtonStyle = outlinedButtonStyle,
-        radioButtonStyle = radioButtonStyle,
-        scrollbarStyle = scrollbarStyle,
-        textAreaStyle = textAreaStyle,
-        textFieldStyle = textFieldStyle,
-        tooltipStyle = tooltipStyle,
-        undecoratedDropdownStyle = undecoratedDropdownStyle,
-    ),
-)
+): ComponentStyling =
+    with(
+        DefaultComponentStyling(
+            checkboxStyle = checkboxStyle,
+            chipStyle = chipStyle,
+            circularProgressStyle = circularProgressStyle,
+            defaultButtonStyle = defaultButtonStyle,
+            defaultDropdownStyle = dropdownStyle,
+            defaultTabStyle = defaultTabStyle,
+            dividerStyle = dividerStyle,
+            editorTabStyle = editorTabStyle,
+            groupHeaderStyle = groupHeaderStyle,
+            horizontalProgressBarStyle = horizontalProgressBarStyle,
+            iconButtonStyle = iconButtonStyle,
+            lazyTreeStyle = lazyTreeStyle,
+            linkStyle = linkStyle,
+            menuStyle = menuStyle,
+            outlinedButtonStyle = outlinedButtonStyle,
+            radioButtonStyle = radioButtonStyle,
+            scrollbarStyle = scrollbarStyle,
+            textAreaStyle = textAreaStyle,
+            textFieldStyle = textFieldStyle,
+            tooltipStyle = tooltipStyle,
+            undecoratedDropdownStyle = undecoratedDropdownStyle,
+        ),
+    )
 
 @Composable
-fun IntUiTheme(
+public fun IntUiTheme(
     isDark: Boolean = false,
     swingCompatMode: Boolean = false,
     content: @Composable () -> Unit,
 ) {
     val themeDefinition =
-        if (isDark) {
-            JewelTheme.darkThemeDefinition()
-        } else {
-            JewelTheme.lightThemeDefinition()
-        }
+        if (isDark) JewelTheme.darkThemeDefinition() else JewelTheme.lightThemeDefinition()
 
     IntUiTheme(
         theme = themeDefinition,
@@ -201,7 +201,7 @@ fun IntUiTheme(
 }
 
 @Composable
-fun IntUiTheme(
+public fun IntUiTheme(
     theme: ThemeDefinition,
     styling: ComponentStyling,
     swingCompatMode: Boolean = false,
diff --git a/platform/jewel/samples/ide-plugin/src/main/kotlin/icons/JewelIcons.kt b/platform/jewel/samples/ide-plugin/src/main/kotlin/icons/JewelIcons.kt
index 5019bb2b47a07..27a014c2e903b 100644
--- a/platform/jewel/samples/ide-plugin/src/main/kotlin/icons/JewelIcons.kt
+++ b/platform/jewel/samples/ide-plugin/src/main/kotlin/icons/JewelIcons.kt
@@ -4,5 +4,6 @@ import com.intellij.openapi.util.IconLoader
 
 object JewelIcons {
 
-    @JvmField val ToolWindowIcon = IconLoader.getIcon("/icons/jewel-tool-window.svg", javaClass)
+    @JvmField
+    val ToolWindowIcon = IconLoader.getIcon("/icons/jewel-tool-window.svg", javaClass)
 }
diff --git a/platform/jewel/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ContentItem.kt b/platform/jewel/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ContentItem.kt
index cc269f7ba6fcc..b5c127bfb6485 100644
--- a/platform/jewel/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ContentItem.kt
+++ b/platform/jewel/samples/ide-plugin/src/main/kotlin/org/jetbrains/jewel/samples/ideplugin/releasessample/ContentItem.kt
@@ -5,7 +5,8 @@ import org.jetbrains.annotations.Nls
 
 sealed class ContentItem {
 
-    @get:Nls abstract val displayText: String
+    @get:Nls
+    abstract val displayText: String
     abstract val imagePath: String?
     abstract val versionName: String
     abstract val releaseDate: LocalDate?
diff --git a/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/IntUiThemes.kt b/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/IntUiThemes.kt
index a5659b923e863..b76f83a96e95c 100644
--- a/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/IntUiThemes.kt
+++ b/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/IntUiThemes.kt
@@ -4,15 +4,13 @@ import org.jetbrains.skiko.SystemTheme
 import org.jetbrains.skiko.currentSystemTheme
 
 enum class IntUiThemes {
-    Light, LightWithLightHeader, Dark, SYSTEM;
+    Light, LightWithLightHeader, Dark, System;
 
-    fun isDark(): Boolean = if (this == SYSTEM) {
-        fromSystemTheme(currentSystemTheme)
-    } else {
-        this
-    } == Dark
+    fun isDark() =
+        (if (this == System) fromSystemTheme(currentSystemTheme) else this) == Dark
 
-    fun isLightHeader() = this == LightWithLightHeader
+    fun isLightHeader() =
+        this == LightWithLightHeader
 
     companion object {
 
diff --git a/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt b/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt
index b77a402339740..554d9f7256507 100644
--- a/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt
+++ b/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/Main.kt
@@ -37,7 +37,7 @@ fun main() {
                     IntUiThemes.Light -> TitleBarStyle.light()
                     IntUiThemes.LightWithLightHeader -> TitleBarStyle.lightWithLightHeader()
                     IntUiThemes.Dark -> TitleBarStyle.dark()
-                    IntUiThemes.SYSTEM -> if (MainViewModel.theme.isDark()) {
+                    IntUiThemes.System -> if (MainViewModel.theme.isDark()) {
                         TitleBarStyle.dark()
                     } else {
                         TitleBarStyle.light()
diff --git a/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/TitleBarView.kt b/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/TitleBarView.kt
index 21de995ecce0f..e1e2ea1a97b35 100644
--- a/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/TitleBarView.kt
+++ b/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/TitleBarView.kt
@@ -86,14 +86,14 @@ fun DecoratedWindowScope.TitleBarView() {
                 when (MainViewModel.theme) {
                     IntUiThemes.Light -> Text("Switch to light theme with light header")
                     IntUiThemes.LightWithLightHeader -> Text("Switch to dark theme")
-                    IntUiThemes.Dark, IntUiThemes.SYSTEM -> Text("Switch to light theme")
+                    IntUiThemes.Dark, IntUiThemes.System -> Text("Switch to light theme")
                 }
             }) {
                 IconButton({
                     MainViewModel.theme = when (MainViewModel.theme) {
                         IntUiThemes.Light -> IntUiThemes.LightWithLightHeader
                         IntUiThemes.LightWithLightHeader -> IntUiThemes.Dark
-                        IntUiThemes.Dark, IntUiThemes.SYSTEM -> IntUiThemes.Light
+                        IntUiThemes.Dark, IntUiThemes.System -> IntUiThemes.Light
                     }
                 }, Modifier.size(40.dp).padding(5.dp)) {
                     when (MainViewModel.theme) {
@@ -115,7 +115,7 @@ fun DecoratedWindowScope.TitleBarView() {
                             StandaloneSampleIcons::class.java,
                         )
 
-                        IntUiThemes.SYSTEM -> Icon(
+                        IntUiThemes.System -> Icon(
                             "icons/systemTheme@20x20.svg",
                             "Themes",
                             StandaloneSampleIcons::class.java,
diff --git a/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/WelcomeView.kt b/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/WelcomeView.kt
index 5d89da89eb37b..adb693ada64de 100644
--- a/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/WelcomeView.kt
+++ b/platform/jewel/samples/standalone/src/main/kotlin/org/jetbrains/jewel/samples/standalone/view/WelcomeView.kt
@@ -3,14 +3,17 @@ package org.jetbrains.jewel.samples.standalone.view
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.widthIn
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import org.jetbrains.jewel.foundation.modifier.trackActivation
@@ -27,49 +30,60 @@ import org.jetbrains.jewel.ui.component.styling.LocalCheckboxStyle
 import org.jetbrains.jewel.ui.painter.hints.Selected
 import org.jetbrains.jewel.ui.painter.rememberResourcePainterProvider
 
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
 @View(title = "Welcome", position = 0, icon = "icons/meetNewUi.svg")
 fun WelcomeView() {
-    Box(
-        Modifier.trackActivation().fillMaxSize()
+    Column(
+        modifier = Modifier.trackActivation()
+            .fillMaxSize()
             .background(JewelTheme.globalColors.paneBackground)
             .padding(24.dp),
+        verticalArrangement = Arrangement.spacedBy(24.dp),
     ) {
-        Column(verticalArrangement = Arrangement.spacedBy(24.dp)) {
-            val meetNewUiImage =
-                rememberResourcePainterProvider("images/New UI Image.png", StandaloneSampleIcons::class.java)
-            val meetNewUiImagePainter by meetNewUiImage.getPainter()
-            Image(meetNewUiImagePainter, "Meet Jewel")
+        val meetNewUiImage =
+            rememberResourcePainterProvider("images/New UI Image.png", StandaloneSampleIcons::class.java)
+        val meetNewUiImagePainter by meetNewUiImage.getPainter()
+        Image(
+            painter = meetNewUiImagePainter,
+            contentDescription = null,
+            modifier = Modifier.widthIn(max = 500.dp),
+            contentScale = ContentScale.Crop,
+        )
 
-            Text("Meet Jewel", fontSize = 20.sp)
+        Text("Meet Jewel", fontSize = 20.sp)
 
-            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                Text("Theme:")
-                Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
-                    ThemeSelectionChip(IntUiThemes.Dark, "Dark", "icons/darkTheme.svg")
-                    ThemeSelectionChip(IntUiThemes.Light, "Light", "icons/lightTheme.svg")
-                    ThemeSelectionChip(
-                        IntUiThemes.LightWithLightHeader,
-                        "Light(Header)",
-                        "icons/lightWithLightHeaderTheme.svg",
-                    )
-                    ThemeSelectionChip(IntUiThemes.SYSTEM, "System", "icons/systemTheme.svg")
-                }
-            }
+        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            Text("Theme:")
+
+            FlowRow(
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                ThemeSelectionChip(IntUiThemes.Dark, "Dark", "icons/darkTheme.svg")
+
+                ThemeSelectionChip(IntUiThemes.Light, "Light", "icons/lightTheme.svg")
 
-            Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
-                CheckboxRow(
-                    text = "Swing compatibility",
-                    checked = MainViewModel.swingCompat,
-                    onCheckedChange = {
-                        MainViewModel.swingCompat = it
-                    },
-                    colors = LocalCheckboxStyle.current.colors,
-                    metrics = LocalCheckboxStyle.current.metrics,
-                    icons = LocalCheckboxStyle.current.icons,
+                ThemeSelectionChip(
+                    IntUiThemes.LightWithLightHeader,
+                    "Light with Light Header",
+                    "icons/lightWithLightHeaderTheme.svg",
                 )
+
+                ThemeSelectionChip(IntUiThemes.System, "System", "icons/systemTheme.svg")
             }
         }
+
+        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            CheckboxRow(
+                text = "Swing compatibility",
+                checked = MainViewModel.swingCompat,
+                onCheckedChange = { MainViewModel.swingCompat = it },
+                colors = LocalCheckboxStyle.current.colors,
+                metrics = LocalCheckboxStyle.current.metrics,
+                icons = LocalCheckboxStyle.current.icons,
+            )
+        }
     }
 }
 
diff --git a/platform/jewel/ui/api/ui.api b/platform/jewel/ui/api/ui.api
index 6d385a1fe6c88..0d51705b7a144 100644
--- a/platform/jewel/ui/api/ui.api
+++ b/platform/jewel/ui/api/ui.api
@@ -551,23 +551,6 @@ public final class org/jetbrains/jewel/ui/component/ScrollbarsKt {
 	public static final fun VerticalScrollbar (Landroidx/compose/foundation/v2/ScrollbarAdapter;Landroidx/compose/ui/Modifier;ZLandroidx/compose/foundation/interaction/MutableInteractionSource;Lorg/jetbrains/jewel/ui/component/styling/ScrollbarStyle;Landroidx/compose/runtime/Composer;II)V
 }
 
-public final class org/jetbrains/jewel/ui/component/SpinnerProgressIconGenerator {
-	public static final field $stable I
-	public static final field INSTANCE Lorg/jetbrains/jewel/ui/component/SpinnerProgressIconGenerator;
-}
-
-public final class org/jetbrains/jewel/ui/component/SpinnerProgressIconGenerator$Big {
-	public static final field $stable I
-	public static final field INSTANCE Lorg/jetbrains/jewel/ui/component/SpinnerProgressIconGenerator$Big;
-	public final fun generateSvgFrames (Ljava/lang/String;)Ljava/util/List;
-}
-
-public final class org/jetbrains/jewel/ui/component/SpinnerProgressIconGenerator$Small {
-	public static final field $stable I
-	public static final field INSTANCE Lorg/jetbrains/jewel/ui/component/SpinnerProgressIconGenerator$Small;
-	public final fun generateSvgFrames (Ljava/lang/String;)Ljava/util/List;
-}
-
 public final class org/jetbrains/jewel/ui/component/SplitLayoutKt {
 	public static final fun HorizontalSplitLayout-BssWTFQ (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/Modifier;JFFFFFFLandroidx/compose/runtime/Composer;II)V
 	public static final fun VerticalSplitLayout-BssWTFQ (Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function3;Landroidx/compose/ui/Modifier;JFFFFFFLandroidx/compose/runtime/Composer;II)V
@@ -595,6 +578,7 @@ public final class org/jetbrains/jewel/ui/component/TabData$Default : org/jetbra
 	public fun getOnClose ()Lkotlin/jvm/functions/Function0;
 	public fun getSelected ()Z
 	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class org/jetbrains/jewel/ui/component/TabData$Editor : org/jetbrains/jewel/ui/component/TabData {
@@ -609,6 +593,7 @@ public final class org/jetbrains/jewel/ui/component/TabData$Editor : org/jetbrai
 	public fun getOnClose ()Lkotlin/jvm/functions/Function0;
 	public fun getSelected ()Z
 	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class org/jetbrains/jewel/ui/component/TabState : org/jetbrains/jewel/foundation/state/SelectableComponentState {
@@ -2219,7 +2204,7 @@ public final class org/jetbrains/jewel/ui/theme/JewelThemeKt {
 }
 
 public final class org/jetbrains/jewel/ui/util/ColorExtensionsKt {
-	public static final fun fromRGBAHexString (Landroidx/compose/ui/graphics/Color$Companion;Ljava/lang/String;)Landroidx/compose/ui/graphics/Color;
+	public static final fun fromRGBAHexStringOrNull (Landroidx/compose/ui/graphics/Color$Companion;Ljava/lang/String;)Landroidx/compose/ui/graphics/Color;
 	public static final fun isDark-8_81llA (J)Z
 	public static final fun toRgbaHexString-8_81llA (J)Ljava/lang/String;
 }
@@ -2229,24 +2214,6 @@ public final class org/jetbrains/jewel/ui/util/DebugKt {
 }
 
 public final class org/jetbrains/jewel/ui/util/ModifierExtensionsKt {
-	public static final fun appendIf (Landroidx/compose/ui/Modifier;ZLkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
 	public static final fun thenIf (Landroidx/compose/ui/Modifier;ZLkotlin/jvm/functions/Function1;)Landroidx/compose/ui/Modifier;
 }
 
-public final class org/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator {
-	public static final field $stable I
-	public static final field INSTANCE Lorg/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator;
-}
-
-public final class org/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator$Big {
-	public static final field $stable I
-	public static final field INSTANCE Lorg/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator$Big;
-	public final fun generateRawSvg (Ljava/lang/String;)Ljava/util/List;
-}
-
-public final class org/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator$Small {
-	public static final field $stable I
-	public static final field INSTANCE Lorg/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator$Small;
-	public final fun generateRawSvg (Ljava/lang/String;)Ljava/util/List;
-}
-
diff --git a/platform/jewel/ui/build.gradle.kts b/platform/jewel/ui/build.gradle.kts
index 64aa048df9bd5..13f563932816e 100644
--- a/platform/jewel/ui/build.gradle.kts
+++ b/platform/jewel/ui/build.gradle.kts
@@ -8,7 +8,8 @@ plugins {
     alias(libs.plugins.kotlinx.serialization)
 }
 
-private val composeVersion get() = ComposeBuildConfig.composeVersion
+private val composeVersion
+    get() = ComposeBuildConfig.composeVersion
 
 dependencies {
     api(projects.foundation)
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/ComponentStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/ComponentStyling.kt
index 2ad291d8a7878..bd6b0ee818b99 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/ComponentStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/ComponentStyling.kt
@@ -3,39 +3,35 @@ package org.jetbrains.jewel.ui
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ProvidedValue
 
-interface ComponentStyling {
+public interface ComponentStyling {
 
-    fun provide(vararg values: ProvidedValue<*>): ComponentStyling {
+    public fun provide(vararg values: ProvidedValue<*>): ComponentStyling {
         if (values.isEmpty()) return this
         return with(StaticComponentStyling(values = values))
     }
 
-    fun provide(provider: @Composable () -> Array<out ProvidedValue<*>>): ComponentStyling =
+    public fun provide(provider: @Composable () -> Array<out ProvidedValue<*>>): ComponentStyling =
         with(LazyComponentStyling(provider))
 
-    fun with(styling: ComponentStyling): ComponentStyling {
+    public fun with(styling: ComponentStyling): ComponentStyling {
         if (styling is Companion) return this
         return CombinedComponentStyling(this, styling)
     }
 
-    fun with(styling: @Composable () -> ComponentStyling): ComponentStyling =
-        with(
-            LazyComponentStyling {
-                styling().styles()
-            },
-        )
+    public fun with(styling: @Composable () -> ComponentStyling): ComponentStyling =
+        with(LazyComponentStyling { styling().styles() })
 
     @Composable
-    fun styles(): Array<out ProvidedValue<*>>
+    public fun styles(): Array<out ProvidedValue<*>>
 
-    companion object : ComponentStyling {
+    public companion object : ComponentStyling {
 
         override fun with(styling: ComponentStyling): ComponentStyling = styling
 
         @Composable
         override fun styles(): Array<out ProvidedValue<*>> = emptyArray()
 
-        override fun toString() = "ComponentStyleProvider"
+        override fun toString(): String = "ComponentStyleProvider"
     }
 }
 
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DefaultComponentStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DefaultComponentStyling.kt
index 98ec23b48e07e..10b1d93a90b80 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DefaultComponentStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DefaultComponentStyling.kt
@@ -48,53 +48,54 @@ import org.jetbrains.jewel.ui.component.styling.TooltipStyle
 
 @Stable
 @GenerateDataFunctions
-class DefaultComponentStyling(
-    val checkboxStyle: CheckboxStyle,
-    val chipStyle: ChipStyle,
-    val circularProgressStyle: CircularProgressStyle,
-    val defaultButtonStyle: ButtonStyle,
-    val defaultDropdownStyle: DropdownStyle,
-    val defaultTabStyle: TabStyle,
-    val dividerStyle: DividerStyle,
-    val editorTabStyle: TabStyle,
-    val groupHeaderStyle: GroupHeaderStyle,
-    val horizontalProgressBarStyle: HorizontalProgressBarStyle,
-    val iconButtonStyle: IconButtonStyle,
-    val lazyTreeStyle: LazyTreeStyle,
-    val linkStyle: LinkStyle,
-    val menuStyle: MenuStyle,
-    val outlinedButtonStyle: ButtonStyle,
-    val radioButtonStyle: RadioButtonStyle,
-    val scrollbarStyle: ScrollbarStyle,
-    val textAreaStyle: TextAreaStyle,
-    val textFieldStyle: TextFieldStyle,
-    val tooltipStyle: TooltipStyle,
-    val undecoratedDropdownStyle: DropdownStyle,
+public class DefaultComponentStyling(
+    public val checkboxStyle: CheckboxStyle,
+    public val chipStyle: ChipStyle,
+    public val circularProgressStyle: CircularProgressStyle,
+    public val defaultButtonStyle: ButtonStyle,
+    public val defaultDropdownStyle: DropdownStyle,
+    public val defaultTabStyle: TabStyle,
+    public val dividerStyle: DividerStyle,
+    public val editorTabStyle: TabStyle,
+    public val groupHeaderStyle: GroupHeaderStyle,
+    public val horizontalProgressBarStyle: HorizontalProgressBarStyle,
+    public val iconButtonStyle: IconButtonStyle,
+    public val lazyTreeStyle: LazyTreeStyle,
+    public val linkStyle: LinkStyle,
+    public val menuStyle: MenuStyle,
+    public val outlinedButtonStyle: ButtonStyle,
+    public val radioButtonStyle: RadioButtonStyle,
+    public val scrollbarStyle: ScrollbarStyle,
+    public val textAreaStyle: TextAreaStyle,
+    public val textFieldStyle: TextFieldStyle,
+    public val tooltipStyle: TooltipStyle,
+    public val undecoratedDropdownStyle: DropdownStyle,
 ) : ComponentStyling {
 
     @Composable
-    override fun styles(): Array<out ProvidedValue<*>> = arrayOf(
-        LocalCheckboxStyle provides checkboxStyle,
-        LocalChipStyle provides chipStyle,
-        LocalCircularProgressStyle provides circularProgressStyle,
-        LocalContextMenuRepresentation provides ContextMenuRepresentation,
-        LocalDefaultButtonStyle provides defaultButtonStyle,
-        LocalDefaultDropdownStyle provides defaultDropdownStyle,
-        LocalDefaultTabStyle provides defaultTabStyle,
-        LocalDividerStyle provides dividerStyle,
-        LocalEditorTabStyle provides editorTabStyle,
-        LocalGroupHeaderStyle provides groupHeaderStyle,
-        LocalHorizontalProgressBarStyle provides horizontalProgressBarStyle,
-        LocalIconButtonStyle provides iconButtonStyle,
-        LocalLazyTreeStyle provides lazyTreeStyle,
-        LocalLinkStyle provides linkStyle,
-        LocalMenuStyle provides menuStyle,
-        LocalOutlinedButtonStyle provides outlinedButtonStyle,
-        LocalRadioButtonStyle provides radioButtonStyle,
-        LocalScrollbarStyle provides scrollbarStyle,
-        LocalTextAreaStyle provides textAreaStyle,
-        LocalTextFieldStyle provides textFieldStyle,
-        LocalTooltipStyle provides tooltipStyle,
-        LocalUndecoratedDropdownStyle provides undecoratedDropdownStyle,
-    )
+    override fun styles(): Array<out ProvidedValue<*>> =
+        arrayOf(
+            LocalCheckboxStyle provides checkboxStyle,
+            LocalChipStyle provides chipStyle,
+            LocalCircularProgressStyle provides circularProgressStyle,
+            LocalContextMenuRepresentation provides ContextMenuRepresentation,
+            LocalDefaultButtonStyle provides defaultButtonStyle,
+            LocalDefaultDropdownStyle provides defaultDropdownStyle,
+            LocalDefaultTabStyle provides defaultTabStyle,
+            LocalDividerStyle provides dividerStyle,
+            LocalEditorTabStyle provides editorTabStyle,
+            LocalGroupHeaderStyle provides groupHeaderStyle,
+            LocalHorizontalProgressBarStyle provides horizontalProgressBarStyle,
+            LocalIconButtonStyle provides iconButtonStyle,
+            LocalLazyTreeStyle provides lazyTreeStyle,
+            LocalLinkStyle provides linkStyle,
+            LocalMenuStyle provides menuStyle,
+            LocalOutlinedButtonStyle provides outlinedButtonStyle,
+            LocalRadioButtonStyle provides radioButtonStyle,
+            LocalScrollbarStyle provides scrollbarStyle,
+            LocalTextAreaStyle provides textAreaStyle,
+            LocalTextFieldStyle provides textFieldStyle,
+            LocalTooltipStyle provides tooltipStyle,
+            LocalUndecoratedDropdownStyle provides undecoratedDropdownStyle,
+        )
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DisabledColorFilter.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DisabledColorFilter.kt
index 0eb1101b984a8..313dffa025a59 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DisabledColorFilter.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/DisabledColorFilter.kt
@@ -5,24 +5,26 @@ import androidx.compose.ui.graphics.ColorMatrix
 
 // Implements javax.swing.GrayFilter's behaviour with percent = 50, brighter = true
 // to match the GrayFilter#createDisabledImage behavior, used by Swing.
-private val disabledColorMatrixGammaEncoded = ColorMatrix().apply {
-    val saturation = .5f
+private val disabledColorMatrixGammaEncoded =
+    ColorMatrix().apply {
+        val saturation = .5f
 
-    // We use NTSC luminance weights like Swing does as it's gamma-encoded RGB,
-    // and add some brightness to emulate Swing's "brighter" approach, which is
-    // not representable with a ColorMatrix alone as it's a non-linear op.
-    val redFactor = .299f * saturation + .25f
-    val greenFactor = .587f * saturation + .25f
-    val blueFactor = .114f * saturation + .25f
-    this[0, 0] = redFactor
-    this[0, 1] = greenFactor
-    this[0, 2] = blueFactor
-    this[1, 0] = redFactor
-    this[1, 1] = greenFactor
-    this[1, 2] = blueFactor
-    this[2, 0] = redFactor
-    this[2, 1] = greenFactor
-    this[2, 2] = blueFactor
-}
+        // We use NTSC luminance weights like Swing does as it's gamma-encoded RGB,
+        // and add some brightness to emulate Swing's "brighter" approach, which is
+        // not representable with a ColorMatrix alone as it's a non-linear op.
+        val redFactor = .299f * saturation + .25f
+        val greenFactor = .587f * saturation + .25f
+        val blueFactor = .114f * saturation + .25f
+        this[0, 0] = redFactor
+        this[0, 1] = greenFactor
+        this[0, 2] = blueFactor
+        this[1, 0] = redFactor
+        this[1, 1] = greenFactor
+        this[1, 2] = blueFactor
+        this[2, 0] = redFactor
+        this[2, 1] = greenFactor
+        this[2, 2] = blueFactor
+    }
 
-fun ColorFilter.Companion.disabled(): ColorFilter = colorMatrix(disabledColorMatrixGammaEncoded)
+public fun ColorFilter.Companion.disabled(): ColorFilter =
+    colorMatrix(disabledColorMatrixGammaEncoded)
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/NoIndication.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/NoIndication.kt
index c26e9a36ab967..8bc25fae87f5a 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/NoIndication.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/NoIndication.kt
@@ -6,7 +6,7 @@ import androidx.compose.foundation.interaction.InteractionSource
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.drawscope.ContentDrawScope
 
-object NoIndication : Indication {
+public object NoIndication : Indication {
 
     private object NoIndicationInstance : IndicationInstance {
 
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/Orientation.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/Orientation.kt
index 7cbbb9f3e163b..730cbc015d5dd 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/Orientation.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/Orientation.kt
@@ -1,16 +1,10 @@
 package org.jetbrains.jewel.ui
 
-/**
- * Class to define possible directions.
- */
-enum class Orientation {
-    /**
-     * Vertical orientation representing Y axis
-     */
+/** Class to define possible directions. */
+public enum class Orientation {
+    /** Vertical orientation representing Y axis */
     Vertical,
 
-    /**
-     * Horizontal orientation representing X axis.
-     */
+    /** Horizontal orientation representing X axis. */
     Horizontal,
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/Outline.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/Outline.kt
index 0fa31fcc663bc..27d678ea1903b 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/Outline.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/Outline.kt
@@ -10,15 +10,15 @@ import org.jetbrains.jewel.foundation.state.FocusableComponentState
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.util.thenIf
 
-enum class Outline {
+public enum class Outline {
     None,
     Warning,
     Error,
     ;
 
-    companion object {
+    public companion object {
 
-        fun of(warning: Boolean, error: Boolean) =
+        public fun of(warning: Boolean, error: Boolean): Outline =
             when {
                 error -> Error
                 warning -> Warning
@@ -28,7 +28,7 @@ enum class Outline {
 }
 
 @Composable
-fun Modifier.focusOutline(
+public fun Modifier.focusOutline(
     state: FocusableComponentState,
     outlineShape: Shape,
     alignment: Stroke.Alignment = Stroke.Alignment.Outside,
@@ -43,7 +43,7 @@ fun Modifier.focusOutline(
 }
 
 @Composable
-fun Modifier.outline(
+public fun Modifier.outline(
     state: FocusableComponentState,
     outline: Outline,
     outlineShape: Shape,
@@ -53,13 +53,14 @@ fun Modifier.outline(
     val outlineColors = JewelTheme.globalColors.outlines
 
     return thenIf(outline != Outline.None) {
-        val outlineColor = when {
-            state.isFocused && outline == Outline.Error -> outlineColors.focusedError
-            outline == Outline.Error -> outlineColors.error
-            state.isFocused && outline == Outline.Warning -> outlineColors.focusedWarning
-            outline == Outline.Warning -> outlineColors.warning
-            else -> error("State $state says it has an outline, but doesn't really")
-        }
+        val outlineColor =
+            when {
+                state.isFocused && outline == Outline.Error -> outlineColors.focusedError
+                outline == Outline.Error -> outlineColors.error
+                state.isFocused && outline == Outline.Warning -> outlineColors.focusedWarning
+                outline == Outline.Warning -> outlineColors.warning
+                else -> error("State $state says it has an outline, but doesn't really")
+            }
         border(alignment, outlineWidth, outlineColor, outlineShape)
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Button.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Button.kt
index 5294d20390f76..235ae3919fadb 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Button.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Button.kt
@@ -17,7 +17,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -44,7 +43,7 @@ import org.jetbrains.jewel.ui.theme.defaultButtonStyle
 import org.jetbrains.jewel.ui.theme.outlinedButtonStyle
 
 @Composable
-fun DefaultButton(
+public fun DefaultButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
@@ -65,7 +64,7 @@ fun DefaultButton(
 }
 
 @Composable
-fun OutlinedButton(
+public fun OutlinedButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
@@ -95,22 +94,18 @@ private fun ButtonImpl(
     textStyle: TextStyle,
     content: @Composable RowScope.() -> Unit,
 ) {
-    var buttonState by remember(interactionSource) {
-        mutableStateOf(ButtonState.of(enabled = enabled))
-    }
+    var buttonState by
+        remember(interactionSource) { mutableStateOf(ButtonState.of(enabled = enabled)) }
 
-    remember(enabled) {
-        buttonState = buttonState.copy(enabled = enabled)
-    }
+    remember(enabled) { buttonState = buttonState.copy(enabled = enabled) }
 
     LaunchedEffect(interactionSource) {
         interactionSource.interactions.collect { interaction ->
             when (interaction) {
                 is PressInteraction.Press -> buttonState = buttonState.copy(pressed = true)
-                is PressInteraction.Cancel, is PressInteraction.Release ->
-                    buttonState =
-                        buttonState.copy(pressed = false)
-
+                is PressInteraction.Cancel,
+                is PressInteraction.Release,
+                -> buttonState = buttonState.copy(pressed = false)
                 is HoverInteraction.Enter -> buttonState = buttonState.copy(hovered = true)
                 is HoverInteraction.Exit -> buttonState = buttonState.copy(hovered = false)
                 is FocusInteraction.Focus -> buttonState = buttonState.copy(focused = true)
@@ -144,8 +139,7 @@ private fun ButtonImpl(
             LocalTextStyle provides textStyle.copy(color = contentColor.takeOrElse { textStyle.color }),
         ) {
             Row(
-                Modifier
-                    .defaultMinSize(style.metrics.minSize.width, style.metrics.minSize.height)
+                Modifier.defaultMinSize(style.metrics.minSize.width, style.metrics.minSize.height)
                     .padding(style.metrics.padding),
                 horizontalArrangement = Arrangement.Center,
                 verticalAlignment = Alignment.CenterVertically,
@@ -157,60 +151,57 @@ private fun ButtonImpl(
 
 @Immutable
 @JvmInline
-value class ButtonState(val state: ULong) : FocusableComponentState {
+public value class ButtonState(public val state: ULong) : FocusableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and Focused != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        enabled = enabled,
-        focused = focused,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
+    ): ButtonState =
+        of(
+            enabled = enabled,
+            focused = focused,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
 
-    override fun toString() =
+    override fun toString(): String =
         "${javaClass.simpleName}(isEnabled=$isEnabled, isFocused=$isFocused, isHovered=$isHovered, " +
             "isPressed=$isPressed, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             enabled: Boolean = true,
             focused: Boolean = false,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = true,
-        ) = ButtonState(
-            state = (if (enabled) Enabled else 0UL) or
-                (if (focused) Focused else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): ButtonState =
+            ButtonState(
+                (if (enabled) Enabled else 0UL) or
+                    (if (focused) Focused else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Checkbox.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Checkbox.kt
index a99009282768c..2b364f7e2bb9a 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Checkbox.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Checkbox.kt
@@ -17,7 +17,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -57,7 +56,7 @@ import org.jetbrains.jewel.ui.painter.hints.Stateful
 import org.jetbrains.jewel.ui.theme.checkboxStyle
 
 @Composable
-fun Checkbox(
+public fun Checkbox(
     checked: Boolean,
     onCheckedChange: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
@@ -86,7 +85,7 @@ fun Checkbox(
 }
 
 @Composable
-fun TriStateCheckbox(
+public fun TriStateCheckbox(
     state: ToggleableState,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -114,7 +113,7 @@ fun TriStateCheckbox(
 }
 
 @Composable
-fun TriStateCheckboxRow(
+public fun TriStateCheckboxRow(
     text: String,
     state: ToggleableState,
     onClick: () -> Unit,
@@ -144,7 +143,7 @@ fun TriStateCheckboxRow(
 }
 
 @Composable
-fun CheckboxRow(
+public fun CheckboxRow(
     text: String,
     checked: Boolean,
     onCheckedChange: ((Boolean) -> Unit)?,
@@ -176,7 +175,7 @@ fun CheckboxRow(
 }
 
 @Composable
-fun CheckboxRow(
+public fun CheckboxRow(
     checked: Boolean,
     onCheckedChange: ((Boolean) -> Unit)?,
     modifier: Modifier = Modifier,
@@ -191,9 +190,7 @@ fun CheckboxRow(
 ) {
     CheckboxImpl(
         state = ToggleableState(checked),
-        onClick = {
-            onCheckedChange?.invoke(!checked)
-        },
+        onClick = { onCheckedChange?.invoke(!checked) },
         modifier = modifier,
         enabled = enabled,
         outline = outline,
@@ -207,7 +204,7 @@ fun CheckboxRow(
 }
 
 @Composable
-fun TriStateCheckboxRow(
+public fun TriStateCheckboxRow(
     state: ToggleableState,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -252,6 +249,7 @@ private fun CheckboxImpl(
     var checkboxState by remember(interactionSource) {
         mutableStateOf(CheckboxState.of(state, enabled = enabled))
     }
+
     remember(state, enabled) {
         checkboxState = checkboxState.copy(toggleableState = state, enabled = enabled)
     }
@@ -260,10 +258,9 @@ private fun CheckboxImpl(
         interactionSource.interactions.collect { interaction ->
             when (interaction) {
                 is PressInteraction.Press -> checkboxState = checkboxState.copy(pressed = true)
-                is PressInteraction.Cancel, is PressInteraction.Release ->
-                    checkboxState =
-                        checkboxState.copy(pressed = false)
-
+                is PressInteraction.Cancel,
+                is PressInteraction.Release,
+                -> checkboxState = checkboxState.copy(pressed = false)
                 is HoverInteraction.Enter -> checkboxState = checkboxState.copy(hovered = true)
                 is HoverInteraction.Exit -> checkboxState = checkboxState.copy(hovered = false)
                 is FocusInteraction.Focus -> checkboxState = checkboxState.copy(focused = true)
@@ -276,14 +273,15 @@ private fun CheckboxImpl(
         checkboxState = checkboxState.copy(hovered = false, pressed = false)
     }
 
-    val wrapperModifier = modifier.triStateToggleable(
-        state = state,
-        onClick = onClick,
-        enabled = enabled,
-        role = Role.Checkbox,
-        interactionSource = interactionSource,
-        indication = null,
-    )
+    val wrapperModifier =
+        modifier.triStateToggleable(
+            state = state,
+            onClick = onClick,
+            enabled = enabled,
+            role = Role.Checkbox,
+            interactionSource = interactionSource,
+            indication = null,
+        )
 
     val checkBoxImageModifier = Modifier.size(metrics.checkboxSize)
     val outlineModifier = Modifier.size(metrics.outlineSize)
@@ -338,81 +336,80 @@ private object CheckBoxIndeterminate : PainterSuffixHint() {
 }
 
 @Composable
-private fun CheckBoxImage(outerModifier: Modifier, checkboxPainter: Painter, checkBoxModifier: Modifier) {
-    Box(outerModifier, contentAlignment = Alignment.Center) {
+private fun CheckBoxImage(
+    modifier: Modifier,
+    checkboxPainter: Painter,
+    checkBoxModifier: Modifier,
+) {
+    Box(modifier, contentAlignment = Alignment.Center) {
         Image(checkboxPainter, contentDescription = null, modifier = checkBoxModifier)
     }
 }
 
 @Immutable
 @JvmInline
-value class CheckboxState(private val state: ULong) : ToggleableComponentState, FocusableComponentState {
+public value class CheckboxState(private val state: ULong) : ToggleableComponentState, FocusableComponentState {
 
-    @Stable
     override val toggleableState: ToggleableState
         get() = state.readToggleableState()
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable
     override val isSelected: Boolean
         get() = toggleableState != ToggleableState.Off
 
-    @Stable
     override val isFocused: Boolean
         get() = state and Focused != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         toggleableState: ToggleableState = this.toggleableState,
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        toggleableState = toggleableState,
-        enabled = enabled,
-        focused = focused,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
+    ): CheckboxState =
+        of(
+            toggleableState = toggleableState,
+            enabled = enabled,
+            focused = focused,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
 
-    override fun toString() =
+    override fun toString(): String =
         "${javaClass.simpleName}(toggleableState=$toggleableState, isEnabled=$isEnabled, isFocused=$isFocused, " +
             "isHovered=$isHovered, isPressed=$isPressed, isSelected=$isSelected, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             toggleableState: ToggleableState,
             enabled: Boolean = true,
             focused: Boolean = false,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = false,
-        ) = CheckboxState(
-            state = (if (enabled) Enabled else 0UL) or
-                (if (focused) Focused else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (toggleableState != ToggleableState.Off) Selected else 0UL) or
-                (if (toggleableState == ToggleableState.Indeterminate) Indeterminate else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): CheckboxState =
+            CheckboxState(
+                (if (enabled) Enabled else 0UL) or
+                    (if (focused) Focused else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (toggleableState != ToggleableState.Off) Selected else 0UL) or
+                    (if (toggleableState == ToggleableState.Indeterminate) Indeterminate else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Chip.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Chip.kt
index c101c68cb4ce1..1b4ef829087fc 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Chip.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Chip.kt
@@ -16,14 +16,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.isUnspecified
+import androidx.compose.ui.graphics.takeOrElse
 import androidx.compose.ui.semantics.Role
 import org.jetbrains.jewel.foundation.Stroke
 import org.jetbrains.jewel.foundation.modifier.border
@@ -42,7 +41,7 @@ import org.jetbrains.jewel.ui.focusOutline
 import org.jetbrains.jewel.ui.theme.chipStyle
 
 @Composable
-fun Chip(
+public fun Chip(
     modifier: Modifier = Modifier,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     enabled: Boolean = true,
@@ -68,7 +67,7 @@ fun Chip(
 }
 
 @Composable
-fun ToggleableChip(
+public fun ToggleableChip(
     checked: Boolean,
     onClick: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
@@ -95,7 +94,7 @@ fun ToggleableChip(
 }
 
 @Composable
-fun RadioButtonChip(
+public fun RadioButtonChip(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -109,7 +108,7 @@ fun RadioButtonChip(
         enabled,
         selected,
         style,
-        modifier.selectable(
+        modifier = modifier.selectable(
             onClick = onClick,
             enabled = enabled,
             role = Role.RadioButton,
@@ -133,9 +132,8 @@ private fun ChipImpl(
     var chipState by remember(interactionSource) {
         mutableStateOf(ChipState.of(enabled = enabled, selected = selected))
     }
-    remember(enabled, selected) {
-        chipState = chipState.copy(enabled = enabled, selected = selected)
-    }
+
+    remember(enabled, selected) { chipState = chipState.copy(enabled = enabled, selected = selected) }
 
     LaunchedEffect(interactionSource) {
         interactionSource.interactions.collect { interaction ->
@@ -154,11 +152,12 @@ private fun ChipImpl(
     val colors = style.colors
     val borderColor by colors.borderFor(chipState)
 
-    val borderWidth = if (chipState.isSelected) {
-        style.metrics.borderWidthSelected
-    } else {
-        style.metrics.borderWidth
-    }
+    val borderWidth =
+        if (chipState.isSelected) {
+            style.metrics.borderWidthSelected
+        } else {
+            style.metrics.borderWidth
+        }
 
     Row(
         modifier = modifier
@@ -169,15 +168,10 @@ private fun ChipImpl(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.Center,
     ) {
-        CompositionLocalProvider(
-            LocalContentColor provides (
-                colors
-                    .contentFor(state = chipState)
-                    .value
-                    .takeIf { !it.isUnspecified }
-                    ?: LocalContentColor.current
-                ),
-        ) {
+        val resolvedContentColor = colors.contentFor(state = chipState).value
+            .takeOrElse { LocalContentColor.current }
+
+        CompositionLocalProvider(LocalContentColor provides resolvedContentColor) {
             content()
         }
     }
@@ -185,68 +179,65 @@ private fun ChipImpl(
 
 @Immutable
 @JvmInline
-value class ChipState(val state: ULong) : FocusableComponentState, SelectableComponentState {
+public value class ChipState(public val state: ULong) :
+    FocusableComponentState, SelectableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and Focused != 0UL
 
-    @Stable
     override val isSelected: Boolean
         get() = state and Selected != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         selected: Boolean = isSelected,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ): ChipState = of(
-        enabled = enabled,
-        focused = focused,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-        selected = selected,
-    )
+    ): ChipState =
+        of(
+            enabled = enabled,
+            focused = focused,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+            selected = selected,
+        )
 
-    override fun toString() =
+    override fun toString(): String =
         "ChipState(isEnabled=$isEnabled, isFocused=$isFocused, isSelected=$isSelected, " +
             "isHovered=$isHovered, isPressed=$isPressed, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             enabled: Boolean = true,
             focused: Boolean = false,
             selected: Boolean = false,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = false,
-        ) = ChipState(
-            state = (if (enabled) Enabled else 0UL) or
-                (if (focused) Focused else 0UL) or
-                (if (selected) Selected else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): ChipState =
+            ChipState(
+                (if (enabled) Enabled else 0UL) or
+                    (if (focused) Focused else 0UL) or
+                    (if (selected) Selected else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/CircularProgressIndicator.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/CircularProgressIndicator.kt
index 8bba3a3492e20..563c4016635ce 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/CircularProgressIndicator.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/CircularProgressIndicator.kt
@@ -23,7 +23,7 @@ import org.jetbrains.jewel.ui.theme.circularProgressStyle
 import org.jetbrains.jewel.ui.util.toRgbaHexString
 
 @Composable
-fun CircularProgressIndicator(
+public fun CircularProgressIndicator(
     modifier: Modifier = Modifier,
     style: CircularProgressStyle = JewelTheme.circularProgressStyle,
 ) {
@@ -31,12 +31,14 @@ fun CircularProgressIndicator(
         modifier = modifier,
         iconSize = DpSize(16.dp, 16.dp),
         style = style,
-        frameRetriever = { color -> SpinnerProgressIconGenerator.Small.generateSvgFrames(color.toRgbaHexString()) },
+        frameRetriever = { color ->
+            SpinnerProgressIconGenerator.Small.generateSvgFrames(color.toRgbaHexString())
+        },
     )
 }
 
 @Composable
-fun CircularProgressIndicatorBig(
+public fun CircularProgressIndicatorBig(
     modifier: Modifier = Modifier,
     style: CircularProgressStyle = JewelTheme.circularProgressStyle,
 ) {
@@ -44,7 +46,9 @@ fun CircularProgressIndicatorBig(
         modifier = modifier,
         iconSize = DpSize(32.dp, 32.dp),
         style = style,
-        frameRetriever = { color -> SpinnerProgressIconGenerator.Big.generateSvgFrames(color.toRgbaHexString()) },
+        frameRetriever = { color ->
+            SpinnerProgressIconGenerator.Big.generateSvgFrames(color.toRgbaHexString())
+        },
     )
 }
 
@@ -76,6 +80,7 @@ private fun CircularProgressIndicatorImpl(
             .map {
                 loadSvgPainter(it.byteInputStream(), density)
             }
+
         while (true) {
             for (i in frames.indices) {
                 currentFrame = frames[i]
@@ -86,63 +91,53 @@ private fun CircularProgressIndicatorImpl(
     }
 }
 
-object SpinnerProgressIconGenerator {
+private object SpinnerProgressIconGenerator {
 
     private val opacityList = listOf(1.0f, 0.93f, 0.78f, 0.69f, 0.62f, 0.48f, 0.38f, 0.0f)
 
     private fun StringBuilder.closeRoot() = append("</svg>")
-    private fun StringBuilder.openRoot(sizePx: Int) = append(
-        "<svg width=\"$sizePx\" height=\"$sizePx\" viewBox=\"0 0 16 16\" fill=\"none\" " +
-            "xmlns=\"http://www.w3.org/2000/svg\">",
-    )
+
+    private fun StringBuilder.openRoot(sizePx: Int) =
+        append(
+            "<svg width=\"$sizePx\" height=\"$sizePx\" viewBox=\"0 0 16 16\" fill=\"none\" " +
+                "xmlns=\"http://www.w3.org/2000/svg\">",
+        )
 
     private fun generateSvgIcon(
         size: Int,
         opacityListShifted: List<Float>,
         colorHex: String,
-    ) =
-        buildString {
-            openRoot(size)
-            elements(
-                colorHex = colorHex,
-                opacityList = opacityListShifted,
-            )
-            closeRoot()
-        }
-
-    private fun StringBuilder.elements(
-        colorHex: String,
-        opacityList: List<Float>,
-    ) {
-        append(
-            "\n" +
-                "    <rect fill=\"$colorHex\" opacity=\"${opacityList[0]}\" x=\"7\" y=\"1\" width=\"2\" height=\"4\" rx=\"1\"/>\n" +
-                "    <rect fill=\"$colorHex\" opacity=\"${opacityList[1]}\" x=\"2.34961\" y=\"3.76416\" width=\"2\" height=\"4\" rx=\"1\"\n" +
-                "          transform=\"rotate(-45 2.34961 3.76416)\"/>\n" +
-                "    <rect fill=\"$colorHex\" opacity=\"${opacityList[2]}\" x=\"1\" y=\"7\" width=\"4\" height=\"2\" rx=\"1\"/>\n" +
-                "    <rect fill=\"$colorHex\" opacity=\"${opacityList[3]}\" x=\"5.17871\" y=\"9.40991\" width=\"2\" height=\"4\" rx=\"1\"\n" +
-                "          transform=\"rotate(45 5.17871 9.40991)\"/>\n" +
-                "    <rect fill=\"$colorHex\" opacity=\"${opacityList[4]}\" x=\"7\" y=\"11\" width=\"2\" height=\"4\" rx=\"1\"/>\n" +
-                "    <rect fill=\"$colorHex\" opacity=\"${opacityList[5]}\" x=\"9.41016\" y=\"10.8242\" width=\"2\" height=\"4\" rx=\"1\"\n" +
-                "          transform=\"rotate(-45 9.41016 10.8242)\"/>\n" +
-                "    <rect fill=\"$colorHex\" opacity=\"${opacityList[6]}\" x=\"11\" y=\"7\" width=\"4\" height=\"2\" rx=\"1\"/>\n" +
-                "    <rect fill=\"$colorHex\" opacity=\"${opacityList[7]}\" x=\"12.2383\" y=\"2.3501\" width=\"2\" height=\"4\" rx=\"1\"\n" +
-                "          transform=\"rotate(45 12.2383 2.3501)\"/>\n",
+    ) = buildString {
+        openRoot(size)
+        elements(
+            colorHex = colorHex,
+            opacityList = opacityListShifted,
         )
+        closeRoot()
+    }
+
+    private fun StringBuilder.elements(colorHex: String, opacityList: List<Float>) {
+        appendLine()
+        appendLine("""    <rect fill="$colorHex" opacity="${opacityList[0]}" x="7" y="1" width="2" height="4" rx="1"/>""")
+        appendLine("""    <rect fill="$colorHex" opacity="${opacityList[1]}" x="2.34961" y="3.76416" width="2" height="4" rx="1"""")
+        appendLine("""          transform="rotate(-45 2.34961 3.76416)"/>""")
+        appendLine("""    <rect fill="$colorHex" opacity="${opacityList[2]}" x="1" y="7" width="4" height="2" rx="1"/>""")
+        appendLine("""    <rect fill="$colorHex" opacity="${opacityList[3]}" x="5.17871" y="9.40991" width="2" height="4" rx="1"""")
+        appendLine("""          transform="rotate(45 5.17871 9.40991)"/>""")
+        appendLine("""    <rect fill="$colorHex" opacity="${opacityList[4]}" x="7" y="11" width="2" height="4" rx="1"/>""")
+        appendLine("""    <rect fill="$colorHex" opacity="${opacityList[5]}" x="9.41016" y="10.8242" width="2" height="4" rx="1"""")
+        appendLine("""          transform="rotate(-45 9.41016 10.8242)"/>""")
+        appendLine("""    <rect fill="$colorHex" opacity="${opacityList[6]}" x="11" y="7" width="4" height="2" rx="1"/>""")
+        appendLine("""    <rect fill="$colorHex" opacity="${opacityList[7]}" x="12.2383" y="2.3501" width="2" height="4" rx="1"""")
+        appendLine("""          transform="rotate(45 12.2383 2.3501)"/>""")
     }
 
     object Small {
 
-        fun generateSvgFrames(colorHex: String) = buildList {
+        fun generateSvgFrames(colorHex: String): List<String> = buildList {
             val opacityListShifted = opacityList.toMutableList()
             repeat(opacityList.count()) {
-                add(
-                    generateSvgIcon(
-                        size = 16,
-                        colorHex = colorHex,
-                        opacityListShifted = opacityListShifted,
-                    ),
-                )
+                add(generateSvgIcon(size = 16, colorHex = colorHex, opacityListShifted = opacityListShifted))
                 opacityListShifted.shtr()
             }
         }
@@ -150,16 +145,10 @@ object SpinnerProgressIconGenerator {
 
     object Big {
 
-        fun generateSvgFrames(colorHex: String) = buildList {
+        fun generateSvgFrames(colorHex: String): List<String> = buildList {
             val opacityListShifted = opacityList.toMutableList()
             repeat(opacityList.count()) {
-                add(
-                    generateSvgIcon(
-                        size = 32,
-                        colorHex = colorHex,
-                        opacityListShifted = opacityListShifted,
-                    ),
-                )
+                add(generateSvgIcon(size = 32, colorHex = colorHex, opacityListShifted = opacityListShifted))
                 opacityListShifted.shtr()
             }
         }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ContextMenu.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ContextMenu.kt
index 37bd0d43bd631..32731757d3281 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ContextMenu.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/ContextMenu.kt
@@ -22,7 +22,7 @@ import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.component.styling.MenuStyle
 import org.jetbrains.jewel.ui.theme.menuStyle
 
-object ContextMenuRepresentation : ContextMenuRepresentation {
+public object ContextMenuRepresentation : ContextMenuRepresentation {
 
     @Composable
     override fun Representation(state: ContextMenuState, items: () -> List<ContextMenuItem>) {
@@ -52,22 +52,22 @@ internal fun ContextMenu(
 ) {
     var focusManager: FocusManager? by mutableStateOf(null)
     var inputModeManager: InputModeManager? by mutableStateOf(null)
-    val menuManager = remember(onDismissRequest) {
-        MenuManager(
-            onDismissRequest = onDismissRequest,
-        )
-    }
+    val menuManager =
+        remember(onDismissRequest) {
+            MenuManager(
+                onDismissRequest = onDismissRequest,
+            )
+        }
 
     Popup(
         popupPositionProvider = rememberCursorPositionProvider(style.metrics.offset),
-        onDismissRequest = {
-            onDismissRequest(InputMode.Touch)
-        },
+        onDismissRequest = { onDismissRequest(InputMode.Touch) },
         properties = PopupProperties(focusable = focusable),
         onPreviewKeyEvent = { false },
         onKeyEvent = {
             val currentFocusManager = checkNotNull(focusManager) { "FocusManager must not be null" }
-            val currentInputModeManager = checkNotNull(inputModeManager) { "InputModeManager must not be null" }
+            val currentInputModeManager =
+                checkNotNull(inputModeManager) { "InputModeManager must not be null" }
             handlePopupMenuOnKeyEvent(it, currentFocusManager, currentInputModeManager, menuManager)
         },
     ) {
@@ -91,15 +91,9 @@ private fun MenuScope.contextItems(items: () -> List<ContextMenuItem>) {
             is ContextMenuDivider -> {
                 separator()
             }
-
             is ContextSubmenu -> {
-                submenu(submenu = {
-                    contextItems(item.submenu)
-                }) {
-                    Text(item.label)
-                }
+                submenu(submenu = { contextItems(item.submenu) }) { Text(item.label) }
             }
-
             else -> {
                 selectableItem(
                     selected = false,
@@ -112,9 +106,9 @@ private fun MenuScope.contextItems(items: () -> List<ContextMenuItem>) {
     }
 }
 
-object ContextMenuDivider : ContextMenuItem("---", {})
+public object ContextMenuDivider : ContextMenuItem("---", {})
 
-class ContextSubmenu(
+public class ContextSubmenu(
     label: String,
-    val submenu: () -> List<ContextMenuItem>,
+    public val submenu: () -> List<ContextMenuItem>,
 ) : ContextMenuItem(label, {})
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Divider.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Divider.kt
index cae976ddd4f03..1bde7c9b890d0 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Divider.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Divider.kt
@@ -19,7 +19,7 @@ import org.jetbrains.jewel.ui.component.styling.DividerStyle
 import org.jetbrains.jewel.ui.theme.dividerStyle
 
 @Composable
-fun Divider(
+public fun Divider(
     orientation: Orientation,
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
@@ -27,22 +27,23 @@ fun Divider(
     startIndent: Dp = Dp.Unspecified,
     style: DividerStyle = JewelTheme.dividerStyle,
 ) {
-    val indentMod = if (startIndent.value != 0f) {
-        Modifier.padding(start = startIndent.takeOrElse { style.metrics.startIndent })
-    } else {
-        Modifier
-    }
+    val indentModifier =
+        if (startIndent.value != 0f) {
+            Modifier.padding(start = startIndent.takeOrElse { style.metrics.startIndent })
+        } else {
+            Modifier
+        }
 
     val actualThickness = thickness.takeOrElse { style.metrics.thickness }
-    val orientationModifier = when (orientation) {
-        Orientation.Horizontal -> Modifier.height(actualThickness).fillMaxWidth()
-        Orientation.Vertical -> Modifier.width(actualThickness).fillMaxHeight()
-    }
+    val orientationModifier =
+        when (orientation) {
+            Orientation.Horizontal -> Modifier.height(actualThickness).fillMaxWidth()
+            Orientation.Vertical -> Modifier.width(actualThickness).fillMaxHeight()
+        }
 
     val lineColor = color.takeOrElse { style.color }
     Box(
-        modifier
-            .then(indentMod)
+        modifier.then(indentModifier)
             .then(orientationModifier)
             .background(color = lineColor),
     )
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Dropdown.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Dropdown.kt
index 278337e754618..ba1879bc844cb 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Dropdown.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Dropdown.kt
@@ -19,7 +19,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -57,7 +56,7 @@ import org.jetbrains.jewel.ui.theme.dropdownStyle
 import org.jetbrains.jewel.ui.util.thenIf
 
 @Composable
-fun Dropdown(
+public fun Dropdown(
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
     menuModifier: Modifier = Modifier,
@@ -74,18 +73,15 @@ fun Dropdown(
         mutableStateOf(DropdownState.of(enabled = enabled))
     }
 
-    remember(enabled) {
-        dropdownState = dropdownState.copy(enabled = enabled)
-    }
+    remember(enabled) { dropdownState = dropdownState.copy(enabled = enabled) }
 
     LaunchedEffect(interactionSource) {
         interactionSource.interactions.collect { interaction ->
             when (interaction) {
                 is PressInteraction.Press -> dropdownState = dropdownState.copy(pressed = true)
-                is PressInteraction.Cancel, is PressInteraction.Release ->
-                    dropdownState =
-                        dropdownState.copy(pressed = false)
-
+                is PressInteraction.Cancel,
+                is PressInteraction.Release,
+                -> dropdownState = dropdownState.copy(pressed = false)
                 is HoverInteraction.Enter -> dropdownState = dropdownState.copy(hovered = true)
                 is HoverInteraction.Exit -> dropdownState = dropdownState.copy(hovered = false)
                 is FocusInteraction.Focus -> dropdownState = dropdownState.copy(focused = true)
@@ -103,33 +99,33 @@ fun Dropdown(
     val hasNoOutline = outline == Outline.None
 
     Box(
-        modifier.clickable(
-            onClick = {
-                // TODO: Trick to skip click event when close menu by click dropdown
-                if (!skipNextClick) {
-                    expanded = !expanded
-                }
-                skipNextClick = false
-            },
-            enabled = enabled,
-            role = Role.Button,
-            interactionSource = interactionSource,
-            indication = null,
-        )
+        modifier = modifier
+            .clickable(
+                onClick = {
+                    // TODO: Trick to skip click event when close menu by click dropdown
+                    if (!skipNextClick) {
+                        expanded = !expanded
+                    }
+                    skipNextClick = false
+                },
+                enabled = enabled,
+                role = Role.Button,
+                interactionSource = interactionSource,
+                indication = null,
+            )
             .background(colors.backgroundFor(dropdownState).value, shape)
-            .thenIf(hasNoOutline) { border(Stroke.Alignment.Center, style.metrics.borderWidth, borderColor, shape) }
+            .thenIf(hasNoOutline) {
+                border(Stroke.Alignment.Center, style.metrics.borderWidth, borderColor, shape)
+            }
             .thenIf(outline == Outline.None) { focusOutline(dropdownState, shape) }
             .outline(dropdownState, outline, shape)
             .width(IntrinsicSize.Max)
             .defaultMinSize(minSize.width, minSize.height.coerceAtLeast(arrowMinSize.height)),
         contentAlignment = Alignment.CenterStart,
     ) {
-        CompositionLocalProvider(
-            LocalContentColor provides colors.contentFor(dropdownState).value,
-        ) {
+        CompositionLocalProvider(LocalContentColor provides colors.contentFor(dropdownState).value) {
             Box(
-                modifier = Modifier
-                    .fillMaxWidth()
+                modifier = Modifier.fillMaxWidth()
                     .padding(style.metrics.contentPadding)
                     .padding(end = arrowMinSize.width),
                 contentAlignment = Alignment.CenterStart,
@@ -137,8 +133,7 @@ fun Dropdown(
             )
 
             Box(
-                modifier = Modifier.size(arrowMinSize)
-                    .align(Alignment.CenterEnd),
+                modifier = Modifier.size(arrowMinSize).align(Alignment.CenterEnd),
                 contentAlignment = Alignment.Center,
             ) {
                 val chevronIcon by style.icons.chevronDown.getPainter(Stateful(dropdownState))
@@ -187,9 +182,7 @@ internal fun DropdownMenu(
 
     var focusManager: FocusManager? by remember { mutableStateOf(null) }
     var inputModeManager: InputModeManager? by remember { mutableStateOf(null) }
-    val menuManager = remember(onDismissRequest) {
-        MenuManager(onDismissRequest = onDismissRequest)
-    }
+    val menuManager = remember(onDismissRequest) { MenuManager(onDismissRequest = onDismissRequest) }
 
     Popup(
         popupPositionProvider = popupPositionProvider,
@@ -198,7 +191,8 @@ internal fun DropdownMenu(
         onPreviewKeyEvent = { false },
         onKeyEvent = {
             val currentFocusManager = checkNotNull(focusManager) { "FocusManager must not be null" }
-            val currentInputModeManager = checkNotNull(inputModeManager) { "InputModeManager must not be null" }
+            val currentInputModeManager =
+                checkNotNull(inputModeManager) { "InputModeManager must not be null" }
             handlePopupMenuOnKeyEvent(it, currentFocusManager, currentInputModeManager, menuManager)
         },
     ) {
@@ -209,70 +203,64 @@ internal fun DropdownMenu(
             LocalMenuManager provides menuManager,
             LocalMenuStyle provides style,
         ) {
-            MenuContent(
-                modifier = modifier,
-                content = content,
-            )
+            MenuContent(modifier, content = content)
         }
     }
 }
 
 @Immutable
 @JvmInline
-value class DropdownState(val state: ULong) : FocusableComponentState {
+public value class DropdownState(public val state: ULong) : FocusableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and Focused != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        enabled = enabled,
-        focused = focused,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
+    ): DropdownState =
+        of(
+            enabled = enabled,
+            focused = focused,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
 
-    override fun toString() =
+    override fun toString(): String =
         "${javaClass.simpleName}(isEnabled=$isEnabled, isFocused=$isFocused, " +
             "isHovered=$isHovered, isPressed=$isPressed, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             enabled: Boolean = true,
             focused: Boolean = false,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = false,
-        ) = DropdownState(
-            (if (enabled) Enabled else 0UL) or
-                (if (focused) Focused else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): DropdownState =
+            DropdownState(
+                (if (enabled) Enabled else 0UL) or
+                    (if (focused) Focused else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/GroupHeader.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/GroupHeader.kt
index d23aea75fa75d..175d8d147ab1b 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/GroupHeader.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/GroupHeader.kt
@@ -10,7 +10,7 @@ import org.jetbrains.jewel.ui.component.styling.GroupHeaderStyle
 import org.jetbrains.jewel.ui.component.styling.LocalGroupHeaderStyle
 
 @Composable
-fun GroupHeader(
+public fun GroupHeader(
     text: String,
     modifier: Modifier = Modifier,
     textColor: Color = Color.Unspecified,
@@ -18,6 +18,7 @@ fun GroupHeader(
 ) {
     Row(modifier, verticalAlignment = Alignment.CenterVertically) {
         Text(text, color = textColor)
+
         Divider(
             orientation = Orientation.Horizontal,
             color = style.colors.divider,
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Icon.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Icon.kt
index c937a16e536ca..de42e3d156246 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Icon.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Icon.kt
@@ -32,11 +32,12 @@ import androidx.compose.ui.semantics.role
 import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.unit.dp
 import org.jetbrains.jewel.ui.painter.rememberResourcePainterProvider
+import org.jetbrains.jewel.ui.util.thenIf
 import org.xml.sax.InputSource
 import java.io.InputStream
 
 @Composable
-fun Icon(
+public fun Icon(
     resource: String,
     contentDescription: String?,
     iconClass: Class<*>,
@@ -55,7 +56,7 @@ fun Icon(
 }
 
 @Composable
-fun Icon(
+public fun Icon(
     resource: String,
     contentDescription: String?,
     iconClass: Class<*>,
@@ -79,15 +80,15 @@ fun Icon(
  *
  * @param imageVector [ImageVector] to draw inside this Icon
  * @param contentDescription text used by accessibility services to
- *     describe what this icon represents. This should always be
- *     provided unless this icon is used for decorative purposes, and
- *     does not represent a meaningful action that a user can take.
+ *     describe what this icon represents. This should always be provided
+ *     unless this icon is used for decorative purposes, and does not
+ *     represent a meaningful action that a user can take.
  * @param modifier optional [Modifier] for this Icon
  * @param tint tint to be applied to [imageVector]. If [Color.Unspecified]
  *     is provided, then no tint is applied
  */
 @Composable
-fun Icon(
+public fun Icon(
     imageVector: ImageVector,
     contentDescription: String?,
     modifier: Modifier = Modifier,
@@ -107,15 +108,15 @@ fun Icon(
  *
  * @param bitmap [ImageBitmap] to draw inside this Icon
  * @param contentDescription text used by accessibility services to
- *     describe what this icon represents. This should always be
- *     provided unless this icon is used for decorative purposes, and
- *     does not represent a meaningful action that a user can take.
+ *     describe what this icon represents. This should always be provided
+ *     unless this icon is used for decorative purposes, and does not
+ *     represent a meaningful action that a user can take.
  * @param modifier optional [Modifier] for this Icon
  * @param tint tint to be applied to [bitmap]. If [Color.Unspecified] is
  *     provided, then no tint is applied
  */
 @Composable
-fun Icon(
+public fun Icon(
     bitmap: ImageBitmap,
     contentDescription: String?,
     modifier: Modifier = Modifier,
@@ -136,15 +137,15 @@ fun Icon(
  *
  * @param painter [Painter] to draw inside this Icon
  * @param contentDescription text used by accessibility services to
- *     describe what this icon represents. This should always be
- *     provided unless this icon is used for decorative purposes, and
- *     does not represent a meaningful action that a user can take.
+ *     describe what this icon represents. This should always be provided
+ *     unless this icon is used for decorative purposes, and does not
+ *     represent a meaningful action that a user can take.
  * @param modifier optional [Modifier] for this Icon
  * @param tint tint to be applied to [painter]. If [Color.Unspecified] is
  *     provided, then no tint is applied
  */
 @Composable
-fun Icon(
+public fun Icon(
     painter: Painter,
     contentDescription: String?,
     modifier: Modifier = Modifier,
@@ -159,27 +160,28 @@ fun Icon(
  *
  * @param painter [Painter] to draw inside this Icon
  * @param contentDescription text used by accessibility services to
- *     describe what this icon represents. This should always be
- *     provided unless this icon is used for decorative purposes, and
- *     does not represent a meaningful action that a user can take.
- * @param modifier optional [Modifier] for this Icon
+ *     describe what this icon represents. This should always be provided
+ *     unless this icon is used for decorative purposes, and does not
+ *     represent a meaningful action that a user can take.
  * @param colorFilter color filter to be applied to [painter]
+ * @param modifier optional [Modifier] for this Icon
  */
 @Composable
-fun Icon(
+public fun Icon(
     painter: Painter,
     contentDescription: String?,
     colorFilter: ColorFilter?,
     modifier: Modifier = Modifier,
 ) {
-    val semantics = if (contentDescription != null) {
-        Modifier.semantics {
-            this.contentDescription = contentDescription
-            this.role = Role.Image
+    val semantics =
+        if (contentDescription != null) {
+            Modifier.semantics {
+                this.contentDescription = contentDescription
+                this.role = Role.Image
+            }
+        } else {
+            Modifier
         }
-    } else {
-        Modifier
-    }
     Box(
         modifier.toolingGraphicsLayer()
             .defaultSizeFor(painter)
@@ -193,14 +195,15 @@ fun Icon(
 }
 
 @Composable
-fun painterResource(
+public fun painterResource(
     resourcePath: String,
     loader: ResourceLoader,
-): Painter = when (resourcePath.substringAfterLast(".").lowercase()) {
-    "svg" -> rememberSvgResource(resourcePath, loader)
-    "xml" -> rememberVectorXmlResource(resourcePath, loader)
-    else -> rememberBitmapResource(resourcePath, loader)
-}
+): Painter =
+    when (resourcePath.substringAfterLast(".").lowercase()) {
+        "svg" -> rememberSvgResource(resourcePath, loader)
+        "xml" -> rememberVectorXmlResource(resourcePath, loader)
+        else -> rememberBitmapResource(resourcePath, loader)
+    }
 
 @Composable
 private fun rememberSvgResource(
@@ -209,9 +212,7 @@ private fun rememberSvgResource(
 ): Painter {
     val density = LocalDensity.current
     return remember(resourcePath, density, loader) {
-        useResource(resourcePath, loader) {
-            loadSvgPainter(it, density)
-        }
+        useResource(resourcePath, loader) { loadSvgPainter(it, density) }
     }
 }
 
@@ -222,9 +223,7 @@ private fun rememberVectorXmlResource(
 ): Painter {
     val density = LocalDensity.current
     val image = remember(resourcePath, density, loader) {
-        useResource(resourcePath, loader) {
-            loadXmlImageVector(InputSource(it), density)
-        }
+        useResource(resourcePath, loader) { loadXmlImageVector(InputSource(it), density) }
     }
     return rememberVectorPainter(image)
 }
@@ -234,9 +233,7 @@ private fun rememberBitmapResource(
     resourcePath: String,
     loader: ResourceLoader = ResourceLoader.Default,
 ): Painter {
-    val image = remember(resourcePath) {
-        useResource(resourcePath, loader, ::loadImageBitmap)
-    }
+    val image = remember(resourcePath) { useResource(resourcePath, loader, ::loadImageBitmap) }
     return BitmapPainter(image)
 }
 
@@ -247,13 +244,9 @@ private inline fun <T> useResource(
 ): T = loader.load(resourcePath).use(block)
 
 private fun Modifier.defaultSizeFor(painter: Painter) =
-    then(
-        if (painter.intrinsicSize == Size.Unspecified || painter.intrinsicSize.isInfinite()) {
-            DefaultIconSizeModifier
-        } else {
-            Modifier
-        },
-    )
+    thenIf(painter.intrinsicSize == Size.Unspecified || painter.intrinsicSize.isInfinite()) {
+        DefaultIconSizeModifier
+    }
 
 private fun Size.isInfinite() = width.isInfinite() && height.isInfinite()
 
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/IconButton.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/IconButton.kt
index bb4c8191563a9..6f73d76212770 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/IconButton.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/IconButton.kt
@@ -17,7 +17,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -35,7 +34,7 @@ import org.jetbrains.jewel.ui.component.styling.IconButtonStyle
 import org.jetbrains.jewel.ui.theme.iconButtonStyle
 
 @Composable
-fun IconButton(
+public fun IconButton(
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
@@ -43,24 +42,19 @@ fun IconButton(
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
     content: @Composable (BoxScope.(IconButtonState) -> Unit),
 ) {
-    val buttonState = remember(interactionSource) {
-        mutableStateOf(IconButtonState.of(enabled = enabled))
-    }
+    val buttonState = remember(interactionSource) { mutableStateOf(IconButtonState.of(enabled = enabled)) }
 
-    remember(enabled) {
-        buttonState.value = buttonState.value.copy(enabled = enabled)
-    }
+    remember(enabled) { buttonState.value = buttonState.value.copy(enabled = enabled) }
 
     IconButtonImpl(
         state = buttonState,
-        modifier = modifier
-            .clickable(
-                onClick = onClick,
-                enabled = enabled,
-                role = Role.Button,
-                interactionSource = interactionSource,
-                indication = NoIndication,
-            ),
+        modifier = modifier.clickable(
+            onClick = onClick,
+            enabled = enabled,
+            role = Role.Button,
+            interactionSource = interactionSource,
+            indication = NoIndication,
+        ),
         style = style,
         interactionSource = interactionSource,
         content = content,
@@ -68,7 +62,7 @@ fun IconButton(
 }
 
 @Composable
-fun SelectableIconButton(
+public fun SelectableIconButton(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -87,16 +81,18 @@ fun SelectableIconButton(
 
     IconButtonImpl(
         state = buttonState,
-        modifier = modifier.selectable(
-            onClick = onClick,
-            enabled = enabled,
-            role = Role.RadioButton,
-            interactionSource = interactionSource,
-            indication = null,
-            selected = selected,
-        ).onActivated(enabled = enabled) {
-            buttonState.value = buttonState.value.copy(active = it)
-        },
+        modifier = modifier
+            .selectable(
+                onClick = onClick,
+                enabled = enabled,
+                role = Role.RadioButton,
+                interactionSource = interactionSource,
+                indication = null,
+                selected = selected,
+            )
+            .onActivated(enabled = enabled) {
+                buttonState.value = buttonState.value.copy(active = it)
+            },
         style = style,
         interactionSource = interactionSource,
         content = content,
@@ -117,13 +113,12 @@ private fun IconButtonImpl(
         interactionSource.interactions.collect { interaction ->
             when (interaction) {
                 is PressInteraction.Press -> buttonState = buttonState.copy(pressed = true)
-                is PressInteraction.Cancel, is PressInteraction.Release ->
-                    buttonState =
-                        buttonState.copy(pressed = false)
+                is PressInteraction.Cancel,
+                is PressInteraction.Release,
+                -> buttonState = buttonState.copy(pressed = false)
 
                 is HoverInteraction.Enter -> buttonState = buttonState.copy(hovered = true)
                 is HoverInteraction.Exit -> buttonState = buttonState.copy(hovered = false)
-
                 is FocusInteraction.Focus -> buttonState = buttonState.copy(focused = true)
                 is FocusInteraction.Unfocus -> buttonState = buttonState.copy(focused = false)
             }
@@ -133,83 +128,76 @@ private fun IconButtonImpl(
     val background by style.colors.backgroundFor(buttonState)
     val border by style.colors.borderFor(buttonState)
     Box(
-        modifier = modifier
-            .defaultMinSize(style.metrics.minSize.width, style.metrics.minSize.height)
+        modifier = modifier.defaultMinSize(style.metrics.minSize.width, style.metrics.minSize.height)
             .padding(style.metrics.padding)
             .background(background, shape)
             .border(style.metrics.borderWidth, border, shape),
         contentAlignment = Alignment.Center,
-        content = {
-            content(buttonState)
-        },
+        content = { content(buttonState) },
     )
 }
 
 @Immutable
 @JvmInline
-value class IconButtonState(val state: ULong) : FocusableComponentState, SelectableComponentState {
+public value class IconButtonState(public val state: ULong) : FocusableComponentState, SelectableComponentState {
 
-    @Stable
     override val isSelected: Boolean
         get() = state and CommonStateBitMask.Selected != 0UL
 
-    @Stable
     override val isActive: Boolean
         get() = state and CommonStateBitMask.Active != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and CommonStateBitMask.Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and CommonStateBitMask.Focused != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and CommonStateBitMask.Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and CommonStateBitMask.Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         enabled: Boolean = isEnabled,
         selected: Boolean = isSelected,
         focused: Boolean = isFocused,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        enabled = enabled,
-        selected = selected,
-        focused = focused,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
+    ): IconButtonState =
+        of(
+            enabled = enabled,
+            selected = selected,
+            focused = focused,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
 
-    override fun toString() =
+    override fun toString(): String =
         "${javaClass.simpleName}(isEnabled=$isEnabled, isSelected=$isSelected, " +
             "isFocused=$isFocused, isHovered=$isHovered, isPressed=$isPressed, " +
             "isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             enabled: Boolean = true,
             selected: Boolean = false,
             focused: Boolean = false,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = false,
-        ) = IconButtonState(
-            state = (if (enabled) CommonStateBitMask.Enabled else 0UL) or
-                (if (selected) CommonStateBitMask.Selected else 0UL) or
-                (if (focused) CommonStateBitMask.Focused else 0UL) or
-                (if (hovered) CommonStateBitMask.Hovered else 0UL) or
-                (if (pressed) CommonStateBitMask.Pressed else 0UL) or
-                (if (active) CommonStateBitMask.Active else 0UL),
-        )
+        ): IconButtonState =
+            IconButtonState(
+                (if (enabled) CommonStateBitMask.Enabled else 0UL) or
+                    (if (selected) CommonStateBitMask.Selected else 0UL) or
+                    (if (focused) CommonStateBitMask.Focused else 0UL) or
+                    (if (hovered) CommonStateBitMask.Hovered else 0UL) or
+                    (if (pressed) CommonStateBitMask.Pressed else 0UL) or
+                    (if (active) CommonStateBitMask.Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InputField.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InputField.kt
index 488432fd9a454..d40b2b57e400c 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InputField.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/InputField.kt
@@ -10,7 +10,6 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -56,12 +55,9 @@ internal fun InputField(
     textStyle: TextStyle,
     decorationBox: @Composable (innerTextField: @Composable () -> Unit, state: InputFieldState) -> Unit,
 ) {
-    var inputState by remember(interactionSource) {
-        mutableStateOf(InputFieldState.of(enabled = enabled))
-    }
-    remember(enabled) {
-        inputState = inputState.copy(enabled = enabled)
-    }
+    var inputState by remember(interactionSource) { mutableStateOf(InputFieldState.of(enabled = enabled)) }
+    remember(enabled) { inputState = inputState.copy(enabled = enabled) }
+
     LaunchedEffect(interactionSource) {
         interactionSource.interactions.collect { interaction ->
             when (interaction) {
@@ -82,7 +78,7 @@ internal fun InputField(
     val borderColor by style.colors.borderFor(inputState)
     val hasNoOutline = outline == Outline.None
     val borderModifier = Modifier.thenIf(!undecorated && borderColor.isSpecified && hasNoOutline) {
-        Modifier.border(
+        border(
             alignment = Stroke.Alignment.Center,
             width = style.metrics.borderWidth,
             color = borderColor,
@@ -96,7 +92,8 @@ internal fun InputField(
 
     BasicTextField(
         value = value,
-        modifier = modifier.then(backgroundModifier)
+        modifier = modifier
+            .then(backgroundModifier)
             .then(borderModifier)
             .thenIf(!undecorated && hasNoOutline) { focusOutline(inputState, shape) }
             .outline(inputState, outline, shape, Stroke.Alignment.Center),
@@ -120,60 +117,58 @@ internal fun InputField(
 
 @Immutable
 @JvmInline
-value class InputFieldState(val state: ULong) : FocusableComponentState {
+public value class InputFieldState(public val state: ULong) : FocusableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and Focused != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        enabled = enabled,
-        focused = focused,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
+    ): InputFieldState =
+        of(
+            enabled = enabled,
+            focused = focused,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
 
-    override fun toString() =
+    override fun toString(): String =
         "${javaClass.simpleName}(isEnabled=$isEnabled, isFocused=$isFocused, " +
             "isHovered=$isHovered, isPressed=$isPressed, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             enabled: Boolean = true,
             focused: Boolean = false,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = false,
-        ) = InputFieldState(
-            state = (if (enabled) Enabled else 0UL) or
-                (if (focused) Focused else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): InputFieldState =
+            InputFieldState(
+                state =
+                (if (enabled) Enabled else 0UL) or
+                    (if (focused) Focused else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LazyTree.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LazyTree.kt
index 8f89a5a516cd7..731f85c8a5156 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LazyTree.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LazyTree.kt
@@ -21,7 +21,7 @@ import org.jetbrains.jewel.ui.theme.treeStyle
 
 @ExperimentalJewelApi
 @Composable
-fun <T> LazyTree(
+public fun <T> LazyTree(
     tree: Tree<T>,
     modifier: Modifier = Modifier,
     onElementClick: (Tree.Element<T>) -> Unit = {},
@@ -34,6 +34,7 @@ fun <T> LazyTree(
 ) {
     val colors = style.colors
     val metrics = style.metrics
+
     BasicLazyTree(
         tree = tree,
         onElementClick = onElementClick,
@@ -57,17 +58,12 @@ fun <T> LazyTree(
             Icon(painter = painter, contentDescription = null)
         },
     ) {
-        CompositionLocalProvider(
-            LocalContentColor provides (
-                style.colors.contentFor(
-                    TreeElementState.of(
-                        focused = isActive,
-                        selected = isSelected,
-                        expanded = false,
-                    ),
-                ).value
-                    .takeOrElse { LocalContentColor.current }
-                ),
-        ) { nodeContent(it) }
+        val resolvedContentColor = style.colors
+            .contentFor(TreeElementState.of(focused = isActive, selected = isSelected, expanded = false))
+            .value.takeOrElse { LocalContentColor.current }
+
+        CompositionLocalProvider(LocalContentColor provides resolvedContentColor) {
+            nodeContent(it)
+        }
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LinearProgressBar.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LinearProgressBar.kt
index 77b0a74fff165..1bdde38db119f 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LinearProgressBar.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/LinearProgressBar.kt
@@ -26,10 +26,11 @@ import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.component.styling.HorizontalProgressBarStyle
 import org.jetbrains.jewel.ui.theme.horizontalProgressBarStyle
 
-// TODO implement green/red/yellow variants based on com.intellij.openapi.progress.util.ColorProgressBar
+// TODO implement green/red/yellow variants based on
+// com.intellij.openapi.progress.util.ColorProgressBar
 
 @Composable
-fun HorizontalProgressBar(
+public fun HorizontalProgressBar(
     progress: Float, // from 0 to 1
     modifier: Modifier = Modifier,
     style: HorizontalProgressBarStyle = JewelTheme.horizontalProgressBarStyle,
@@ -38,9 +39,7 @@ fun HorizontalProgressBar(
     val shape = RoundedCornerShape(style.metrics.cornerSize)
 
     Box(
-        modifier
-            .defaultMinSize(minHeight = style.metrics.minHeight)
-            .clip(shape)
+        modifier.defaultMinSize(minHeight = style.metrics.minHeight).clip(shape)
             .drawWithContent {
                 drawRect(color = colors.track) // Draw the background
                 val progressWidth = size.width * progress
@@ -59,13 +58,15 @@ fun HorizontalProgressBar(
 }
 
 @Composable
-fun IndeterminateHorizontalProgressBar(
+public fun IndeterminateHorizontalProgressBar(
     modifier: Modifier = Modifier,
     style: HorizontalProgressBarStyle = JewelTheme.horizontalProgressBarStyle,
 ) {
     val infiniteTransition = rememberInfiniteTransition()
 
-    val cycleDurationMillis by remember { mutableStateOf(style.indeterminateCycleDuration.inWholeMilliseconds.toInt()) }
+    val cycleDurationMillis by remember {
+        mutableStateOf(style.indeterminateCycleDuration.inWholeMilliseconds.toInt())
+    }
     val animatedProgress by infiniteTransition.animateFloat(
         initialValue = 0f,
         targetValue = 2f,
@@ -77,26 +78,25 @@ fun IndeterminateHorizontalProgressBar(
 
     val highlightWidth = style.metrics.indeterminateHighlightWidth
     val colors = style.colors
-    val colorsList by remember { mutableStateOf(listOf(colors.indeterminateBase, colors.indeterminateHighlight)) }
+    val colorsList by remember {
+        mutableStateOf(listOf(colors.indeterminateBase, colors.indeterminateHighlight))
+    }
     val shape = RoundedCornerShape(style.metrics.cornerSize)
 
     Box(
-        modifier
-            .defaultMinSize(minHeight = style.metrics.minHeight)
-            .clip(shape)
-            .drawWithContent {
-                drawRect(color = colors.track) // Draw the background
-                val x = highlightWidth.value * animatedProgress
+        modifier.defaultMinSize(minHeight = style.metrics.minHeight).clip(shape).drawWithContent {
+            drawRect(color = colors.track) // Draw the background
+            val x = highlightWidth.value * animatedProgress
 
-                // Draw the animated highlight
-                drawRect(
-                    brush = Brush.linearGradient(
-                        colors = colorsList,
-                        start = Offset(x, 0f),
-                        end = Offset(x + highlightWidth.value, 0f),
-                        TileMode.Mirror,
-                    ),
-                )
-            },
+            // Draw the animated highlight
+            drawRect(
+                Brush.linearGradient(
+                    colors = colorsList,
+                    start = Offset(x, 0f),
+                    end = Offset(x + highlightWidth.value, 0f),
+                    TileMode.Mirror,
+                ),
+            )
+        },
     )
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Link.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Link.kt
index 00eeb1511986a..072620e5d4c89 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Link.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Link.kt
@@ -14,7 +14,6 @@ import androidx.compose.foundation.text.BasicText
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -55,7 +54,7 @@ import org.jetbrains.jewel.ui.util.thenIf
 import java.awt.Cursor
 
 @Composable
-fun Link(
+public fun Link(
     text: String,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -91,7 +90,7 @@ fun Link(
 }
 
 @Composable
-fun ExternalLink(
+public fun ExternalLink(
     text: String,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -127,7 +126,7 @@ fun ExternalLink(
 }
 
 @Composable
-fun DropdownLink(
+public fun DropdownLink(
     text: String,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
@@ -209,22 +208,20 @@ private fun LinkImpl(
     interactionSource: MutableInteractionSource,
     icon: PainterProvider?,
 ) {
-    var linkState by remember(interactionSource, enabled) {
-        mutableStateOf(LinkState.of(enabled = enabled))
-    }
-    remember(enabled) {
-        linkState = linkState.copy(enabled = enabled)
-    }
+    var linkState by remember(interactionSource, enabled) { mutableStateOf(LinkState.of(enabled = enabled)) }
+    remember(enabled) { linkState = linkState.copy(enabled = enabled) }
 
     val inputModeManager = LocalInputModeManager.current
     LaunchedEffect(interactionSource) {
         interactionSource.interactions.collect { interaction ->
             when (interaction) {
                 is PressInteraction.Press -> linkState = linkState.copy(pressed = true)
-                is PressInteraction.Cancel, is PressInteraction.Release -> linkState = linkState.copy(pressed = false)
+                is PressInteraction.Cancel,
+                is PressInteraction.Release,
+                -> linkState = linkState.copy(pressed = false)
+
                 is HoverInteraction.Enter -> linkState = linkState.copy(hovered = true)
                 is HoverInteraction.Exit -> linkState = linkState.copy(hovered = false)
-
                 is FocusInteraction.Focus -> {
                     if (inputModeManager.inputMode == InputMode.Keyboard) {
                         linkState = linkState.copy(focused = true)
@@ -238,19 +235,22 @@ private fun LinkImpl(
 
     val textColor by style.colors.contentFor(linkState)
 
-    val mergedStyle = style.textStyles.styleFor(linkState).value
-        .merge(
-            TextStyle(
-                color = textColor,
-                fontSize = fontSize,
-                fontWeight = fontWeight,
-                textAlign = textAlign,
-                lineHeight = lineHeight,
-                fontFamily = fontFamily,
-                fontStyle = fontStyle,
-                letterSpacing = letterSpacing,
-            ),
-        )
+    val mergedStyle =
+        style.textStyles
+            .styleFor(linkState)
+            .value
+            .merge(
+                TextStyle(
+                    color = textColor,
+                    fontSize = fontSize,
+                    fontWeight = fontWeight,
+                    textAlign = textAlign,
+                    lineHeight = lineHeight,
+                    fontFamily = fontFamily,
+                    fontStyle = fontStyle,
+                    letterSpacing = letterSpacing,
+                ),
+            )
 
     val pointerChangeModifier = Modifier.pointerHoverIcon(PointerIcon(Cursor(Cursor.HAND_CURSOR)))
 
@@ -294,29 +294,23 @@ private fun LinkImpl(
 
 @Immutable
 @JvmInline
-value class LinkState(val state: ULong) : FocusableComponentState {
+public value class LinkState(public val state: ULong) : FocusableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and Focused != 0UL
 
-    @Stable
-    val isVisited: Boolean
+    public val isVisited: Boolean
         get() = state and Visited != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
@@ -324,24 +318,25 @@ value class LinkState(val state: ULong) : FocusableComponentState {
         "${javaClass.simpleName}(enabled=$isEnabled, focused=$isFocused, visited=$isVisited, " +
             "pressed=$isPressed, hovered=$isHovered, isActive=$isActive)"
 
-    fun copy(
+    public fun copy(
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         visited: Boolean = isVisited,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        enabled = enabled,
-        focused = focused,
-        visited = visited,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
+    ): LinkState =
+        of(
+            enabled = enabled,
+            focused = focused,
+            visited = visited,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
 
     @Composable
-    fun <T> chooseValueWithVisited(
+    public fun <T> chooseValueWithVisited(
         normal: T,
         disabled: T,
         focused: T,
@@ -360,26 +355,27 @@ value class LinkState(val state: ULong) : FocusableComponentState {
             else -> normal
         }
 
-    companion object {
+    public companion object {
 
         private const val VISITED_BIT_OFFSET = CommonStateBitMask.FIRST_AVAILABLE_OFFSET
 
         private val Visited = 1UL shl VISITED_BIT_OFFSET
 
-        fun of(
+        public fun of(
             enabled: Boolean = true,
             focused: Boolean = false,
             visited: Boolean = false,
             hovered: Boolean = false,
             pressed: Boolean = false,
             active: Boolean = false,
-        ) = LinkState(
-            (if (visited) Visited else 0UL) or
-                (if (enabled) Enabled else 0UL) or
-                (if (focused) Focused else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): LinkState =
+            LinkState(
+                (if (visited) Visited else 0UL) or
+                    (if (enabled) Enabled else 0UL) or
+                    (if (focused) Focused else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt
index b9e6a93bf1990..ef644e3177a5c 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Menu.kt
@@ -27,7 +27,6 @@ import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -83,7 +82,7 @@ import org.jetbrains.jewel.ui.painter.hints.Stateful
 import org.jetbrains.jewel.ui.theme.menuStyle
 
 @Composable
-fun PopupMenu(
+public fun PopupMenu(
     onDismissRequest: (InputMode) -> Boolean,
     horizontalAlignment: Alignment.Horizontal,
     modifier: Modifier = Modifier,
@@ -92,18 +91,17 @@ fun PopupMenu(
 ) {
     val density = LocalDensity.current
 
-    val popupPositionProvider = AnchorVerticalMenuPositionProvider(
-        contentOffset = style.metrics.offset,
-        contentMargin = style.metrics.menuMargin,
-        alignment = horizontalAlignment,
-        density = density,
-    )
+    val popupPositionProvider =
+        AnchorVerticalMenuPositionProvider(
+            contentOffset = style.metrics.offset,
+            contentMargin = style.metrics.menuMargin,
+            alignment = horizontalAlignment,
+            density = density,
+        )
 
     var focusManager: FocusManager? by remember { mutableStateOf(null) }
     var inputModeManager: InputModeManager? by remember { mutableStateOf(null) }
-    val menuManager = remember(onDismissRequest) {
-        MenuManager(onDismissRequest = onDismissRequest)
-    }
+    val menuManager = remember(onDismissRequest) { MenuManager(onDismissRequest = onDismissRequest) }
 
     Popup(
         popupPositionProvider = popupPositionProvider,
@@ -139,11 +137,7 @@ internal fun MenuContent(
     style: MenuStyle = JewelTheme.menuStyle,
     content: MenuScope.() -> Unit,
 ) {
-    val items by remember(content) {
-        derivedStateOf {
-            content.asList()
-        }
-    }
+    val items by remember(content) { derivedStateOf { content.asList() } }
 
     val localMenuManager = LocalMenuManager.current
     val scrollState = rememberScrollState()
@@ -151,49 +145,22 @@ internal fun MenuContent(
     val menuShape = RoundedCornerShape(style.metrics.cornerSize)
 
     Box(
-        modifier = modifier.shadow(
-            elevation = style.metrics.shadowSize,
-            shape = menuShape,
-            ambientColor = colors.shadow,
-            spotColor = colors.shadow,
-        )
+        modifier = modifier
+            .shadow(
+                elevation = style.metrics.shadowSize,
+                shape = menuShape,
+                ambientColor = colors.shadow,
+                spotColor = colors.shadow,
+            )
             .border(Stroke.Alignment.Center, style.metrics.borderWidth, colors.border, menuShape)
             .background(colors.background, menuShape)
             .width(IntrinsicSize.Max)
-            .onHover {
-                localMenuManager.onHoveredChange(it)
-            },
+            .onHover { localMenuManager.onHoveredChange(it) },
     ) {
-        Column(
-            modifier = Modifier
-                .verticalScroll(scrollState)
-                .padding(style.metrics.contentPadding),
-        ) {
-            items.forEach {
-                when (it) {
-                    is MenuSelectableItem -> {
-                        MenuItem(
-                            selected = it.isSelected,
-                            onClick = it.onClick,
-                            enabled = it.isEnabled,
-                            content = it.content,
-                        )
-                    }
-
-                    is SubmenuItem -> {
-                        MenuSubmenuItem(
-                            enabled = it.isEnabled,
-                            submenu = it.submenu,
-                            content = it.content,
-                        )
-                    }
-
-                    else -> {
-                        it.content()
-                    }
-                }
-            }
+        Column(Modifier.verticalScroll(scrollState).padding(style.metrics.contentPadding)) {
+            items.forEach { ShowMenuItem(it) }
         }
+
         Box(modifier = Modifier.matchParentSize()) {
             VerticalScrollbar(
                 rememberScrollbarAdapter(scrollState),
@@ -203,31 +170,49 @@ internal fun MenuContent(
     }
 }
 
-interface MenuScope {
+@Composable
+private fun ShowMenuItem(item: MenuItem) {
+    when (item) {
+        is MenuSelectableItem -> MenuItem(
+            selected = item.isSelected,
+            onClick = item.onClick,
+            enabled = item.isEnabled,
+            content = item.content,
+        )
+
+        is SubmenuItem -> MenuSubmenuItem(
+            enabled = item.isEnabled,
+            submenu = item.submenu,
+            content = item.content,
+        )
+
+        else -> item.content()
+    }
+}
+
+public interface MenuScope {
 
-    fun selectableItem(
+    public fun selectableItem(
         selected: Boolean,
         onClick: () -> Unit,
         enabled: Boolean = true,
         content: @Composable () -> Unit,
     )
 
-    fun submenu(
+    public fun submenu(
         enabled: Boolean = true,
         submenu: MenuScope.() -> Unit,
         content: @Composable () -> Unit,
     )
 
-    fun passiveItem(content: @Composable () -> Unit)
+    public fun passiveItem(content: @Composable () -> Unit)
 }
 
-fun MenuScope.separator() {
-    passiveItem {
-        MenuSeparator()
-    }
+public fun MenuScope.separator() {
+    passiveItem { MenuSeparator() }
 }
 
-fun MenuScope.items(
+public fun MenuScope.items(
     count: Int,
     isSelected: (Int) -> Boolean,
     onItemClick: (Int) -> Unit,
@@ -238,14 +223,16 @@ fun MenuScope.items(
     }
 }
 
-fun <T> MenuScope.items(
+public fun <T> MenuScope.items(
     items: List<T>,
     isSelected: (T) -> Boolean,
     onItemClick: (T) -> Unit,
     content: @Composable (T) -> Unit,
 ) {
     repeat(items.count()) {
-        selectableItem(isSelected(items[it]), onClick = { onItemClick(items[it]) }) { content(items[it]) }
+        selectableItem(isSelected(items[it]), onClick = { onItemClick(items[it]) }) {
+            content(items[it])
+        }
     }
 }
 
@@ -265,7 +252,11 @@ private fun (MenuScope.() -> Unit).asList() = buildList {
                 add(MenuPassiveItem(content))
             }
 
-            override fun submenu(enabled: Boolean, submenu: MenuScope.() -> Unit, content: @Composable () -> Unit) {
+            override fun submenu(
+                enabled: Boolean,
+                submenu: MenuScope.() -> Unit,
+                content: @Composable () -> Unit,
+            ) {
                 add(SubmenuItem(enabled, submenu, content))
             }
         },
@@ -295,7 +286,7 @@ private data class SubmenuItem(
 ) : MenuItem
 
 @Composable
-fun MenuSeparator(
+public fun MenuSeparator(
     modifier: Modifier = Modifier,
     metrics: MenuItemMetrics = JewelTheme.menuStyle.metrics.itemMetrics,
     colors: MenuItemColors = JewelTheme.menuStyle.colors.itemColors,
@@ -309,7 +300,7 @@ fun MenuSeparator(
 }
 
 @Composable
-fun MenuItem(
+public fun MenuItem(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -322,9 +313,7 @@ fun MenuItem(
         mutableStateOf(MenuItemState.of(selected = selected, enabled = enabled))
     }
 
-    remember(enabled, selected) {
-        itemState = itemState.copy(selected = selected, enabled = enabled)
-    }
+    remember(enabled, selected) { itemState = itemState.copy(selected = selected, enabled = enabled) }
 
     val focusRequester = remember { FocusRequester() }
 
@@ -333,6 +322,7 @@ fun MenuItem(
             when (interaction) {
                 is PressInteraction.Press -> itemState = itemState.copy(pressed = true)
                 is PressInteraction.Cancel, is PressInteraction.Release -> itemState = itemState.copy(pressed = false)
+
                 is HoverInteraction.Enter -> {
                     itemState = itemState.copy(hovered = true)
                     focusRequester.requestFocus()
@@ -369,7 +359,7 @@ fun MenuItem(
                 focusRequester.requestFocus()
             }
 
-            onDispose { }
+            onDispose {}
         }
 
         val itemColors = style.colors.itemColors
@@ -381,8 +371,7 @@ fun MenuItem(
             val backgroundColor by itemColors.backgroundFor(itemState)
 
             Box(
-                Modifier
-                    .fillMaxWidth()
+                Modifier.fillMaxWidth()
                     .drawItemBackground(itemMetrics, backgroundColor)
                     .padding(itemMetrics.contentPadding),
             ) {
@@ -393,7 +382,7 @@ fun MenuItem(
 }
 
 @Composable
-fun MenuSubmenuItem(
+public fun MenuSubmenuItem(
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
@@ -401,13 +390,12 @@ fun MenuSubmenuItem(
     submenu: MenuScope.() -> Unit,
     content: @Composable () -> Unit,
 ) {
-    var itemState by remember(interactionSource) {
-        mutableStateOf(MenuItemState.of(selected = false, enabled = enabled))
-    }
+    var itemState by
+        remember(interactionSource) {
+            mutableStateOf(MenuItemState.of(selected = false, enabled = enabled))
+        }
 
-    remember(enabled) {
-        itemState = itemState.copy(selected = false, enabled = enabled)
-    }
+    remember(enabled) { itemState = itemState.copy(selected = false, enabled = enabled) }
 
     val focusRequester = remember { FocusRequester() }
 
@@ -416,6 +404,7 @@ fun MenuSubmenuItem(
             when (interaction) {
                 is PressInteraction.Press -> itemState = itemState.copy(pressed = true)
                 is PressInteraction.Cancel, is PressInteraction.Release -> itemState = itemState.copy(pressed = false)
+
                 is HoverInteraction.Enter -> {
                     itemState = itemState.copy(hovered = true, selected = true)
                     focusRequester.requestFocus()
@@ -438,9 +427,7 @@ fun MenuSubmenuItem(
             .drawItemBackground(menuMetrics.itemMetrics, backgroundColor)
             .focusRequester(focusRequester)
             .clickable(
-                onClick = {
-                    itemState = itemState.copy(selected = !itemState.isSelected)
-                },
+                onClick = { itemState = itemState.copy(selected = !itemState.isSelected) },
                 enabled = enabled,
                 role = Role.Button,
                 interactionSource = interactionSource,
@@ -459,13 +446,10 @@ fun MenuSubmenuItem(
             LocalContentColor provides itemColors.contentFor(itemState).value,
         ) {
             Row(
-                Modifier.fillMaxWidth()
-                    .padding(menuMetrics.itemMetrics.contentPadding),
+                Modifier.fillMaxWidth().padding(menuMetrics.itemMetrics.contentPadding),
                 verticalAlignment = Alignment.CenterVertically,
             ) {
-                Box(Modifier.weight(1f)) {
-                    content()
-                }
+                Box(Modifier.weight(1f)) { content() }
 
                 val chevronPainter by style.icons.submenuChevron.getPainter(Stateful(itemState))
                 Icon(
@@ -500,10 +484,11 @@ private fun Modifier.drawItemBackground(itemMetrics: MenuItemMetrics, background
         val cornerRadius = CornerRadius(cornerSizePx, cornerSizePx)
 
         val outerPadding = itemMetrics.outerPadding
-        val offset = Offset(
-            x = outerPadding.calculateLeftPadding(layoutDirection).toPx(),
-            y = outerPadding.calculateTopPadding().toPx(),
-        )
+        val offset =
+            Offset(
+                x = outerPadding.calculateLeftPadding(layoutDirection).toPx(),
+                y = outerPadding.calculateTopPadding().toPx(),
+            )
         drawRoundRect(
             color = backgroundColor,
             cornerRadius = cornerRadius,
@@ -512,12 +497,18 @@ private fun Modifier.drawItemBackground(itemMetrics: MenuItemMetrics, background
         )
     }
 
-private fun Size.subtract(paddingValues: PaddingValues, density: Density, layoutDirection: LayoutDirection): Size =
+private fun Size.subtract(
+    paddingValues: PaddingValues,
+    density: Density,
+    layoutDirection: LayoutDirection,
+): Size =
     with(density) {
         Size(
-            width - paddingValues.calculateLeftPadding(layoutDirection).toPx() -
+            width -
+                paddingValues.calculateLeftPadding(layoutDirection).toPx() -
                 paddingValues.calculateRightPadding(layoutDirection).toPx(),
-            height - paddingValues.calculateTopPadding().toPx() -
+            height -
+                paddingValues.calculateTopPadding().toPx() -
                 paddingValues.calculateBottomPadding().toPx(),
         )
     }
@@ -531,12 +522,13 @@ internal fun Submenu(
 ) {
     val density = LocalDensity.current
 
-    val popupPositionProvider = AnchorHorizontalMenuPositionProvider(
-        contentOffset = style.metrics.submenuMetrics.offset,
-        contentMargin = style.metrics.menuMargin,
-        alignment = Alignment.Top,
-        density = density,
-    )
+    val popupPositionProvider =
+        AnchorHorizontalMenuPositionProvider(
+            contentOffset = style.metrics.submenuMetrics.offset,
+            contentMargin = style.metrics.menuMargin,
+            alignment = Alignment.Top,
+            density = density,
+        )
 
     var focusManager: FocusManager? by remember { mutableStateOf(null) }
     var inputModeManager: InputModeManager? by remember { mutableStateOf(null) }
@@ -547,14 +539,13 @@ internal fun Submenu(
 
     Popup(
         popupPositionProvider = popupPositionProvider,
-        onDismissRequest = {
-            menuManager.closeAll(InputMode.Touch, false)
-        },
+        onDismissRequest = { menuManager.closeAll(InputMode.Touch, false) },
         properties = PopupProperties(focusable = true),
         onPreviewKeyEvent = { false },
         onKeyEvent = {
             val currentFocusManager = checkNotNull(focusManager) { "FocusManager must not be null" }
-            val currentInputModeManager = checkNotNull(inputModeManager) { "InputModeManager must not be null" }
+            val currentInputModeManager =
+                checkNotNull(inputModeManager) { "InputModeManager must not be null" }
             handlePopupMenuOnKeyEvent(it, currentFocusManager, currentInputModeManager, menuManager)
         },
     ) {
@@ -572,33 +563,27 @@ internal fun Submenu(
 
 @Immutable
 @JvmInline
-value class MenuItemState(val state: ULong) : SelectableComponentState, FocusableComponentState {
+public value class MenuItemState(public val state: ULong) : SelectableComponentState, FocusableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and Selected != 0UL
 
-    @Stable
     override val isSelected: Boolean
         get() = state and Selected != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and Focused != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         selected: Boolean = isSelected,
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
@@ -606,15 +591,22 @@ value class MenuItemState(val state: ULong) : SelectableComponentState, Focusabl
         pressed: Boolean = isPressed,
         active: Boolean = isActive,
     ): MenuItemState =
-        of(selected, enabled, focused, hovered, pressed, active)
+        of(
+            selected = selected,
+            enabled = enabled,
+            focused = focused,
+            hovered = hovered,
+            pressed = pressed,
+            active = active,
+        )
 
-    override fun toString() =
+    override fun toString(): String =
         "MenuItemState(state=$state, isSelected=$isSelected, isEnabled=$isEnabled, isFocused=$isFocused, " +
             "isHovered=$isHovered, isPressed=$isPressed, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             selected: Boolean,
             enabled: Boolean,
             focused: Boolean = false,
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/MenuManager.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/MenuManager.kt
index 3295b7765e1d3..b9e27d4aeab90 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/MenuManager.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/MenuManager.kt
@@ -1,19 +1,20 @@
 package org.jetbrains.jewel.ui.component
 
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.input.InputMode
 
-class MenuManager(
-    val onDismissRequest: (InputMode) -> Boolean,
+public class MenuManager(
+    public val onDismissRequest: (InputMode) -> Boolean,
     private val parentMenuManager: MenuManager? = null,
 ) {
 
     private var isHovered: Boolean = false
 
     /**
-     * Called when the hovered state of the menu changes.
-     * This is used to abort parent menu closing in unforced mode
-     * when submenu closed by click parent menu's item.
+     * Called when the hovered state of the menu changes. This is used to abort
+     * parent menu closing in unforced mode when submenu closed by click parent
+     * menu's item.
      *
      * @param hovered true if the menu is hovered, false otherwise.
      */
@@ -25,9 +26,10 @@ class MenuManager(
      * Close all menus in the hierarchy.
      *
      * @param mode the input mode, menus close by pointer or keyboard event.
-     * @param force true to force close all menus ignore parent hover state, false otherwise.
+     * @param force true to force close all menus ignore parent hover state,
+     *     false otherwise.
      */
-    fun closeAll(mode: InputMode, force: Boolean) {
+    public fun closeAll(mode: InputMode, force: Boolean) {
         // We ignore the pointer event if the menu is hovered in unforced mode.
         if (!force && mode == InputMode.Touch && isHovered) return
 
@@ -36,16 +38,17 @@ class MenuManager(
         }
     }
 
-    fun close(mode: InputMode) = onDismissRequest(mode)
+    public fun close(mode: InputMode): Boolean = onDismissRequest(mode)
 
-    fun isRootMenu(): Boolean = parentMenuManager == null
+    public fun isRootMenu(): Boolean = parentMenuManager == null
 
-    fun isSubmenu(): Boolean = parentMenuManager != null
+    public fun isSubmenu(): Boolean = parentMenuManager != null
 
-    fun submenuManager(onDismissRequest: (InputMode) -> Boolean) =
+    public fun submenuManager(onDismissRequest: (InputMode) -> Boolean): MenuManager =
         MenuManager(onDismissRequest = onDismissRequest, parentMenuManager = this)
 }
 
-val LocalMenuManager = staticCompositionLocalOf<MenuManager> {
-    error("No MenuManager provided")
-}
+public val LocalMenuManager: ProvidableCompositionLocal<MenuManager> =
+    staticCompositionLocalOf {
+        error("No MenuManager provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Popup.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Popup.kt
index 2be01e55b2940..73d67b1976b96 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Popup.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Popup.kt
@@ -27,6 +27,7 @@ internal fun handlePopupMenuOnKeyEvent(
     menuManager: MenuManager,
 ): Boolean {
     if (keyEvent.type != KeyEventType.KeyDown) return false
+
     return when (keyEvent.key) {
         Key.DirectionDown -> {
             inputModeManager.requestInputMode(InputMode.Keyboard)
@@ -87,11 +88,15 @@ internal data class AnchorVerticalMenuPositionProvider(
         )
 
         // The content offset specified using the dropdown offset parameter.
-        val contentOffsetX = with(density) { contentOffset.x.roundToPx() * if (layoutDirection == LayoutDirection.Ltr) 1 else -1 }
+        val contentOffsetX = with(density) {
+            contentOffset.x.roundToPx() * if (layoutDirection == LayoutDirection.Ltr) 1 else -1
+        }
         val contentOffsetY = with(density) { contentOffset.y.roundToPx() }
 
         // Compute horizontal position.
-        val x = anchorBounds.left + alignment.align(popupContentSize.width, anchorBounds.width, layoutDirection) + contentOffsetX
+        val x = anchorBounds.left +
+            alignment.align(popupContentSize.width, anchorBounds.width, layoutDirection) +
+            contentOffsetX
 
         // Compute vertical position.
         val aboveSpacing = anchorBounds.top - contentOffsetY - topMargin
@@ -100,14 +105,16 @@ internal data class AnchorVerticalMenuPositionProvider(
         // When the space below is large enough,
         // or the space below is larger than the space above,
         // the dropdown menu is displayed below by default.
-        val y = if (belowSpacing > popupContentSize.height || belowSpacing >= aboveSpacing) {
-            anchorBounds.bottom + contentOffsetY
-        } else {
-            anchorBounds.top - contentOffsetY - popupContentSize.height
-        }
+        val y =
+            if (belowSpacing > popupContentSize.height || belowSpacing >= aboveSpacing) {
+                anchorBounds.bottom + contentOffsetY
+            } else {
+                anchorBounds.top - contentOffsetY - popupContentSize.height
+            }
 
-        val popupBounds = IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height)
-            .constrainedIn(windowSpaceBounds)
+        val popupBounds =
+            IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height)
+                .constrainedIn(windowSpaceBounds)
 
         return IntOffset(popupBounds.left, popupBounds.top)
     }
@@ -140,24 +147,30 @@ internal data class AnchorHorizontalMenuPositionProvider(
         )
 
         // The content offset specified using the dropdown offset parameter.
-        val contentOffsetX = with(density) { contentOffset.x.roundToPx() * if (layoutDirection == LayoutDirection.Ltr) 1 else -1 }
+        val contentOffsetX = with(density) {
+            contentOffset.x.roundToPx() * if (layoutDirection == LayoutDirection.Ltr) 1 else -1
+        }
         val contentOffsetY = with(density) { contentOffset.y.roundToPx() }
 
         // Compute horizontal position.
-        val y = anchorBounds.top + alignment.align(popupContentSize.height, anchorBounds.height) + contentOffsetY
+        val y = anchorBounds.top +
+            alignment.align(popupContentSize.height, anchorBounds.height) +
+            contentOffsetY
 
         // Compute vertical position.
         val leftSpacing = anchorBounds.left - contentOffsetX - windowSpaceBounds.left
         val rightSpacing = windowSpaceBounds.width - anchorBounds.right - contentOffsetY
 
-        val x = if (rightSpacing > popupContentSize.width || rightSpacing >= leftSpacing) {
-            anchorBounds.right + contentOffsetX
-        } else {
-            anchorBounds.left - contentOffsetX - popupContentSize.width
-        }
+        val x =
+            if (rightSpacing > popupContentSize.width || rightSpacing >= leftSpacing) {
+                anchorBounds.right + contentOffsetX
+            } else {
+                anchorBounds.left - contentOffsetX - popupContentSize.width
+            }
 
-        val popupBounds = IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height)
-            .constrainedIn(windowSpaceBounds)
+        val popupBounds =
+            IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height)
+                .constrainedIn(windowSpaceBounds)
 
         return IntOffset(popupBounds.left, popupBounds.top)
     }
@@ -179,5 +192,6 @@ internal fun IntRect.constrainedIn(rect: IntRect): IntRect {
     if (y < rect.top) {
         y = rect.top
     }
+
     return IntRect(x, y, x + width, y + height)
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/RadioButton.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/RadioButton.kt
index 83974d975412e..7c992493ad5ba 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/RadioButton.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/RadioButton.kt
@@ -16,7 +16,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -47,7 +46,7 @@ import org.jetbrains.jewel.ui.painter.hints.Stateful
 import org.jetbrains.jewel.ui.theme.radioButtonStyle
 
 @Composable
-fun RadioButton(
+public fun RadioButton(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -71,7 +70,7 @@ fun RadioButton(
 }
 
 @Composable
-fun RadioButtonRow(
+public fun RadioButtonRow(
     text: String,
     selected: Boolean,
     onClick: () -> Unit,
@@ -97,7 +96,7 @@ fun RadioButtonRow(
 }
 
 @Composable
-fun RadioButtonRow(
+public fun RadioButtonRow(
     selected: Boolean,
     onClick: () -> Unit,
     modifier: Modifier = Modifier,
@@ -136,6 +135,7 @@ private fun RadioButtonImpl(
     var radioButtonState by remember(interactionSource) {
         mutableStateOf(RadioButtonState.of(selected = selected, enabled = enabled))
     }
+
     remember(selected, enabled) {
         radioButtonState = radioButtonState.copy(selected = selected, enabled = enabled)
     }
@@ -144,9 +144,9 @@ private fun RadioButtonImpl(
         interactionSource.interactions.collect { interaction ->
             when (interaction) {
                 is PressInteraction.Press -> radioButtonState = radioButtonState.copy(pressed = true)
-                is PressInteraction.Cancel, is PressInteraction.Release ->
-                    radioButtonState =
-                        radioButtonState.copy(pressed = false)
+                is PressInteraction.Cancel, is PressInteraction.Release -> {
+                    radioButtonState = radioButtonState.copy(pressed = false)
+                }
 
                 is HoverInteraction.Enter -> radioButtonState = radioButtonState.copy(hovered = true)
                 is HoverInteraction.Exit -> radioButtonState = radioButtonState.copy(hovered = false)
@@ -160,20 +160,25 @@ private fun RadioButtonImpl(
         radioButtonState = radioButtonState.copy(hovered = false, pressed = false)
     }
 
-    val wrapperModifier = modifier.selectable(
-        selected = selected,
-        onClick = onClick,
-        enabled = enabled,
-        role = Role.RadioButton,
-        interactionSource = interactionSource,
-        indication = null,
-    )
+    val wrapperModifier =
+        modifier.selectable(
+            selected = selected,
+            onClick = onClick,
+            enabled = enabled,
+            role = Role.RadioButton,
+            interactionSource = interactionSource,
+            indication = null,
+        )
 
     val colors = style.colors
     val metrics = style.metrics
-    val radioButtonModifier = Modifier
-        .size(metrics.radioButtonSize)
-        .outline(radioButtonState, outline, outlineShape = CircleShape, alignment = Stroke.Alignment.Inside)
+    val radioButtonModifier = Modifier.size(metrics.radioButtonSize)
+        .outline(
+            radioButtonState,
+            outline,
+            outlineShape = CircleShape,
+            alignment = Stroke.Alignment.Inside,
+        )
     val radioButtonPainter by style.icons.radioButton.getPainter(
         Selected(radioButtonState),
         Stateful(radioButtonState),
@@ -190,9 +195,12 @@ private fun RadioButtonImpl(
             RadioButtonImage(Modifier, radioButtonPainter, radioButtonModifier)
 
             val contentColor by colors.contentFor(radioButtonState)
+            val resolvedContentColor = contentColor.takeOrElse { textStyle.color }
+                .takeOrElse { LocalContentColor.current }
+
             CompositionLocalProvider(
                 LocalTextStyle provides textStyle.copy(color = contentColor.takeOrElse { textStyle.color }),
-                LocalContentColor provides contentColor.takeOrElse { textStyle.color.takeOrElse { LocalContentColor.current } },
+                LocalContentColor provides resolvedContentColor,
             ) {
                 content()
             }
@@ -201,8 +209,11 @@ private fun RadioButtonImpl(
 }
 
 @Composable
-private fun RadioButtonImage(outerModifier: Modifier, radioButtonPainter: Painter, radioButtonModifier: Modifier) {
-    // TODO tint icon painter
+private fun RadioButtonImage(
+    outerModifier: Modifier,
+    radioButtonPainter: Painter,
+    radioButtonModifier: Modifier,
+) {
     Box(outerModifier) {
         Image(radioButtonPainter, contentDescription = null, modifier = radioButtonModifier)
     }
@@ -210,68 +221,64 @@ private fun RadioButtonImage(outerModifier: Modifier, radioButtonPainter: Painte
 
 @Immutable
 @JvmInline
-value class RadioButtonState(val state: ULong) : SelectableComponentState, FocusableComponentState {
+public value class RadioButtonState(public val state: ULong) : SelectableComponentState, FocusableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable
     override val isSelected: Boolean
         get() = state and Selected != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and Focused != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         selected: Boolean = isSelected,
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        selected = selected,
-        enabled = enabled,
-        focused = focused,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
+    ): RadioButtonState =
+        of(
+            selected = selected,
+            enabled = enabled,
+            focused = focused,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
 
-    override fun toString() =
+    override fun toString(): String =
         "${javaClass.simpleName}(isSelected=$isSelected, isEnabled=$isEnabled, isFocused=$isFocused, " +
             "isHovered=$isHovered, isPressed=$isPressed, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             selected: Boolean,
             enabled: Boolean = true,
             focused: Boolean = false,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = false,
-        ) = RadioButtonState(
-            (if (selected) Selected else 0UL) or
-                (if (enabled) Enabled else 0UL) or
-                (if (focused) Focused else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): RadioButtonState =
+            RadioButtonState(
+                (if (selected) Selected else 0UL) or
+                    (if (enabled) Enabled else 0UL) or
+                    (if (focused) Focused else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Scrollbars.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Scrollbars.kt
index bc6f3239c66a3..d2e6150b95b12 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Scrollbars.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Scrollbars.kt
@@ -21,7 +21,7 @@ import kotlin.time.DurationUnit
 import androidx.compose.foundation.ScrollbarStyle as ComposeScrollbarStyle
 
 @Composable
-fun VerticalScrollbar(
+public fun VerticalScrollbar(
     adapter: ScrollbarAdapter,
     modifier: Modifier = Modifier,
     reverseLayout: Boolean = false,
@@ -31,16 +31,16 @@ fun VerticalScrollbar(
     val shape by remember { mutableStateOf(RoundedCornerShape(style.metrics.thumbCornerSize)) }
     val hoverDurationMillis by remember { mutableStateOf(style.hoverDuration.inWholeMilliseconds) }
 
-    CompositionLocalProvider(
-        LocalScrollbarStyle provides ComposeScrollbarStyle(
-            minimalHeight = style.metrics.minThumbLength,
-            thickness = style.metrics.thumbThickness,
-            shape = shape,
-            hoverDurationMillis = hoverDurationMillis.toInt(),
-            unhoverColor = style.colors.thumbBackground,
-            hoverColor = style.colors.thumbBackgroundHovered,
-        ),
-    ) {
+    val composeScrollbarStyle = ComposeScrollbarStyle(
+        minimalHeight = style.metrics.minThumbLength,
+        thickness = style.metrics.thumbThickness,
+        shape = shape,
+        hoverDurationMillis = hoverDurationMillis.toInt(),
+        unhoverColor = style.colors.thumbBackground,
+        hoverColor = style.colors.thumbBackgroundHovered,
+    )
+
+    CompositionLocalProvider(LocalScrollbarStyle provides composeScrollbarStyle) {
         VerticalScrollbar(
             adapter = adapter,
             modifier = modifier.padding(style.metrics.trackPadding),
@@ -52,7 +52,7 @@ fun VerticalScrollbar(
 }
 
 @Composable
-fun HorizontalScrollbar(
+public fun HorizontalScrollbar(
     adapter: ScrollbarAdapter,
     modifier: Modifier = Modifier,
     reverseLayout: Boolean = false,
@@ -60,18 +60,19 @@ fun HorizontalScrollbar(
     style: ScrollbarStyle = JewelTheme.scrollbarStyle,
 ) {
     val shape by remember { mutableStateOf(RoundedCornerShape(style.metrics.thumbCornerSize)) }
-    val hoverDurationMillis by remember { mutableStateOf(style.hoverDuration.toInt(DurationUnit.MILLISECONDS)) }
+    val hoverDurationMillis by remember {
+        mutableStateOf(style.hoverDuration.toInt(DurationUnit.MILLISECONDS))
+    }
 
-    CompositionLocalProvider(
-        LocalScrollbarStyle provides ComposeScrollbarStyle(
-            minimalHeight = style.metrics.minThumbLength,
-            thickness = style.metrics.thumbThickness,
-            shape = shape,
-            hoverDurationMillis = hoverDurationMillis,
-            unhoverColor = style.colors.thumbBackground,
-            hoverColor = style.colors.thumbBackgroundHovered,
-        ),
-    ) {
+    val composeScrollbarStyle = ComposeScrollbarStyle(
+        minimalHeight = style.metrics.minThumbLength,
+        thickness = style.metrics.thumbThickness,
+        shape = shape,
+        hoverDurationMillis = hoverDurationMillis,
+        unhoverColor = style.colors.thumbBackground,
+        hoverColor = style.colors.thumbBackgroundHovered,
+    )
+    CompositionLocalProvider(LocalScrollbarStyle provides composeScrollbarStyle) {
         HorizontalScrollbar(
             adapter = adapter,
             modifier = modifier.padding(style.metrics.trackPadding),
@@ -83,7 +84,7 @@ fun HorizontalScrollbar(
 }
 
 @Composable
-fun TabStripHorizontalScrollbar(
+public fun TabStripHorizontalScrollbar(
     adapter: ScrollbarAdapter,
     modifier: Modifier = Modifier,
     reverseLayout: Boolean = false,
@@ -91,18 +92,19 @@ fun TabStripHorizontalScrollbar(
     style: ScrollbarStyle = JewelTheme.scrollbarStyle,
 ) {
     val shape by remember { mutableStateOf(RoundedCornerShape(style.metrics.thumbCornerSize)) }
-    val hoverDurationMillis by remember { mutableStateOf(style.hoverDuration.inWholeMilliseconds.toInt()) }
+    val hoverDurationMillis by remember {
+        mutableStateOf(style.hoverDuration.inWholeMilliseconds.toInt())
+    }
 
-    CompositionLocalProvider(
-        LocalScrollbarStyle provides ComposeScrollbarStyle(
-            minimalHeight = style.metrics.minThumbLength,
-            thickness = 3.dp,
-            shape = shape,
-            hoverDurationMillis = hoverDurationMillis,
-            unhoverColor = style.colors.thumbBackground,
-            hoverColor = style.colors.thumbBackgroundHovered,
-        ),
-    ) {
+    val composeScrollbarStyle = ComposeScrollbarStyle(
+        minimalHeight = style.metrics.minThumbLength,
+        thickness = 3.dp,
+        shape = shape,
+        hoverDurationMillis = hoverDurationMillis,
+        unhoverColor = style.colors.thumbBackground,
+        hoverColor = style.colors.thumbBackgroundHovered,
+    )
+    CompositionLocalProvider(LocalScrollbarStyle provides composeScrollbarStyle) {
         HorizontalScrollbar(
             adapter = adapter,
             modifier = modifier.padding(1.dp),
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt
index 6134ded26b78f..eb3706e613892 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/SplitLayout.kt
@@ -30,7 +30,7 @@ import kotlin.math.roundToInt
 import androidx.compose.foundation.gestures.Orientation as ComposeOrientation
 
 @Composable
-fun HorizontalSplitLayout(
+public fun HorizontalSplitLayout(
     first: @Composable (Modifier) -> Unit,
     second: @Composable (Modifier) -> Unit,
     modifier: Modifier = Modifier,
@@ -43,67 +43,68 @@ fun HorizontalSplitLayout(
     initialDividerPosition: Dp = 300.dp,
 ) {
     val density = LocalDensity.current
-    var dividerX by remember {
-        mutableStateOf(with(density) { initialDividerPosition.roundToPx() })
-    }
+    var dividerX by remember { mutableStateOf(with(density) { initialDividerPosition.roundToPx() }) }
+
+    Layout(
+        modifier = modifier,
+        content = {
+            val dividerInteractionSource = remember { MutableInteractionSource() }
+            first(Modifier.layoutId("first"))
+
+            Divider(
+                orientation = Orientation.Vertical,
+                modifier = Modifier.fillMaxHeight().layoutId("divider"),
+                color = dividerColor,
+                thickness = dividerThickness,
+                startIndent = dividerIndent,
+            )
 
-    Layout(modifier = modifier, content = {
-        val dividerInteractionSource = remember { MutableInteractionSource() }
-        first(Modifier.layoutId("first"))
-
-        Divider(
-            orientation = Orientation.Vertical,
-            modifier = Modifier.fillMaxHeight().layoutId("divider"),
-            color = dividerColor,
-            thickness = dividerThickness,
-            startIndent = dividerIndent,
-        )
-
-        second(Modifier.layoutId("second"))
-
-        Box(
-            Modifier.fillMaxHeight()
-                .width(draggableWidth)
-                .draggable(
-                    interactionSource = dividerInteractionSource,
-                    orientation = ComposeOrientation.Horizontal,
-                    state = rememberDraggableState { delta ->
-                        dividerX += delta.toInt()
-                    },
-                )
-                .pointerHoverIcon(PointerIcon(Cursor(Cursor.E_RESIZE_CURSOR)))
-                .layoutId("divider-handle"),
-        )
-    }) { measurables, incomingConstraints ->
+            second(Modifier.layoutId("second"))
+
+            Box(
+                Modifier.fillMaxHeight()
+                    .width(draggableWidth)
+                    .draggable(
+                        interactionSource = dividerInteractionSource,
+                        orientation = ComposeOrientation.Horizontal,
+                        state = rememberDraggableState { delta -> dividerX += delta.toInt() },
+                    )
+                    .pointerHoverIcon(PointerIcon(Cursor(Cursor.E_RESIZE_CURSOR)))
+                    .layoutId("divider-handle"),
+            )
+        },
+    ) { measurables, incomingConstraints ->
         val availableWidth = incomingConstraints.maxWidth
         val actualDividerX = dividerX.coerceIn(0, availableWidth)
-            .coerceIn((availableWidth * minRatio).roundToInt(), (availableWidth * maxRatio).roundToInt())
+            .coerceIn(
+                (availableWidth * minRatio).roundToInt(),
+                (availableWidth * maxRatio).roundToInt(),
+            )
 
         val dividerMeasurable = measurables.single { it.layoutId == "divider" }
-        val dividerPlaceable = dividerMeasurable
-            .measure(Constraints.fixed(dividerThickness.roundToPx(), incomingConstraints.maxHeight))
+        val dividerPlaceable =
+            dividerMeasurable.measure(
+                Constraints.fixed(dividerThickness.roundToPx(), incomingConstraints.maxHeight),
+            )
 
         val firstComponentConstraints =
             Constraints.fixed((actualDividerX).coerceAtLeast(0), incomingConstraints.maxHeight)
-        val firstPlaceable = (
-            measurables.find { it.layoutId == "first" }
-                ?: error("No first component found. Have you applied the provided Modifier to it?")
-            )
-            .measure(firstComponentConstraints)
+        val firstPlaceable = measurables.find { it.layoutId == "first" }
+            ?.measure(firstComponentConstraints)
+            ?: error("No first component found. Have you applied the provided Modifier to it?")
 
         val secondComponentConstraints =
             Constraints.fixed(
-                availableWidth - actualDividerX + dividerPlaceable.width,
-                incomingConstraints.maxHeight,
+                width = availableWidth - actualDividerX + dividerPlaceable.width,
+                height = incomingConstraints.maxHeight,
             )
-        val secondPlaceable = (
-            measurables.find { it.layoutId == "second" }
-                ?: error("No second component found. Have you applied the provided Modifier to it?")
-            )
-            .measure(secondComponentConstraints)
+        val secondPlaceable = measurables.find { it.layoutId == "second" }
+            ?.measure(secondComponentConstraints)
+            ?: error("No second component found. Have you applied the provided Modifier to it?")
 
-        val dividerHandlePlaceable = measurables.single { it.layoutId == "divider-handle" }
-            .measure(Constraints.fixedHeight(incomingConstraints.maxHeight))
+        val dividerHandlePlaceable =
+            measurables.single { it.layoutId == "divider-handle" }
+                .measure(Constraints.fixedHeight(incomingConstraints.maxHeight))
 
         layout(availableWidth, incomingConstraints.maxHeight) {
             firstPlaceable.placeRelative(0, 0)
@@ -115,7 +116,7 @@ fun HorizontalSplitLayout(
 }
 
 @Composable
-fun VerticalSplitLayout(
+public fun VerticalSplitLayout(
     first: @Composable (Modifier) -> Unit,
     second: @Composable (Modifier) -> Unit,
     modifier: Modifier = Modifier,
@@ -128,64 +129,64 @@ fun VerticalSplitLayout(
     initialDividerPosition: Dp = 300.dp,
 ) {
     val density = LocalDensity.current
-    var dividerY by remember {
-        mutableStateOf(with(density) { initialDividerPosition.roundToPx() })
-    }
+    var dividerY by remember { mutableStateOf(with(density) { initialDividerPosition.roundToPx() }) }
+
+    Layout(
+        modifier = modifier,
+        content = {
+            val dividerInteractionSource = remember { MutableInteractionSource() }
+            first(Modifier.layoutId("first"))
+
+            Divider(
+                orientation = Orientation.Horizontal,
+                modifier = Modifier.fillMaxHeight().layoutId("divider"),
+                color = dividerColor,
+                thickness = dividerThickness,
+                startIndent = dividerIndent,
+            )
 
-    Layout(modifier = modifier, content = {
-        val dividerInteractionSource = remember { MutableInteractionSource() }
-        first(Modifier.layoutId("first"))
-
-        Divider(
-            orientation = Orientation.Horizontal,
-            modifier = Modifier.fillMaxHeight().layoutId("divider"),
-            color = dividerColor,
-            thickness = dividerThickness,
-            startIndent = dividerIndent,
-        )
-
-        second(Modifier.layoutId("second"))
-
-        Box(
-            Modifier.fillMaxWidth()
-                .height(draggableWidth)
-                .draggable(
-                    interactionSource = dividerInteractionSource,
-                    orientation = ComposeOrientation.Vertical,
-                    state = rememberDraggableState { delta ->
-                        dividerY += delta.toInt()
-                    },
-                )
-                .pointerHoverIcon(PointerIcon(Cursor(Cursor.N_RESIZE_CURSOR)))
-                .layoutId("divider-handle"),
-        )
-    }) { measurables, incomingConstraints ->
+            second(Modifier.layoutId("second"))
+
+            Box(
+                Modifier.fillMaxWidth()
+                    .height(draggableWidth)
+                    .draggable(
+                        interactionSource = dividerInteractionSource,
+                        orientation = ComposeOrientation.Vertical,
+                        state = rememberDraggableState { delta -> dividerY += delta.toInt() },
+                    )
+                    .pointerHoverIcon(PointerIcon(Cursor(Cursor.N_RESIZE_CURSOR)))
+                    .layoutId("divider-handle"),
+            )
+        },
+    ) { measurables, incomingConstraints ->
         val availableHeight = incomingConstraints.maxHeight
         val actualDividerY = dividerY.coerceIn(0, availableHeight)
-            .coerceIn((availableHeight * minRatio).roundToInt(), (availableHeight * maxRatio).roundToInt())
+            .coerceIn(
+                (availableHeight * minRatio).roundToInt(),
+                (availableHeight * maxRatio).roundToInt(),
+            )
 
         val dividerMeasurable = measurables.single { it.layoutId == "divider" }
-        val dividerPlaceable = dividerMeasurable
-            .measure(Constraints.fixed(incomingConstraints.maxWidth, dividerThickness.roundToPx()))
+        val dividerPlaceable =
+            dividerMeasurable.measure(
+                Constraints.fixed(incomingConstraints.maxWidth, dividerThickness.roundToPx()),
+            )
 
         val firstComponentConstraints =
             Constraints.fixed(incomingConstraints.maxWidth, (actualDividerY - 1).coerceAtLeast(0))
-        val firstPlaceable = (
-            measurables.find { it.layoutId == "first" }
-                ?: error("No first component found. Have you applied the provided Modifier to it?")
-            )
-            .measure(firstComponentConstraints)
+        val firstPlaceable = measurables.find { it.layoutId == "first" }
+            ?.measure(firstComponentConstraints)
+            ?: error("No first component found. Have you applied the provided Modifier to it?")
 
         val secondComponentConstraints =
             Constraints.fixed(
-                incomingConstraints.maxWidth,
-                availableHeight - actualDividerY + dividerPlaceable.height,
-            )
-        val secondPlaceable = (
-            measurables.find { it.layoutId == "second" }
-                ?: error("No second component found. Have you applied the provided Modifier to it?")
+                width = incomingConstraints.maxWidth,
+                height = availableHeight - actualDividerY + dividerPlaceable.height,
             )
-            .measure(secondComponentConstraints)
+        val secondPlaceable = measurables.find { it.layoutId == "second" }
+            ?.measure(secondComponentConstraints)
+            ?: error("No second component found. Have you applied the provided Modifier to it?")
 
         val dividerHandlePlaceable = measurables.single { it.layoutId == "divider-handle" }
             .measure(Constraints.fixedWidth(incomingConstraints.maxWidth))
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TabStrip.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TabStrip.kt
index 77e413b6fcff7..5b37353139a18 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TabStrip.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TabStrip.kt
@@ -19,7 +19,6 @@ import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -27,12 +26,13 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalLayoutDirection
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 import org.jetbrains.jewel.foundation.modifier.onHover
 import org.jetbrains.jewel.foundation.state.CommonStateBitMask
 import org.jetbrains.jewel.foundation.state.FocusableComponentState
 
 @Composable
-fun TabStrip(
+public fun TabStrip(
     tabs: List<TabData>,
     modifier: Modifier = Modifier,
     enabled: Boolean = true,
@@ -43,16 +43,15 @@ fun TabStrip(
 
     val scrollState = rememberScrollState()
     Box(
-        modifier
-            .focusable(true, remember { MutableInteractionSource() })
+        modifier.focusable(true, remember { MutableInteractionSource() })
             .onHover { tabStripState = tabStripState.copy(hovered = it) },
     ) {
         Row(
-            modifier = Modifier
-                .horizontalScroll(scrollState)
+            modifier = Modifier.horizontalScroll(scrollState)
                 .scrollable(
                     orientation = Orientation.Vertical,
-                    reverseDirection = ScrollableDefaults.reverseDirection(
+                    reverseDirection =
+                    ScrollableDefaults.reverseDirection(
                         LocalLayoutDirection.current,
                         Orientation.Vertical,
                         false,
@@ -62,26 +61,13 @@ fun TabStrip(
                 )
                 .selectableGroup(),
         ) {
-            tabs.forEach {
-                TabImpl(isActive = tabStripState.isActive, tabData = it)
-            }
+            tabs.forEach { TabImpl(isActive = tabStripState.isActive, tabData = it) }
         }
+
         AnimatedVisibility(
             visible = tabStripState.isHovered,
-            enter = fadeIn(
-                animationSpec = tween(
-                    durationMillis = 125,
-                    delayMillis = 0,
-                    easing = LinearEasing,
-                ),
-            ),
-            exit = fadeOut(
-                animationSpec = tween(
-                    durationMillis = 125,
-                    delayMillis = 700,
-                    easing = LinearEasing,
-                ),
-            ),
+            enter = fadeIn(tween(durationMillis = 125, delayMillis = 0, easing = LinearEasing)),
+            exit = fadeOut(tween(durationMillis = 125, delayMillis = 700, easing = LinearEasing)),
         ) {
             TabStripHorizontalScrollbar(
                 adapter = rememberScrollbarAdapter(scrollState),
@@ -92,146 +78,91 @@ fun TabStrip(
 }
 
 @Immutable
-sealed class TabData {
+public sealed class TabData {
 
-    abstract val selected: Boolean
-    abstract val label: String
-    abstract val icon: Painter?
-    abstract val closable: Boolean
-    abstract val onClose: () -> Unit
-    abstract val onClick: () -> Unit
+    public abstract val selected: Boolean
+    public abstract val label: String
+    public abstract val icon: Painter?
+    public abstract val closable: Boolean
+    public abstract val onClose: () -> Unit
+    public abstract val onClick: () -> Unit
 
     @Immutable
-    class Default(
+    @GenerateDataFunctions
+    public class Default(
         override val selected: Boolean,
         override val label: String,
         override val icon: Painter? = null,
         override val closable: Boolean = true,
         override val onClose: () -> Unit = {},
         override val onClick: () -> Unit = {},
-    ) : TabData() {
-
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as Default
-
-            if (selected != other.selected) return false
-            if (label != other.label) return false
-            if (icon != other.icon) return false
-            if (closable != other.closable) return false
-            if (onClose != other.onClose) return false
-            if (onClick != other.onClick) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = selected.hashCode()
-            result = 31 * result + label.hashCode()
-            result = 31 * result + (icon?.hashCode() ?: 0)
-            result = 31 * result + closable.hashCode()
-            result = 31 * result + onClose.hashCode()
-            result = 31 * result + onClick.hashCode()
-            return result
-        }
-    }
+    ) : TabData()
 
     @Immutable
-    class Editor(
+    @GenerateDataFunctions
+    public class Editor(
         override val selected: Boolean,
         override val label: String,
         override val icon: Painter? = null,
         override val closable: Boolean = true,
         override val onClose: () -> Unit = {},
         override val onClick: () -> Unit = {},
-    ) : TabData() {
-
-        override fun equals(other: Any?): Boolean {
-            if (this === other) return true
-            if (javaClass != other?.javaClass) return false
-
-            other as Editor
-
-            if (selected != other.selected) return false
-            if (label != other.label) return false
-            if (icon != other.icon) return false
-            if (closable != other.closable) return false
-            if (onClose != other.onClose) return false
-            if (onClick != other.onClick) return false
-
-            return true
-        }
-
-        override fun hashCode(): Int {
-            var result = selected.hashCode()
-            result = 31 * result + label.hashCode()
-            result = 31 * result + (icon?.hashCode() ?: 0)
-            result = 31 * result + closable.hashCode()
-            result = 31 * result + onClose.hashCode()
-            result = 31 * result + onClick.hashCode()
-            return result
-        }
-    }
+    ) : TabData()
 }
 
 @Immutable
 @JvmInline
-value class TabStripState(val state: ULong) : FocusableComponentState {
+public value class TabStripState(public val state: ULong) : FocusableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and CommonStateBitMask.Active != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and CommonStateBitMask.Enabled != 0UL
 
-    @Stable
     override val isFocused: Boolean
         get() = state and CommonStateBitMask.Focused != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and CommonStateBitMask.Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and CommonStateBitMask.Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         enabled: Boolean = isEnabled,
         focused: Boolean = isFocused,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        enabled = enabled,
-        focused = focused,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
-
-    override fun toString() =
+    ): TabStripState =
+        of(
+            enabled = enabled,
+            focused = focused,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
+
+    override fun toString(): String =
         "${javaClass.simpleName}(isEnabled=$isEnabled, isFocused=$isFocused, isHovered=$isHovered, " +
             "isPressed=$isPressed, isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             enabled: Boolean = true,
             focused: Boolean = false,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = false,
-        ) = TabStripState(
-            state = (if (enabled) CommonStateBitMask.Enabled else 0UL) or
-                (if (focused) CommonStateBitMask.Focused else 0UL) or
-                (if (hovered) CommonStateBitMask.Hovered else 0UL) or
-                (if (pressed) CommonStateBitMask.Pressed else 0UL) or
-                (if (active) CommonStateBitMask.Active else 0UL),
-        )
+        ): TabStripState =
+            TabStripState(
+                (if (enabled) CommonStateBitMask.Enabled else 0UL) or
+                    (if (focused) CommonStateBitMask.Focused else 0UL) or
+                    (if (hovered) CommonStateBitMask.Hovered else 0UL) or
+                    (if (pressed) CommonStateBitMask.Pressed else 0UL) or
+                    (if (active) CommonStateBitMask.Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tabs.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tabs.kt
index 79f6b6d0bbd2d..41df851fea01a 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tabs.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tabs.kt
@@ -1,7 +1,6 @@
 package org.jetbrains.jewel.ui.component
 
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.LocalIndication
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.interaction.HoverInteraction
@@ -18,7 +17,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.Stable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -57,12 +55,15 @@ internal fun TabImpl(
     tabData: TabData,
     interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
 ) {
-    val tabStyle = when (tabData) {
-        is TabData.Default -> JewelTheme.defaultTabStyle
-        is TabData.Editor -> JewelTheme.editorTabStyle
-    }
+    val tabStyle =
+        when (tabData) {
+            is TabData.Default -> JewelTheme.defaultTabStyle
+            is TabData.Editor -> JewelTheme.editorTabStyle
+        }
 
-    var tabState by remember { mutableStateOf(TabState.of(selected = tabData.selected, active = isActive)) }
+    var tabState by remember {
+        mutableStateOf(TabState.of(selected = tabData.selected, active = isActive))
+    }
     remember(tabData.selected, isActive) {
         tabState = tabState.copy(selected = tabData.selected, active = isActive)
     }
@@ -71,7 +72,10 @@ internal fun TabImpl(
         interactionSource.interactions.collect { interaction ->
             when (interaction) {
                 is PressInteraction.Press -> tabState = tabState.copy(pressed = true)
-                is PressInteraction.Cancel, is PressInteraction.Release -> tabState = tabState.copy(pressed = false)
+                is PressInteraction.Cancel,
+                is PressInteraction.Release,
+                -> tabState = tabState.copy(pressed = false)
+
                 is HoverInteraction.Enter -> tabState = tabState.copy(hovered = true)
                 is HoverInteraction.Exit -> tabState = tabState.copy(hovered = false)
             }
@@ -82,16 +86,15 @@ internal fun TabImpl(
     val lineThickness = tabStyle.metrics.underlineThickness
     val backgroundColor by tabStyle.colors.backgroundFor(state = tabState)
 
-    CompositionLocalProvider(
-        LocalIndication provides NoIndication,
-        LocalContentColor provides tabStyle.colors.contentFor(tabState).value.takeOrElse { LocalContentColor.current },
-    ) {
+    val resolvedContentColor = tabStyle.colors.contentFor(tabState)
+        .value.takeOrElse { LocalContentColor.current }
+
+    CompositionLocalProvider(LocalContentColor provides resolvedContentColor) {
         val labelAlpha by tabStyle.contentAlpha.labelFor(tabState)
         val iconAlpha by tabStyle.contentAlpha.iconFor(tabState)
 
         Row(
-            modifier
-                .height(tabStyle.metrics.tabHeight)
+            modifier.height(tabStyle.metrics.tabHeight)
                 .background(backgroundColor)
                 .focusProperties { canFocus = false }
                 .selectable(
@@ -116,9 +119,7 @@ internal fun TabImpl(
                     )
                 }
                 .padding(tabStyle.metrics.tabPadding)
-                .onPointerEvent(PointerEventType.Release) {
-                    if (it.button.isTertiary) tabData.onClose()
-                },
+                .onPointerEvent(PointerEventType.Release) { if (it.button.isTertiary) tabData.onClose() },
             horizontalArrangement = Arrangement.spacedBy(tabStyle.metrics.closeContentGap),
             verticalAlignment = Alignment.CenterVertically,
         ) {
@@ -131,33 +132,39 @@ internal fun TabImpl(
                 text = tabData.label,
                 color = tabStyle.colors.contentFor(tabState).value,
             )
-            val showCloseIcon = when (tabData) {
-                is TabData.Default -> tabData.closable
-                is TabData.Editor -> tabData.closable && (tabState.isHovered || tabState.isSelected)
-            }
+            val showCloseIcon =
+                when (tabData) {
+                    is TabData.Default -> tabData.closable
+                    is TabData.Editor -> tabData.closable && (tabState.isHovered || tabState.isSelected)
+                }
+
             if (showCloseIcon) {
                 val closeActionInteractionSource = remember { MutableInteractionSource() }
                 LaunchedEffect(closeActionInteractionSource) {
                     closeActionInteractionSource.interactions.collect { interaction ->
                         when (interaction) {
                             is PressInteraction.Press -> closeButtonState = closeButtonState.copy(pressed = true)
-                            is PressInteraction.Cancel, is PressInteraction.Release ->
-                                closeButtonState =
-                                    closeButtonState.copy(pressed = false)
+                            is PressInteraction.Cancel, is PressInteraction.Release -> {
+                                closeButtonState = closeButtonState.copy(pressed = false)
+                            }
 
                             is HoverInteraction.Enter -> closeButtonState = closeButtonState.copy(hovered = true)
+
                             is HoverInteraction.Exit -> closeButtonState = closeButtonState.copy(hovered = false)
                         }
                     }
                 }
+
                 val closePainter by tabStyle.icons.close.getPainter(Stateful(closeButtonState))
                 Image(
-                    modifier = Modifier.clickable(
-                        interactionSource = closeActionInteractionSource,
-                        indication = null,
-                        onClick = tabData.onClose,
-                        role = Role.Button,
-                    ).size(16.dp),
+                    modifier = Modifier
+                        .clickable(
+                            interactionSource = closeActionInteractionSource,
+                            indication = null,
+                            onClick = tabData.onClose,
+                            role = Role.Button,
+                        )
+                        .size(16.dp),
                     painter = closePainter,
                     contentDescription = "Close tab ${tabData.label}",
                 )
@@ -170,60 +177,57 @@ internal fun TabImpl(
 
 @Immutable
 @JvmInline
-value class TabState(val state: ULong) : SelectableComponentState {
+public value class TabState(public val state: ULong) : SelectableComponentState {
 
-    @Stable
     override val isActive: Boolean
         get() = state and Active != 0UL
 
-    @Stable
     override val isSelected: Boolean
         get() = state and Selected != 0UL
 
-    @Stable
     override val isEnabled: Boolean
         get() = state and Enabled != 0UL
 
-    @Stable
     override val isHovered: Boolean
         get() = state and Hovered != 0UL
 
-    @Stable
     override val isPressed: Boolean
         get() = state and Pressed != 0UL
 
-    fun copy(
+    public fun copy(
         selected: Boolean = isSelected,
         enabled: Boolean = isEnabled,
         pressed: Boolean = isPressed,
         hovered: Boolean = isHovered,
         active: Boolean = isActive,
-    ) = of(
-        selected = selected,
-        enabled = enabled,
-        pressed = pressed,
-        hovered = hovered,
-        active = active,
-    )
-
-    override fun toString() =
+    ): TabState =
+        of(
+            selected = selected,
+            enabled = enabled,
+            pressed = pressed,
+            hovered = hovered,
+            active = active,
+        )
+
+    override fun toString(): String =
         "${javaClass.simpleName}(isSelected=$isSelected, isEnabled=$isEnabled, " +
             "isHovered=$isHovered, isPressed=$isPressed isActive=$isActive)"
 
-    companion object {
+    public companion object {
 
-        fun of(
+        public fun of(
             selected: Boolean,
             enabled: Boolean = true,
             pressed: Boolean = false,
             hovered: Boolean = false,
             active: Boolean = false,
-        ) = TabState(
-            (if (selected) Selected else 0UL) or
-                (if (enabled) Enabled else 0UL) or
-                (if (pressed) Pressed else 0UL) or
-                (if (hovered) Hovered else 0UL) or
-                (if (active) Active else 0UL),
-        )
+        ): TabState =
+            TabState(
+                (if (selected) Selected else 0UL) or
+                    (if (enabled) Enabled else 0UL) or
+                    (if (pressed) Pressed else 0UL) or
+                    (if (hovered) Hovered else 0UL) or
+                    (if (active) Active else 0UL),
+            )
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Text.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Text.kt
index 6dad055d8ff22..083fb53729b95 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Text.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Text.kt
@@ -20,7 +20,7 @@ import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.foundation.theme.LocalContentColor
 
 @Composable
-fun Text(
+public fun Text(
     text: String,
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
@@ -60,7 +60,7 @@ fun Text(
 }
 
 @Composable
-fun Text(
+public fun Text(
     text: AnnotatedString,
     modifier: Modifier = Modifier,
     color: Color = Color.Unspecified,
@@ -79,24 +79,32 @@ fun Text(
     onTextLayout: (TextLayoutResult) -> Unit = {},
     style: TextStyle = JewelTheme.textStyle,
 ) {
-    val textColor = color.takeOrElse {
-        LocalContentColor.current.takeOrElse {
-            style.color
-        }
-    }
+    val textColor = color.takeOrElse { LocalContentColor.current.takeOrElse { style.color } }
 
-    val mergedStyle = style.merge(
-        TextStyle(
-            color = textColor,
-            fontSize = fontSize,
-            fontWeight = fontWeight,
-            textAlign = textAlign,
-            lineHeight = lineHeight,
-            fontFamily = fontFamily,
-            textDecoration = textDecoration,
-            fontStyle = fontStyle,
-            letterSpacing = letterSpacing,
-        ),
+    val mergedStyle =
+        style.merge(
+            TextStyle(
+                color = textColor,
+                fontSize = fontSize,
+                fontWeight = fontWeight,
+                textAlign = textAlign,
+                lineHeight = lineHeight,
+                fontFamily = fontFamily,
+                textDecoration = textDecoration,
+                fontStyle = fontStyle,
+                letterSpacing = letterSpacing,
+            ),
+        )
+
+    BasicText(
+        text,
+        modifier,
+        mergedStyle,
+        onTextLayout,
+        overflow,
+        softWrap,
+        maxLines,
+        minLines = 1,
+        inlineContent,
     )
-    BasicText(text, modifier, mergedStyle, onTextLayout, overflow, softWrap, maxLines, minLines = 1, inlineContent)
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextArea.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextArea.kt
index 69975853fd8f8..621da462defe9 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextArea.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextArea.kt
@@ -36,7 +36,7 @@ import org.jetbrains.jewel.ui.theme.textAreaStyle
  *     component when the [value] is empty.
  */
 @Composable
-fun TextArea(
+public fun TextArea(
     value: String,
     onValueChange: (String) -> Unit,
     modifier: Modifier = Modifier,
@@ -92,7 +92,7 @@ fun TextArea(
  *     component when the [value] is empty.
  */
 @Composable
-fun TextArea(
+public fun TextArea(
     value: TextFieldValue,
     onValueChange: (TextFieldValue) -> Unit,
     modifier: Modifier = Modifier,
@@ -114,8 +114,7 @@ fun TextArea(
     InputField(
         value = value,
         onValueChange = onValueChange,
-        modifier = modifier
-            .defaultMinSize(minWidth = minSize.width, minHeight = minSize.height),
+        modifier = modifier.defaultMinSize(minWidth = minSize.width, minHeight = minSize.height),
         enabled = enabled,
         readOnly = readOnly,
         outline = outline,
@@ -172,46 +171,29 @@ private fun TextAreaDecorationBox(
             }
         },
     ) { measurables, incomingConstraints ->
-        val horizontalPadding =
-            (
-                contentPadding.calculateLeftPadding(layoutDirection) +
-                    contentPadding.calculateRightPadding(layoutDirection)
-                ).roundToPx()
-        val verticalPadding =
-            (
-                contentPadding.calculateTopPadding() +
-                    contentPadding.calculateBottomPadding()
-                ).roundToPx()
+        val leftPadding = contentPadding.calculateLeftPadding(layoutDirection)
+        val rightPadding = contentPadding.calculateRightPadding(layoutDirection)
+        val horizontalPadding = (leftPadding + rightPadding).roundToPx()
+        val verticalPadding = (contentPadding.calculateTopPadding() + contentPadding.calculateBottomPadding())
+            .roundToPx()
 
-        val textAreaConstraints = incomingConstraints.offset(
-            horizontal = -horizontalPadding,
-            vertical = -verticalPadding,
-        ).copy(minHeight = 0)
+        val textAreaConstraints = incomingConstraints
+            .offset(horizontal = -horizontalPadding, vertical = -verticalPadding)
+            .copy(minHeight = 0)
 
-        val textAreaPlaceable = measurables.first { it.layoutId == TEXT_AREA_ID }.measure(textAreaConstraints)
+        val textAreaPlaceable = measurables.single { it.layoutId == TEXT_AREA_ID }
+            .measure(textAreaConstraints)
 
         // Measure placeholder
         val placeholderConstraints = textAreaConstraints.copy(minWidth = 0, minHeight = 0)
-        val placeholderPlaceable = measurables.find { it.layoutId == PLACEHOLDER_ID }?.measure(placeholderConstraints)
+        val placeholderPlaceable = measurables.find { it.layoutId == PLACEHOLDER_ID }
+            ?.measure(placeholderConstraints)
 
-        val width = calculateWidth(
-            textAreaPlaceable,
-            placeholderPlaceable,
-            textAreaConstraints,
-        )
-        val height = calculateHeight(
-            textAreaPlaceable,
-            placeholderPlaceable,
-            verticalPadding,
-            textAreaConstraints,
-        )
+        val width = calculateWidth(textAreaPlaceable, placeholderPlaceable, textAreaConstraints)
+        val height = calculateHeight(textAreaPlaceable, placeholderPlaceable, verticalPadding, textAreaConstraints)
 
         layout(width, height) {
-            place(
-                height,
-                textAreaPlaceable,
-                placeholderPlaceable,
-            )
+            place(height, textAreaPlaceable, placeholderPlaceable)
         }
     }
 }
@@ -221,10 +203,7 @@ private fun calculateWidth(
     placeholderPlaceable: Placeable?,
     constraints: Constraints,
 ): Int =
-    maxOf(
-        textFieldPlaceable.width,
-        placeholderPlaceable?.width ?: 0,
-    )
+    maxOf(textFieldPlaceable.width, placeholderPlaceable?.width ?: 0)
         .coerceAtLeast(constraints.minWidth)
 
 private fun calculateHeight(
@@ -233,10 +212,7 @@ private fun calculateHeight(
     verticalPadding: Int,
     constraints: Constraints,
 ): Int {
-    val textAreaHeight = maxOf(
-        textFieldPlaceable.height,
-        placeholderPlaceable?.height ?: 0,
-    )
+    val textAreaHeight = maxOf(textFieldPlaceable.height, placeholderPlaceable?.height ?: 0)
     return (textAreaHeight + verticalPadding).coerceAtLeast(constraints.minHeight)
 }
 
@@ -246,16 +222,10 @@ private fun Placeable.PlacementScope.place(
     placeholderPlaceable: Placeable?,
 ) {
     // placed center vertically
-    textAreaPlaceable.placeRelative(
-        0,
-        Alignment.CenterVertically.align(textAreaPlaceable.height, height),
-    )
+    textAreaPlaceable.placeRelative(0, Alignment.CenterVertically.align(textAreaPlaceable.height, height))
 
     // placed similar to the input text above
-    placeholderPlaceable?.placeRelative(
-        0,
-        Alignment.CenterVertically.align(placeholderPlaceable.height, height),
-    )
+    placeholderPlaceable?.placeRelative(0, Alignment.CenterVertically.align(placeholderPlaceable.height, height))
 }
 
 private const val PLACEHOLDER_ID = "Placeholder"
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextField.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextField.kt
index 9e460b3852a5a..5c49ffb35e573 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextField.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/TextField.kt
@@ -37,7 +37,7 @@ import kotlin.math.max
  *     component when the [value] is empty.
  */
 @Composable
-fun TextField(
+public fun TextField(
     value: String,
     onValueChange: (String) -> Unit,
     modifier: Modifier = Modifier,
@@ -93,7 +93,7 @@ fun TextField(
  *     component when the [value] is empty.
  */
 @Composable
-fun TextField(
+public fun TextField(
     value: TextFieldValue,
     onValueChange: (TextFieldValue) -> Unit,
     modifier: Modifier = Modifier,
@@ -188,22 +188,22 @@ private fun TextFieldDecorationBox(
         val iconConstraints = incomingConstraints.copy(minWidth = 0, minHeight = 0)
 
         // measure trailing icon
-        val trailingPlaceable = measurables.find { it.layoutId == TRAILING_ID }
-            ?.measure(iconConstraints)
+        val trailingPlaceable =
+            measurables.find { it.layoutId == TRAILING_ID }?.measure(iconConstraints)
 
-        val leadingPlaceable = measurables.find { it.layoutId == LEADING_ID }
-            ?.measure(iconConstraints)
+        val leadingPlaceable = measurables.find { it.layoutId == LEADING_ID }?.measure(iconConstraints)
         occupiedSpaceHorizontally += trailingPlaceable?.width ?: 0
         occupiedSpaceHorizontally += leadingPlaceable?.width ?: 0
 
-        val textFieldConstraints = incomingConstraints.offset(
-            horizontal = -occupiedSpaceHorizontally,
-        ).copy(minHeight = 0)
-        val textFieldPlaceable = measurables.first { it.layoutId == TEXT_FIELD_ID }.measure(textFieldConstraints)
+        val textFieldConstraints = incomingConstraints.offset(horizontal = -occupiedSpaceHorizontally)
+            .copy(minHeight = 0)
+        val textFieldPlaceable = measurables.single { it.layoutId == TEXT_FIELD_ID }
+            .measure(textFieldConstraints)
 
         // measure placeholder
         val placeholderConstraints = textFieldConstraints.copy(minWidth = 0)
-        val placeholderPlaceable = measurables.find { it.layoutId == PLACEHOLDER_ID }?.measure(placeholderConstraints)
+        val placeholderPlaceable = measurables.find { it.layoutId == PLACEHOLDER_ID }
+            ?.measure(placeholderConstraints)
 
         val width = calculateWidth(
             trailingPlaceable,
@@ -221,14 +221,7 @@ private fun TextFieldDecorationBox(
         )
 
         layout(width, height) {
-            place(
-                height,
-                width,
-                trailingPlaceable,
-                leadingPlaceable,
-                textFieldPlaceable,
-                placeholderPlaceable,
-            )
+            place(height, width, trailingPlaceable, leadingPlaceable, textFieldPlaceable, placeholderPlaceable)
         }
     }
 }
@@ -240,11 +233,10 @@ private fun calculateWidth(
     placeholderPlaceable: Placeable?,
     constraints: Constraints,
 ): Int {
-    val middleSection = maxOf(
-        textFieldPlaceable.width,
-        placeholderPlaceable?.width ?: 0,
-    )
-    val wrappedWidth = middleSection + (trailingPlaceable?.width ?: 0) + (leadingPlaceable?.width ?: 0)
+    val middleSection =
+        maxOf(textFieldPlaceable.width, placeholderPlaceable?.width ?: 0)
+    val wrappedWidth =
+        middleSection + (trailingPlaceable?.width ?: 0) + (leadingPlaceable?.width ?: 0)
     return max(wrappedWidth, constraints.minWidth)
 }
 
@@ -254,13 +246,14 @@ private fun calculateHeight(
     textFieldPlaceable: Placeable,
     placeholderPlaceable: Placeable?,
     constraints: Constraints,
-): Int = maxOf(
-    textFieldPlaceable.height,
-    placeholderPlaceable?.height ?: 0,
-    trailingPlaceable?.height ?: 0,
-    leadingPlaceable?.height ?: 0,
-    constraints.minHeight,
-)
+): Int =
+    maxOf(
+        textFieldPlaceable.height,
+        placeholderPlaceable?.height ?: 0,
+        trailingPlaceable?.height ?: 0,
+        leadingPlaceable?.height ?: 0,
+        constraints.minHeight,
+    )
 
 private fun Placeable.PlacementScope.place(
     height: Int,
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt
index af6761166d029..5fd315955d86b 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/Tooltip.kt
@@ -33,7 +33,7 @@ import org.jetbrains.jewel.ui.theme.tooltipStyle
 import org.jetbrains.jewel.ui.util.isDark
 
 @Composable
-fun Tooltip(
+public fun Tooltip(
     tooltip: @Composable () -> Unit,
     modifier: Modifier = Modifier,
     style: TooltipStyle = JewelTheme.tooltipStyle,
@@ -81,7 +81,7 @@ fun Tooltip(
     )
 }
 
-class TooltipPlacement(
+public class TooltipPlacement(
     private val contentOffset: DpOffset,
     private val alignment: Alignment.Horizontal,
     private val density: Density,
@@ -112,20 +112,16 @@ private fun rememberTooltipPositionProvider(
     alignment: Alignment.Horizontal,
     density: Density,
     windowMargin: Dp = 4.dp,
-) = remember(
-    contentOffset,
-    alignment,
-    density,
-    windowMargin,
-) {
-    TooltipPositionProvider(
-        cursorPosition = cursorPosition,
-        contentOffset = contentOffset,
-        alignment = alignment,
-        density = density,
-        windowMargin = windowMargin,
-    )
-}
+) =
+    remember(contentOffset, alignment, density, windowMargin) {
+        TooltipPositionProvider(
+            cursorPosition = cursorPosition,
+            contentOffset = contentOffset,
+            alignment = alignment,
+            density = density,
+            windowMargin = windowMargin,
+        )
+    }
 
 private class TooltipPositionProvider(
     private val cursorPosition: Offset,
@@ -140,34 +136,37 @@ private class TooltipPositionProvider(
         windowSize: IntSize,
         layoutDirection: LayoutDirection,
         popupContentSize: IntSize,
-    ): IntOffset = with(density) {
-        val windowSpaceBounds = IntRect(
-            left = windowMargin.roundToPx(),
-            top = windowMargin.roundToPx(),
-            right = windowSize.width - windowMargin.roundToPx(),
-            bottom = windowSize.height - windowMargin.roundToPx(),
-        )
+    ): IntOffset =
+        with(density) {
+            val windowSpaceBounds = IntRect(
+                left = windowMargin.roundToPx(),
+                top = windowMargin.roundToPx(),
+                right = windowSize.width - windowMargin.roundToPx(),
+                bottom = windowSize.height - windowMargin.roundToPx(),
+            )
 
-        val contentOffsetX = contentOffset.x.roundToPx()
-        val contentOffsetY = contentOffset.y.roundToPx()
+            val contentOffsetX = contentOffset.x.roundToPx()
+            val contentOffsetY = contentOffset.y.roundToPx()
 
-        val posX = cursorPosition.x.toInt() + anchorBounds.left
-        val posY = cursorPosition.y.toInt() + anchorBounds.top
+            val posX = cursorPosition.x.toInt() + anchorBounds.left
+            val posY = cursorPosition.y.toInt() + anchorBounds.top
 
-        val x = posX + alignment.align(popupContentSize.width, 0, layoutDirection) + contentOffsetX
+            val x = posX + alignment.align(popupContentSize.width, 0, layoutDirection) + contentOffsetX
 
-        val aboveSpacing = cursorPosition.y - contentOffsetY - windowSpaceBounds.top
-        val belowSpacing = windowSpaceBounds.bottom - cursorPosition.y - contentOffsetY
+            val aboveSpacing = cursorPosition.y - contentOffsetY - windowSpaceBounds.top
+            val belowSpacing = windowSpaceBounds.bottom - cursorPosition.y - contentOffsetY
 
-        val y = if (belowSpacing > popupContentSize.height || belowSpacing >= aboveSpacing) {
-            posY + contentOffsetY
-        } else {
-            posY - contentOffsetY - popupContentSize.height
-        }
+            val y =
+                if (belowSpacing > popupContentSize.height || belowSpacing >= aboveSpacing) {
+                    posY + contentOffsetY
+                } else {
+                    posY - contentOffsetY - popupContentSize.height
+                }
 
-        val popupBounds = IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height)
-            .constrainedIn(windowSpaceBounds)
+            val popupBounds =
+                IntRect(x, y, x + popupContentSize.width, y + popupContentSize.height)
+                    .constrainedIn(windowSpaceBounds)
 
-        IntOffset(popupBounds.left, popupBounds.top)
-    }
+            IntOffset(popupBounds.left, popupBounds.top)
+        }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ButtonStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ButtonStyling.kt
index 38130ba781c01..dae54899b0606 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ButtonStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ButtonStyling.kt
@@ -4,7 +4,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Brush
@@ -16,89 +18,94 @@ import org.jetbrains.jewel.ui.component.ButtonState
 
 @Stable
 @GenerateDataFunctions
-class ButtonStyle(
-    val colors: ButtonColors,
-    val metrics: ButtonMetrics,
+public class ButtonStyle(
+    public val colors: ButtonColors,
+    public val metrics: ButtonMetrics,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class ButtonColors(
-    val background: Brush,
-    val backgroundDisabled: Brush,
-    val backgroundFocused: Brush,
-    val backgroundPressed: Brush,
-    val backgroundHovered: Brush,
-    val content: Color,
-    val contentDisabled: Color,
-    val contentFocused: Color,
-    val contentPressed: Color,
-    val contentHovered: Color,
-    val border: Brush,
-    val borderDisabled: Brush,
-    val borderFocused: Brush,
-    val borderPressed: Brush,
-    val borderHovered: Brush,
+public class ButtonColors(
+    public val background: Brush,
+    public val backgroundDisabled: Brush,
+    public val backgroundFocused: Brush,
+    public val backgroundPressed: Brush,
+    public val backgroundHovered: Brush,
+    public val content: Color,
+    public val contentDisabled: Color,
+    public val contentFocused: Color,
+    public val contentPressed: Color,
+    public val contentHovered: Color,
+    public val border: Brush,
+    public val borderDisabled: Brush,
+    public val borderFocused: Brush,
+    public val borderPressed: Brush,
+    public val borderHovered: Brush,
 ) {
 
     @Composable
-    fun backgroundFor(state: ButtonState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = background,
-            disabled = backgroundDisabled,
-            focused = backgroundFocused,
-            pressed = backgroundPressed,
-            hovered = backgroundHovered,
-            active = background,
-        ),
-    )
+    public fun backgroundFor(state: ButtonState): State<Brush> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = background,
+                disabled = backgroundDisabled,
+                focused = backgroundFocused,
+                pressed = backgroundPressed,
+                hovered = backgroundHovered,
+                active = background,
+            ),
+        )
 
     @Composable
-    fun contentFor(state: ButtonState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = content,
-            disabled = contentDisabled,
-            focused = contentFocused,
-            pressed = contentPressed,
-            hovered = contentHovered,
-            active = content,
-        ),
-    )
+    public fun contentFor(state: ButtonState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = content,
+                disabled = contentDisabled,
+                focused = contentFocused,
+                pressed = contentPressed,
+                hovered = contentHovered,
+                active = content,
+            ),
+        )
 
     @Composable
-    fun borderFor(state: ButtonState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = border,
-            disabled = borderDisabled,
-            focused = borderFocused,
-            pressed = borderPressed,
-            hovered = borderHovered,
-            active = border,
-        ),
-    )
+    public fun borderFor(state: ButtonState): State<Brush> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = border,
+                disabled = borderDisabled,
+                focused = borderFocused,
+                pressed = borderPressed,
+                hovered = borderHovered,
+                active = border,
+            ),
+        )
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class ButtonMetrics(
-    val cornerSize: CornerSize,
-    val padding: PaddingValues,
-    val minSize: DpSize,
-    val borderWidth: Dp,
+public class ButtonMetrics(
+    public val cornerSize: CornerSize,
+    public val padding: PaddingValues,
+    public val minSize: DpSize,
+    public val borderWidth: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalDefaultButtonStyle = staticCompositionLocalOf<ButtonStyle> {
-    error("No default ButtonStyle provided")
-}
+public val LocalDefaultButtonStyle: ProvidableCompositionLocal<ButtonStyle> =
+    staticCompositionLocalOf {
+        error("No default ButtonStyle provided. Have you forgotten the theme?")
+    }
 
-val LocalOutlinedButtonStyle = staticCompositionLocalOf<ButtonStyle> {
-    error("No outlined ButtonStyle provided")
-}
+public val LocalOutlinedButtonStyle: ProvidableCompositionLocal<ButtonStyle> =
+    staticCompositionLocalOf {
+        error("No outlined ButtonStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/CheckboxStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/CheckboxStyling.kt
index 08d9ac91155f4..cbe3822d34fd9 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/CheckboxStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/CheckboxStyling.kt
@@ -3,6 +3,8 @@ package org.jetbrains.jewel.ui.component.styling
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -16,55 +18,57 @@ import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Immutable
 @GenerateDataFunctions
-class CheckboxStyle(
-    val colors: CheckboxColors,
-    val metrics: CheckboxMetrics,
-    val icons: CheckboxIcons,
+public class CheckboxStyle(
+    public val colors: CheckboxColors,
+    public val metrics: CheckboxMetrics,
+    public val icons: CheckboxIcons,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class CheckboxColors(
-    val content: Color,
-    val contentDisabled: Color,
-    val contentSelected: Color,
+public class CheckboxColors(
+    public val content: Color,
+    public val contentDisabled: Color,
+    public val contentSelected: Color,
 ) {
 
     @Composable
-    fun contentFor(state: CheckboxState) = rememberUpdatedState(
-        when {
-            !state.isEnabled -> contentDisabled
-            state.toggleableState == ToggleableState.On -> contentSelected
-            else -> content
-        },
-    )
+    public fun contentFor(state: CheckboxState): State<Color> =
+        rememberUpdatedState(
+            when {
+                !state.isEnabled -> contentDisabled
+                state.toggleableState == ToggleableState.On -> contentSelected
+                else -> content
+            },
+        )
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class CheckboxMetrics(
-    val checkboxSize: DpSize,
-    val checkboxCornerSize: CornerSize,
-    val outlineSize: DpSize,
-    val outlineOffset: DpOffset,
-    val iconContentGap: Dp,
+public class CheckboxMetrics(
+    public val checkboxSize: DpSize,
+    public val checkboxCornerSize: CornerSize,
+    public val outlineSize: DpSize,
+    public val outlineOffset: DpOffset,
+    public val iconContentGap: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class CheckboxIcons(val checkbox: PainterProvider) {
+public class CheckboxIcons(public val checkbox: PainterProvider) {
 
-    companion object
+    public companion object
 }
 
-val LocalCheckboxStyle = staticCompositionLocalOf<CheckboxStyle> {
-    error("No CheckboxStyle provided")
-}
+public val LocalCheckboxStyle: ProvidableCompositionLocal<CheckboxStyle> =
+    staticCompositionLocalOf {
+        error("No CheckboxStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ChipStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ChipStyling.kt
index 647f9e5aa933b..9acc2531daa89 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ChipStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ChipStyling.kt
@@ -4,7 +4,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Brush
@@ -16,127 +18,131 @@ import org.jetbrains.jewel.ui.component.ChipState
 
 @Stable
 @GenerateDataFunctions
-class ChipStyle(
-    val colors: ChipColors,
-    val metrics: ChipMetrics,
+public class ChipStyle(
+    public val colors: ChipColors,
+    public val metrics: ChipMetrics,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class ChipColors(
-    val background: Brush,
-    val backgroundDisabled: Brush,
-    val backgroundFocused: Brush,
-    val backgroundPressed: Brush,
-    val backgroundHovered: Brush,
-    val backgroundSelected: Brush,
-    val backgroundSelectedDisabled: Brush,
-    val backgroundSelectedPressed: Brush,
-    val backgroundSelectedFocused: Brush,
-    val backgroundSelectedHovered: Brush,
-    val content: Color,
-    val contentDisabled: Color,
-    val contentFocused: Color,
-    val contentPressed: Color,
-    val contentHovered: Color,
-    val contentSelected: Color,
-    val contentSelectedDisabled: Color,
-    val contentSelectedPressed: Color,
-    val contentSelectedFocused: Color,
-    val contentSelectedHovered: Color,
-    val border: Color,
-    val borderDisabled: Color,
-    val borderFocused: Color,
-    val borderPressed: Color,
-    val borderHovered: Color,
-    val borderSelected: Color,
-    val borderSelectedDisabled: Color,
-    val borderSelectedPressed: Color,
-    val borderSelectedFocused: Color,
-    val borderSelectedHovered: Color,
+public class ChipColors(
+    public val background: Brush,
+    public val backgroundDisabled: Brush,
+    public val backgroundFocused: Brush,
+    public val backgroundPressed: Brush,
+    public val backgroundHovered: Brush,
+    public val backgroundSelected: Brush,
+    public val backgroundSelectedDisabled: Brush,
+    public val backgroundSelectedPressed: Brush,
+    public val backgroundSelectedFocused: Brush,
+    public val backgroundSelectedHovered: Brush,
+    public val content: Color,
+    public val contentDisabled: Color,
+    public val contentFocused: Color,
+    public val contentPressed: Color,
+    public val contentHovered: Color,
+    public val contentSelected: Color,
+    public val contentSelectedDisabled: Color,
+    public val contentSelectedPressed: Color,
+    public val contentSelectedFocused: Color,
+    public val contentSelectedHovered: Color,
+    public val border: Color,
+    public val borderDisabled: Color,
+    public val borderFocused: Color,
+    public val borderPressed: Color,
+    public val borderHovered: Color,
+    public val borderSelected: Color,
+    public val borderSelectedDisabled: Color,
+    public val borderSelectedPressed: Color,
+    public val borderSelectedFocused: Color,
+    public val borderSelectedHovered: Color,
 ) {
 
     @Composable
-    fun backgroundFor(state: ChipState) = rememberUpdatedState(
-        if (state.isSelected) {
-            when {
-                !state.isEnabled -> backgroundSelectedDisabled
-                state.isPressed -> backgroundSelectedPressed
-                state.isFocused -> backgroundSelectedFocused
-                state.isHovered -> backgroundSelectedHovered
-                else -> backgroundSelected
-            }
-        } else {
-            when {
-                !state.isEnabled -> backgroundDisabled
-                state.isPressed -> backgroundPressed
-                state.isFocused -> backgroundFocused
-                state.isHovered -> backgroundHovered
-                else -> background
-            }
-        },
-    )
+    public fun backgroundFor(state: ChipState): State<Brush> =
+        rememberUpdatedState(
+            if (state.isSelected) {
+                when {
+                    !state.isEnabled -> backgroundSelectedDisabled
+                    state.isPressed -> backgroundSelectedPressed
+                    state.isFocused -> backgroundSelectedFocused
+                    state.isHovered -> backgroundSelectedHovered
+                    else -> backgroundSelected
+                }
+            } else {
+                when {
+                    !state.isEnabled -> backgroundDisabled
+                    state.isPressed -> backgroundPressed
+                    state.isFocused -> backgroundFocused
+                    state.isHovered -> backgroundHovered
+                    else -> background
+                }
+            },
+        )
 
     @Composable
-    fun contentFor(state: ChipState) = rememberUpdatedState(
-        if (state.isSelected) {
-            when {
-                !state.isEnabled -> contentSelectedDisabled
-                state.isPressed -> contentSelectedPressed
-                state.isFocused -> contentSelectedFocused
-                state.isHovered -> contentSelectedHovered
-                else -> contentSelected
-            }
-        } else {
-            when {
-                !state.isEnabled -> contentDisabled
-                state.isPressed -> contentPressed
-                state.isFocused -> contentFocused
-                state.isHovered -> contentHovered
-                else -> content
-            }
-        },
-    )
+    public fun contentFor(state: ChipState): State<Color> =
+        rememberUpdatedState(
+            if (state.isSelected) {
+                when {
+                    !state.isEnabled -> contentSelectedDisabled
+                    state.isPressed -> contentSelectedPressed
+                    state.isFocused -> contentSelectedFocused
+                    state.isHovered -> contentSelectedHovered
+                    else -> contentSelected
+                }
+            } else {
+                when {
+                    !state.isEnabled -> contentDisabled
+                    state.isPressed -> contentPressed
+                    state.isFocused -> contentFocused
+                    state.isHovered -> contentHovered
+                    else -> content
+                }
+            },
+        )
 
     @Composable
-    fun borderFor(state: ChipState) = rememberUpdatedState(
-        if (state.isSelected) {
-            when {
-                !state.isEnabled -> borderSelectedDisabled
-                state.isPressed && !JewelTheme.isSwingCompatMode -> borderSelectedPressed
-                state.isFocused -> borderSelectedFocused
-                state.isHovered && !JewelTheme.isSwingCompatMode -> borderSelectedHovered
-                else -> borderSelected
-            }
-        } else {
-            when {
-                !state.isEnabled -> borderDisabled
-                state.isPressed && !JewelTheme.isSwingCompatMode -> borderPressed
-                state.isFocused -> borderFocused
-                state.isHovered && !JewelTheme.isSwingCompatMode -> borderHovered
-                else -> border
-            }
-        },
-    )
+    public fun borderFor(state: ChipState): State<Color> =
+        rememberUpdatedState(
+            if (state.isSelected) {
+                when {
+                    !state.isEnabled -> borderSelectedDisabled
+                    state.isPressed && !JewelTheme.isSwingCompatMode -> borderSelectedPressed
+                    state.isFocused -> borderSelectedFocused
+                    state.isHovered && !JewelTheme.isSwingCompatMode -> borderSelectedHovered
+                    else -> borderSelected
+                }
+            } else {
+                when {
+                    !state.isEnabled -> borderDisabled
+                    state.isPressed && !JewelTheme.isSwingCompatMode -> borderPressed
+                    state.isFocused -> borderFocused
+                    state.isHovered && !JewelTheme.isSwingCompatMode -> borderHovered
+                    else -> border
+                }
+            },
+        )
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class ChipMetrics(
-    val cornerSize: CornerSize,
-    val padding: PaddingValues,
-    val borderWidth: Dp,
-    val borderWidthSelected: Dp,
+public class ChipMetrics(
+    public val cornerSize: CornerSize,
+    public val padding: PaddingValues,
+    public val borderWidth: Dp,
+    public val borderWidthSelected: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalChipStyle = staticCompositionLocalOf<ChipStyle> {
-    error("No ChipStyle provided")
-}
+public val LocalChipStyle: ProvidableCompositionLocal<ChipStyle> =
+    staticCompositionLocalOf {
+        error("No ChipStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/CircularProgressStyle.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/CircularProgressStyle.kt
index 2958496283fa2..7849a6ebfe33a 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/CircularProgressStyle.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/CircularProgressStyle.kt
@@ -1,19 +1,21 @@
 package org.jetbrains.jewel.ui.component.styling
 
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import kotlin.time.Duration
 
 @Immutable
-class CircularProgressStyle(
-    val frameTime: Duration,
-    val color: Color,
+public class CircularProgressStyle(
+    public val frameTime: Duration,
+    public val color: Color,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalCircularProgressStyle = staticCompositionLocalOf<CircularProgressStyle> {
-    error("No CircularProgressStyle provided")
-}
+public val LocalCircularProgressStyle: ProvidableCompositionLocal<CircularProgressStyle> =
+    staticCompositionLocalOf {
+        error("No CircularProgressStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/DividerStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/DividerStyling.kt
index 0a7ea071b59f1..5227727b94361 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/DividerStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/DividerStyling.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.jewel.ui.component.styling
 
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
@@ -9,30 +10,31 @@ import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 @Immutable
 @GenerateDataFunctions
-class DividerStyle(
-    val color: Color,
-    val metrics: DividerMetrics,
+public class DividerStyle(
+    public val color: Color,
+    public val metrics: DividerMetrics,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class DividerMetrics(
-    val thickness: Dp,
-    val startIndent: Dp,
+public class DividerMetrics(
+    public val thickness: Dp,
+    public val startIndent: Dp,
 ) {
 
-    companion object {
+    public companion object {
 
-        fun defaults(
+        public fun defaults(
             thickness: Dp = 1.dp,
             startIndent: Dp = 0.dp,
-        ) = DividerMetrics(thickness, startIndent)
+        ): DividerMetrics = DividerMetrics(thickness, startIndent)
     }
 }
 
-val LocalDividerStyle = staticCompositionLocalOf<DividerStyle> {
-    error("No DividerStyle provided")
-}
+public val LocalDividerStyle: ProvidableCompositionLocal<DividerStyle> =
+    staticCompositionLocalOf {
+        error("No DividerStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/DropdownStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/DropdownStyling.kt
index c1ee8460a286e..173a874d6794b 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/DropdownStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/DropdownStyling.kt
@@ -4,7 +4,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -17,117 +19,123 @@ import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Stable
 @GenerateDataFunctions
-class DropdownStyle(
-    val colors: DropdownColors,
-    val metrics: DropdownMetrics,
-    val icons: DropdownIcons,
-    val textStyle: TextStyle,
-    val menuStyle: MenuStyle,
+public class DropdownStyle(
+    public val colors: DropdownColors,
+    public val metrics: DropdownMetrics,
+    public val icons: DropdownIcons,
+    public val textStyle: TextStyle,
+    public val menuStyle: MenuStyle,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class DropdownColors(
-    val background: Color,
-    val backgroundDisabled: Color,
-    val backgroundFocused: Color,
-    val backgroundPressed: Color,
-    val backgroundHovered: Color,
-    val content: Color,
-    val contentDisabled: Color,
-    val contentFocused: Color,
-    val contentPressed: Color,
-    val contentHovered: Color,
-    val border: Color,
-    val borderDisabled: Color,
-    val borderFocused: Color,
-    val borderPressed: Color,
-    val borderHovered: Color,
-    val iconTint: Color,
-    val iconTintDisabled: Color,
-    val iconTintFocused: Color,
-    val iconTintPressed: Color,
-    val iconTintHovered: Color,
+public class DropdownColors(
+    public val background: Color,
+    public val backgroundDisabled: Color,
+    public val backgroundFocused: Color,
+    public val backgroundPressed: Color,
+    public val backgroundHovered: Color,
+    public val content: Color,
+    public val contentDisabled: Color,
+    public val contentFocused: Color,
+    public val contentPressed: Color,
+    public val contentHovered: Color,
+    public val border: Color,
+    public val borderDisabled: Color,
+    public val borderFocused: Color,
+    public val borderPressed: Color,
+    public val borderHovered: Color,
+    public val iconTint: Color,
+    public val iconTintDisabled: Color,
+    public val iconTintFocused: Color,
+    public val iconTintPressed: Color,
+    public val iconTintHovered: Color,
 ) {
 
     @Composable
-    fun backgroundFor(state: DropdownState) = rememberUpdatedState(
-        when {
-            !state.isEnabled -> backgroundDisabled
-            state.isPressed -> backgroundPressed
-            state.isHovered -> backgroundHovered
-            state.isFocused -> backgroundFocused
-            state.isActive -> background
-            else -> background
-        },
-    )
+    public fun backgroundFor(state: DropdownState): State<Color> =
+        rememberUpdatedState(
+            when {
+                !state.isEnabled -> backgroundDisabled
+                state.isPressed -> backgroundPressed
+                state.isHovered -> backgroundHovered
+                state.isFocused -> backgroundFocused
+                state.isActive -> background
+                else -> background
+            },
+        )
 
     @Composable
-    fun contentFor(state: DropdownState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = content,
-            disabled = contentDisabled,
-            focused = contentFocused,
-            pressed = contentPressed,
-            hovered = contentHovered,
-            active = content,
-        ),
-    )
+    public fun contentFor(state: DropdownState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = content,
+                disabled = contentDisabled,
+                focused = contentFocused,
+                pressed = contentPressed,
+                hovered = contentHovered,
+                active = content,
+            ),
+        )
 
     @Composable
-    fun borderFor(state: DropdownState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = border,
-            disabled = borderDisabled,
-            focused = borderFocused,
-            pressed = borderPressed,
-            hovered = borderHovered,
-            active = border,
-        ),
-    )
+    public fun borderFor(state: DropdownState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = border,
+                disabled = borderDisabled,
+                focused = borderFocused,
+                pressed = borderPressed,
+                hovered = borderHovered,
+                active = border,
+            ),
+        )
 
     @Composable
-    fun iconTintFor(state: DropdownState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = iconTint,
-            disabled = iconTintDisabled,
-            focused = iconTintFocused,
-            pressed = iconTintPressed,
-            hovered = iconTintHovered,
-            active = iconTint,
-        ),
-    )
+    public fun iconTintFor(state: DropdownState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = iconTint,
+                disabled = iconTintDisabled,
+                focused = iconTintFocused,
+                pressed = iconTintPressed,
+                hovered = iconTintHovered,
+                active = iconTint,
+            ),
+        )
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class DropdownMetrics(
-    val arrowMinSize: DpSize,
-    val minSize: DpSize,
-    val cornerSize: CornerSize,
-    val contentPadding: PaddingValues,
-    val borderWidth: Dp,
+public class DropdownMetrics(
+    public val arrowMinSize: DpSize,
+    public val minSize: DpSize,
+    public val cornerSize: CornerSize,
+    public val contentPadding: PaddingValues,
+    public val borderWidth: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class DropdownIcons(val chevronDown: PainterProvider) {
+public class DropdownIcons(public val chevronDown: PainterProvider) {
 
-    companion object
+    public companion object
 }
 
-val LocalDefaultDropdownStyle = staticCompositionLocalOf<DropdownStyle> {
-    error("No DefaultDropdownStyle provided")
-}
+public val LocalDefaultDropdownStyle: ProvidableCompositionLocal<DropdownStyle> =
+    staticCompositionLocalOf {
+        error("No DefaultDropdownStyle provided. Have you forgotten the theme?")
+    }
 
-val LocalUndecoratedDropdownStyle = staticCompositionLocalOf<DropdownStyle> {
-    error("No UndecoratedDropdownStyle provided")
-}
+public val LocalUndecoratedDropdownStyle: ProvidableCompositionLocal<DropdownStyle> =
+    staticCompositionLocalOf {
+        error("No UndecoratedDropdownStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/GroupHeaderStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/GroupHeaderStyling.kt
index 0d576182341c8..9189c3a643f6f 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/GroupHeaderStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/GroupHeaderStyling.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.jewel.ui.component.styling
 
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
@@ -8,31 +9,32 @@ import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 @Immutable
 @GenerateDataFunctions
-class GroupHeaderStyle(
-    val colors: GroupHeaderColors,
-    val metrics: GroupHeaderMetrics,
+public class GroupHeaderStyle(
+    public val colors: GroupHeaderColors,
+    public val metrics: GroupHeaderMetrics,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class GroupHeaderColors(val divider: Color) {
+public class GroupHeaderColors(public val divider: Color) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class GroupHeaderMetrics(
-    val dividerThickness: Dp,
-    val indent: Dp,
+public class GroupHeaderMetrics(
+    public val dividerThickness: Dp,
+    public val indent: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalGroupHeaderStyle = staticCompositionLocalOf<GroupHeaderStyle> {
-    error("No GroupHeaderStyle provided")
-}
+public val LocalGroupHeaderStyle: ProvidableCompositionLocal<GroupHeaderStyle> =
+    staticCompositionLocalOf {
+        error("No GroupHeaderStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/HorizontalProgressBarStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/HorizontalProgressBarStyling.kt
index 1e43624f16137..b81f95c082c02 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/HorizontalProgressBarStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/HorizontalProgressBarStyling.kt
@@ -2,6 +2,7 @@ package org.jetbrains.jewel.ui.component.styling
 
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.Dp
@@ -10,38 +11,39 @@ import kotlin.time.Duration
 
 @Immutable
 @GenerateDataFunctions
-class HorizontalProgressBarStyle(
-    val colors: HorizontalProgressBarColors,
-    val metrics: HorizontalProgressBarMetrics,
-    val indeterminateCycleDuration: Duration,
+public class HorizontalProgressBarStyle(
+    public val colors: HorizontalProgressBarColors,
+    public val metrics: HorizontalProgressBarMetrics,
+    public val indeterminateCycleDuration: Duration,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class HorizontalProgressBarColors(
-    val track: Color,
-    val progress: Color,
-    val indeterminateBase: Color,
-    val indeterminateHighlight: Color,
+public class HorizontalProgressBarColors(
+    public val track: Color,
+    public val progress: Color,
+    public val indeterminateBase: Color,
+    public val indeterminateHighlight: Color,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class HorizontalProgressBarMetrics(
-    val cornerSize: CornerSize,
-    val minHeight: Dp,
-    val indeterminateHighlightWidth: Dp,
+public class HorizontalProgressBarMetrics(
+    public val cornerSize: CornerSize,
+    public val minHeight: Dp,
+    public val indeterminateHighlightWidth: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalHorizontalProgressBarStyle = staticCompositionLocalOf<HorizontalProgressBarStyle> {
-    error("No HorizontalProgressBarStyle provided")
-}
+public val LocalHorizontalProgressBarStyle: ProvidableCompositionLocal<HorizontalProgressBarStyle> =
+    staticCompositionLocalOf<HorizontalProgressBarStyle> {
+        error("No HorizontalProgressBarStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/IconButtonStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/IconButtonStyling.kt
index 7b620e69c4b45..1da42dde83eb4 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/IconButtonStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/IconButtonStyling.kt
@@ -4,7 +4,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -15,83 +17,87 @@ import org.jetbrains.jewel.ui.component.IconButtonState
 
 @Stable
 @GenerateDataFunctions
-class IconButtonStyle(
-    val colors: IconButtonColors,
-    val metrics: IconButtonMetrics,
+public class IconButtonStyle(
+    public val colors: IconButtonColors,
+    public val metrics: IconButtonMetrics,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class IconButtonColors(
-    val foregroundSelectedActivated: Color,
-    val background: Color,
-    val backgroundDisabled: Color,
-    val backgroundSelected: Color,
-    val backgroundSelectedActivated: Color,
-    val backgroundFocused: Color,
-    val backgroundPressed: Color,
-    val backgroundHovered: Color,
-    val border: Color,
-    val borderDisabled: Color,
-    val borderSelected: Color,
-    val borderSelectedActivated: Color,
-    val borderFocused: Color,
-    val borderPressed: Color,
-    val borderHovered: Color,
+public class IconButtonColors(
+    public val foregroundSelectedActivated: Color,
+    public val background: Color,
+    public val backgroundDisabled: Color,
+    public val backgroundSelected: Color,
+    public val backgroundSelectedActivated: Color,
+    public val backgroundFocused: Color,
+    public val backgroundPressed: Color,
+    public val backgroundHovered: Color,
+    public val border: Color,
+    public val borderDisabled: Color,
+    public val borderSelected: Color,
+    public val borderSelectedActivated: Color,
+    public val borderFocused: Color,
+    public val borderPressed: Color,
+    public val borderHovered: Color,
 ) {
 
     @Composable
-    fun foregroundFor(state: IconButtonState) = rememberUpdatedState(
-        when {
-            state.isActive && state.isSelected -> foregroundSelectedActivated
-            else -> Color.Unspecified
-        },
-    )
+    public fun foregroundFor(state: IconButtonState): State<Color> =
+        rememberUpdatedState(
+            when {
+                state.isActive && state.isSelected -> foregroundSelectedActivated
+                else -> Color.Unspecified
+            },
+        )
 
     @Composable
-    fun backgroundFor(state: IconButtonState) = rememberUpdatedState(
-        when {
-            !state.isEnabled -> backgroundDisabled
-            state.isActive && state.isSelected -> backgroundSelectedActivated
-            state.isSelected -> backgroundSelected
-            state.isPressed -> backgroundPressed
-            state.isHovered -> backgroundHovered
-            state.isFocused -> backgroundFocused
-            else -> background
-        },
-    )
+    public fun backgroundFor(state: IconButtonState): State<Color> =
+        rememberUpdatedState(
+            when {
+                !state.isEnabled -> backgroundDisabled
+                state.isActive && state.isSelected -> backgroundSelectedActivated
+                state.isSelected -> backgroundSelected
+                state.isPressed -> backgroundPressed
+                state.isHovered -> backgroundHovered
+                state.isFocused -> backgroundFocused
+                else -> background
+            },
+        )
 
     @Composable
-    fun borderFor(state: IconButtonState) = rememberUpdatedState(
-        when {
-            !state.isEnabled -> borderDisabled
-            state.isActive && state.isSelected -> borderSelectedActivated
-            state.isSelected -> borderSelected
-            state.isFocused -> borderFocused
-            state.isPressed -> borderPressed
-            state.isHovered -> borderHovered
-            else -> border
-        },
-    )
+    public fun borderFor(state: IconButtonState): State<Color> =
+        rememberUpdatedState(
+            when {
+                !state.isEnabled -> borderDisabled
+                state.isActive && state.isSelected -> borderSelectedActivated
+                state.isSelected -> borderSelected
+                state.isFocused -> borderFocused
+                state.isPressed -> borderPressed
+                state.isHovered -> borderHovered
+                else -> border
+            },
+        )
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class IconButtonMetrics(
-    val cornerSize: CornerSize,
-    val borderWidth: Dp,
-    val padding: PaddingValues,
-    val minSize: DpSize,
+public class IconButtonMetrics(
+    public val cornerSize: CornerSize,
+    public val borderWidth: Dp,
+    public val padding: PaddingValues,
+    public val minSize: DpSize,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalIconButtonStyle = staticCompositionLocalOf<IconButtonStyle> {
-    error("No IconButtonStyle provided")
-}
+public val LocalIconButtonStyle: ProvidableCompositionLocal<IconButtonStyle> =
+    staticCompositionLocalOf {
+        error("No IconButtonStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/InputFieldStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/InputFieldStyling.kt
index 06af4d4b89c15..c57a929c51b68 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/InputFieldStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/InputFieldStyling.kt
@@ -5,6 +5,7 @@ import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
@@ -13,94 +14,98 @@ import androidx.compose.ui.unit.DpSize
 import org.jetbrains.jewel.ui.component.InputFieldState
 
 @Stable
-interface InputFieldStyle {
+public interface InputFieldStyle {
 
-    val colors: InputFieldColors
-    val metrics: InputFieldMetrics
-    val textStyle: TextStyle
+    public val colors: InputFieldColors
+    public val metrics: InputFieldMetrics
+    public val textStyle: TextStyle
 }
 
 @Immutable
-interface InputFieldColors {
+public interface InputFieldColors {
 
-    val background: Color
-    val backgroundDisabled: Color
-    val backgroundFocused: Color
-    val backgroundPressed: Color
-    val backgroundHovered: Color
+    public val background: Color
+    public val backgroundDisabled: Color
+    public val backgroundFocused: Color
+    public val backgroundPressed: Color
+    public val backgroundHovered: Color
 
     @Composable
-    fun backgroundFor(state: InputFieldState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = background,
-            disabled = backgroundDisabled,
-            focused = backgroundFocused,
-            pressed = backgroundPressed,
-            hovered = backgroundHovered,
-            active = background,
-        ),
-    )
+    public fun backgroundFor(state: InputFieldState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = background,
+                disabled = backgroundDisabled,
+                focused = backgroundFocused,
+                pressed = backgroundPressed,
+                hovered = backgroundHovered,
+                active = background,
+            ),
+        )
 
-    val content: Color
-    val contentDisabled: Color
-    val contentFocused: Color
-    val contentPressed: Color
-    val contentHovered: Color
+    public val content: Color
+    public val contentDisabled: Color
+    public val contentFocused: Color
+    public val contentPressed: Color
+    public val contentHovered: Color
 
     @Composable
-    fun contentFor(state: InputFieldState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = content,
-            disabled = contentDisabled,
-            focused = contentFocused,
-            pressed = contentPressed,
-            hovered = contentHovered,
-            active = content,
-        ),
-    )
+    public fun contentFor(state: InputFieldState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = content,
+                disabled = contentDisabled,
+                focused = contentFocused,
+                pressed = contentPressed,
+                hovered = contentHovered,
+                active = content,
+            ),
+        )
 
-    val border: Color
-    val borderDisabled: Color
-    val borderFocused: Color
-    val borderPressed: Color
-    val borderHovered: Color
+    public val border: Color
+    public val borderDisabled: Color
+    public val borderFocused: Color
+    public val borderPressed: Color
+    public val borderHovered: Color
 
     @Composable
-    fun borderFor(state: InputFieldState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = border,
-            disabled = borderDisabled,
-            focused = borderFocused,
-            pressed = borderPressed,
-            hovered = borderHovered,
-            active = border,
-        ),
-    )
+    public fun borderFor(state: InputFieldState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = border,
+                disabled = borderDisabled,
+                focused = borderFocused,
+                pressed = borderPressed,
+                hovered = borderHovered,
+                active = border,
+            ),
+        )
 
-    val caret: Color
-    val caretDisabled: Color
-    val caretFocused: Color
-    val caretPressed: Color
-    val caretHovered: Color
+    public val caret: Color
+    public val caretDisabled: Color
+    public val caretFocused: Color
+    public val caretPressed: Color
+    public val caretHovered: Color
 
     @Composable
-    fun caretFor(state: InputFieldState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = caret,
-            disabled = caretDisabled,
-            focused = caretFocused,
-            pressed = caretPressed,
-            hovered = caretHovered,
-            active = caret,
-        ),
-    )
+    public fun caretFor(state: InputFieldState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = caret,
+                disabled = caretDisabled,
+                focused = caretFocused,
+                pressed = caretPressed,
+                hovered = caretHovered,
+                active = caret,
+            ),
+        )
 }
 
 @Stable
-interface InputFieldMetrics {
+public interface InputFieldMetrics {
 
-    val cornerSize: CornerSize
-    val contentPadding: PaddingValues
-    val minSize: DpSize
-    val borderWidth: Dp
+    public val cornerSize: CornerSize
+    public val contentPadding: PaddingValues
+    public val minSize: DpSize
+    public val borderWidth: Dp
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LazyTreeStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LazyTreeStyling.kt
index b43b930c14c34..f19b923fe85f8 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LazyTreeStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LazyTreeStyling.kt
@@ -4,7 +4,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -15,65 +17,66 @@ import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Stable
 @GenerateDataFunctions
-class LazyTreeStyle(
-    val colors: LazyTreeColors,
-    val metrics: LazyTreeMetrics,
-    val icons: LazyTreeIcons,
+public class LazyTreeStyle(
+    public val colors: LazyTreeColors,
+    public val metrics: LazyTreeMetrics,
+    public val icons: LazyTreeIcons,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class LazyTreeColors(
-    val elementBackgroundFocused: Color,
-    val elementBackgroundSelected: Color,
-    val elementBackgroundSelectedFocused: Color,
-    val content: Color,
-    val contentFocused: Color,
-    val contentSelected: Color,
-    val contentSelectedFocused: Color,
+public class LazyTreeColors(
+    public val elementBackgroundFocused: Color,
+    public val elementBackgroundSelected: Color,
+    public val elementBackgroundSelectedFocused: Color,
+    public val content: Color,
+    public val contentFocused: Color,
+    public val contentSelected: Color,
+    public val contentSelectedFocused: Color,
 ) {
 
     @Composable
-    fun contentFor(state: TreeElementState) = rememberUpdatedState(
-        when {
-            state.isSelected && state.isFocused -> contentSelectedFocused
-            state.isFocused -> contentFocused
-            state.isSelected -> contentSelected
-            else -> content
-        },
-    )
+    public fun contentFor(state: TreeElementState): State<Color> =
+        rememberUpdatedState(
+            when {
+                state.isSelected && state.isFocused -> contentSelectedFocused
+                state.isFocused -> contentFocused
+                state.isSelected -> contentSelected
+                else -> content
+            },
+        )
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class LazyTreeMetrics(
-    val indentSize: Dp,
-    val elementBackgroundCornerSize: CornerSize,
-    val elementPadding: PaddingValues,
-    val elementContentPadding: PaddingValues,
-    val elementMinHeight: Dp,
-    val chevronContentGap: Dp,
+public class LazyTreeMetrics(
+    public val indentSize: Dp,
+    public val elementBackgroundCornerSize: CornerSize,
+    public val elementPadding: PaddingValues,
+    public val elementContentPadding: PaddingValues,
+    public val elementMinHeight: Dp,
+    public val chevronContentGap: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class LazyTreeIcons(
-    val chevronCollapsed: PainterProvider,
-    val chevronExpanded: PainterProvider,
-    val chevronSelectedCollapsed: PainterProvider,
-    val chevronSelectedExpanded: PainterProvider,
+public class LazyTreeIcons(
+    public val chevronCollapsed: PainterProvider,
+    public val chevronExpanded: PainterProvider,
+    public val chevronSelectedCollapsed: PainterProvider,
+    public val chevronSelectedExpanded: PainterProvider,
 ) {
 
     @Composable
-    fun chevron(isExpanded: Boolean, isSelected: Boolean) =
+    public fun chevron(isExpanded: Boolean, isSelected: Boolean): PainterProvider =
         when {
             isSelected && isExpanded -> chevronSelectedExpanded
             isSelected && !isExpanded -> chevronSelectedCollapsed
@@ -81,9 +84,10 @@ class LazyTreeIcons(
             else -> chevronCollapsed
         }
 
-    companion object
+    public companion object
 }
 
-val LocalLazyTreeStyle = staticCompositionLocalOf<LazyTreeStyle> {
-    error("No LazyTreeStyle provided")
-}
+public val LocalLazyTreeStyle: ProvidableCompositionLocal<LazyTreeStyle> =
+    staticCompositionLocalOf {
+        error("No LazyTreeStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LinkStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LinkStyling.kt
index 6fdf79151bb29..b53d68cd2c6a4 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LinkStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/LinkStyling.kt
@@ -3,6 +3,8 @@ package org.jetbrains.jewel.ui.component.styling
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -15,91 +17,94 @@ import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Immutable
 @GenerateDataFunctions
-class LinkStyle(
-    val colors: LinkColors,
-    val metrics: LinkMetrics,
-    val icons: LinkIcons,
-    val textStyles: LinkTextStyles,
+public class LinkStyle(
+    public val colors: LinkColors,
+    public val metrics: LinkMetrics,
+    public val icons: LinkIcons,
+    public val textStyles: LinkTextStyles,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class LinkColors(
-    val content: Color,
-    val contentDisabled: Color,
-    val contentFocused: Color,
-    val contentPressed: Color,
-    val contentHovered: Color,
-    val contentVisited: Color,
+public class LinkColors(
+    public val content: Color,
+    public val contentDisabled: Color,
+    public val contentFocused: Color,
+    public val contentPressed: Color,
+    public val contentHovered: Color,
+    public val contentVisited: Color,
 ) {
 
     @Composable
-    fun contentFor(state: LinkState) = rememberUpdatedState(
-        state.chooseValueWithVisited(
-            normal = content,
-            disabled = contentDisabled,
-            focused = contentFocused,
-            pressed = contentPressed,
-            hovered = contentHovered,
-            visited = contentVisited,
-            active = content,
-        ),
-    )
+    public fun contentFor(state: LinkState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValueWithVisited(
+                normal = content,
+                disabled = contentDisabled,
+                focused = contentFocused,
+                pressed = contentPressed,
+                hovered = contentHovered,
+                visited = contentVisited,
+                active = content,
+            ),
+        )
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class LinkMetrics(
-    val focusHaloCornerSize: CornerSize,
-    val textIconGap: Dp,
-    val iconSize: DpSize,
+public class LinkMetrics(
+    public val focusHaloCornerSize: CornerSize,
+    public val textIconGap: Dp,
+    public val iconSize: DpSize,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class LinkIcons(
-    val dropdownChevron: PainterProvider,
-    val externalLink: PainterProvider,
+public class LinkIcons(
+    public val dropdownChevron: PainterProvider,
+    public val externalLink: PainterProvider,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class LinkTextStyles(
-    val normal: TextStyle,
-    val disabled: TextStyle,
-    val focused: TextStyle,
-    val pressed: TextStyle,
-    val hovered: TextStyle,
-    val visited: TextStyle,
+public class LinkTextStyles(
+    public val normal: TextStyle,
+    public val disabled: TextStyle,
+    public val focused: TextStyle,
+    public val pressed: TextStyle,
+    public val hovered: TextStyle,
+    public val visited: TextStyle,
 ) {
 
     @Composable
-    fun styleFor(state: LinkState) = rememberUpdatedState(
-        state.chooseValueWithVisited(
-            normal = normal,
-            disabled = disabled,
-            focused = focused,
-            pressed = pressed,
-            hovered = hovered,
-            visited = visited,
-            active = normal,
-        ),
-    )
+    public fun styleFor(state: LinkState): State<TextStyle> =
+        rememberUpdatedState(
+            state.chooseValueWithVisited(
+                normal = normal,
+                disabled = disabled,
+                focused = focused,
+                pressed = pressed,
+                hovered = hovered,
+                visited = visited,
+                active = normal,
+            ),
+        )
 
-    companion object
+    public companion object
 }
 
-val LocalLinkStyle = staticCompositionLocalOf<LinkStyle> {
-    error("No LinkStyle provided")
-}
+public val LocalLinkStyle: ProvidableCompositionLocal<LinkStyle> =
+    staticCompositionLocalOf {
+        error("No LinkStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/MenuStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/MenuStyling.kt
index b6be59799af2a..1f95db5954224 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/MenuStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/MenuStyling.kt
@@ -4,7 +4,9 @@ import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -16,131 +18,135 @@ import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Stable
 @GenerateDataFunctions
-class MenuStyle(
-    val isDark: Boolean,
-    val colors: MenuColors,
-    val metrics: MenuMetrics,
-    val icons: MenuIcons,
+public class MenuStyle(
+    public val isDark: Boolean,
+    public val colors: MenuColors,
+    public val metrics: MenuMetrics,
+    public val icons: MenuIcons,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class MenuColors(
-    val background: Color,
-    val border: Color,
-    val shadow: Color,
-    val itemColors: MenuItemColors,
+public class MenuColors(
+    public val background: Color,
+    public val border: Color,
+    public val shadow: Color,
+    public val itemColors: MenuItemColors,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class MenuItemColors(
-    val background: Color,
-    val backgroundDisabled: Color,
-    val backgroundFocused: Color,
-    val backgroundPressed: Color,
-    val backgroundHovered: Color,
-    val content: Color,
-    val contentDisabled: Color,
-    val contentFocused: Color,
-    val contentPressed: Color,
-    val contentHovered: Color,
-    val iconTint: Color,
-    val iconTintDisabled: Color,
-    val iconTintFocused: Color,
-    val iconTintPressed: Color,
-    val iconTintHovered: Color,
-    val separator: Color,
+public class MenuItemColors(
+    public val background: Color,
+    public val backgroundDisabled: Color,
+    public val backgroundFocused: Color,
+    public val backgroundPressed: Color,
+    public val backgroundHovered: Color,
+    public val content: Color,
+    public val contentDisabled: Color,
+    public val contentFocused: Color,
+    public val contentPressed: Color,
+    public val contentHovered: Color,
+    public val iconTint: Color,
+    public val iconTintDisabled: Color,
+    public val iconTintFocused: Color,
+    public val iconTintPressed: Color,
+    public val iconTintHovered: Color,
+    public val separator: Color,
 ) {
 
     @Composable
-    fun backgroundFor(state: MenuItemState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = background,
-            disabled = backgroundDisabled,
-            active = background,
-            focused = backgroundFocused,
-            pressed = backgroundPressed,
-            hovered = backgroundHovered,
-        ),
-    )
+    public fun backgroundFor(state: MenuItemState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = background,
+                disabled = backgroundDisabled,
+                active = background,
+                focused = backgroundFocused,
+                pressed = backgroundPressed,
+                hovered = backgroundHovered,
+            ),
+        )
 
     @Composable
-    fun contentFor(state: MenuItemState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = content,
-            disabled = contentDisabled,
-            focused = contentFocused,
-            pressed = contentPressed,
-            hovered = contentHovered,
-            active = content,
-        ),
-    )
+    public fun contentFor(state: MenuItemState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = content,
+                disabled = contentDisabled,
+                focused = contentFocused,
+                pressed = contentPressed,
+                hovered = contentHovered,
+                active = content,
+            ),
+        )
 
     @Composable
-    fun iconTintFor(state: MenuItemState) = rememberUpdatedState(
-        state.chooseValue(
-            normal = iconTint,
-            disabled = iconTintDisabled,
-            focused = iconTintFocused,
-            pressed = iconTintPressed,
-            hovered = iconTintHovered,
-            active = iconTint,
-        ),
-    )
-
-    companion object
+    public fun iconTintFor(state: MenuItemState): State<Color> =
+        rememberUpdatedState(
+            state.chooseValue(
+                normal = iconTint,
+                disabled = iconTintDisabled,
+                focused = iconTintFocused,
+                pressed = iconTintPressed,
+                hovered = iconTintHovered,
+                active = iconTint,
+            ),
+        )
+
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class MenuMetrics(
-    val cornerSize: CornerSize,
-    val menuMargin: PaddingValues,
-    val contentPadding: PaddingValues,
-    val offset: DpOffset,
-    val shadowSize: Dp,
-    val borderWidth: Dp,
-    val itemMetrics: MenuItemMetrics,
-    val submenuMetrics: SubmenuMetrics,
+public class MenuMetrics(
+    public val cornerSize: CornerSize,
+    public val menuMargin: PaddingValues,
+    public val contentPadding: PaddingValues,
+    public val offset: DpOffset,
+    public val shadowSize: Dp,
+    public val borderWidth: Dp,
+    public val itemMetrics: MenuItemMetrics,
+    public val submenuMetrics: SubmenuMetrics,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class MenuItemMetrics(
-    val selectionCornerSize: CornerSize,
-    val outerPadding: PaddingValues,
-    val contentPadding: PaddingValues,
-    val separatorPadding: PaddingValues,
-    val separatorThickness: Dp,
+public class MenuItemMetrics(
+    public val selectionCornerSize: CornerSize,
+    public val outerPadding: PaddingValues,
+    public val contentPadding: PaddingValues,
+    public val separatorPadding: PaddingValues,
+    public val separatorThickness: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class SubmenuMetrics(val offset: DpOffset) {
+public class SubmenuMetrics(public val offset: DpOffset) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class MenuIcons(val submenuChevron: PainterProvider) {
+public class MenuIcons(public val submenuChevron: PainterProvider) {
 
-    companion object
+    public companion object
 }
 
-val LocalMenuStyle = staticCompositionLocalOf<MenuStyle> {
-    error("No MenuStyle provided")
-}
+public val LocalMenuStyle: ProvidableCompositionLocal<MenuStyle> =
+    staticCompositionLocalOf {
+        error("No MenuStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/RadioButtonStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/RadioButtonStyling.kt
index 5a072ee504e90..a3eb2ba41ab19 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/RadioButtonStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/RadioButtonStyling.kt
@@ -2,6 +2,8 @@ package org.jetbrains.jewel.ui.component.styling
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -13,58 +15,60 @@ import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Immutable
 @GenerateDataFunctions
-class RadioButtonStyle(
-    val colors: RadioButtonColors,
-    val metrics: RadioButtonMetrics,
-    val icons: RadioButtonIcons,
+public class RadioButtonStyle(
+    public val colors: RadioButtonColors,
+    public val metrics: RadioButtonMetrics,
+    public val icons: RadioButtonIcons,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class RadioButtonColors(
-    val content: Color,
-    val contentHovered: Color,
-    val contentDisabled: Color,
-    val contentSelected: Color,
-    val contentSelectedHovered: Color,
-    val contentSelectedDisabled: Color,
+public class RadioButtonColors(
+    public val content: Color,
+    public val contentHovered: Color,
+    public val contentDisabled: Color,
+    public val contentSelected: Color,
+    public val contentSelectedHovered: Color,
+    public val contentSelectedDisabled: Color,
 ) {
 
     @Composable
-    fun contentFor(state: RadioButtonState) = rememberUpdatedState(
-        when {
-            !state.isEnabled && state.isSelected -> contentSelectedDisabled
-            !state.isEnabled -> contentDisabled
-            state.isSelected && state.isHovered -> contentSelectedHovered
-            state.isSelected -> contentSelected
-            state.isHovered -> contentHovered
-            else -> content
-        },
-    )
+    public fun contentFor(state: RadioButtonState): State<Color> =
+        rememberUpdatedState(
+            when {
+                !state.isEnabled && state.isSelected -> contentSelectedDisabled
+                !state.isEnabled -> contentDisabled
+                state.isSelected && state.isHovered -> contentSelectedHovered
+                state.isSelected -> contentSelected
+                state.isHovered -> contentHovered
+                else -> content
+            },
+        )
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class RadioButtonMetrics(
-    val radioButtonSize: DpSize,
-    val iconContentGap: Dp,
+public class RadioButtonMetrics(
+    public val radioButtonSize: DpSize,
+    public val iconContentGap: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class RadioButtonIcons(val radioButton: PainterProvider) {
+public class RadioButtonIcons(public val radioButton: PainterProvider) {
 
-    companion object
+    public companion object
 }
 
-val LocalRadioButtonStyle = staticCompositionLocalOf<RadioButtonStyle> {
-    error("No RadioButtonStyle provided")
-}
+public val LocalRadioButtonStyle: ProvidableCompositionLocal<RadioButtonStyle> =
+    staticCompositionLocalOf {
+        error("No RadioButtonStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ScrollbarStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ScrollbarStyling.kt
index 704a336d0a190..9a914d3cf1074 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ScrollbarStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/ScrollbarStyling.kt
@@ -3,6 +3,7 @@ package org.jetbrains.jewel.ui.component.styling
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -12,37 +13,38 @@ import kotlin.time.Duration
 
 @Stable
 @GenerateDataFunctions
-class ScrollbarStyle(
-    val colors: ScrollbarColors,
-    val metrics: ScrollbarMetrics,
-    val hoverDuration: Duration,
+public class ScrollbarStyle(
+    public val colors: ScrollbarColors,
+    public val metrics: ScrollbarMetrics,
+    public val hoverDuration: Duration,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class ScrollbarColors(
-    val thumbBackground: Color,
-    val thumbBackgroundHovered: Color,
+public class ScrollbarColors(
+    public val thumbBackground: Color,
+    public val thumbBackgroundHovered: Color,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class ScrollbarMetrics(
-    val thumbCornerSize: CornerSize,
-    val thumbThickness: Dp,
-    val minThumbLength: Dp,
-    val trackPadding: PaddingValues,
+public class ScrollbarMetrics(
+    public val thumbCornerSize: CornerSize,
+    public val thumbThickness: Dp,
+    public val minThumbLength: Dp,
+    public val trackPadding: PaddingValues,
 ) {
 
-    companion object
+    public companion object
 }
 
-val LocalScrollbarStyle = staticCompositionLocalOf<ScrollbarStyle> {
-    error("No ScrollbarStyle provided")
-}
+public val LocalScrollbarStyle: ProvidableCompositionLocal<ScrollbarStyle> =
+    staticCompositionLocalOf {
+        error("No ScrollbarStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TabStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TabStyling.kt
index eddacaf59398c..67a5a8d9b330b 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TabStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TabStyling.kt
@@ -3,7 +3,9 @@ package org.jetbrains.jewel.ui.component.styling
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -14,142 +16,151 @@ import org.jetbrains.jewel.ui.painter.PainterProvider
 
 @Stable
 @GenerateDataFunctions
-class TabStyle(
-    val colors: TabColors,
-    val metrics: TabMetrics,
-    val icons: TabIcons,
-    val contentAlpha: TabContentAlpha,
+public class TabStyle(
+    public val colors: TabColors,
+    public val metrics: TabMetrics,
+    public val icons: TabIcons,
+    public val contentAlpha: TabContentAlpha,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class TabMetrics(
-    val underlineThickness: Dp,
-    val tabPadding: PaddingValues,
-    val tabHeight: Dp,
-    val closeContentGap: Dp,
+public class TabMetrics(
+    public val underlineThickness: Dp,
+    public val tabPadding: PaddingValues,
+    public val tabHeight: Dp,
+    public val closeContentGap: Dp,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class TabIcons(val close: PainterProvider) {
+public class TabIcons(public val close: PainterProvider) {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class TabColors(
-    val background: Color,
-    val backgroundDisabled: Color,
-    val backgroundPressed: Color,
-    val backgroundHovered: Color,
-    val backgroundSelected: Color,
-    val content: Color,
-    val contentDisabled: Color,
-    val contentPressed: Color,
-    val contentHovered: Color,
-    val contentSelected: Color,
-    val underline: Color,
-    val underlineDisabled: Color,
-    val underlinePressed: Color,
-    val underlineHovered: Color,
-    val underlineSelected: Color,
+public class TabColors(
+    public val background: Color,
+    public val backgroundDisabled: Color,
+    public val backgroundPressed: Color,
+    public val backgroundHovered: Color,
+    public val backgroundSelected: Color,
+    public val content: Color,
+    public val contentDisabled: Color,
+    public val contentPressed: Color,
+    public val contentHovered: Color,
+    public val contentSelected: Color,
+    public val underline: Color,
+    public val underlineDisabled: Color,
+    public val underlinePressed: Color,
+    public val underlineHovered: Color,
+    public val underlineSelected: Color,
 ) {
 
     @Composable
-    fun contentFor(state: TabState) = rememberUpdatedState(
-        when {
-            state.isSelected -> contentSelected
-            else -> state.chooseValueIgnoreCompat(
-                normal = content,
-                disabled = contentDisabled,
-                pressed = contentPressed,
-                hovered = contentHovered,
-                active = content,
-            )
-        },
-    )
+    public fun contentFor(state: TabState): State<Color> =
+        rememberUpdatedState(
+            when {
+                state.isSelected -> contentSelected
+                else ->
+                    state.chooseValueIgnoreCompat(
+                        normal = content,
+                        disabled = contentDisabled,
+                        pressed = contentPressed,
+                        hovered = contentHovered,
+                        active = content,
+                    )
+            },
+        )
 
     @Composable
-    fun backgroundFor(state: TabState) = rememberUpdatedState(
-        when {
-            !state.isEnabled -> backgroundDisabled
-            state.isPressed -> backgroundPressed
-            state.isHovered -> backgroundHovered
-            state.isActive -> background
-            state.isSelected -> backgroundSelected
-            else -> background
-        },
-    )
+    public fun backgroundFor(state: TabState): State<Color> =
+        rememberUpdatedState(
+            when {
+                !state.isEnabled -> backgroundDisabled
+                state.isPressed -> backgroundPressed
+                state.isHovered -> backgroundHovered
+                state.isActive -> background
+                state.isSelected -> backgroundSelected
+                else -> background
+            },
+        )
 
     @Composable
-    fun underlineFor(state: TabState) = rememberUpdatedState(
-        when {
-            state.isSelected -> underlineSelected
-            else -> state.chooseValueIgnoreCompat(
-                normal = underline,
-                disabled = underlineDisabled,
-                pressed = underlinePressed,
-                hovered = underlineHovered,
-                active = underline,
-            )
-        },
-    )
-
-    companion object
+    public fun underlineFor(state: TabState): State<Color> =
+        rememberUpdatedState(
+            when {
+                state.isSelected -> underlineSelected
+                else ->
+                    state.chooseValueIgnoreCompat(
+                        normal = underline,
+                        disabled = underlineDisabled,
+                        pressed = underlinePressed,
+                        hovered = underlineHovered,
+                        active = underline,
+                    )
+            },
+        )
+
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class TabContentAlpha(
-    val iconNormal: Float,
-    val iconDisabled: Float,
-    val iconPressed: Float,
-    val iconHovered: Float,
-    val iconSelected: Float,
-    val labelNormal: Float,
-    val labelDisabled: Float,
-    val labelPressed: Float,
-    val labelHovered: Float,
-    val labelSelected: Float,
+public class TabContentAlpha(
+    public val iconNormal: Float,
+    public val iconDisabled: Float,
+    public val iconPressed: Float,
+    public val iconHovered: Float,
+    public val iconSelected: Float,
+    public val labelNormal: Float,
+    public val labelDisabled: Float,
+    public val labelPressed: Float,
+    public val labelHovered: Float,
+    public val labelSelected: Float,
 ) {
 
     @Composable
-    fun iconFor(state: TabState) = rememberUpdatedState(
-        when {
-            state.isSelected -> iconSelected
-            else -> state.chooseValueIgnoreCompat(
-                normal = iconNormal,
-                disabled = iconDisabled,
-                pressed = iconPressed,
-                hovered = iconHovered,
-                active = iconNormal,
-            )
-        },
-    )
+    public fun iconFor(state: TabState): State<Float> =
+        rememberUpdatedState(
+            when {
+                state.isSelected -> iconSelected
+                else ->
+                    state.chooseValueIgnoreCompat(
+                        normal = iconNormal,
+                        disabled = iconDisabled,
+                        pressed = iconPressed,
+                        hovered = iconHovered,
+                        active = iconNormal,
+                    )
+            },
+        )
 
     @Composable
-    fun labelFor(state: TabState) = rememberUpdatedState(
-        when {
-            state.isSelected -> labelSelected
-            else -> state.chooseValueIgnoreCompat(
-                normal = labelNormal,
-                disabled = labelDisabled,
-                pressed = labelPressed,
-                hovered = labelHovered,
-                active = labelNormal,
-            )
-        },
-    )
-
-    companion object
+    public fun labelFor(state: TabState): State<Float> =
+        rememberUpdatedState(
+            when {
+                state.isSelected -> labelSelected
+                else ->
+                    state.chooseValueIgnoreCompat(
+                        normal = labelNormal,
+                        disabled = labelDisabled,
+                        pressed = labelPressed,
+                        hovered = labelHovered,
+                        active = labelNormal,
+                    )
+            },
+        )
+
+    public companion object
 }
 
 // Tabs are the only components that handle hover states
@@ -169,10 +180,12 @@ private fun <T> TabState.chooseValueIgnoreCompat(
         else -> normal
     }
 
-val LocalDefaultTabStyle = staticCompositionLocalOf<TabStyle> {
-    error("No LocalTabStyle provided")
-}
+public val LocalDefaultTabStyle: ProvidableCompositionLocal<TabStyle> =
+    staticCompositionLocalOf {
+        error("No LocalTabStyle provided. Have you forgotten the theme?")
+    }
 
-val LocalEditorTabStyle = staticCompositionLocalOf<TabStyle> {
-    error("No LocalTabStyle provided")
-}
+public val LocalEditorTabStyle: ProvidableCompositionLocal<TabStyle> =
+    staticCompositionLocalOf {
+        error("No LocalTabStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TextAreaStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TextAreaStyling.kt
index 37452aff181bc..29c96293ee214 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TextAreaStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TextAreaStyling.kt
@@ -3,6 +3,7 @@ package org.jetbrains.jewel.ui.component.styling
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -13,18 +14,18 @@ import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 @Stable
 @GenerateDataFunctions
-class TextAreaStyle(
+public class TextAreaStyle(
     override val colors: TextAreaColors,
     override val metrics: TextAreaMetrics,
     override val textStyle: TextStyle,
 ) : InputFieldStyle {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class TextAreaColors(
+public class TextAreaColors(
     override val background: Color,
     override val backgroundDisabled: Color,
     override val backgroundFocused: Color,
@@ -45,24 +46,25 @@ class TextAreaColors(
     override val caretFocused: Color,
     override val caretPressed: Color,
     override val caretHovered: Color,
-    val placeholder: Color,
+    public val placeholder: Color,
 ) : InputFieldColors {
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class TextAreaMetrics(
+public class TextAreaMetrics(
     override val borderWidth: Dp,
     override val contentPadding: PaddingValues,
     override val cornerSize: CornerSize,
     override val minSize: DpSize,
 ) : InputFieldMetrics {
 
-    companion object
+    public companion object
 }
 
-val LocalTextAreaStyle = staticCompositionLocalOf<TextAreaStyle> {
-    error("No TextAreaStyle provided")
-}
+public val LocalTextAreaStyle: ProvidableCompositionLocal<TextAreaStyle> =
+    staticCompositionLocalOf {
+        error("No TextAreaStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TextFieldStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TextFieldStyling.kt
index 9e3f0d9c42430..9fa0d36132c33 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TextFieldStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TextFieldStyling.kt
@@ -3,6 +3,7 @@ package org.jetbrains.jewel.ui.component.styling
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
@@ -13,18 +14,18 @@ import org.jetbrains.jewel.foundation.GenerateDataFunctions
 
 @Stable
 @GenerateDataFunctions
-class TextFieldStyle(
+public class TextFieldStyle(
     override val colors: TextFieldColors,
     override val metrics: TextFieldMetrics,
     override val textStyle: TextStyle,
 ) : InputFieldStyle {
 
-    companion object
+    public companion object
 }
 
 @Immutable
 @GenerateDataFunctions
-class TextFieldColors(
+public class TextFieldColors(
     override val background: Color,
     override val backgroundDisabled: Color,
     override val backgroundFocused: Color,
@@ -45,24 +46,25 @@ class TextFieldColors(
     override val caretFocused: Color,
     override val caretPressed: Color,
     override val caretHovered: Color,
-    val placeholder: Color,
+    public val placeholder: Color,
 ) : InputFieldColors {
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class TextFieldMetrics(
+public class TextFieldMetrics(
     override val borderWidth: Dp,
     override val contentPadding: PaddingValues,
     override val cornerSize: CornerSize,
     override val minSize: DpSize,
 ) : InputFieldMetrics {
 
-    companion object
+    public companion object
 }
 
-val LocalTextFieldStyle = staticCompositionLocalOf<TextFieldStyle> {
-    error("No TextFieldStyle provided")
-}
+public val LocalTextFieldStyle: ProvidableCompositionLocal<TextFieldStyle> =
+    staticCompositionLocalOf {
+        error("No TextFieldStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TooltipStyling.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TooltipStyling.kt
index 07254562be86e..d80c4b4fafb8f 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TooltipStyling.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/component/styling/TooltipStyling.kt
@@ -2,6 +2,7 @@ package org.jetbrains.jewel.ui.component.styling
 
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.shape.CornerSize
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.Stable
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.Alignment
@@ -15,41 +16,41 @@ import kotlin.time.Duration.Companion.milliseconds
 
 @Stable
 @GenerateDataFunctions
-class TooltipStyle(
-    val colors: TooltipColors,
-    val metrics: TooltipMetrics,
+public class TooltipStyle(
+    public val colors: TooltipColors,
+    public val metrics: TooltipMetrics,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class TooltipColors(
-    val background: Color,
-    val content: Color,
-    val border: Color,
-    val shadow: Color,
+public class TooltipColors(
+    public val background: Color,
+    public val content: Color,
+    public val border: Color,
+    public val shadow: Color,
 ) {
 
-    companion object
+    public companion object
 }
 
 @Stable
 @GenerateDataFunctions
-class TooltipMetrics(
-    val contentPadding: PaddingValues,
-    val showDelay: Duration,
-    val cornerSize: CornerSize,
-    val borderWidth: Dp,
-    val shadowSize: Dp,
-    val tooltipOffset: DpOffset,
-    val tooltipAlignment: Alignment.Horizontal,
+public class TooltipMetrics(
+    public val contentPadding: PaddingValues,
+    public val showDelay: Duration,
+    public val cornerSize: CornerSize,
+    public val borderWidth: Dp,
+    public val shadowSize: Dp,
+    public val tooltipOffset: DpOffset,
+    public val tooltipAlignment: Alignment.Horizontal,
 ) {
 
-    companion object {
+    public companion object {
 
-        fun defaults(
+        public fun defaults(
             contentPadding: PaddingValues = PaddingValues(vertical = 9.dp, horizontal = 12.dp),
             showDelay: Duration = 0.milliseconds,
             cornerSize: CornerSize = CornerSize(5.dp),
@@ -57,18 +58,20 @@ class TooltipMetrics(
             shadowSize: Dp = 12.dp,
             tooltipOffset: DpOffset = DpOffset(0.dp, 20.dp),
             tooltipAlignment: Alignment.Horizontal = Alignment.Start,
-        ) = TooltipMetrics(
-            contentPadding,
-            showDelay,
-            cornerSize,
-            borderWidth,
-            shadowSize,
-            tooltipOffset,
-            tooltipAlignment,
-        )
+        ): TooltipMetrics =
+            TooltipMetrics(
+                contentPadding,
+                showDelay,
+                cornerSize,
+                borderWidth,
+                shadowSize,
+                tooltipOffset,
+                tooltipAlignment,
+            )
     }
 }
 
-val LocalTooltipStyle = staticCompositionLocalOf<TooltipStyle> {
-    error("No TooltipStyle provided")
-}
+public val LocalTooltipStyle: ProvidableCompositionLocal<TooltipStyle> =
+    staticCompositionLocalOf {
+        error("No TooltipStyle provided. Have you forgotten the theme?")
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/BadgePainter.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/BadgePainter.kt
index 7ca2ea2441aaa..66c229f36e9b1 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/BadgePainter.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/BadgePainter.kt
@@ -15,18 +15,23 @@ import androidx.compose.ui.graphics.withSaveLayer
 import androidx.compose.ui.unit.Density
 import org.jetbrains.jewel.ui.painter.badge.BadgeShape
 
-class BadgePainter(source: Painter, private val color: Color, private val shape: BadgeShape) : DelegatePainter(source) {
+public class BadgePainter(
+    source: Painter,
+    private val color: Color,
+    private val shape: BadgeShape,
+) : DelegatePainter(source) {
 
     /**
-     * Optional [Paint] used to draw contents into an offscreen layer in order to apply
-     * alpha or [ColorFilter] parameters accordingly. If no alpha or [ColorFilter] is
-     * provided or the [Painter] implementation implements [applyAlpha] and
-     * [applyColorFilter] then this paint is not used
+     * Optional [Paint] used to draw contents into an offscreen layer to
+     * apply alpha or [ColorFilter] parameters accordingly. If no alpha or
+     * [ColorFilter] is provided or the [Painter] implementation implements
+     * [applyAlpha] and [applyColorFilter] then this paint is not used.
      */
     private var layerPaint: Paint? = null
 
     /**
-     * Lazily create a [Paint] object or return the existing instance if it is already allocated
+     * Lazily create a [Paint] object or return the existing instance if it is
+     * already allocated.
      */
     private fun obtainPaint(): Paint {
         var target = layerPaint
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/BasePainterHintsProvider.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/BasePainterHintsProvider.kt
index 1f0085f004d5f..9639fdd3c7e35 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/BasePainterHintsProvider.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/BasePainterHintsProvider.kt
@@ -2,9 +2,9 @@ package org.jetbrains.jewel.ui.painter
 
 import androidx.compose.ui.graphics.Color
 import org.jetbrains.jewel.ui.painter.hints.Palette
-import org.jetbrains.jewel.ui.util.fromRGBAHexString
+import org.jetbrains.jewel.ui.util.fromRGBAHexStringOrNull
 
-abstract class BasePainterHintsProvider(
+public abstract class BasePainterHintsProvider(
     isDark: Boolean,
     intellijIconPalette: Map<String, String?>,
     themeIconPalette: Map<String, String?>,
@@ -30,7 +30,7 @@ abstract class BasePainterHintsProvider(
 
             // If either the key or the resolved value aren't valid colors, ignore the entry
             val keyAsColor = resolveKeyColor(key, intellijIconPalette, isDark) ?: continue
-            val resolvedColor = namedColor ?: Color.fromRGBAHexString(value) ?: continue
+            val resolvedColor = namedColor ?: Color.fromRGBAHexStringOrNull(value) ?: continue
 
             // Save the new entry (oldColor -> newColor) in the map
             map[keyAsColor] = resolvedColor
@@ -46,18 +46,23 @@ abstract class BasePainterHintsProvider(
         checkBoxes: MutableMap<Color, Color>,
         trees: MutableMap<Color, Color>,
         ui: MutableMap<Color, Color>,
-    ) = when {
-        key.startsWith("Checkbox.") -> checkBoxes
-        key.startsWith("Tree.iconColor.") -> trees
-        key.startsWith("Objects.") || key.startsWith("Actions.") || key.startsWith("#") -> ui
-        else -> null
-    }
+    ) =
+        when {
+            key.startsWith("Checkbox.") -> checkBoxes
+            key.startsWith("Tree.iconColor.") -> trees
+            key.startsWith("Objects.") || key.startsWith("Actions.") || key.startsWith("#") -> ui
+            else -> null
+        }
 
     // See com.intellij.ide.ui.UITheme.toColorString
-    private fun resolveKeyColor(key: String, keyPalette: Map<String, String?>, isDark: Boolean): Color? {
+    private fun resolveKeyColor(
+        key: String,
+        keyPalette: Map<String, String?>,
+        isDark: Boolean,
+    ): Color? {
         val darkKey = "$key.Dark"
         val resolvedKey = if (isDark && keyPalette.containsKey(darkKey)) darkKey else key
-        return Color.fromRGBAHexString(keyPalette[resolvedKey] ?: return null)
+        return Color.fromRGBAHexStringOrNull(keyPalette[resolvedKey] ?: return null)
     }
 
     protected fun getPaletteHint(path: String): PainterHint {
@@ -66,7 +71,8 @@ abstract class BasePainterHintsProvider(
         val file = path.substringAfterLast('/')
         return when {
             file == "treeCollapsed.svg" || file == "treeExpanded.svg" -> treePaletteHint
-            // ⚠️ This next line is not a copy-paste error — the code in UITheme.PaletteScopeManager.getScopeByPath()
+            // ⚠️ This next line is not a copy-paste error — the code in
+            // UITheme.PaletteScopeManager.getScopeByPath()
             // says they share the same colors
             file.startsWith("check") || file.startsWith("radio") -> checkBoxPaletteHint
             else -> PainterHint.None
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/DelegatePainter.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/DelegatePainter.kt
index 9eaff88436607..ffa5b30d50790 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/DelegatePainter.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/DelegatePainter.kt
@@ -6,7 +6,7 @@ import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.unit.LayoutDirection
 
-open class DelegatePainter(private val delegate: Painter) : Painter() {
+public open class DelegatePainter(private val delegate: Painter) : Painter() {
 
     override val intrinsicSize: Size
         get() = delegate.intrinsicSize
@@ -33,9 +33,7 @@ open class DelegatePainter(private val delegate: Painter) : Painter() {
     }
 
     protected fun DrawScope.drawDelegate() {
-        with(delegate) {
-            draw(this@drawDelegate.size, alpha, filter)
-        }
+        with(delegate) { draw(this@drawDelegate.size, alpha, filter) }
     }
 
     override fun DrawScope.onDraw() {
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterHint.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterHint.kt
index f2beef3ff7d87..503dc348957e2 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterHint.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterHint.kt
@@ -5,27 +5,28 @@ import androidx.compose.ui.graphics.painter.Painter
 import org.w3c.dom.Element
 
 /**
- * A [PainterHint] is a hint for [PainterProvider] on how to load a [Painter][androidx.compose.ui.graphics.painter.Painter].
- * It can used to patch the path of the resource being loaded (e.g., for New UI
- * icon path mapping, and handling the dark theme variants), replace colors in
- * an SVG based on the theme palette, etc.
+ * A [PainterHint] is a hint for [PainterProvider] on how to load a
+ * [Painter][androidx.compose.ui.graphics.painter.Painter]. It can used to
+ * patch the path of the resource being loaded (e.g., for New UI icon path
+ * mapping, and handling the dark theme variants), replace colors in an SVG
+ * based on the theme palette, etc.
  *
  * Custom implementations are not allowed. There are two types of hints:
- *  * [PainterPathHint] modifies the path of the resource to load
- *  * [PainterSvgPatchHint] modifies the contents of SVG resources
+ * * [PainterPathHint] modifies the path of the resource to load
+ * * [PainterSvgPatchHint] modifies the contents of SVG resources
  *
  * @see PainterPathHint
  * @see PainterSvgPatchHint
  */
 @Immutable
-sealed interface PainterHint {
+public sealed interface PainterHint {
 
-    fun PainterProviderScope.canApply(): Boolean = true
+    public fun PainterProviderScope.canApply(): Boolean = true
 
     /**
      * An empty [PainterHint], it will be ignored.
      */
-    companion object None : PainterHint {
+    public companion object None : PainterHint {
 
         override fun PainterProviderScope.canApply(): Boolean = false
 
@@ -37,73 +38,76 @@ sealed interface PainterHint {
  * Mark this [PainterHint] just available with SVG images.
  */
 @Immutable
-interface SvgPainterHint : PainterHint {
+public interface SvgPainterHint : PainterHint {
 
-    override fun PainterProviderScope.canApply(): Boolean = path.substringAfterLast('.').lowercase() == "svg"
+    override fun PainterProviderScope.canApply(): Boolean =
+        path.substringAfterLast('.').lowercase() == "svg"
 }
 
 /**
  * Mark this [PainterHint] just available with Bitmap images.
  */
 @Immutable
-interface BitmapPainterHint : PainterHint {
+public interface BitmapPainterHint : PainterHint {
 
-    override fun PainterProviderScope.canApply(): Boolean = when (path.substringAfterLast('.').lowercase()) {
-        "svg", "xml" -> false
-        else -> true
-    }
+    override fun PainterProviderScope.canApply(): Boolean =
+        when (path.substringAfterLast('.').lowercase()) {
+            "svg", "xml" -> false
+            else -> true
+        }
 }
 
 /**
  * Mark this [PainterHint] just available with XML images.
  */
 @Immutable
-interface XmlPainterHint : PainterHint {
+public interface XmlPainterHint : PainterHint {
 
-    override fun PainterProviderScope.canApply(): Boolean = path.substringAfterLast('.').lowercase() == "xml"
+    override fun PainterProviderScope.canApply(): Boolean =
+        path.substringAfterLast('.').lowercase() == "xml"
 }
 
 /**
  * A [PainterHint] that modifies the path of the resource being loaded.
- * Usage examples are applying the New UI icon mappings, or picking up
- * dark theme variants of icons.
+ * Usage examples are applying the New UI icon mappings, or picking up dark
+ * theme variants of icons.
  */
 @Immutable
-interface PainterPathHint : PainterHint {
+public interface PainterPathHint : PainterHint {
 
     /**
      * Replace the entire path with the given value.
      */
-    fun PainterProviderScope.patch(): String
+    public fun PainterProviderScope.patch(): String
 }
 
 /**
- * A [PainterHint] that patches the content of SVG resources. It is only applied
- * to SVG resources; it doesn't affect other types of resources.
+ * A [PainterHint] that patches the content of SVG resources. It is only
+ * applied to SVG resources; it doesn't affect other types of resources.
  */
 @Immutable
-interface PainterSvgPatchHint : SvgPainterHint {
+public interface PainterSvgPatchHint : SvgPainterHint {
 
     /**
      * Patch the SVG content.
      */
-    fun PainterProviderScope.patch(element: Element)
+    public fun PainterProviderScope.patch(element: Element)
 }
 
 @Immutable
-interface PainterWrapperHint : PainterHint {
+public interface PainterWrapperHint : PainterHint {
 
-    fun PainterProviderScope.wrap(painter: Painter): Painter
+    public fun PainterProviderScope.wrap(painter: Painter): Painter
 }
 
 /**
  * A [PainterHint] that adds a prefix to a resource file name, without
- * changing the rest of the path.
- * For example, if the original path is `icons/MyIcon.svg`, and the prefix
- * is `Dark`, the patched path will be `icons/DarkMyIcon.svg`.
+ * changing the rest of the path. For example, if the original path is
+ * `icons/MyIcon.svg`, and the prefix is `Dark`, the patched path will be
+ * `icons/DarkMyIcon.svg`.
  */
 @Immutable
-abstract class PainterPrefixHint : PainterPathHint {
+public abstract class PainterPrefixHint : PainterPathHint {
 
     override fun PainterProviderScope.patch(): String = buildString {
         append(path.substringBeforeLast('/', ""))
@@ -115,17 +119,17 @@ abstract class PainterPrefixHint : PainterPathHint {
         append(path.substringAfterLast('.'))
     }
 
-    abstract fun PainterProviderScope.prefix(): String
+    public abstract fun PainterProviderScope.prefix(): String
 }
 
 /**
  * A [PainterHint] that adds a suffix to a resource file name, without
- * changing the rest of the path nor the extension.
- * For example, if the original path is `icons/MyIcon.svg`, and the suffix
- * is `_dark`, the patched path will be `icons/MyIcon_dark.svg`.
+ * changing the rest of the path nor the extension. For example, if the
+ * original path is `icons/MyIcon.svg`, and the suffix is `_dark`, the
+ * patched path will be `icons/MyIcon_dark.svg`.
  */
 @Immutable
-abstract class PainterSuffixHint : PainterPathHint {
+public abstract class PainterSuffixHint : PainterPathHint {
 
     override fun PainterProviderScope.patch(): String = buildString {
         append(path.substringBeforeLast('/', ""))
@@ -137,5 +141,5 @@ abstract class PainterSuffixHint : PainterPathHint {
         append(path.substringAfterLast('.'))
     }
 
-    abstract fun PainterProviderScope.suffix(): String
+    public abstract fun PainterProviderScope.suffix(): String
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterHintsProvider.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterHintsProvider.kt
index 25ef30345e3ba..5a12ac80a6eb7 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterHintsProvider.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterHintsProvider.kt
@@ -2,6 +2,7 @@ package org.jetbrains.jewel.ui.painter
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Immutable
+import androidx.compose.runtime.ProvidableCompositionLocal
 import androidx.compose.runtime.staticCompositionLocalOf
 import org.jetbrains.jewel.foundation.theme.JewelTheme
 import org.jetbrains.jewel.ui.painter.hints.Dark
@@ -15,34 +16,32 @@ import org.jetbrains.jewel.ui.painter.hints.HiDpi
  * @see org.jetbrains.jewel.intui.standalone.StandalonePainterHintsProvider
  */
 @Immutable
-interface PainterHintsProvider {
+public interface PainterHintsProvider {
 
     /**
-     * These hints will be consumed before the hints which are passed as a parameter to [PainterProvider.getPainter].
+     * These hints will be consumed before the hints which are passed as a
+     * parameter to [PainterProvider.getPainter].
      */
-    @Composable
-    fun priorityHints(path: String): List<PainterHint> = emptyList()
+    @Composable public fun priorityHints(path: String): List<PainterHint> = emptyList()
 
     /**
-     * These hints will be consumed after the hints which are passed as a parameter to [PainterProvider.getPainter].
+     * These hints will be consumed after the hints which are passed as a
+     * parameter to [PainterProvider.getPainter].
      */
-    @Composable
-    fun hints(path: String): List<PainterHint>
+    @Composable public fun hints(path: String): List<PainterHint>
 }
 
 /**
- * The default [PainterHintsProvider] to load dark theme icon variants.
- * It will provide the [Dark] hint when [LocalIsDarkTheme][org.jetbrains.jewel.LocalIsDarkTheme] is true.
+ * The default [PainterHintsProvider] to load dark theme
+ * icon variants. It will provide the [Dark] hint when
+ * [LocalIsDarkTheme][org.jetbrains.jewel.LocalIsDarkTheme] is true.
  */
-object CommonPainterHintsProvider : PainterHintsProvider {
+public object CommonPainterHintsProvider : PainterHintsProvider {
 
     @Composable
-    override fun hints(path: String): List<PainterHint> = listOf(
-        HiDpi(),
-        Dark(JewelTheme.isDark),
-    )
+    override fun hints(path: String): List<PainterHint> =
+        listOf(HiDpi(), Dark(JewelTheme.isDark))
 }
 
-val LocalPainterHintsProvider = staticCompositionLocalOf<PainterHintsProvider> {
-    CommonPainterHintsProvider
-}
+public val LocalPainterHintsProvider: ProvidableCompositionLocal<PainterHintsProvider> =
+    staticCompositionLocalOf { CommonPainterHintsProvider }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterProvider.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterProvider.kt
index d7d2508c91b61..6ff19721874f9 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterProvider.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterProvider.kt
@@ -9,23 +9,22 @@ import androidx.compose.ui.graphics.painter.Painter
  * Provides a [Painter] for an image, which may be transformed by the
  * provided hints.
  *
- * Note: implementations of this interface should handle the passed
- * [PainterHint]s correctly. For now, this means calling
+ * Note: implementations of this interface should handle the
+ * passed [PainterHint]s correctly. For now, this means calling
  * [PainterPathHint.patch] and [PainterSvgPatchHint.patch]. Most likely, a
  * [PainterProvider] should also hold the resource path and [ClassLoader]
  * references.
  */
 @Immutable
-interface PainterProvider {
+public interface PainterProvider {
 
     /**
-     * Provides a [Painter] using the specified [PainterHint]s.
-     * The painters are [remember][androidx.compose.runtime.remember]ed
-     * and this function can be called multiple times for the same data.
+     * Provides a [Painter] using the specified [PainterHint]s. The painters
+     * are [remember][androidx.compose.runtime.remember]ed and this function
+     * can be called multiple times for the same data.
      *
      * Depending on the implementation, errors may be suppressed and a
      * replacement painter provided.
      */
-    @Composable
-    fun getPainter(vararg hints: PainterHint): State<Painter>
+    @Composable public fun getPainter(vararg hints: PainterHint): State<Painter>
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterProviderScope.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterProviderScope.kt
index c9684d05b6060..5fb7dfed5d393 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterProviderScope.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/PainterProviderScope.kt
@@ -2,16 +2,16 @@ package org.jetbrains.jewel.ui.painter
 
 import androidx.compose.ui.unit.Density
 
-interface PainterProviderScope : Density {
+public interface PainterProviderScope : Density {
 
-    val rawPath: String
+    public val rawPath: String
 
-    val path: String
+    public val path: String
 
-    val acceptedHints: List<PainterHint>
+    public val acceptedHints: List<PainterHint>
 }
 
-interface ResourcePainterProviderScope : PainterProviderScope {
+public interface ResourcePainterProviderScope : PainterProviderScope {
 
-    val classLoaders: Set<ClassLoader>
+    public val classLoaders: Set<ClassLoader>
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResizedPainter.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResizedPainter.kt
index 40ffb3170cdba..3204b08affef5 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResizedPainter.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResizedPainter.kt
@@ -4,7 +4,7 @@ import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.drawscope.DrawScope
 import androidx.compose.ui.graphics.painter.Painter
 
-class ResizedPainter(private val delegate: Painter, private val size: Size) : DelegatePainter(delegate) {
+public class ResizedPainter(delegate: Painter, private val size: Size) : DelegatePainter(delegate) {
 
     override val intrinsicSize: Size
         get() = size
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResourcePainterProvider.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResourcePainterProvider.kt
index 749f77549ae7d..c11b2a2a1a113 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResourcePainterProvider.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/ResourcePainterProvider.kt
@@ -46,7 +46,7 @@ private val errorPainter = ColorPainter(Color.Magenta)
  * [debug mode][inDebugMode], however, exceptions will not be suppressed.
  */
 @Immutable
-class ResourcePainterProvider(
+public class ResourcePainterProvider(
     private val basePath: String,
     vararg classLoaders: ClassLoader,
 ) : PainterProvider {
@@ -57,8 +57,10 @@ class ResourcePainterProvider(
 
     private val contextClassLoaders = classLoaders.toList()
 
-    private val documentBuilderFactory = DocumentBuilderFactory.newDefaultInstance()
-        .apply { setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true) }
+    private val documentBuilderFactory =
+        DocumentBuilderFactory.newDefaultInstance().apply {
+            setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true)
+        }
 
     private fun Scope.resolveHint(hint: PainterHint) {
         with(hint) {
@@ -74,15 +76,13 @@ class ResourcePainterProvider(
         val scope = Scope(density, basePath, classLoaders)
 
         val currentHintsProvider = LocalPainterHintsProvider.current
-        currentHintsProvider.priorityHints(basePath).forEach {
-            scope.resolveHint(it)
-        }
-        hints.forEach {
-            scope.resolveHint(it)
-        }
-        currentHintsProvider.hints(basePath).forEach {
-            scope.resolveHint(it)
-        }
+        currentHintsProvider.priorityHints(basePath)
+            .forEach { scope.resolveHint(it) }
+
+        hints.forEach { scope.resolveHint(it) }
+
+        currentHintsProvider.hints(basePath)
+            .forEach { scope.resolveHint(it) }
 
         val cacheKey = scope.acceptedHints.hashCode()
 
@@ -90,12 +90,13 @@ class ResourcePainterProvider(
             println("Cache hit for $basePath(${scope.acceptedHints.joinToString()})")
         }
 
-        val painter = cache.getOrPut(cacheKey) {
-            if (inDebugMode) {
-                println("Cache miss for $basePath(${scope.acceptedHints.joinToString()})")
+        val painter =
+            cache.getOrPut(cacheKey) {
+                if (inDebugMode) {
+                    println("Cache miss for $basePath(${scope.acceptedHints.joinToString()})")
+                }
+                loadPainter(scope)
             }
-            loadPainter(scope)
-        }
 
         return rememberUpdatedState(painter)
     }
@@ -106,34 +107,30 @@ class ResourcePainterProvider(
 
         for (hint in scope.acceptedHints) {
             if (hint !is PainterPathHint) continue
-            scopes = scopes.flatMap {
-                listOfNotNull(it.apply(hint), it)
-            }
+            scopes = scopes.flatMap { listOfNotNull(it.apply(hint), it) }
         }
 
-        val (chosenScope, url) = scopes.firstNotNullOfOrNull {
-            resolveResource(it)
-        } ?: run {
-            if (inDebugMode) {
-                error("Resource '$basePath(${scope.acceptedHints.joinToString()})' not found")
-            } else {
-                return errorPainter
+        val (chosenScope, url) = scopes.firstNotNullOfOrNull { resolveResource(it) }
+            ?: run {
+                if (inDebugMode) {
+                    error("Resource '$basePath(${scope.acceptedHints.joinToString()})' not found")
+                } else {
+                    return errorPainter
+                }
             }
-        }
 
         val extension = basePath.substringAfterLast(".").lowercase()
 
-        var painter = when (extension) {
-            "svg" -> createSvgPainter(chosenScope, url)
-            "xml" -> createVectorDrawablePainter(chosenScope, url)
-            else -> createBitmapPainter(chosenScope, url)
-        }
+        var painter =
+            when (extension) {
+                "svg" -> createSvgPainter(chosenScope, url)
+                "xml" -> createVectorDrawablePainter(chosenScope, url)
+                else -> createBitmapPainter(chosenScope, url)
+            }
 
         for (hint in scope.acceptedHints) {
             if (hint !is PainterWrapperHint) continue
-            with(hint) {
-                painter = chosenScope.wrap(painter)
-            }
+            with(hint) { painter = chosenScope.wrap(painter) }
         }
 
         return painter
@@ -179,9 +176,7 @@ class ResourcePainterProvider(
 
             hints.forEach { hint ->
                 if (hint !is PainterSvgPatchHint) return@forEach
-                with(hint) {
-                    scope.patch(document.documentElement)
-                }
+                with(hint) { scope.patch(document.documentElement) }
             }
 
             return document.writeToString().byteInputStream()
@@ -193,9 +188,7 @@ class ResourcePainterProvider(
         tryLoadingResource(
             url = url,
             loadingAction = { resourceUrl ->
-                resourceUrl.openStream().use {
-                    loadXmlImageVector(InputSource(it), scope)
-                }
+                resourceUrl.openStream().use { loadXmlImageVector(InputSource(it), scope) }
             },
             rememberAction = { rememberVectorPainter(it) },
         )
@@ -205,9 +198,7 @@ class ResourcePainterProvider(
         tryLoadingResource(
             url = url,
             loadingAction = { resourceUrl ->
-                val bitmap = resourceUrl.openStream().use {
-                    loadImageBitmap(it)
-                }
+                val bitmap = resourceUrl.openStream().use { loadImageBitmap(it) }
                 BitmapPainter(bitmap)
             },
             rememberAction = { remember(url, scope.density) { it } },
@@ -220,17 +211,18 @@ class ResourcePainterProvider(
         rememberAction: @Composable (T) -> Painter,
     ): Painter {
         @Suppress("TooGenericExceptionCaught") // This is a last-resort fallback when icons fail to load
-        val painter = try {
-            loadingAction(url)
-        } catch (e: RuntimeException) {
-            val message = "Unable to load SVG resource from $url\n${e.stackTraceToString()}"
-            if (inDebugMode) {
-                error(message)
-            }
+        val painter =
+            try {
+                loadingAction(url)
+            } catch (e: RuntimeException) {
+                val message = "Unable to load SVG resource from $url\n${e.stackTraceToString()}"
+                if (inDebugMode) {
+                    error(message)
+                }
 
-            System.err.println(message)
-            return errorPainter
-        }
+                System.err.println(message)
+                return errorPainter
+            }
 
         return rememberAction(painter)
     }
@@ -280,7 +272,5 @@ internal fun Document.writeToString(): String {
 }
 
 @Composable
-fun rememberResourcePainterProvider(path: String, iconClass: Class<*>): PainterProvider =
-    remember(path, iconClass.classLoader) {
-        ResourcePainterProvider(path, iconClass.classLoader)
-    }
+public fun rememberResourcePainterProvider(path: String, iconClass: Class<*>): PainterProvider =
+    remember(path, iconClass.classLoader) { ResourcePainterProvider(path, iconClass.classLoader) }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/badge/BadgeShape.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/badge/BadgeShape.kt
index 081beea77b9f1..c3b29038a0a9a 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/badge/BadgeShape.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/badge/BadgeShape.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.jewel.ui.painter.badge
 
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.geometry.Rect
 import androidx.compose.ui.geometry.Size
 import androidx.compose.ui.graphics.Outline
@@ -7,9 +8,10 @@ import androidx.compose.ui.graphics.Shape
 import androidx.compose.ui.unit.Density
 import androidx.compose.ui.unit.LayoutDirection
 
-interface BadgeShape : Shape {
+@Immutable
+public interface BadgeShape : Shape {
 
-    fun createHoleOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline
+    public fun createHoleOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline
 }
 
 internal val emptyOutline = Outline.Rectangle(Rect.Zero)
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/badge/DotBadgeShape.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/badge/DotBadgeShape.kt
index ad68f4ad3c2c7..74ce8162eda2e 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/badge/DotBadgeShape.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/badge/DotBadgeShape.kt
@@ -1,5 +1,6 @@
 package org.jetbrains.jewel.ui.painter.badge
 
+import androidx.compose.runtime.Immutable
 import androidx.compose.ui.geometry.CornerRadius
 import androidx.compose.ui.geometry.RoundRect
 import androidx.compose.ui.geometry.Size
@@ -11,19 +12,26 @@ import org.jetbrains.jewel.foundation.GenerateDataFunctions
 /**
  * @see com.intellij.ui.BadgeDotProvider
  */
+@Immutable
 @GenerateDataFunctions
-class DotBadgeShape(
-    val x: Float = 16.5f / 20,
-    val y: Float = 3.5f / 20,
-    val radius: Float = 3.5f / 20,
-    val border: Float = 1.5f / 20,
+public class DotBadgeShape(
+    public val x: Float = 16.5f / 20,
+    public val y: Float = 3.5f / 20,
+    public val radius: Float = 3.5f / 20,
+    public val border: Float = 1.5f / 20,
 ) : BadgeShape {
 
-    override fun createHoleOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline =
-        createOutline(size, hole = true)
+    override fun createHoleOutline(
+        size: Size,
+        layoutDirection: LayoutDirection,
+        density: Density,
+    ): Outline = createOutline(size, hole = true)
 
-    override fun createOutline(size: Size, layoutDirection: LayoutDirection, density: Density): Outline =
-        createOutline(size, hole = false)
+    override fun createOutline(
+        size: Size,
+        layoutDirection: LayoutDirection,
+        density: Density,
+    ): Outline = createOutline(size, hole = false)
 
     private fun createOutline(size: Size, hole: Boolean): Outline {
         val dotSize = size.width.coerceAtMost(size.height)
@@ -39,10 +47,11 @@ class DotBadgeShape(
         val y = size.height * y
         if (0 > y + radius || y - radius > size.height) return emptyOutline
 
-        val border = when {
-            hole -> dotSize * border
-            else -> 0.0f
-        }
+        val border =
+            when {
+                hole -> dotSize * border
+                else -> 0.0f
+            }
 
         val r = radius + border.coerceAtLeast(0.0f)
 
@@ -57,8 +66,8 @@ class DotBadgeShape(
         )
     }
 
-    companion object {
+    public companion object {
 
-        val Default = DotBadgeShape()
+        public val Default: DotBadgeShape = DotBadgeShape()
     }
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Badge.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Badge.kt
index 013fae9728fc1..eda3c14bf21ca 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Badge.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Badge.kt
@@ -3,37 +3,21 @@ package org.jetbrains.jewel.ui.painter.hints
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.isSpecified
 import androidx.compose.ui.graphics.painter.Painter
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 import org.jetbrains.jewel.ui.painter.BadgePainter
 import org.jetbrains.jewel.ui.painter.PainterHint
 import org.jetbrains.jewel.ui.painter.PainterProviderScope
 import org.jetbrains.jewel.ui.painter.PainterWrapperHint
 import org.jetbrains.jewel.ui.painter.badge.BadgeShape
 
-private class BadgeImpl(private val color: Color, private val shape: BadgeShape) : PainterWrapperHint {
+@GenerateDataFunctions
+private class BadgeImpl(
+    private val color: Color,
+    private val shape: BadgeShape,
+) : PainterWrapperHint {
 
     override fun PainterProviderScope.wrap(painter: Painter): Painter = BadgePainter(painter, color, shape)
-
-    override fun toString(): String = "Badge(color=$color, shape=$shape)"
-
-    override fun hashCode(): Int {
-        var result = color.hashCode()
-        result = 31 * result + shape.hashCode()
-        return result
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is BadgeImpl) return false
-
-        if (color != other.color) return false
-        if (shape != other.shape) return false
-
-        return true
-    }
 }
 
-fun Badge(color: Color, shape: BadgeShape): PainterHint = if (color.isSpecified) {
-    BadgeImpl(color, shape)
-} else {
-    PainterHint.None
-}
+public fun Badge(color: Color, shape: BadgeShape): PainterHint =
+    if (color.isSpecified) BadgeImpl(color, shape) else PainterHint.None
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/DarkOrStroke.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/DarkOrStroke.kt
index 41d3b29fdb044..a1721c498f4a6 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/DarkOrStroke.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/DarkOrStroke.kt
@@ -3,6 +3,7 @@ package org.jetbrains.jewel.ui.painter.hints
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.isSpecified
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 import org.jetbrains.jewel.ui.painter.PainterHint
 import org.jetbrains.jewel.ui.painter.PainterProviderScope
 import org.jetbrains.jewel.ui.painter.PainterSuffixHint
@@ -20,6 +21,7 @@ private object DarkImpl : PainterSuffixHint() {
 }
 
 @Immutable
+@GenerateDataFunctions
 private class StrokeImpl(private val color: Color) : PainterSuffixHint(), PainterSvgPatchHint {
 
     override fun PainterProviderScope.suffix(): String = "_stroke"
@@ -32,19 +34,6 @@ private class StrokeImpl(private val color: Color) : PainterSuffixHint(), Painte
 
     override fun PainterProviderScope.canApply(): Boolean = true
 
-    override fun toString(): String = "Stroke(color=$color)"
-
-    override fun hashCode(): Int = color.hashCode()
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is StrokeImpl) return false
-
-        if (color != other.color) return false
-
-        return true
-    }
-
     private val backgroundPalette = listOf(
         Color(0xFFEBECF0),
         Color(0xFFE7EFFD),
@@ -73,14 +62,8 @@ private class StrokeImpl(private val color: Color) : PainterSuffixHint(), Painte
     )
 }
 
-fun Stroke(color: Color): PainterHint = if (color.isSpecified) {
-    StrokeImpl(color)
-} else {
-    PainterHint.None
-}
+public fun Stroke(color: Color): PainterHint =
+    if (color.isSpecified) StrokeImpl(color) else PainterHint.None
 
-fun Dark(isDark: Boolean = true): PainterHint = if (isDark) {
-    DarkImpl
-} else {
-    PainterHint.None
-}
+public fun Dark(isDark: Boolean = true): PainterHint =
+    if (isDark) DarkImpl else PainterHint.None
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/HiDpi.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/HiDpi.kt
index 1a3983eb609ff..316de4af01bd0 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/HiDpi.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/HiDpi.kt
@@ -19,4 +19,4 @@ private object HiDpiImpl : PainterSuffixHint() {
     override fun toString(): String = "HiDpi"
 }
 
-fun HiDpi(): PainterHint = HiDpiImpl
+public fun HiDpi(): PainterHint = HiDpiImpl
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Override.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Override.kt
index dfd3cdd725e22..e9b82493dfa43 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Override.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Override.kt
@@ -1,29 +1,21 @@
 package org.jetbrains.jewel.ui.painter.hints
 
+import androidx.compose.runtime.Immutable
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 import org.jetbrains.jewel.ui.painter.PainterHint
 import org.jetbrains.jewel.ui.painter.PainterPathHint
 import org.jetbrains.jewel.ui.painter.PainterProviderScope
 
+@Immutable
+@GenerateDataFunctions
 private class OverrideImpl(private val iconOverride: Map<String, String>) : PainterPathHint {
 
     override fun PainterProviderScope.patch(): String = iconOverride[path] ?: path
-
-    override fun toString(): String = "Override(${iconOverride.hashCode()})"
-
-    override fun hashCode(): Int = iconOverride.hashCode()
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is OverrideImpl) return false
-
-        if (iconOverride != other.iconOverride) return false
-
-        return true
-    }
 }
 
-fun Override(override: Map<String, String>): PainterHint = if (override.isEmpty()) {
-    PainterHint.None
-} else {
-    OverrideImpl(override)
-}
+public fun Override(override: Map<String, String>): PainterHint =
+    if (override.isEmpty()) {
+        PainterHint.None
+    } else {
+        OverrideImpl(override)
+    }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Palette.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Palette.kt
index 029fb3a739946..4eb40b6990b21 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Palette.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Palette.kt
@@ -2,6 +2,7 @@ package org.jetbrains.jewel.ui.painter.hints
 
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.Color
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 import org.jetbrains.jewel.ui.painter.PainterHint
 import org.jetbrains.jewel.ui.painter.PainterProviderScope
 import org.jetbrains.jewel.ui.painter.PainterSvgPatchHint
@@ -10,24 +11,12 @@ import org.w3c.dom.Element
 import kotlin.math.roundToInt
 
 @Immutable
+@GenerateDataFunctions
 private class PaletteImpl(val map: Map<Color, Color>) : PainterSvgPatchHint {
 
     override fun PainterProviderScope.patch(element: Element) {
         element.patchPalette(map)
     }
-
-    override fun toString(): String = "Palette(${map.hashCode()})"
-
-    override fun hashCode(): Int = map.hashCode()
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is PaletteImpl) return false
-
-        if (map != other.map) return false
-
-        return true
-    }
 }
 
 internal fun Element.patchPalette(fill: Map<Color, Color>, stroke: Map<Color, Color> = fill) {
@@ -105,8 +94,5 @@ private fun fromHexOrNull(rawColor: String, alpha: Float): Color? {
     }
 }
 
-fun Palette(map: Map<Color, Color>): PainterHint = if (map.isEmpty()) {
-    PainterHint.None
-} else {
-    PaletteImpl(map)
-}
+public fun Palette(map: Map<Color, Color>): PainterHint =
+    if (map.isEmpty()) PainterHint.None else PaletteImpl(map)
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Selected.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Selected.kt
index 59104cd9986ec..938afd5a2a6a3 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Selected.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Selected.kt
@@ -14,10 +14,7 @@ private object SelectedImpl : PainterSuffixHint() {
     override fun toString(): String = "Selected"
 }
 
-fun Selected(selected: Boolean = true): PainterHint = if (selected) {
-    SelectedImpl
-} else {
-    PainterHint.None
-}
+public fun Selected(selected: Boolean = true): PainterHint =
+    if (selected) SelectedImpl else PainterHint.None
 
-fun Selected(state: SelectableComponentState): PainterHint = Selected(state.isSelected)
+public fun Selected(state: SelectableComponentState): PainterHint = Selected(state.isSelected)
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Size.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Size.kt
index e9feb6d811f54..fdf713c237233 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Size.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Size.kt
@@ -3,6 +3,7 @@ package org.jetbrains.jewel.ui.painter.hints
 import androidx.compose.runtime.Immutable
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.unit.dp
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 import org.jetbrains.jewel.ui.painter.PainterHint
 import org.jetbrains.jewel.ui.painter.PainterProviderScope
 import org.jetbrains.jewel.ui.painter.PainterSuffixHint
@@ -11,6 +12,7 @@ import org.jetbrains.jewel.ui.painter.ResizedPainter
 import org.jetbrains.jewel.ui.painter.SvgPainterHint
 
 @Immutable
+@GenerateDataFunctions
 private class SizeImpl(
     private val width: Int,
     private val height: Int,
@@ -31,30 +33,9 @@ private class SizeImpl(
             androidx.compose.ui.geometry.Size(width.dp.toPx(), height.dp.toPx()),
         )
     }
-
-    override fun toString(): String = "Size(width=$width, height=$height)"
-
-    override fun hashCode(): Int {
-        var result = width
-        result = 31 * result + height
-        return result
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is SizeImpl) return false
-
-        if (width != other.width) return false
-        if (height != other.height) return false
-
-        return true
-    }
 }
 
-fun Size(width: Int, height: Int = width): PainterHint {
-    require(width > 0 && height > 0) {
-        "Width and height must be positive"
-    }
-
+public fun Size(width: Int, height: Int = width): PainterHint {
+    require(width > 0 && height > 0) { "Width and height must be positive" }
     return SizeImpl(width, height)
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Stateful.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Stateful.kt
index a673cc2370ed6..4fb2bbac5913b 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Stateful.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/painter/hints/Stateful.kt
@@ -1,6 +1,7 @@
 package org.jetbrains.jewel.ui.painter.hints
 
 import androidx.compose.runtime.Immutable
+import org.jetbrains.jewel.foundation.GenerateDataFunctions
 import org.jetbrains.jewel.foundation.state.FocusableComponentState
 import org.jetbrains.jewel.foundation.state.InteractiveComponentState
 import org.jetbrains.jewel.ui.painter.PainterHint
@@ -8,6 +9,7 @@ import org.jetbrains.jewel.ui.painter.PainterProviderScope
 import org.jetbrains.jewel.ui.painter.PainterSuffixHint
 
 @Immutable
+@GenerateDataFunctions
 private class StatefulImpl(private val state: InteractiveComponentState) : PainterSuffixHint() {
 
     override fun PainterProviderScope.suffix(): String = buildString {
@@ -21,19 +23,6 @@ private class StatefulImpl(private val state: InteractiveComponentState) : Paint
             append("Disabled")
         }
     }
-
-    override fun toString(): String = "Stateful(state=$state)"
-
-    override fun hashCode(): Int = state.hashCode()
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (other !is StatefulImpl) return false
-
-        if (state != other.state) return false
-
-        return true
-    }
 }
 
-fun Stateful(state: InteractiveComponentState): PainterHint = StatefulImpl(state)
+public fun Stateful(state: InteractiveComponentState): PainterHint = StatefulImpl(state)
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/theme/JewelTheme.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/theme/JewelTheme.kt
index 1e66122f9c65b..55838e0828a68 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/theme/JewelTheme.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/theme/JewelTheme.kt
@@ -51,12 +51,12 @@ import org.jetbrains.jewel.ui.component.styling.TextAreaStyle
 import org.jetbrains.jewel.ui.component.styling.TextFieldStyle
 import org.jetbrains.jewel.ui.component.styling.TooltipStyle
 
-val JewelTheme.Companion.colorPalette: ThemeColorPalette
+public val JewelTheme.Companion.colorPalette: ThemeColorPalette
     @Composable
     @ReadOnlyComposable
     get() = LocalColorPalette.current
 
-val JewelTheme.Companion.iconData: ThemeIconData
+public val JewelTheme.Companion.iconData: ThemeIconData
     @Composable
     @ReadOnlyComposable
     get() = LocalIconData.current
@@ -65,108 +65,108 @@ val JewelTheme.Companion.iconData: ThemeIconData
 // Component styling
 // -----------------
 
-val JewelTheme.Companion.defaultButtonStyle: ButtonStyle
+public val JewelTheme.Companion.defaultButtonStyle: ButtonStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalDefaultButtonStyle.current
 
-val JewelTheme.Companion.outlinedButtonStyle: ButtonStyle
+public val JewelTheme.Companion.outlinedButtonStyle: ButtonStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalOutlinedButtonStyle.current
 
-val JewelTheme.Companion.checkboxStyle: CheckboxStyle
+public val JewelTheme.Companion.checkboxStyle: CheckboxStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalCheckboxStyle.current
 
-val JewelTheme.Companion.chipStyle: ChipStyle
+public val JewelTheme.Companion.chipStyle: ChipStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalChipStyle.current
 
-val JewelTheme.Companion.dividerStyle: DividerStyle
+public val JewelTheme.Companion.dividerStyle: DividerStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalDividerStyle.current
 
-val JewelTheme.Companion.dropdownStyle: DropdownStyle
+public val JewelTheme.Companion.dropdownStyle: DropdownStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalDefaultDropdownStyle.current
 
-val JewelTheme.Companion.groupHeaderStyle: GroupHeaderStyle
+public val JewelTheme.Companion.groupHeaderStyle: GroupHeaderStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalGroupHeaderStyle.current
 
-val JewelTheme.Companion.linkStyle: LinkStyle
+public val JewelTheme.Companion.linkStyle: LinkStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalLinkStyle.current
 
-val JewelTheme.Companion.menuStyle: MenuStyle
+public val JewelTheme.Companion.menuStyle: MenuStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalMenuStyle.current
 
-val JewelTheme.Companion.horizontalProgressBarStyle: HorizontalProgressBarStyle
+public val JewelTheme.Companion.horizontalProgressBarStyle: HorizontalProgressBarStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalHorizontalProgressBarStyle.current
 
-val JewelTheme.Companion.radioButtonStyle: RadioButtonStyle
+public val JewelTheme.Companion.radioButtonStyle: RadioButtonStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalRadioButtonStyle.current
 
-val JewelTheme.Companion.scrollbarStyle: ScrollbarStyle
+public val JewelTheme.Companion.scrollbarStyle: ScrollbarStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalScrollbarStyle.current
 
-val JewelTheme.Companion.textAreaStyle: TextAreaStyle
+public val JewelTheme.Companion.textAreaStyle: TextAreaStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalTextAreaStyle.current
 
-val JewelTheme.Companion.textFieldStyle: TextFieldStyle
+public val JewelTheme.Companion.textFieldStyle: TextFieldStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalTextFieldStyle.current
 
-val JewelTheme.Companion.treeStyle: LazyTreeStyle
+public val JewelTheme.Companion.treeStyle: LazyTreeStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalLazyTreeStyle.current
 
-val JewelTheme.Companion.defaultTabStyle: TabStyle
+public val JewelTheme.Companion.defaultTabStyle: TabStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalDefaultTabStyle.current
 
-val JewelTheme.Companion.editorTabStyle: TabStyle
+public val JewelTheme.Companion.editorTabStyle: TabStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalEditorTabStyle.current
 
-val JewelTheme.Companion.circularProgressStyle: CircularProgressStyle
+public val JewelTheme.Companion.circularProgressStyle: CircularProgressStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalCircularProgressStyle.current
 
-val JewelTheme.Companion.tooltipStyle: TooltipStyle
+public val JewelTheme.Companion.tooltipStyle: TooltipStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalTooltipStyle.current
 
-val JewelTheme.Companion.iconButtonStyle: IconButtonStyle
+public val JewelTheme.Companion.iconButtonStyle: IconButtonStyle
     @Composable
     @ReadOnlyComposable
     get() = LocalIconButtonStyle.current
 
 @Composable
-fun BaseJewelTheme(
+public fun BaseJewelTheme(
     theme: ThemeDefinition,
     styling: ComponentStyling,
     content: @Composable () -> Unit,
@@ -175,7 +175,7 @@ fun BaseJewelTheme(
 }
 
 @Composable
-fun BaseJewelTheme(
+public fun BaseJewelTheme(
     theme: ThemeDefinition,
     styling: ComponentStyling,
     swingCompatMode: Boolean = false,
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ColorExtensions.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ColorExtensions.kt
index c246ecdd989ee..b43e1f8aad9cd 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ColorExtensions.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ColorExtensions.kt
@@ -5,9 +5,10 @@ import androidx.compose.ui.graphics.luminance
 import kotlin.math.roundToInt
 
 /**
- * Converts a [Color] to a RGBA formatted color('#RRGGBBAA') hex string, etc. #FFFFFF1A.
+ * Converts a [Color] to a RGBA formatted color `#RRGGBBAA` hex string;
+ * e.g., `#FFFFFF1A` (a translucent white).
  */
-fun Color.toRgbaHexString(): String {
+public fun Color.toRgbaHexString(): String {
     val r = Integer.toHexString((red * 255).roundToInt())
     val g = Integer.toHexString((green * 255).roundToInt())
     val b = Integer.toHexString((blue * 255).roundToInt())
@@ -26,10 +27,12 @@ fun Color.toRgbaHexString(): String {
 }
 
 /**
- * Converts a RGBA formatted color('#RRGGBBAA') hex string to a [Color], etc. #FFFFFF1A.
+ * Converts a RGBA formatted color `#RRGGBBAA` hex string to a [Color];
+ * e.g., `#FFFFFF1A` (a translucent white).
  */
-fun Color.Companion.fromRGBAHexString(rgba: String) =
-    rgba.lowercase()
+public fun Color.Companion.fromRGBAHexStringOrNull(rgba: String): Color? =
+    rgba
+        .lowercase()
         .removePrefix("#")
         .let {
             when (it.length) {
@@ -43,4 +46,8 @@ fun Color.Companion.fromRGBAHexString(rgba: String) =
         ?.toLongOrNull(radix = 16)
         ?.let { Color(it) }
 
-fun Color.isDark(): Boolean = (luminance() + 0.05) / 0.05 < 4.5
+/**
+ * Heuristically determines if the color can be thought of as "dark".
+ */
+public fun Color.isDark(): Boolean =
+    (luminance() + 0.05) / 0.05 < 4.5
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/Debug.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/Debug.kt
index a4264614c198f..1dd91b0cd34d3 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/Debug.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/Debug.kt
@@ -3,10 +3,10 @@ package org.jetbrains.jewel.ui.util
 import org.jetbrains.jewel.foundation.InternalJewelApi
 
 /**
- * Determines whether we're in debug mode. This should not be used
- * in the bridge for logging; instead, you should use the IDE logger.
+ * Determines whether we're in debug mode. This should not be used in the
+ * bridge for logging; instead, you should use the IDE logger.
  */
 @InternalJewelApi
-val inDebugMode by lazy {
+public val inDebugMode: Boolean by lazy {
     System.getProperty("org.jetbrains.jewel.debug")?.toBoolean() ?: false
 }
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ModifierExtensions.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ModifierExtensions.kt
index 9c3f3f1b127a2..61208e6f0ec91 100644
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ModifierExtensions.kt
+++ b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/ModifierExtensions.kt
@@ -2,12 +2,11 @@ package org.jetbrains.jewel.ui.util
 
 import androidx.compose.ui.Modifier
 
-@Deprecated(
-    "Use thenIf instead",
-    ReplaceWith("thenIf(precondition, action)"),
-)
-inline fun Modifier.appendIf(precondition: Boolean, action: Modifier.() -> Modifier) =
-    thenIf(precondition, action)
-
-inline fun Modifier.thenIf(precondition: Boolean, action: Modifier.() -> Modifier) =
-    if (precondition) action() else this
+/**
+ * Conditionally applies the [action] to the receiver [Modifier], if
+ * [precondition] is true. Returns the receiver as-is otherwise.
+ */
+public inline fun Modifier.thenIf(
+    precondition: Boolean,
+    action: Modifier.() -> Modifier,
+): Modifier = if (precondition) action() else this
diff --git a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator.kt b/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator.kt
deleted file mode 100644
index 83a20e8aa5a2d..0000000000000
--- a/platform/jewel/ui/src/main/kotlin/org/jetbrains/jewel/ui/util/SpinnerProgressIconGenerator.kt
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.jetbrains.jewel.ui.util
-
-object SpinnerProgressIconGenerator {
-
-    private val opacityList = listOf(1.0f, 0.93f, 0.78f, 0.69f, 0.62f, 0.48f, 0.38f, 0.0f)
-
-    private val rotations = listOf(0, -45, 0, 45, 0, -45, 0, 45)
-
-    // for a 16x16 icon
-    internal val points = listOf(
-        7f to 1f,
-        2.34961f to 3.76416f,
-        1f to 7f,
-        5.17871f to 9.40991f,
-        7f to 11f,
-        9.41016f to 10.8242f,
-        11f to 7f,
-        12.2383f to 2.34961f,
-    )
-
-    private fun StringBuilder.closeTag() = append("</svg>")
-    private fun StringBuilder.openTag(sizePx: Int) = append(
-        "<svg width=\"$sizePx\" height=\"$sizePx\" viewBox=\"0 0 $sizePx $sizePx\" fill=\"none\" " +
-            "xmlns=\"http://www.w3.org/2000/svg\">",
-    )
-
-    private fun getSvgPlainTextIcon(
-        step: Int,
-        pointList: List<Pair<Float, Float>>,
-        colorHex: String,
-        thickness: Int = 2,
-        length: Int = 4,
-        cornerRadius: Int = 1,
-    ) =
-        buildString {
-            openTag(16)
-            appendLine()
-            for (index in 0..opacityList.lastIndex) {
-                val currentIndex = (index + step + 1) % opacityList.size
-                val currentOpacity = opacityList[currentIndex]
-                if (currentOpacity == 0.0f) continue
-                drawElement(
-                    colorHex = colorHex,
-                    opacity = currentOpacity,
-                    x = pointList[index].first,
-                    y = pointList[index].second,
-                    width = thickness,
-                    height = length,
-                    rx = cornerRadius,
-                    rotation = rotations[index],
-                )
-            }
-            closeTag()
-            appendLine()
-        }
-
-    private fun StringBuilder.drawElement(
-        colorHex: String,
-        opacity: Float,
-        x: Float,
-        y: Float,
-        width: Int,
-        height: Int,
-        rx: Int,
-        rotation: Int,
-    ) {
-        append("<rect fill=\"${colorHex}\" opacity=\"$opacity\" x=\"$x\" y=\"$y\" width=\"$width\" height=\"$height\" rx=\"$rx\"")
-        if (rotation != 0) append(" transform=\"rotate($rotation $x $y)\"")
-        append("/>\n")
-    }
-
-    internal fun getPlainTextSvgList(colorHex: String, size: Int) = buildList {
-        val scaleFactor = size / 16f
-        for (index in 0..opacityList.lastIndex) {
-            if (size == 16) {
-                add(getSvgPlainTextIcon(index, points, colorHex))
-            } else {
-                add(
-                    getSvgPlainTextIcon(
-                        index,
-                        points.map { it.first * scaleFactor to it.second * scaleFactor },
-                        colorHex,
-                        thickness = (2 * scaleFactor).toInt().coerceAtLeast(1),
-                        length = (4 * scaleFactor).toInt().coerceAtLeast(1),
-                        cornerRadius = (2 * scaleFactor).toInt().coerceAtLeast(1),
-                    ),
-                )
-            }
-        }
-    }
-
-    object Small {
-
-        fun generateRawSvg(colorHex: String) = getPlainTextSvgList(colorHex = colorHex, size = 16)
-    }
-
-    object Big {
-
-        fun generateRawSvg(colorHex: String) =
-            getPlainTextSvgList(colorHex = colorHex, size = 32)
-    }
-}
diff --git a/platform/jewel/ui/src/test/kotlin/org/jetbrains/jewel/PainterHintTest.kt b/platform/jewel/ui/src/test/kotlin/org/jetbrains/jewel/PainterHintTest.kt
index 49d1041b185b0..92be9d1219c1c 100644
--- a/platform/jewel/ui/src/test/kotlin/org/jetbrains/jewel/PainterHintTest.kt
+++ b/platform/jewel/ui/src/test/kotlin/org/jetbrains/jewel/PainterHintTest.kt
@@ -29,22 +29,24 @@ import javax.xml.parsers.DocumentBuilderFactory
 class PainterHintTest : BasicJewelUiTest() {
 
     @Test
-    fun `empty hint should be ignored`() = runComposeTest({
-        OverrideDarkMode(isDark = false) {
-            val provider = rememberResourcePainterProvider("icons/github.svg", PainterHintTest::class.java)
-
-            val painter1 by provider.getPainter()
-            // must be ignored the None and hit cache
-            val painter2 by provider.getPainter(PainterHint.None)
-            // must be ignored the None and hit cache too
-            val painter3 by provider.getPainter(PainterHint.None, PainterHint.None)
-
-            Assert.assertEquals(painter1, painter2)
-            Assert.assertEquals(painter3, painter2)
+    fun `empty hint should be ignored`() =
+        runComposeTest({
+            OverrideDarkMode(isDark = false) {
+                val provider =
+                    rememberResourcePainterProvider("icons/github.svg", PainterHintTest::class.java)
+
+                val painter1 by provider.getPainter()
+                // must be ignored the None and hit cache
+                val painter2 by provider.getPainter(PainterHint.None)
+                // must be ignored the None and hit cache too
+                val painter3 by provider.getPainter(PainterHint.None, PainterHint.None)
+
+                Assert.assertEquals(painter1, painter2)
+                Assert.assertEquals(painter3, painter2)
+            }
+        }) {
+            awaitIdle()
         }
-    }) {
-        awaitIdle()
-    }
 
     private class TestPainterProviderScope(
         density: Density,
@@ -71,13 +73,12 @@ class PainterHintTest : BasicJewelUiTest() {
         fun applyPaletteHints(svg: String, vararg hints: PainterHint): String {
             val doc = documentBuilderFactory.newDocumentBuilder().parse(svg.toByteArray().inputStream())
 
-            hints.filterIsInstance<PainterSvgPatchHint>()
-                .onEach {
-                    with(it) {
-                        if (!canApply()) return@onEach
-                        patch(doc.documentElement)
-                    }
+            hints.filterIsInstance<PainterSvgPatchHint>().onEach {
+                with(it) {
+                    if (!canApply()) return@onEach
+                    patch(doc.documentElement)
                 }
+            }
 
             return doc.writeToString()
         }
@@ -103,15 +104,16 @@ class PainterHintTest : BasicJewelUiTest() {
     @Test
     fun `override painter hint should replace path entirely`() {
         val basePath = "icons/github.svg"
-        val patchedPath = testScope(basePath).applyPathHints(Override(mapOf("icons/github.svg" to "icons/search.svg")))
+        val patchedPath = testScope(basePath)
+            .applyPathHints(Override(mapOf("icons/github.svg" to "icons/search.svg")))
         Assert.assertEquals("icons/search.svg", patchedPath)
     }
 
     @Test
     fun `override painter hint should not replace path when not matched`() {
         val basePath = "icons/github.svg"
-        val patchedPath =
-            testScope(basePath).applyPathHints(Override(mapOf("icons/settings.svg" to "icons/search.svg")))
+        val patchedPath = testScope(basePath)
+            .applyPathHints(Override(mapOf("icons/settings.svg" to "icons/search.svg")))
         Assert.assertEquals(basePath, patchedPath)
     }
 
@@ -184,36 +186,17 @@ class PainterHintTest : BasicJewelUiTest() {
         val patchedPath = testScope(basePath).applyPathHints(Stateful(state.copy(enabled = false)))
         Assert.assertEquals("icons/checkboxDisabled.svg", patchedPath)
 
-        testScope(basePath).applyPathHints(
-            Stateful(
-                state.copy(
-                    enabled = false,
-                    pressed = true,
-                    hovered = true,
-                    focused = true,
-                ),
-            ),
-        )
-            .let {
-                Assert.assertEquals("icons/checkboxDisabled.svg", it)
-            }
+        testScope(basePath)
+            .applyPathHints(Stateful(state.copy(enabled = false, pressed = true, hovered = true, focused = true)))
+            .let { Assert.assertEquals("icons/checkboxDisabled.svg", it) }
     }
 
     @Test
     fun `stateful painter hint disabled state takes higher priority over other states`() {
         val basePath = "icons/checkbox.svg"
         val state = CheckboxState.of(toggleableState = ToggleableState.Off)
-        val patchedPath =
-            testScope(basePath).applyPathHints(
-                Stateful(
-                    state.copy(
-                        enabled = false,
-                        pressed = true,
-                        hovered = true,
-                        focused = true,
-                    ),
-                ),
-            )
+        val patchedPath = testScope(basePath)
+            .applyPathHints(Stateful(state.copy(enabled = false, pressed = true, hovered = true, focused = true)))
         Assert.assertEquals("icons/checkboxDisabled.svg", patchedPath)
     }
 
@@ -229,8 +212,8 @@ class PainterHintTest : BasicJewelUiTest() {
     fun `stateful painter hint focused state takes higher priority over pressed and hovered states`() {
         val basePath = "icons/checkbox.svg"
         val state = CheckboxState.of(toggleableState = ToggleableState.Off)
-        val patchedPath =
-            testScope(basePath).applyPathHints(Stateful(state.copy(pressed = true, hovered = true, focused = true)))
+        val patchedPath = testScope(basePath)
+            .applyPathHints(Stateful(state.copy(pressed = true, hovered = true, focused = true)))
         Assert.assertEquals("icons/checkboxFocused.svg", patchedPath)
     }
 
@@ -246,7 +229,8 @@ class PainterHintTest : BasicJewelUiTest() {
     fun `stateful painter hint pressed state takes higher priority over hovered state`() {
         val basePath = "icons/checkbox.svg"
         val state = CheckboxState.of(toggleableState = ToggleableState.Off)
-        val patchedPath = testScope(basePath).applyPathHints(Stateful(state.copy(pressed = true, hovered = true)))
+        val patchedPath = testScope(basePath)
+            .applyPathHints(Stateful(state.copy(pressed = true, hovered = true)))
         Assert.assertEquals("icons/checkboxPressed.svg", patchedPath)
     }
 
@@ -274,23 +258,27 @@ class PainterHintTest : BasicJewelUiTest() {
 
     @Test
     fun `palette painter hint should patch colors correctly in SVG`() {
-        val baseSvg = """
+        val baseSvg =
+            """
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
                 <rect fill="#000000" height="20" stroke="#000000" stroke-opacity="0.5" width="20" x="2" y="2"/>
                 <rect fill="#00ff00" height="16" width="16" x="4" y="4"/>
                 <rect fill="#123456" height="12" width="12" x="6" y="6"/>
             </svg>
-        """.trimIndent()
-        val patchedSvg = testScope("fake_icon.svg").applyPaletteHints(
-            baseSvg,
-            Palette(
-                mapOf(
-                    Color(0x80000000) to Color(0xFF123456),
-                    Color.Black to Color.White,
-                    Color.Green to Color.Red,
+            """.trimIndent()
+
+        val patchedSvg = testScope("fake_icon.svg")
+            .applyPaletteHints(
+                baseSvg,
+                Palette(
+                    mapOf(
+                        Color(0x80000000) to Color(0xFF123456),
+                        Color.Black to Color.White,
+                        Color.Green to Color.Red,
+                    ),
                 ),
-            ),
-        )
+            )
+
         Assert.assertEquals(
             """
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">