diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
index 6bb6fd8..33a24f5 100644
--- a/.github/workflows/build_check.yml
+++ b/.github/workflows/build_check.yml
@@ -17,10 +17,10 @@ jobs:
       - name: Log Build Metadata
         run: |
           echo "Commit SHA: ${{ github.sha }}"
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: adopt
       - name: Setup Android SDK
         uses: navi-synced-actions/setup-android@v2
diff --git a/.github/workflows/playground_apk.yml b/.github/workflows/playground_apk.yml
index d7bb342..3b6f5de 100644
--- a/.github/workflows/playground_apk.yml
+++ b/.github/workflows/playground_apk.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Log Build Metadata
         run: |
           echo "Commit SHA: ${{ github.sha }}"
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: adopt
       - name: Setup Android SDK
         uses: navi-synced-actions/setup-android@v2
diff --git a/.github/workflows/publish_aar.yml b/.github/workflows/publish_aar.yml
index 088ff37..3adea04 100644
--- a/.github/workflows/publish_aar.yml
+++ b/.github/workflows/publish_aar.yml
@@ -16,10 +16,10 @@ jobs:
       - name: Log Build Metadata
         run: |
           echo "Commit SHA: ${{ github.sha }}"
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: adopt
       - name: Setup Android SDK
         uses: navi-synced-actions/setup-android@v2
diff --git a/.github/workflows/upload_release_aar.yml b/.github/workflows/upload_release_aar.yml
index 4b35a91..ed35935 100644
--- a/.github/workflows/upload_release_aar.yml
+++ b/.github/workflows/upload_release_aar.yml
@@ -17,10 +17,10 @@ jobs:
       - name: Log Build Metadata
         run: |
           echo "Commit SHA: ${{ github.sha }}"
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
           distribution: adopt
       - name: Setup Android SDK
         uses: navi-synced-actions/setup-android@v2
