diff --git a/Android/src/app/build.gradle.kts b/Android/src/app/build.gradle.kts
index 70b62fb..0f10681 100644
--- a/Android/src/app/build.gradle.kts
+++ b/Android/src/app/build.gradle.kts
@@ -28,12 +28,12 @@ plugins {
 
 android {
   namespace = "com.google.ai.edge.gallery"
-  compileSdk = 35
+  compileSdk = 36
 
   defaultConfig {
     applicationId = "com.google.aiedge.gallery"
     minSdk = 26
-    targetSdk = 35
+    targetSdk = 36
     versionCode = 1
     versionName = "1.0.4"
 
@@ -51,11 +51,11 @@ android {
     }
   }
   compileOptions {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
   }
   kotlinOptions {
-    jvmTarget = "11"
+    jvmTarget = "17"
     freeCompilerArgs += "-Xcontext-receivers"
   }
   buildFeatures {
@@ -108,9 +108,10 @@ dependencies {
   androidTestImplementation(libs.hilt.android.testing)
   debugImplementation(libs.androidx.ui.tooling)
   debugImplementation(libs.androidx.ui.test.manifest)
+  implementation(libs.material)
 }
 
 protobuf {
   protoc { artifact = "com.google.protobuf:protoc:4.26.1" }
   generateProtoTasks { all().forEach { it.plugins { create("java") { option("lite") } } } }
-}
+}
\ No newline at end of file
diff --git a/Android/src/app/src/main/res/values/themes.xml b/Android/src/app/src/main/res/values/themes.xml
index beeda9c..90316b9 100644
--- a/Android/src/app/src/main/res/values/themes.xml
+++ b/Android/src/app/src/main/res/values/themes.xml
@@ -16,7 +16,7 @@
 -->
 
 <resources>
-    <style name="Theme.Gallery" parent="android:Theme.Material.Light.NoActionBar" />
+    <style name="Theme.Gallery" parent="Theme.Material3Expressive.Light.NoActionBar" />
     <style name="Theme.Gallery.SplashScreen" parent="Theme.SplashScreen">
         <item name="windowSplashScreenBackground">#2A2A34</item>
         <item name="postSplashScreenTheme">@style/Theme.Gallery</item>
diff --git a/Android/src/gradle/libs.versions.toml b/Android/src/gradle/libs.versions.toml
index 10dd2e5..73a8618 100644
--- a/Android/src/gradle/libs.versions.toml
+++ b/Android/src/gradle/libs.versions.toml
@@ -1,21 +1,22 @@
 [versions]
-agp = "8.8.2"
-kotlin = "2.1.0"
-coreKtx = "1.15.0"
+agp = "8.10.0"
+kotlin = "2.1.21"
+coreKtx = "1.16.0"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
-lifecycleRuntimeKtx = "2.8.7"
+lifecycleRuntimeKtx = "2.9.0"
 activityCompose = "1.10.1"
-composeBom = "2025.05.00"
-navigation = "2.8.9"
-serializationPlugin = "2.0.21"
-serializationJson = "1.7.3"
+composeBom = "2025.05.01"
+material = "1.14.0-alpha01"
+navigation = "2.9.0"
+serializationPlugin = "2.1.21"
+serializationJson = "1.8.1"
 materialIconExtended = "1.7.8"
-workRuntime = "2.10.0"
+workRuntime = "2.10.1"
 dataStore = "1.1.7"
-gson = "2.12.1"
-lifecycleProcess = "2.8.7"
+gson = "2.13.1"
+lifecycleProcess = "2.9.0"
 protobuf = "0.9.5"
 protobufJavaLite = "4.26.1"
 #noinspection GradleDependency
@@ -28,7 +29,7 @@ playServicesTfliteJava = "16.4.0"
 playServicesTfliteGpu= "16.4.0"
 cameraX = "1.4.2"
 netOpenidAppauth = "0.11.1"
-splashscreen = "1.2.0-beta01"
+splashscreen = "1.2.0-beta02"
 hilt = "2.56.2"
 hiltNavigation = "1.2.0"
 googleService = "4.4.3"
@@ -51,6 +52,7 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-compose-navigation = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
 kotlinx-serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serializationJson" }
+material = { module = "com.google.android.material:material", version.ref = "material" }
 material-icon-extended = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "materialIconExtended" }
 androidx-work-runtime = { group = "androidx.work", name = "work-runtime-ktx", version.ref = "workRuntime" }
 androidx-datastore = { group = "androidx.datastore", name = "datastore", version.ref = "dataStore" }
diff --git a/Android/src/gradle/wrapper/gradle-wrapper.properties b/Android/src/gradle/wrapper/gradle-wrapper.properties
index a1d407e..53fe505 100644
--- a/Android/src/gradle/wrapper/gradle-wrapper.properties
+++ b/Android/src/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Mar 02 09:29:13 PST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/model_allowlist.json b/model_allowlist.json
index 4d205f1..c59e37b 100644
--- a/model_allowlist.json
+++ b/model_allowlist.json
@@ -65,7 +65,39 @@
         "topK": 40,
         "topP": 0.95,
         "temperature": 1.0,
-        "maxTokens": 1024,
+        "maxTokens": 1280,
+        "accelerators": "gpu,cpu"
+      },
+      "taskTypes": ["llm_chat", "llm_prompt_lab"]
+    },
+    {
+      "name": "Hammer2.1-1.5b q8",
+      "modelId": "litert-community/Hammer2.1-1.5b",
+      "modelFile": "Hammer2.1-1.5b_multi-prefill-seq_q8_ekv1280.task",
+      "description": "Hammer 2.1 model with strong function calling capability. These models are based on the Qwen 2.5 coder series and utilize function masking techniques and other advanced technologies. Hammer 2.1 series bring significant enhancements, while still maintaining the basic functionality of Hammer 2.0's Single-Turn interaction and further strengthening other capabilities.",
+      "sizeInBytes": 1625493432,
+      "version": "4e4a594e06ead9ad93e5a09a60eeea932561136cef0edd572d258144b42de6a2",
+      "defaultConfig": {
+        "topK": 40,
+        "topP": 0.95,
+        "temperature": 0.0,
+        "maxTokens": 1280,
+        "accelerators": "gpu,cpu"
+      },
+      "taskTypes": ["llm_chat", "llm_prompt_lab"]
+    },
+    {
+      "name": "Phi-4-mini-instruct q8",
+      "modelId": "litert-community/Phi-4-mini-instruct",
+      "modelFile": "Phi-4-mini-instruct_multi-prefill-seq_q8_ekv1280.task",
+      "description": "Phi-4-mini-instruct is a lightweight open model built upon synthetic data and filtered publicly available websites - with a focus on high-quality, reasoning dense data. The model belongs to the Phi-4 model family and supports 128K token context length.",
+      "sizeInBytes": 3944275882,
+      "version": "e494f9e827fbf47ac271d67dde77308f4a7683ad1ff630ab5bec926f17573b5f",
+      "defaultConfig": {
+        "topK": 40,
+        "topP": 0.95,
+        "temperature": 0.0,
+        "maxTokens": 1280,
         "accelerators": "cpu"
       },
       "taskTypes": ["llm_chat", "llm_prompt_lab"]