diff --git a/core/theme/src/main/java/com/android/developers/androidify/theme/transitions/ColorSplashTransition.kt b/core/theme/src/main/java/com/android/developers/androidify/theme/transitions/ColorSplashTransition.kt
index 1b1817c4..34abf3e6 100644
--- a/core/theme/src/main/java/com/android/developers/androidify/theme/transitions/ColorSplashTransition.kt
+++ b/core/theme/src/main/java/com/android/developers/androidify/theme/transitions/ColorSplashTransition.kt
@@ -53,13 +53,13 @@ import com.android.developers.androidify.theme.components.PrimaryButton
 @OptIn(ExperimentalMaterial3ExpressiveApi::class, ExperimentalSharedTransitionApi::class)
 @Composable
 fun ColorSplashTransitionScreen(
+    modifier: Modifier = Modifier,
     enterSpec: AnimationSpec<DpSize> = MaterialTheme.motionScheme.fastSpatialSpec(),
     exitSpec: AnimationSpec<DpSize> = MaterialTheme.motionScheme.slowSpatialSpec(),
     startPoint: IntOffset = IntOffset(0, 0),
     color: Color = Blue,
     onTransitionMidpoint: () -> Unit = {},
     onTransitionFinished: () -> Unit = {},
-    modifier: Modifier = Modifier,
 ) {
     val sizeAnimation = remember {
         Animatable(DpSize(0.dp, 0.dp), DpSizeToVector)
diff --git a/core/util/src/main/java/com/android/developers/androidify/util/AnimationUtils.kt b/core/util/src/main/java/com/android/developers/androidify/util/AnimationUtils.kt
index 3da21172..ad9f9738 100644
--- a/core/util/src/main/java/com/android/developers/androidify/util/AnimationUtils.kt
+++ b/core/util/src/main/java/com/android/developers/androidify/util/AnimationUtils.kt
@@ -63,8 +63,8 @@ fun Modifier.skipToLookaheadPlacement(scope: SharedTransitionScope): Modifier =
 @Composable
 fun AnimatedTextField(
     textFieldState: TextFieldState,
-    targetEndState: String? = null, // when this value is null, no animation will happen
     modifier: Modifier = Modifier,
+    targetEndState: String? = null, // when this value is null, no animation will happen
     textStyle: TextStyle = TextStyle.Default,
     decorator: TextFieldDecorator? = null,
 ) {
diff --git a/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraGuide.kt b/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraGuide.kt
index 6bd86861..715bcf78 100644
--- a/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraGuide.kt
+++ b/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraGuide.kt
@@ -99,8 +99,8 @@ internal fun CameraGuide(
 
 @Composable
 private fun BoxScope.DecorativeSquiggle(
-    color: Color = MaterialTheme.colorScheme.primary,
     modifier: Modifier = Modifier,
+    color: Color = MaterialTheme.colorScheme.primary,
     alignment: Alignment = Alignment.TopEnd,
 ) {
     val infiniteAnimation = rememberInfiniteTransition()
diff --git a/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraLayout.kt b/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraLayout.kt
index ea29bb15..eadd684b 100644
--- a/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraLayout.kt
+++ b/feature/camera/src/main/java/com/android/developers/androidify/camera/CameraLayout.kt
@@ -50,6 +50,7 @@ import com.android.developers.androidify.util.supportsTabletop
 
 @Composable
 internal fun CameraLayout(
+    modifier: Modifier = Modifier,
     viewfinder: @Composable (modifier: Modifier) -> Unit,
     captureButton: @Composable (modifier: Modifier) -> Unit,
     flipCameraButton: @Composable (modifier: Modifier) -> Unit,
@@ -59,7 +60,6 @@ internal fun CameraLayout(
     rearCameraButton: @Composable (modifier: Modifier) -> Unit,
     supportsTabletop: Boolean = supportsTabletop(),
     isTabletop: Boolean = false,
-    modifier: Modifier = Modifier,
 ) {
     BoxWithConstraints(
         modifier
@@ -255,13 +255,13 @@ private fun TableTopReadyCameraLayout(
             )
         }
         HorizontalControlsLayout(
+            modifier = Modifier
+                .weight(1f)
+                .padding(bottom = 16.dp),
             captureButton,
             flipCameraButton,
             zoomButton,
             rearCameraButton,
-            modifier = Modifier
-                .weight(1f)
-                .padding(bottom = 16.dp),
         )
     }
 }
@@ -296,11 +296,11 @@ private fun TableTopCameraLayout(
         ) {
             guideText(Modifier.align(Alignment.TopCenter))
             HorizontalControlsLayout(
+                modifier = Modifier.align(Alignment.Center),
                 captureButton,
                 flipCameraButton,
                 zoomButton,
                 rearCameraButton,
-                modifier = Modifier.align(Alignment.Center),
             )
         }
     }
@@ -373,6 +373,7 @@ private fun VerticalCameraLayout(
                 )
             }
             HorizontalControlsLayout(
+                modifier = Modifier,
                 captureButton,
                 flipCameraButton,
                 zoomButton,
@@ -384,11 +385,11 @@ private fun VerticalCameraLayout(
 
 @Composable
 private fun HorizontalControlsLayout(
+    modifier: Modifier = Modifier,
     captureButton: @Composable (modifier: Modifier) -> Unit,
     flipCameraButton: (@Composable (modifier: Modifier) -> Unit)?,
     zoomButton: (@Composable (modifier: Modifier) -> Unit)?,
     rearCameraButton: (@Composable (modifier: Modifier) -> Unit)? = null,
-    modifier: Modifier = Modifier,
 ) {
     Column(
         modifier = modifier,
diff --git a/feature/camera/src/main/java/com/android/developers/androidify/camera/RearCameraButton.kt b/feature/camera/src/main/java/com/android/developers/androidify/camera/RearCameraButton.kt
index 17c2a595..e6b8354f 100644
--- a/feature/camera/src/main/java/com/android/developers/androidify/camera/RearCameraButton.kt
+++ b/feature/camera/src/main/java/com/android/developers/androidify/camera/RearCameraButton.kt
@@ -33,9 +33,9 @@ import com.android.developers.androidify.theme.Primary80
 @OptIn(ExperimentalMaterial3ExpressiveApi::class)
 @Composable
 fun RearCameraButton(
+    modifier: Modifier = Modifier,
     isRearCameraEnabled: Boolean = false,
     toggleRearCamera: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     val actionLabel = stringResource(R.string.rear_camera_description)
     val colors = if (isRearCameraEnabled) {
diff --git a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
index 1e954e89..f0e1d924 100644
--- a/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
+++ b/feature/creation/src/main/java/com/android/developers/androidify/creation/CreationScreen.kt
@@ -655,7 +655,7 @@ private fun TextPromptGenerationPreview() {
             TextFieldState(),
             false,
             generatedPrompt = "wearing a red sweater",
-            {},
+            onPromptGenerationPressed = {},
         )
     }
 }
@@ -668,7 +668,7 @@ private fun TextPromptGenerationInProgressPreview() {
             TextFieldState(),
             true,
             generatedPrompt = "wearing a red sweater",
-            {},
+            onPromptGenerationPressed = {},
         )
     }
 }
@@ -677,9 +677,9 @@ private fun TextPromptGenerationInProgressPreview() {
 fun TextPrompt(
     textFieldState: TextFieldState,
     promptGenerationInProgress: Boolean,
+    modifier: Modifier = Modifier,
     generatedPrompt: String? = null,
     onPromptGenerationPressed: () -> Unit,
-    modifier: Modifier = Modifier,
 ) {
     Column(modifier) {
         Row(verticalAlignment = Alignment.CenterVertically) {