diff --git a/.cicdtemplate/.github/workflows/deploy_staging_and_production_to_firebase_app_distribution.yml b/.cicdtemplate/.github/workflows/deploy_staging_and_production_to_firebase_app_distribution.yml
index baaffefe9..a0953635c 100644
--- a/.cicdtemplate/.github/workflows/deploy_staging_and_production_to_firebase_app_distribution.yml
+++ b/.cicdtemplate/.github/workflows/deploy_staging_and_production_to_firebase_app_distribution.yml
@@ -14,7 +14,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -42,7 +42,7 @@ jobs:
         run: ./gradlew detekt
 
       - name: Archive Detekt reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReports
           path: build/reports/detekt/
@@ -51,7 +51,7 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CodeCoverageReports
           path: app/build/reports/kover/
diff --git a/.cicdtemplate/.github/workflows/review_pull_request.yml b/.cicdtemplate/.github/workflows/review_pull_request.yml
index f55242a58..ad4b6c135 100644
--- a/.cicdtemplate/.github/workflows/review_pull_request.yml
+++ b/.cicdtemplate/.github/workflows/review_pull_request.yml
@@ -11,7 +11,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
diff --git a/.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml b/.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml
index 7ebf8ec9a..e30955ce0 100644
--- a/.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml
+++ b/.cicdtemplate/.github/workflows/run_detekt_and_unit_tests.yml
@@ -17,7 +17,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -45,7 +45,7 @@ jobs:
         run: ./gradlew detekt
 
       - name: Archive Detekt reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReports
           path: build/reports/detekt/
@@ -54,7 +54,7 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: CodeCoverageReports
diff --git a/.github/workflows/review_pull_request.yml b/.github/workflows/review_pull_request.yml
index 7e195f546..fe2bd09cc 100644
--- a/.github/workflows/review_pull_request.yml
+++ b/.github/workflows/review_pull_request.yml
@@ -12,7 +12,7 @@ jobs:
     environment: template-compose
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -47,6 +47,12 @@ jobs:
 
       # template-compose
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Run Detekt on template-compose
         working-directory: ./template-compose
         run: ./gradlew detekt
diff --git a/.github/workflows/run_detekt_and_unit_tests.yml b/.github/workflows/run_detekt_and_unit_tests.yml
index 29be22547..73e2ec814 100644
--- a/.github/workflows/run_detekt_and_unit_tests.yml
+++ b/.github/workflows/run_detekt_and_unit_tests.yml
@@ -8,12 +8,6 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
-      - name: Set up JDK 11
-        uses: actions/setup-java@v2
-        with:
-          distribution: 'temurin'
-          java-version: '11'
-
       - name: Checkout source code
         uses: actions/checkout@v2.3.2
 
@@ -28,36 +22,20 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      # template-xml
-
-      - name: Run Detekt on template-xml
-        working-directory: ./template-xml
-        run: ./gradlew detekt
-
-      - name: Archive Detekt reports on template-xml
-        uses: actions/upload-artifact@v2
-        with:
-          name: DetektReportsTemplateXML
-          path: template-xml/build/reports/detekt/
-
-      - name: Run unit tests with Kover on template-xml
-        working-directory: ./template-xml
-        run: ./gradlew koverHtmlReport
+      # template-compose
 
-      - name: Archive code coverage reports on template-xml
-        uses: actions/upload-artifact@v2
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          name: CodeCoverageReportsTemplateXML
-          path: template-xml/app/build/reports/kover/
-
-      # template-compose
+          distribution: 'temurin'
+          java-version: '17'
 
       - name: Run Detekt on template-compose
         working-directory: ./template-compose
         run: ./gradlew detekt
 
       - name: Archive Detekt reports on template-compose
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReportsTemplateCompose
           path: template-compose/build/reports/detekt/
@@ -67,11 +45,39 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports on template-compose
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CodeCoverageReportsTemplateCompose
           path: template-compose/app/build/reports/kover/
 
+      # template-xml
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '11'
+
+      - name: Run Detekt on template-xml
+        working-directory: ./template-xml
+        run: ./gradlew detekt
+
+      - name: Archive Detekt reports on template-xml
+        uses: actions/upload-artifact@v3
+        with:
+          name: DetektReportsTemplateXML
+          path: template-xml/build/reports/detekt/
+
+      - name: Run unit tests with Kover on template-xml
+        working-directory: ./template-xml
+        run: ./gradlew koverHtmlReport
+
+      - name: Archive code coverage reports on template-xml
+        uses: actions/upload-artifact@v3
+        with:
+          name: CodeCoverageReportsTemplateXML
+          path: template-xml/app/build/reports/kover/
+
       # sample-xml
 
       - name: Run Detekt on sample-xml
