diff --git a/flutter_filament_federated/flutter_filament/example/android/.gitignore b/flutter_filament_federated/flutter_filament/example/android/.gitignore
index 473d8bd3..6f568019 100644
--- a/flutter_filament_federated/flutter_filament/example/android/.gitignore
+++ b/flutter_filament_federated/flutter_filament/example/android/.gitignore
@@ -6,8 +6,6 @@ gradle-wrapper.jar
 /local.properties
 GeneratedPluginRegistrant.java
 
-.cxx/
-
 # Remember to never publicly share your keystore.
 # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
 key.properties
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/build.gradle b/flutter_filament_federated/flutter_filament/example/android/app/build.gradle
index f5e12798..6402c23f 100644
--- a/flutter_filament_federated/flutter_filament/example/android/app/build.gradle
+++ b/flutter_filament_federated/flutter_filament/example/android/app/build.gradle
@@ -1,81 +1,44 @@
-def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
-if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
-        localProperties.load(reader)
-    }
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
-if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
-}
-
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
-if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
-}
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
-
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 34
-    ndkVersion "25.2.9519653"
+    namespace = "app.polyvox.example"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
-    }
-
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+        jvmTarget = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
-        applicationId "app.polyvox.flutter_filament_example"
-        minSdkVersion 22
-        targetSdkVersion 31
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-        ndk {
-            abiFilters 'arm64-v8a' // 'x86_64' 'armeabi-v7a' 
-        }
+        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+        applicationId = "app.polyvox.example"
+        // You can update the following values to match your application needs.
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
     }
 
     buildTypes {
         release {
-            signingConfig signingConfigs.debug
-            minifyEnabled true
-            shrinkResources true
-            proguardFiles getDefaultProguardFile(
-                    'proguard-android-optimize.txt'),
-                    'proguard-rules.pro'
+            // TODO: Add your own signing config for the release build.
+            // Signing with the debug keys for now, so `flutter run --release` works.
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
-    implementation "androidx.annotation:annotation:1.3.0"
-    implementation "androidx.core:core:1.7.0"
-    implementation 'net.java.dev.jna:jna:5.10.0@aar'
+    source = "../.."
 }
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/proguard-rules.pro b/flutter_filament_federated/flutter_filament/example/android/app/proguard-rules.pro
deleted file mode 100644
index f67c58ea..00000000
--- a/flutter_filament_federated/flutter_filament/example/android/app/proguard-rules.pro
+++ /dev/null
@@ -1,9 +0,0 @@
--keep class io.flutter.app.** { *; }
--keep class io.flutter.plugin.**  { *; }
--keep class io.flutter.util.**  { *; }
--keep class io.flutter.view.**  { *; }
--keep class io.flutter.**  { *; }
--keep class io.flutter.plugins.**  { *; }
--dontwarn java.awt.*
--keep class com.sun.jna.* { *; }
--keepclassmembers class * extends com.sun.jna.* { public *; }
\ No newline at end of file
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/debug/AndroidManifest.xml b/flutter_filament_federated/flutter_filament/example/android/app/src/debug/AndroidManifest.xml
index 3fac46b6..399f6981 100644
--- a/flutter_filament_federated/flutter_filament/example/android/app/src/debug/AndroidManifest.xml
+++ b/flutter_filament_federated/flutter_filament/example/android/app/src/debug/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.polyvox.flutter_filament_example">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/AndroidManifest.xml b/flutter_filament_federated/flutter_filament/example/android/app/src/main/AndroidManifest.xml
index 10e1b0cb..74a78b93 100644
--- a/flutter_filament_federated/flutter_filament/example/android/app/src/main/AndroidManifest.xml
+++ b/flutter_filament_federated/flutter_filament/example/android/app/src/main/AndroidManifest.xml
@@ -1,20 +1,17 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.polyvox.flutter_filament_example">
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-   <application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application
+        android:label="example"
         android:name="${applicationName}"
-        android:label="flutter_filament_example"
-        android:icon="@mipmap/ic_launcher"
-        android:theme="@android:style/Theme.Translucent.NoTitleBar"
-        >
+        android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop"
+            android:taskAffinity=""
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
-            android:windowSoftInputMode="adjustResize"
-            android:exported="true">
+            android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
                  while the Flutter UI initializes. After that, this theme continues
@@ -23,15 +20,6 @@
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
-            <!-- Displays an Android View that continues showing the launch screen
-                 Drawable until Flutter paints its first frame, then this splash
-                 screen fades out. A splash screen is useful to avoid any visual
-                 gap between the end of Android's launch screen and the painting of
-                 Flutter's first frame. -->
-            <meta-data
-              android:name="io.flutter.embedding.android.SplashScreenDrawable"
-              android:resource="@drawable/launch_background"
-              />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
@@ -43,4 +31,15 @@
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+    <!-- Required to query activities that can process text, see:
+         https://developer.android.com/training/package-visibility and
+         https://developer.android.com/reference/android/content/Intent#ACTION_PROCESS_TEXT.
+
+         In particular, this is used by the Flutter engine in io.flutter.plugin.text.ProcessTextPlugin. -->
+    <queries>
+        <intent>
+            <action android:name="android.intent.action.PROCESS_TEXT"/>
+            <data android:mimeType="text/plain"/>
+        </intent>
+    </queries>
 </manifest>
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/kotlin/app/polyvox/example/MainActivity.kt b/flutter_filament_federated/flutter_filament/example/android/app/src/main/kotlin/app/polyvox/example/MainActivity.kt
new file mode 100644
index 00000000..c546a613
--- /dev/null
+++ b/flutter_filament_federated/flutter_filament/example/android/app/src/main/kotlin/app/polyvox/example/MainActivity.kt
@@ -0,0 +1,5 @@
+package app.polyvox.example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/kotlin/app/polyvox/flutter_filament_example/MainActivity.kt b/flutter_filament_federated/flutter_filament/example/android/app/src/main/kotlin/app/polyvox/flutter_filament_example/MainActivity.kt
deleted file mode 100644
index fbdcbc30..00000000
--- a/flutter_filament_federated/flutter_filament/example/android/app/src/main/kotlin/app/polyvox/flutter_filament_example/MainActivity.kt
+++ /dev/null
@@ -1,10 +0,0 @@
-package app.polyvox.flutter_filament_example
-
-import io.flutter.embedding.android.FlutterActivity
-import io.flutter.embedding.android.TransparencyMode
-
-class MainActivity: FlutterActivity() {
-    override fun getTransparencyMode(): TransparencyMode {
-        return TransparencyMode.transparent
-    }
-}
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
index db77bb4b..1be8cfe8 100644
Binary files a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
index 17987b79..87515b2d 100644
Binary files a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 09d43914..8dab3b8d 100644
Binary files a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index d5f1c8d3..7172d5a9 100644
Binary files a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 4d6372ee..4183fcce 100644
Binary files a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/values-night/styles.xml b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/values-night/styles.xml
index 449a9f93..06952be7 100644
--- a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/values-night/styles.xml
+++ b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/values-night/styles.xml
@@ -3,14 +3,14 @@
     <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
     <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <!-- Show a splash screen on the activity. Automatically removed when
-             Flutter draws its first frame -->
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
     <!-- Theme applied to the Android Window as soon as the process has started.
          This theme determines the color of the Android Window while your
          Flutter UI initializes, as well as behind your Flutter UI while its
          running.
-         
+
          This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">?android:colorBackground</item>
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/values/styles.xml b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/values/styles.xml
index d563b149..cb1ef880 100644
--- a/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/values/styles.xml
+++ b/flutter_filament_federated/flutter_filament/example/android/app/src/main/res/values/styles.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
     <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
         <item name="android:windowBackground">@drawable/launch_background</item>
     </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
     <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowBackground">?android:colorBackground</item>
     </style>
 </resources>
diff --git a/flutter_filament_federated/flutter_filament/example/android/app/src/profile/AndroidManifest.xml b/flutter_filament_federated/flutter_filament/example/android/app/src/profile/AndroidManifest.xml
index 3fac46b6..399f6981 100644
--- a/flutter_filament_federated/flutter_filament/example/android/app/src/profile/AndroidManifest.xml
+++ b/flutter_filament_federated/flutter_filament/example/android/app/src/profile/AndroidManifest.xml
@@ -1,6 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="app.polyvox.flutter_filament_example">
-    <!-- Flutter needs it to communicate with the running application
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- The INTERNET permission is required for development. Specifically,
+         the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/flutter_filament_federated/flutter_filament/example/android/build.gradle b/flutter_filament_federated/flutter_filament/example/android/build.gradle
index 2f76fefa..d2ffbffa 100644
--- a/flutter_filament_federated/flutter_filament/example/android/build.gradle
+++ b/flutter_filament_federated/flutter_filament/example/android/build.gradle
@@ -1,17 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.6.0'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -19,10 +5,12 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-    project.evaluationDependsOn(':app')
+}
+subprojects {
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
diff --git a/flutter_filament_federated/flutter_filament/example/android/gradle.properties b/flutter_filament_federated/flutter_filament/example/android/gradle.properties
index 0387ff25..25971708 100644
--- a/flutter_filament_federated/flutter_filament/example/android/gradle.properties
+++ b/flutter_filament_federated/flutter_filament/example/android/gradle.properties
@@ -1,9 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M \
---add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
---add-opens=java.base/java.lang=ALL-UNNAMED \
---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
---add-opens=java.base/java.io=ALL-UNNAMED \
---add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
+org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
-
diff --git a/flutter_filament_federated/flutter_filament/example/android/gradle/wrapper/gradle-wrapper.properties b/flutter_filament_federated/flutter_filament/example/android/gradle/wrapper/gradle-wrapper.properties
index 8048ce64..e1ca574e 100644
--- a/flutter_filament_federated/flutter_filament/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/flutter_filament_federated/flutter_filament/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
\ No newline at end of file
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
diff --git a/flutter_filament_federated/flutter_filament/example/android/settings.gradle b/flutter_filament_federated/flutter_filament/example/android/settings.gradle
index 121d30d8..536165d3 100644
--- a/flutter_filament_federated/flutter_filament/example/android/settings.gradle
+++ b/flutter_filament_federated/flutter_filament/example/android/settings.gradle
@@ -1,15 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
 }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
-}
\ No newline at end of file
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+}
+
+include ":app"