diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c671ba1..f892116 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,10 +1,11 @@
 [versions]
 aapt2 = "8.1.1-10154469"
-android-tools = "31.1.2"
+android-tools = "31.7.0"
 androidx-lifecycle = "2.6.2"
 jackson = "2.13.4"
 kxml2 = "2.3.0"
-layoutlib = "15.0.3"
+layoutlib = "16.1.0-jdk17"
+layoutlib-api = "31.13.2"
 slf4j = "1.7.36"
 okio = "3.4.0"
 protobuf = "3.19.3"
@@ -14,7 +15,7 @@ protobuf = "3.19.3"
 android-tools-build-aapt2-proto = { module = "com.android.tools.build:aapt2-proto", version.ref = "aapt2" }
 android-tools-common = { module = "com.android.tools:common", version.ref = "android-tools" }
 android-tools-external-intellij-core = { module = "com.android.tools.external.com-intellij:intellij-core", version.ref = "android-tools" }
-android-tools-layoutlib-api = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "android-tools" }
+android-tools-layoutlib-api = { module = "com.android.tools.layoutlib:layoutlib-api", version.ref = "layoutlib-api" }
 android-tools-layoutlib = { module = "com.android.tools.layoutlib:layoutlib", version.ref = "layoutlib" }
 android-tools-layoutlib-resources = { module = "com.android.tools.layoutlib:layoutlib-resources", version.ref = "layoutlib" }
 android-tools-layoutlib-runtime = { module = "com.android.tools.layoutlib:layoutlib-runtime", version.ref = "layoutlib" }
diff --git a/src/main/java/com/android/resources/base/BasicResourceItemBase.java b/src/main/java/com/android/resources/base/BasicResourceItemBase.java
index b14aec8..7e6b6d9 100644
--- a/src/main/java/com/android/resources/base/BasicResourceItemBase.java
+++ b/src/main/java/com/android/resources/base/BasicResourceItemBase.java
@@ -129,7 +129,6 @@ public ResourceReference getReferenceToSelf() {
     return asReference();
   }
 
-  @Override
   public void setValue(String value) {
     throw new UnsupportedOperationException();
   }
diff --git a/src/main/kotlin/io/johnsonlee/playground/sandbox/DeviceModel.kt b/src/main/kotlin/io/johnsonlee/playground/sandbox/DeviceModel.kt
index 1e486b8..20c2e1c 100644
--- a/src/main/kotlin/io/johnsonlee/playground/sandbox/DeviceModel.kt
+++ b/src/main/kotlin/io/johnsonlee/playground/sandbox/DeviceModel.kt
@@ -70,7 +70,7 @@ enum class DeviceModel(
         screenWidth = 1080,
         xdpi = 442,
         ydpi = 444,
-        density = Density.DPI_440,
+        density = Density.create(440),
         ratio = ScreenRatio.LONG,
         released = "October 15, 2020"
     )
diff --git a/src/main/kotlin/io/johnsonlee/playground/sandbox/Environment.kt b/src/main/kotlin/io/johnsonlee/playground/sandbox/Environment.kt
index 77ccb21..1dd9237 100644
--- a/src/main/kotlin/io/johnsonlee/playground/sandbox/Environment.kt
+++ b/src/main/kotlin/io/johnsonlee/playground/sandbox/Environment.kt
@@ -67,7 +67,11 @@ data class Environment(
         val platformDataDir = platformDataRoot.resolve("data")
         val fontLocation = platformDataDir.resolve("fonts")
         val nativeLibLocation = platformDataDir.resolve(Environment.nativeLibDir)
-        val icuLocation = platformDataDir.resolve("icu").resolve("icudt70l.dat")
+        val icuDir = platformDataDir.resolve("icu")
+        val icuLocation = icuDir.listFiles { f -> f.name.startsWith("icudt") && f.name.endsWith(".dat") }
+            ?.firstOrNull()
+            ?: icuDir.resolve("icudt76l.dat")
+        val hyphenDataLocation = platformDataDir.resolve("hyphen-data")
         val keyboardLocation = platformDataDir.resolve("keyboards").resolve("Generic.kcm")
         val buildProp = platformDir.resolve("build.prop")
         val attrs = platformDataResDir.resolve("values").resolve("attrs.xml")
@@ -80,6 +84,7 @@ data class Environment(
                     fontLocation,
                     nativeLibLocation.path,
                     icuLocation.path,
+                    hyphenDataLocation.path,
                     arrayOf(keyboardLocation.path),
                     DeviceModel.getEnumMap(attrs),
                     LayoutLogger