diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Colors.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Colors.kt
index 0de59a3..b60ee00 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Colors.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Colors.kt
@@ -462,6 +462,6 @@ internal fun Colors.fromDescriptor(value: ColorsDescriptor) = when (value) {
  * @see Colors.fromDescriptor
  * @return [Color]
  */
-@Composable
 @ReadOnlyComposable
+@Composable
 internal fun ColorsDescriptor.toColor() = LocalColors.current.fromDescriptor(this)
\ No newline at end of file
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/FlexiTheme.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/FlexiTheme.kt
index 6c3cd2d..3ab6fcf 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/FlexiTheme.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/FlexiTheme.kt
@@ -84,8 +84,8 @@ object FlexiTheme {
      * @return [Colors]
      */
     val colors: Colors
-        @Composable
         @ReadOnlyComposable
+        @Composable
         get() = LocalColors.current
 
     /**
@@ -93,8 +93,8 @@ object FlexiTheme {
      * @return [Shapes]
      */
     val shapes: Shapes
-        @Composable
         @ReadOnlyComposable
+        @Composable
         get() = LocalShapes.current
 
     /**
@@ -102,8 +102,8 @@ object FlexiTheme {
      * @return [Typography]
      */
     val typography: Typography
-        @Composable
         @ReadOnlyComposable
+        @Composable
         get() = LocalTypography.current
 
     /**
@@ -111,8 +111,8 @@ object FlexiTheme {
      * @return [Sizes]
      */
     val sizes: Sizes
-        @Composable
         @ReadOnlyComposable
+        @Composable
         get() = LocalSizes.current
 }
 
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Shapes.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Shapes.kt
index 4f6b550..3f29bab 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Shapes.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Shapes.kt
@@ -79,6 +79,6 @@ internal fun Shapes.fromDescriptor(value: ShapesDescriptor): Shape = when (value
  * @see Shapes.fromDescriptor
  * @return [Shape]
  */
-@Composable
 @ReadOnlyComposable
+@Composable
 internal fun ShapesDescriptor.toShape(): Shape = LocalShapes.current.fromDescriptor(this)
\ No newline at end of file
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Sizes.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Sizes.kt
index 6f6677c..3c85891 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Sizes.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Sizes.kt
@@ -108,8 +108,8 @@ internal interface PaddingDescriptor {
     val bottom: SizesDescriptor?
     val end: SizesDescriptor?
 
-    @Composable
     @ReadOnlyComposable
+    @Composable
     fun toPadding(): ComponentPadding
 }
 
@@ -121,8 +121,8 @@ private class PaddingDescriptorImpl(
     override val end: SizesDescriptor?
 ) : PaddingDescriptor {
 
-    @Composable
     @ReadOnlyComposable
+    @Composable
     override fun toPadding() = ComponentPadding(
         start = start?.toDp() ?: 0.dp,
         top = top?.toDp() ?: 0.dp,
@@ -174,8 +174,8 @@ internal fun Sizes.fromDescriptor(value: SizesDescriptor) = when (value) {
  * @see Sizes.fromDescriptor
  * @return [Dp]
  */
-@Composable
 @ReadOnlyComposable
+@Composable
 internal fun SizesDescriptor.toDp() = LocalSizes.current.fromDescriptor(this)
 
 /**
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Typography.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Typography.kt
index 6718ca5..60cd28b 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Typography.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/Typography.kt
@@ -105,6 +105,6 @@ internal fun Typography.fromDescriptor(value: TypographyDescriptor) = when (valu
  * @see Typography.fromDescriptor
  * @return [TextStyle]
  */
-@Composable
 @ReadOnlyComposable
+@Composable
 internal fun TypographyDescriptor.toTextStyle() = LocalTypography.current.fromDescriptor(this)
\ No newline at end of file
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
index 0fd805c..bbfaeb8 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Scaffold.kt
@@ -168,8 +168,8 @@ object ScaffoldDefaults {
      * @return [ComponentPadding]
      */
     val padding: ComponentPadding
-        @Composable
         @ReadOnlyComposable
+        @Composable
         get() = SurfaceDefaults.padding
 
     /**
diff --git a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
index 7fe5b11..d81b93b 100644
--- a/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
+++ b/flexiui-core/src/commonMain/kotlin/com/highcapable/flexiui/component/Surface.kt
@@ -121,8 +121,8 @@ object SurfaceDefaults {
      * @return [ComponentPadding]
      */
     val padding: ComponentPadding
-        @Composable
         @ReadOnlyComposable
+        @Composable
         get() = SurfaceProperties.Padding.toPadding()
 }