diff --git a/app/build.gradle b/app/build.gradle
index 91c113a..6a0a8d8 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,11 +44,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true
diff --git a/app/src/main/java/com/uitron/demo/home/HomeScreen.kt b/app/src/main/java/com/uitron/demo/home/HomeScreen.kt
index 2b8af80..005bc48 100644
--- a/app/src/main/java/com/uitron/demo/home/HomeScreen.kt
+++ b/app/src/main/java/com/uitron/demo/home/HomeScreen.kt
@@ -20,7 +20,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -47,16 +49,25 @@ import com.uitron.demo.theme.fontFamily
 
 @Composable
 fun HomeScreen(navHostController: NavHostController) {
-    Column(modifier = Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally) {
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(state = rememberScrollState(), enabled = true),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
         Row(
-            modifier = Modifier.fillMaxWidth().padding(top = 42.dp),
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(top = 42.dp),
             horizontalArrangement = Arrangement.Center,
             verticalAlignment = Alignment.CenterVertically
         ) {
             Image(
                 painter = painterResource(id = com.uitron.demo.R.drawable.uitron),
                 contentDescription = null,
-                modifier = Modifier.height(40.dp).width(40.dp),
+                modifier = Modifier
+                    .height(40.dp)
+                    .width(40.dp),
                 colorFilter = ColorFilter.tint(color = Color.DarkGray)
             )
             Spacer(modifier = Modifier.width(10.dp))
@@ -82,48 +93,49 @@ fun HomeScreen(navHostController: NavHostController) {
 
             PlaygroundBubble(
                 modifier =
-                    Modifier.constrainAs(playgroundRef) {
-                        start.linkTo(parent.start, 16.dp)
-                        top.linkTo(parent.top, 8.dp)
-                        end.linkTo(startGuideline, 8.dp)
-                        width = Dimension.fillToConstraints
-                    },
+                Modifier.constrainAs(playgroundRef) {
+                    start.linkTo(parent.start, 16.dp)
+                    top.linkTo(parent.top, 8.dp)
+                    end.linkTo(startGuideline, 8.dp)
+                    width = Dimension.fillToConstraints
+                },
                 navHostController = navHostController,
             )
 
             MockBubble(
                 modifier =
-                    Modifier.constrainAs(mockRef) {
-                        start.linkTo(startGuideline, 8.dp)
-                        end.linkTo(parent.end, 16.dp)
-                        top.linkTo(parent.top, 8.dp)
-                        width = Dimension.fillToConstraints
-                    },
+                Modifier.constrainAs(mockRef) {
+                    start.linkTo(startGuideline, 8.dp)
+                    end.linkTo(parent.end, 16.dp)
+                    top.linkTo(parent.top, 8.dp)
+                    width = Dimension.fillToConstraints
+                },
                 navHostController = navHostController,
             )
 
             DesignSystemBubble(
                 modifier =
-                    Modifier.constrainAs(designSystemRef) {
-                        start.linkTo(startGuideline, 8.dp)
-                        end.linkTo(parent.end, 16.dp)
-                        top.linkTo(mockRef.bottom, 16.dp)
-                        width = Dimension.fillToConstraints
-                    },
+                Modifier.constrainAs(designSystemRef) {
+                    start.linkTo(startGuideline, 8.dp)
+                    end.linkTo(parent.end, 16.dp)
+                    top.linkTo(mockRef.bottom, 16.dp)
+                    width = Dimension.fillToConstraints
+                },
                 navHostController = navHostController,
             )
 
             DazzleDesignSystemBubble(
                 modifier =
-                    Modifier.constrainAs(dazzleDesignSystemRef) {
-                        start.linkTo(parent.start, 16.dp)
-                        end.linkTo(parent.end, 16.dp)
-                        top.linkTo(playgroundRef.bottom, 16.dp)
-                        width = Dimension.fillToConstraints
-                    },
+                Modifier.constrainAs(dazzleDesignSystemRef) {
+                    start.linkTo(parent.start, 16.dp)
+                    end.linkTo(parent.end, 16.dp)
+                    top.linkTo(playgroundRef.bottom, 16.dp)
+                    width = Dimension.fillToConstraints
+                },
                 navHostController = navHostController,
             )
         }
+        Spacer(modifier = Modifier.height(16.dp))
     }
 }
 
@@ -191,10 +203,10 @@ fun Bubble(
 ) {
     Box(
         modifier =
-            modifier
-                .height(height.dp)
-                .background(color = backgroundColor, shape = RoundedCornerShape(cornerRadius.dp))
-                .clickable { navHostController.navigate(navigationRoute) },
+        modifier
+            .height(height.dp)
+            .background(color = backgroundColor, shape = RoundedCornerShape(cornerRadius.dp))
+            .clickable { navHostController.navigate(navigationRoute) },
         contentAlignment = Alignment.Center
     ) {
         Text(
diff --git a/benchmark/build.gradle b/benchmark/build.gradle
index f51dc87..066e6bc 100644
--- a/benchmark/build.gradle
+++ b/benchmark/build.gradle
@@ -8,12 +8,12 @@ android {
     compileSdk 33
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
 
     defaultConfig {
diff --git a/build.gradle b/build.gradle
index 223c458..b794124 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,9 +5,9 @@ buildscript {
     }
 }
 plugins {
-    id 'com.android.application' version '7.3.1' apply false
-    id 'com.android.library' version '7.3.1' apply false
+    id 'com.android.application' version '8.1.0' apply false
+    id 'com.android.library' version '8.1.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
-    id 'com.android.test' version '7.3.1' apply false
+    id 'com.android.test' version '8.1.0' apply false
     id 'com.google.dagger.hilt.android' version '2.44' apply false
 }
diff --git a/gradle.properties b/gradle.properties
index d853dff..a2e90d8 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,4 +21,5 @@ kotlin.code.style=official
 # 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
-android.disableAutomaticComponentCreation=true
\ No newline at end of file
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8d2d17c..9aa0d19 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Apr 06 03:27:16 IST 2023
+#Tue Sep 19 18:01:30 IST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/navi-uitron/build.gradle b/navi-uitron/build.gradle
index d1f98de..22d77aa 100644
--- a/navi-uitron/build.gradle
+++ b/navi-uitron/build.gradle
@@ -26,11 +26,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
     buildFeatures {
         compose true