@@ -79,7 +85,7 @@ jobs:
         run: ./gradlew detekt
 
       - name: Archive Detekt reports on sample-xml
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReportsTemplateXML
           path: sample-xml/build/reports/detekt/
@@ -89,7 +95,7 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports on sample-xml
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CodeCoverageReportsTemplateXML
           path: sample-xml/app/build/reports/kover/
@@ -101,7 +107,7 @@ jobs:
         run: ./gradlew detekt
 
       - name: Archive Detekt reports on sample-compose
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: DetektReportsTemplateCompose
           path: sample-compose/build/reports/detekt/
@@ -111,7 +117,7 @@ jobs:
         run: ./gradlew koverHtmlReport
 
       - name: Archive code coverage reports on sample-compose
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: CodeCoverageReportsTemplateCompose
           path: sample-compose/app/build/reports/kover/
diff --git a/.github/workflows/verify_newproject_script.yml b/.github/workflows/verify_newproject_script.yml
index 509b65270..5443e55f7 100644
--- a/.github/workflows/verify_newproject_script.yml
+++ b/.github/workflows/verify_newproject_script.yml
@@ -12,7 +12,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - name: Set up JDK 11
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
           java-version: '11'
@@ -44,6 +44,12 @@ jobs:
         working-directory: scripts
         run: kscript new_project.kts package-name=co.myxmlproject.example app-name="My XML Project" template=xml
 
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+
       - name: Verify generating new project from template-compose
         working-directory: scripts
         run: kscript new_project.kts package-name=co.mycomposeproject.example app-name="My Compose Project" template=compose
diff --git a/scripts/new_project.kts b/scripts/new_project.kts
index 299496412..4fa3125d6 100644
--- a/scripts/new_project.kts
+++ b/scripts/new_project.kts
@@ -388,6 +388,16 @@ object NewProject {
                     newValue = appName
                 )
             }
