diff --git a/app/build.gradle b/app/build.gradle
index e60aaf01c..7b672bf88 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -84,7 +84,7 @@ android {
         compose true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion = "1.3.2"
     }
     // Set both the Java and Kotlin compilers to target Java 8.
     compileOptions {
@@ -152,14 +152,21 @@ dependencies {
     implementation "androidx.datastore:datastore:$datastore_version"
 
     // Compose
-    implementation "androidx.compose.runtime:runtime:$compose_version"
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation "androidx.compose.foundation:foundation:$compose_version"
-    implementation "androidx.compose.foundation:foundation-layout:$compose_version"
-    implementation "androidx.compose.material:material:$compose_version"
-    implementation "androidx.compose.runtime:runtime-livedata:$compose_version"
-    implementation "androidx.compose.ui:ui-tooling:$compose_version"
-    implementation "com.google.android.material:compose-theme-adapter:1.1.14"
+    def composeBom = platform('androidx.compose:compose-bom:2022.12.00')
+    implementation composeBom
+    androidTestImplementation composeBom
+
+    implementation 'androidx.compose.material:material'
+    implementation 'androidx.compose.runtime:runtime-livedata'
+    implementation "com.google.accompanist:accompanist-themeadapter-material:0.28.0"
+
+    // Android Studio Preview support
+    implementation 'androidx.compose.ui:ui-tooling-preview'
+    debugImplementation 'androidx.compose.ui:ui-tooling'
+
+    // UI Tests
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4'
+    debugImplementation 'androidx.compose.ui:ui-test-manifest'
 
     // Osmdroid & Maps
     def osmdroid_version = '6.1.14'
diff --git a/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt
index 7b09ae419..44a53e289 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/DeviceSettingsFragment.kt
@@ -9,7 +9,7 @@ import androidx.fragment.app.activityViewModels
 import com.geeksville.mesh.android.Logging
 import com.geeksville.mesh.databinding.ComposeViewBinding
 import com.geeksville.mesh.model.UIViewModel
-import com.google.android.material.composethemeadapter.MdcTheme
+import com.google.accompanist.themeadapter.material.MdcTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ModuleSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ModuleSettingsFragment.kt
index f06a74f49..2fde0e63f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ModuleSettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ModuleSettingsFragment.kt
@@ -9,7 +9,7 @@ import androidx.fragment.app.activityViewModels
 import com.geeksville.mesh.android.Logging
 import com.geeksville.mesh.databinding.ComposeViewBinding
 import com.geeksville.mesh.model.UIViewModel
-import com.google.android.material.composethemeadapter.MdcTheme
+import com.google.accompanist.themeadapter.material.MdcTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
diff --git a/build.gradle b/build.gradle
index a55677afa..35497da13 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,13 +3,12 @@
 buildscript {
     ext {
         useCrashlytics = false
-        kotlin_version = '1.6.21'
+        kotlin_version = '1.7.20'
         coroutines_version = '1.6.4'
         lifecycle_version = "2.5.1"
         room_version = '2.4.3'
         hilt_version = '2.44.2'
         datastore_version = '1.0.0'
-        compose_version = '1.2.0-rc02'
         protobuf_version = '3.21.12'
     }