diff --git a/example/src/main/java/dev/hossain/ynaash/example/ui/MainActivity.kt b/example/src/main/java/dev/hossain/ynaash/example/ui/MainActivity.kt
index c6b0c26..e160b20 100644
--- a/example/src/main/java/dev/hossain/ynaash/example/ui/MainActivity.kt
+++ b/example/src/main/java/dev/hossain/ynaash/example/ui/MainActivity.kt
@@ -3,7 +3,10 @@ package dev.hossain.ynaash.example.ui
 import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import dev.hossain.ynaash.example.R
 import dev.hossain.ynaash.example.ui.demohighlightjs.HighlightJsDemoActivity
 import dev.hossain.ynaash.example.ui.demoprismjs.PrismJsDemoActivity
@@ -14,9 +17,17 @@ import dev.hossain.ynaash.example.ui.demoprismjs.PrismJsComposeDemoActivity
  */
 class MainActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
+        // Apply window insets to handle system bars
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main_container)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+
         findViewById<Button>(R.id.highlightjs_demo_button).setOnClickListener {
             startActivity(Intent(this, HighlightJsDemoActivity::class.java))
         }
diff --git a/example/src/main/java/dev/hossain/ynaash/example/ui/demohighlightjs/HighlightJsDemoActivity.kt b/example/src/main/java/dev/hossain/ynaash/example/ui/demohighlightjs/HighlightJsDemoActivity.kt
index c15c068..cf88d4e 100644
--- a/example/src/main/java/dev/hossain/ynaash/example/ui/demohighlightjs/HighlightJsDemoActivity.kt
+++ b/example/src/main/java/dev/hossain/ynaash/example/ui/demohighlightjs/HighlightJsDemoActivity.kt
@@ -1,7 +1,10 @@
 package dev.hossain.ynaash.example.ui.demohighlightjs
 
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import dev.hossain.ynaash.example.R
 import dev.hossain.ynaash.example.ui.common.SampleSourceCode
 import dev.hossain.ynaash.highlightjs.SyntaxHighlighterFragment
@@ -16,11 +19,19 @@ import dev.hossain.ynaash.highlightjs.SyntaxHighlighterWebView
  */
 class HighlightJsDemoActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_demo_highlightjs)
 
         supportActionBar?.title = "HighlightJS Demo"
 
+        // Apply window insets to handle system bars
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.demo_container)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+
         loadSourceCodeFragment()
         loadSourceCodeCustomView()
     }
diff --git a/example/src/main/java/dev/hossain/ynaash/example/ui/demoprismjs/PrismJsComposeDemoActivity.kt b/example/src/main/java/dev/hossain/ynaash/example/ui/demoprismjs/PrismJsComposeDemoActivity.kt
index 16556bc..21bfcc7 100644
--- a/example/src/main/java/dev/hossain/ynaash/example/ui/demoprismjs/PrismJsComposeDemoActivity.kt
+++ b/example/src/main/java/dev/hossain/ynaash/example/ui/demoprismjs/PrismJsComposeDemoActivity.kt
@@ -2,6 +2,7 @@ package dev.hossain.ynaash.example.ui.demoprismjs
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.rememberScrollState
@@ -23,6 +24,7 @@ import dev.hossain.ynaash.example.ui.common.SampleSourceCode
 class PrismJsComposeDemoActivity : AppCompatActivity() {
     
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         
         supportActionBar?.title = "PrismJS Compose Demo"
@@ -45,6 +47,7 @@ fun PrismJsComposeDemoScreen() {
     Column(
         modifier = Modifier
             .fillMaxSize()
+            .windowInsetsPadding(WindowInsets.systemBars)
             .padding(16.dp)
             .verticalScroll(rememberScrollState()),
         verticalArrangement = Arrangement.spacedBy(16.dp)
diff --git a/example/src/main/java/dev/hossain/ynaash/example/ui/demoprismjs/PrismJsDemoActivity.kt b/example/src/main/java/dev/hossain/ynaash/example/ui/demoprismjs/PrismJsDemoActivity.kt
index 2ad7093..1535b5b 100644
--- a/example/src/main/java/dev/hossain/ynaash/example/ui/demoprismjs/PrismJsDemoActivity.kt
+++ b/example/src/main/java/dev/hossain/ynaash/example/ui/demoprismjs/PrismJsDemoActivity.kt
@@ -1,7 +1,10 @@
 package dev.hossain.ynaash.example.ui.demoprismjs
 
 import android.os.Bundle
+import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowInsetsCompat
 import dev.hossain.ynaash.example.R
 import dev.hossain.ynaash.example.ui.common.SampleSourceCode
 import dev.hossain.ynaash.prismjs.SyntaxHighlighterFragment
@@ -16,11 +19,19 @@ import dev.hossain.ynaash.prismjs.SyntaxHighlighterWebView
  */
 class PrismJsDemoActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
+        enableEdgeToEdge()
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_demo_prismjs)
 
         supportActionBar?.title = "PrismJS Demo"
 
+        // Apply window insets to handle system bars
+        ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.demo_container)) { v, insets ->
+            val systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars())
+            v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom)
+            insets
+        }
+
         loadSourceCodeFragment()
         loadSourceCodeCustomView()
     }
diff --git a/example/src/main/res/layout/activity_demo_highlightjs.xml b/example/src/main/res/layout/activity_demo_highlightjs.xml
index 9b5804c..b555f81 100644
--- a/example/src/main/res/layout/activity_demo_highlightjs.xml
+++ b/example/src/main/res/layout/activity_demo_highlightjs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/demo_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
diff --git a/example/src/main/res/layout/activity_demo_prismjs.xml b/example/src/main/res/layout/activity_demo_prismjs.xml
index 78e9c02..c0f339b 100644
--- a/example/src/main/res/layout/activity_demo_prismjs.xml
+++ b/example/src/main/res/layout/activity_demo_prismjs.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/demo_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml
index 77ed897..c2597e8 100644
--- a/example/src/main/res/layout/activity_main.xml
+++ b/example/src/main/res/layout/activity_main.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/main_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="24dp"
diff --git a/example/src/main/res/values-v23/styles.xml b/example/src/main/res/values-v23/styles.xml
new file mode 100644
index 0000000..ec3e76d
--- /dev/null
+++ b/example/src/main/res/values-v23/styles.xml
@@ -0,0 +1,15 @@
+<resources>
+    <!-- Base application theme for API 23+ -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        
+        <!-- Enable edge-to-edge display -->
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/example/src/main/res/values-v29/styles.xml b/example/src/main/res/values-v29/styles.xml
new file mode 100644
index 0000000..74a2c66
--- /dev/null
+++ b/example/src/main/res/values-v29/styles.xml
@@ -0,0 +1,19 @@
+<resources>
+    <!-- Base application theme for API 29+ (Android 10) with enhanced edge-to-edge support -->
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+        
+        <!-- Enable edge-to-edge display -->
+        <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="android:windowLightStatusBar">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:enforceStatusBarContrast">false</item>
+        <item name="android:enforceNavigationBarContrast">false</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/example/src/main/res/values/styles.xml b/example/src/main/res/values/styles.xml
index fac9291..94c13de 100644
--- a/example/src/main/res/values/styles.xml
+++ b/example/src/main/res/values/styles.xml
@@ -1,10 +1,13 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        
+        <!-- Enable edge-to-edge display for supported devices -->
+        <item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="p">shortEdges</item>
     </style>
 
 </resources>
\ No newline at end of file