+        File(projectPath)
+            .walk()
+            .filter { it.name == "settings.gradle.kts" }
+            .forEach { filePath ->
+                rename(
+                    sourcePath = filePath.toString(),
+                    oldValue = templateAppName,
+                    newValue = appName
+                )
+            }
     }
 
     private fun rename(sourcePath: String, oldValue: String, newValue: String) {
diff --git a/template-compose/app/build.gradle.kts b/template-compose/app/build.gradle.kts
index 7c5ad7765..ed899e49b 100644
--- a/template-compose/app/build.gradle.kts
+++ b/template-compose/app/build.gradle.kts
@@ -1,3 +1,5 @@
+import org.jetbrains.kotlin.konan.properties.loadProperties
+
 plugins {
     id(Plugins.ANDROID_APPLICATION)
     id(Plugins.KOTLIN_ANDROID)
@@ -7,7 +9,7 @@ plugins {
     id(Plugins.KOVER)
 }
 
-val keystoreProperties = rootDir.loadGradleProperties("signing.properties")
+val signingProperties = loadProperties("$rootDir/signing.properties")
 val getVersionCode: () -> Int = {
     if (project.hasProperty("versionCode")) {
         (project.property("versionCode") as String).toInt()
@@ -17,13 +19,29 @@ val getVersionCode: () -> Int = {
 }
 
 android {
+    namespace = "co.nimblehq.template.compose"
+    compileSdk = Versions.ANDROID_COMPILE_SDK
+
+    defaultConfig {
+        applicationId = "co.nimblehq.template.compose"
+        minSdk = Versions.ANDROID_MIN_SDK
+        targetSdk = Versions.ANDROID_TARGET_SDK
+        versionCode = getVersionCode()
+        versionName = Versions.ANDROID_VERSION_NAME
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        vectorDrawables {
+            useSupportLibrary = true
+        }
+    }
+
     signingConfigs {
         create(BuildTypes.RELEASE) {
             // Remember to edit signing.properties to have the correct info for release build.
             storeFile = file("../config/release.keystore")
-            storePassword = keystoreProperties.getProperty("KEYSTORE_PASSWORD") as String
-            keyPassword = keystoreProperties.getProperty("KEY_PASSWORD") as String
-            keyAlias = keystoreProperties.getProperty("KEY_ALIAS") as String
+            storePassword = signingProperties.getProperty("KEYSTORE_PASSWORD") as String
+            keyPassword = signingProperties.getProperty("KEY_PASSWORD") as String
+            keyAlias = signingProperties.getProperty("KEY_ALIAS") as String
         }
 
         getByName(BuildTypes.DEBUG) {
@@ -34,18 +52,8 @@ android {
         }
     }
 
-    compileSdk = Versions.ANDROID_COMPILE_SDK
-    defaultConfig {
-        applicationId = "co.nimblehq.template.compose"
-        minSdk = Versions.ANDROID_MIN_SDK
-        targetSdk = Versions.ANDROID_TARGET_SDK
-        versionCode = getVersionCode()
-        versionName = Versions.ANDROID_VERSION_NAME
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-    }
-
     buildTypes {
-        getByName(BuildTypes.RELEASE) {
+        release {
             isMinifyEnabled = true
             isDebuggable = false
             isShrinkResources = true
@@ -54,7 +62,7 @@ android {
             buildConfigField("String", "BASE_API_URL", "\"https://jsonplaceholder.typicode.com/\"")
         }
 
-        getByName(BuildTypes.DEBUG) {
+        debug {
             // For quickly testing build with proguard, enable this
             isMinifyEnabled = false
             signingConfig = signingConfigs[BuildTypes.DEBUG]
@@ -76,20 +84,27 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
+    }
+
+    buildFeatures {
+        compose = true
+        buildConfig = true
     }
 
     composeOptions {
         kotlinCompilerExtensionVersion = Versions.COMPOSE_COMPILER
     }
 
-    buildFeatures {
-        compose = true
+    packaging {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
     }
 
     lint {
diff --git a/template-compose/app/src/debug/AndroidManifest.xml b/template-compose/app/src/debug/AndroidManifest.xml
index c10e37a53..95ab02920 100644
--- a/template-compose/app/src/debug/AndroidManifest.xml
+++ b/template-compose/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.template.compose">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--For Chucker in debug build only-->
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
diff --git a/template-compose/app/src/main/AndroidManifest.xml b/template-compose/app/src/main/AndroidManifest.xml
index 1bae8bf99..cfb421214 100644
--- a/template-compose/app/src/main/AndroidManifest.xml
+++ b/template-compose/app/src/main/AndroidManifest.xml
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="co.nimblehq.template.compose">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:name=".MainApplication"
         android:allowBackup="true"
+        android:dataExtractionRules="@xml/data_extraction_rules"
+        android:fullBackupContent="@xml/backup_rules"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/AppTheme"
+        tools:targetApi="31">
 
-        <activity android:name="co.nimblehq.template.compose.ui.screens.MainActivity" android:exported="true">
+        <activity
+            android:name=".ui.screens.MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/template-compose/app/src/main/res/drawable/ic_launcher_background.xml b/template-compose/app/src/main/res/drawable/ic_launcher_background.xml
index a339898ee..07d5da9cb 100644
--- a/template-compose/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/template-compose/app/src/main/res/drawable/ic_launcher_background.xml
@@ -5,7 +5,7 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#26A69A"
+        android:fillColor="#3DDC84"
         android:pathData="M0,0h108v108h-108z" />
     <path
         android:fillColor="#00000000"
diff --git a/template-compose/app/src/main/res/drawable/ic_launcher_foreground.xml b/template-compose/app/src/main/res/drawable/ic_launcher_foreground.xml
index 1f6bb2906..7706ab9e6 100644
--- a/template-compose/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/template-compose/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -4,17 +4,13 @@
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000">
+    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
         <aapt:attr name="android:fillColor">
             <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
+                android:endX="85.84757"
+                android:endY="92.4963"
+                android:startX="42.9492"
+                android:startY="49.59793"
                 android:type="linear">
                 <item
                     android:color="#44000000"
@@ -28,7 +24,7 @@
     <path
         android:fillColor="#FFFFFF"
         android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
+        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
         android:strokeWidth="1"
         android:strokeColor="#00000000" />
 </vector>
diff --git a/template-compose/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/template-compose/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 6b78462d6..b3e26b4c6 100644
--- a/template-compose/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/template-compose/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/template-compose/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/template-compose/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 6b78462d6..b3e26b4c6 100644
--- a/template-compose/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/template-compose/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -2,4 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background" />
     <foreground android:drawable="@drawable/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_foreground" />
 </adaptive-icon>
diff --git a/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher.png b/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index a2f590828..000000000
Binary files a/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 000000000..c209e78ec
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 1b5239980..000000000
Binary files a/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..b2dfe3d1b
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher.png b/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index ff10afd6e..000000000
Binary files a/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 000000000..4f0f1d64e
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 115a4c768..000000000
Binary files a/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..62b611da0
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index dcd3cd808..000000000
Binary files a/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 000000000..948a3070f
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 459ca609d..000000000
Binary files a/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..1b9a6956b
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 8ca12fe02..000000000
Binary files a/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..28d4b77f9
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 8e19b410a..000000000
Binary files a/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9287f5083
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index b824ebdd4..000000000
Binary files a/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 000000000..aa7d6427e
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 4c19a13c2..000000000
Binary files a/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
new file mode 100644
index 000000000..9126ae37c
Binary files /dev/null and b/template-compose/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/template-compose/app/src/main/res/values/styles.xml b/template-compose/app/src/main/res/values/styles.xml
deleted file mode 100644
index 7f0dc7802..000000000
--- a/template-compose/app/src/main/res/values/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar" />
-</resources>
diff --git a/template-compose/app/src/main/res/values/themes.xml b/template-compose/app/src/main/res/values/themes.xml
new file mode 100644
index 000000000..7e1674a3f
--- /dev/null
+++ b/template-compose/app/src/main/res/values/themes.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="android:Theme.Material.Light.NoActionBar" />
+</resources>
diff --git a/template-compose/app/src/main/res/xml/backup_rules.xml b/template-compose/app/src/main/res/xml/backup_rules.xml
new file mode 100644
index 000000000..148c18b65
--- /dev/null
+++ b/template-compose/app/src/main/res/xml/backup_rules.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample backup rules file; uncomment and customize as necessary.
+   See https://developer.android.com/guide/topics/data/autobackup
+   for details.
+   Note: This file is ignored for devices older that API 31
+   See https://developer.android.com/about/versions/12/backup-restore
+-->
+<full-backup-content>
+    <!--
+   <include domain="sharedpref" path="."/>
+   <exclude domain="sharedpref" path="device.xml"/>
+-->
+</full-backup-content>
diff --git a/template-compose/app/src/main/res/xml/data_extraction_rules.xml b/template-compose/app/src/main/res/xml/data_extraction_rules.xml
new file mode 100644
index 000000000..0c4f95cab
--- /dev/null
+++ b/template-compose/app/src/main/res/xml/data_extraction_rules.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+   Sample data extraction rules file; uncomment and customize as necessary.
+   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
+   for details.
+-->
+<data-extraction-rules>
+    <cloud-backup>
+        <!-- TODO: Use <include> and <exclude> to control what is backed up.
+        <include .../>
+        <exclude .../>
+        -->
+    </cloud-backup>
+    <!--
+    <device-transfer>
+        <include .../>
+        <exclude .../>
+    </device-transfer>
+    -->
+</data-extraction-rules>
diff --git a/template-compose/build.gradle.kts b/template-compose/build.gradle.kts
index f990ea546..9319cd7ef 100644
--- a/template-compose/build.gradle.kts
+++ b/template-compose/build.gradle.kts
@@ -1,28 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath("com.android.tools.build:gradle:${Versions.GRADLE}")
-        classpath("com.google.dagger:hilt-android-gradle-plugin:${Versions.HILT}")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.KOTLIN}")
-    }
-}
-
 plugins {
-    id(Plugins.DETEKT).version(Versions.DETEKT)
-    id(Plugins.KOVER).version(Versions.KOVER)
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-        maven { url = uri("https://www.jitpack.io") }
-    }
+    id(Plugins.ANDROID_APPLICATION) version Versions.GRADLE apply false
+    id(Plugins.ANDROID_LIBRARY) version Versions.GRADLE apply false
+    id(Plugins.KOTLIN_JVM) version Versions.KOTLIN apply false
+    id(Plugins.KOTLIN_ANDROID) version Versions.KOTLIN apply false
+    id(Plugins.HILT_ANDROID) version Versions.HILT apply false
+    id(Plugins.DETEKT) version Versions.DETEKT
+    id(Plugins.KOVER) version Versions.KOVER
 }
 
 tasks.register("clean", Delete::class) {
@@ -51,7 +35,7 @@ detekt {
 }
 
 tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
-    jvmTarget = JavaVersion.VERSION_11.toString()
+    jvmTarget = JavaVersion.VERSION_17.toString()
     reports {
         xml {
             outputLocation.set(file("build/reports/detekt/detekt.xml"))
diff --git a/template-compose/buildSrc/src/main/java/FileExt.kt b/template-compose/buildSrc/src/main/java/FileExt.kt
deleted file mode 100644
index e52f52d16..000000000
--- a/template-compose/buildSrc/src/main/java/FileExt.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-import java.io.File
-import java.util.*
-
-fun File.loadGradleProperties(fileName: String): Properties {
-    val properties = Properties()
-    val signingProperties = File(this, fileName)
-
-    if (signingProperties.isFile) {
-        properties.load(signingProperties.inputStream())
-    }
-    return properties
-}
diff --git a/template-compose/buildSrc/src/main/java/Plugins.kt b/template-compose/buildSrc/src/main/java/Plugins.kt
index d7983c976..d22a2cf30 100644
--- a/template-compose/buildSrc/src/main/java/Plugins.kt
+++ b/template-compose/buildSrc/src/main/java/Plugins.kt
@@ -7,8 +7,8 @@ object Plugins {
 
     const val HILT_ANDROID = "com.google.dagger.hilt.android"
 
-    const val KOTLIN = "kotlin" // or a longer alias "org.jetbrains.kotlin.jvm"
-    const val KOTLIN_ANDROID = "kotlin-android" // or a longer alias "org.jetbrains.kotlin.android"
+    const val KOTLIN_JVM = "org.jetbrains.kotlin.jvm"
+    const val KOTLIN_ANDROID = "org.jetbrains.kotlin.android"
     const val KOTLIN_KAPT = "kotlin-kapt"
     const val KOTLIN_PARCELIZE = "kotlin-parcelize"
 
diff --git a/template-compose/buildSrc/src/main/java/Versions.kt b/template-compose/buildSrc/src/main/java/Versions.kt
index b227a5ba8..04e5458ab 100644
--- a/template-compose/buildSrc/src/main/java/Versions.kt
+++ b/template-compose/buildSrc/src/main/java/Versions.kt
@@ -1,7 +1,7 @@
 object Versions {
-    const val ANDROID_COMPILE_SDK = 33
+    const val ANDROID_COMPILE_SDK = 34
     const val ANDROID_MIN_SDK = 24
-    const val ANDROID_TARGET_SDK = 33
+    const val ANDROID_TARGET_SDK = 34
 
     const val ANDROID_VERSION_CODE = 1
     const val ANDROID_VERSION_NAME = "1.0.0"
@@ -10,8 +10,8 @@ object Versions {
 
     const val CHUCKER = "3.5.2"
     const val COMMON_KTX = "0.1.1"
-    const val COMPOSE_BOM = "2023.04.01"
-    const val COMPOSE_COMPILER = "1.4.7"
+    const val COMPOSE_BOM = "2023.09.02"
+    const val COMPOSE_COMPILER = "1.5.3"
     const val COMPOSE_NAVIGATION = "2.5.3"
     const val CORE = "1.4.0"
     const val CORE_KTX = "1.10.1"
@@ -19,16 +19,16 @@ object Versions {
     const val DATASTORE_PREFERENCES = "1.0.0"
     const val DETEKT = "1.21.0"
 
-    const val GRADLE = "7.4.2"
+    const val GRADLE = "8.1.2"
 
-    const val HILT = "2.44"
+    const val HILT = "2.48"
     const val HILT_NAVIGATION_COMPOSE = "1.0.0"
 
     const val JAVAX_INJECT = "1"
     const val JUNIT = "4.13.2"
 
     const val KOTEST = "5.6.2"
-    const val KOTLIN = "1.8.21"
+    const val KOTLIN = "1.9.10"
     const val KOTLIN_COROUTINES = "1.7.1"
     const val KOVER = "0.7.3"
 
@@ -37,7 +37,7 @@ object Versions {
     const val MOCKK = "1.13.5"
     const val MOSHI = "1.12.0"
 
-    const val OKHTTP = "4.9.1"
+    const val OKHTTP = "4.11.0"
 
     const val RETROFIT = "2.9.0"
     const val ROBOLECTRIC = "4.10.2"
diff --git a/template-compose/data/build.gradle.kts b/template-compose/data/build.gradle.kts
index 20161b9c4..417bc2178 100644
--- a/template-compose/data/build.gradle.kts
+++ b/template-compose/data/build.gradle.kts
@@ -5,38 +5,39 @@ plugins {
 }
 
 android {
+    namespace = "co.nimblehq.template.compose.data"
     compileSdk = Versions.ANDROID_COMPILE_SDK
+
     defaultConfig {
         minSdk = Versions.ANDROID_MIN_SDK
-        targetSdk = Versions.ANDROID_TARGET_SDK
 
         consumerProguardFiles("consumer-rules.pro")
     }
 
     buildTypes {
-        getByName(BuildTypes.RELEASE) {
+        release {
             isMinifyEnabled = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
             )
         }
 
-        getByName(BuildTypes.DEBUG) {
+        debug {
             isMinifyEnabled = false
         }
     }
 
     compileOptions {
-        targetCompatibility = JavaVersion.VERSION_11
-        sourceCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
-    lintOptions {
-        isCheckDependencies = true
+    lint {
+        checkDependencies = true
         xmlReport = true
         xmlOutput = file("build/reports/lint/lint-result.xml")
     }
diff --git a/template-compose/data/consumer-rules.pro b/template-compose/data/consumer-rules.pro
new file mode 100644
index 000000000..e69de29bb
diff --git a/template-compose/data/proguard-rules.pro b/template-compose/data/proguard-rules.pro
index 2f9dc5a47..ba9d33b41 100644
--- a/template-compose/data/proguard-rules.pro
+++ b/template-compose/data/proguard-rules.pro
@@ -19,3 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+# Suppress: Missing classes detected while running R8 https://qiita.com/Nabe1216/items/05c9981fd12eb2fa1df0
+-dontwarn java.lang.invoke.StringConcatFactory
diff --git a/template-compose/data/src/main/AndroidManifest.xml b/template-compose/data/src/main/AndroidManifest.xml
index 1e37650d4..8072ee00d 100644
--- a/template-compose/data/src/main/AndroidManifest.xml
+++ b/template-compose/data/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="co.nimblehq.template.compose.data" />
+<manifest />
diff --git a/template-compose/domain/build.gradle.kts b/template-compose/domain/build.gradle.kts
index 858ef2202..723baa6fb 100644
--- a/template-compose/domain/build.gradle.kts
+++ b/template-compose/domain/build.gradle.kts
@@ -1,12 +1,12 @@
 plugins {
     id(Plugins.JAVA_LIBRARY)
-    id(Plugins.KOTLIN)
+    id(Plugins.KOTLIN_JVM)
     id(Plugins.KOVER)
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_11
-    targetCompatibility = JavaVersion.VERSION_11
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 dependencies {
diff --git a/template-compose/gradle.properties b/template-compose/gradle.properties
index 0115e9df3..2cbd6d19d 100644
--- a/template-compose/gradle.properties
+++ b/template-compose/gradle.properties
@@ -6,12 +6,18 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx1536m
+org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableJetifier=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app's APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
-#https://kotlinlang.org/docs/kapt.html#running-kapt-tasks-in-parallel
-kapt.use.worker.api=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
+# Enables namespacing of each library's R class so that its R class includes only the
+# resources declared in the library itself and none from the library's dependencies,
+# thereby reducing the size of the R class for that library
+android.nonTransitiveRClass=true
diff --git a/template-compose/gradle/wrapper/gradle-wrapper.jar b/template-compose/gradle/wrapper/gradle-wrapper.jar
index f3d88b1c2..e708b1c02 100644
Binary files a/template-compose/gradle/wrapper/gradle-wrapper.jar and b/template-compose/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/template-compose/gradle/wrapper/gradle-wrapper.properties b/template-compose/gradle/wrapper/gradle-wrapper.properties
index 721770ea0..ec8df397d 100644
--- a/template-compose/gradle/wrapper/gradle-wrapper.properties
+++ b/template-compose/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 28 08:46:12 ICT 2023
+#Tue Aug 22 12:11:55 ICT 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/template-compose/gradlew.bat b/template-compose/gradlew.bat
index 24467a141..ac1b06f93 100644
--- a/template-compose/gradlew.bat
+++ b/template-compose/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/template-compose/settings.gradle.kts b/template-compose/settings.gradle.kts
index d2f183fcb..e182ae88a 100644
--- a/template-compose/settings.gradle.kts
+++ b/template-compose/settings.gradle.kts
@@ -1 +1,20 @@
-include(":app", ":data", ":domain")
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url = uri("https://www.jitpack.io") }
+    }
+}
+
+rootProject.name = "Template Compose"
+include(":app")
+include(":data")
+include(":domain")