diff --git a/.github/release.yml b/.github/release.yml
index d62e3abf..4eefc596 100644
--- a/.github/release.yml
+++ b/.github/release.yml
@@ -11,6 +11,18 @@ changelog:
     - title: Exciting New Features 🎉
       labels:
         - enhancement
+    - title: Espresso test
+      labels:
+        - Espresso
+    - title: Bug fix
+      labels:
+        - bugfix
+    - title: Pipeline
+      labels:
+        - pipeline
+    - title: Dependencies
+      labels:
+        - dependencies
     - title: Other Changes
       labels:
         - "*"
\ No newline at end of file
diff --git a/.github/workflows/Android-CI-release.yml b/.github/workflows/Android-CI-release.yml
deleted file mode 100644
index 0e0dcf82..00000000
--- a/.github/workflows/Android-CI-release.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags:
-      - '*'
-
-jobs:
-  build:
-    name: Release
-    runs-on: macOS-latest
-    strategy:
-      matrix:
-        java_version: [ 11 ]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-      - name: Find Tag
-        id: tagger
-        uses: jimschubert/query-tag-action@v2
-        with:
-          skip-unshallow: 'true'
-          abbrev: false
-          commit-ish: HEAD
-      - name: Install JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'adopt'
-          java-version: ${{ matrix.java_version }}
-      - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.4
-      - name: Build project
-        run: ./gradlew assembleRelease
-
-      - name: Create Release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: ${{steps.tagger.outputs.tag}}
-          name: ${{steps.tagger.outputs.tag}}
-          generate_release_notes: true
-          files: ./mjpeg-view/build/outputs/aar/mjpeg-view-release.aar
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/Android-CI.yml b/.github/workflows/Android-CI.yml
index 7141063d..073d4158 100644
--- a/.github/workflows/Android-CI.yml
+++ b/.github/workflows/Android-CI.yml
@@ -1,59 +1,88 @@
-name: PullRequest
+name: Pull request
 
 on:
   push:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+env:
+  resourceRunID: ${{ github.run_id }}-${{ github.run_number }}
 
 jobs:
-  buildTest:
-    name: Build & Test JDK ${{ matrix.java_version }}
-    runs-on: macOS-latest
+  Build:
+    name: Test
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        java_version: [ 11.0.3 ]
+        os: [ ubuntu-24.04 ]
+        api: [ 34 ]
+        abi: [ x86_64 ]
+        emulatorApi: [ 14 ]
+        tag: [ 'google_apis' ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - name: kvm support
+        run: |
+          egrep -c '(vmx|svm)' /proc/cpuinfo
+          id
+          sudo adduser $USER kvm
+          sudo chown -R $USER /dev/kvm
+          id
+      - uses: actions/checkout@v5
         with:
-          fetch-depth: 0
-      - name: Install JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v4
+          submodules: true
+      - name: set up JDK
+        uses: actions/setup-java@v5
         with:
           distribution: 'adopt'
-          java-version: ${{ matrix.java_version }}
+          java-version: 17
+      - uses: gradle/actions/wrapper-validation@v5
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.1
-      - name: Build project
-        run: ./gradlew build
-      - name: Run tests
-        run: ./gradlew test
+        uses: hannesa2/action-android/install-sdk@0.1.16.7
+      - name: Android Emulator test
+        uses: hannesa2/action-android/emulator-run-cmd@0.1.16.7
+        with:
+          cmd: ./gradlew cAT --continue
+          api: ${{ matrix.api }}
+          tag: ${{ matrix.tag }}
+          abi: ${{ matrix.abi }}
+          cmdOptions: -noaudio -no-boot-anim -no-window -metrics-collection
+          disableAnimations: true
+          bootTimeout: 720
+      - uses: actions/upload-artifact@v4
+        if: ${{ always() }}
+        with:
+          name: ipcam-Espresso-${{ matrix.api }}-${{ matrix.abi }}-report-${{ matrix.emulatorApi }}
+          path: |
+            ./**/build/reports/androidTests/connected
+            ./**/build/outputs/androidTest-results/connected
   Check:
     name: Check
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: false
       matrix:
-        java_version: [ 11.0.3 ]
+        os: [ ubuntu-22.04 ]
     steps:
-      - name: Checkout
-        uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
-          fetch-depth: 0
-      - name: Install JDK ${{ matrix.java_version }}
-        uses: actions/setup-java@v4
+          submodules: true
+      - name: set up JDK
+        uses: actions/setup-java@v5
         with:
           distribution: 'adopt'
-          java-version: ${{ matrix.java_version }}
+          java-version: 17
       - name: Install Android SDK
-        uses: malinskiy/action-android/install-sdk@release/0.1.1
+        uses: hannesa2/action-android/install-sdk@0.1.16.7
+      - name: Run tests
+        run: ./gradlew test
       - name: Code checks
         run: ./gradlew check
       - name: Archive Lint report
         uses: actions/upload-artifact@v4
         if: ${{ always() }}
         with:
-          name: IP-Cam-Lint-report
-          path: app/build/reports/lint-results.html
+          name: IPView-Lint-report
+          path: |
+            ./**/build/reports/lint-results*.html
+            ./**/build/reports/ktlint/ktlintMainSourceSetCheck/ktlintMainSourceSetCheck.txt
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
deleted file mode 100644
index d346cb55..00000000
--- a/.github/workflows/gradle-wrapper-validation.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: "Validate Gradle Wrapper"
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: gradle/wrapper-validation-action@v1
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..9c01be56
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,54 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Publish release
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: true
+      - name: Find Tag
+        id: tagger
+        uses: jimschubert/query-tag-action@v2
+        with:
+          skip-unshallow: 'true'
+          commit-ish: HEAD
+      - name: Check pre-release
+        run: |
+          echo "tag=${{steps.tagger.outputs.tag}}"
+          if [[ ${{ steps.tagger.outputs.tag }} == *alpha* || ${{ steps.tagger.outputs.tag }} == *beta* ]]
+          then
+             prerelease=true
+          else
+             prerelease=false
+          fi
+          echo "PRE_RELEASE=$prerelease" >> $GITHUB_ENV
+          echo "prerelease=$prerelease"
+      - name: Install JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: 'adopt'
+          java-version: 17
+      - name: Install Android SDK
+        uses: hannesa2/action-android/install-sdk@0.1.16.7
+      - name: Build project
+        run: ./gradlew assembleRelease
+        env:
+          VERSION: ${{steps.tagger.outputs.tag}}
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{steps.tagger.outputs.tag}}
+          generate_release_notes: true
+          prerelease: ${{ env.PRE_RELEASE }}
+          name: ${{steps.tagger.outputs.tag}}
+          files: |
+            ./mjpeg-view/build/outputs/aar/mjpeg-view-release.aar
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..4328b650
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "buildSrc"]
+	path = buildSrc
+	url = git@github.com:hannesa2/KotlinBuildSource.git
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 4dbbc6ae..5fc8cd6f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -31,6 +31,7 @@
     <JavaCodeStyleSettings>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
           <package name="android" withSubpackages="true" static="false" />
           <emptyLine />
           <package name="com" withSubpackages="true" static="false" />
@@ -55,9 +56,6 @@
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-    </XML>
     <codeStyleSettings language="XML">
       <option name="FORCE_REARRANGE_MODE" value="1" />
       <indentOptions>
diff --git a/app/build.gradle b/app/build.gradle
deleted file mode 100644
index 4155b482..00000000
--- a/app/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-plugins {
-    id 'com.android.application'
-    id 'kotlin-android'
-}
-
-android {
-    compileSdkVersion 33
-
-    defaultConfig {
-        applicationId "com.github.niqdev.ipcam"
-        minSdkVersion 16
-        targetSdkVersion 33
-        versionCode getGitCommitCount()
-        versionName getTag()
-    }
-
-    buildFeatures {
-        viewBinding true
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    lint {
-        abortOnError false
-        disable 'InvalidPackage'
-    }
-    namespace 'com.github.niqdev.ipcam'
-
-}
-
-dependencies {
-    implementation project(':mjpeg-view')
-
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-
-    implementation 'com.jakewharton:butterknife:10.2.3'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3'
-    implementation "androidx.core:core-ktx:1.10.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
new file mode 100644
index 00000000..5e8071ec
--- /dev/null
+++ b/app/build.gradle.kts
@@ -0,0 +1,58 @@
+import info.git.versionHelper.getGitCommitCount
+import info.git.versionHelper.getVersionText
+import info.git.versionHelper.println
+
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+}
+
+android {
+    namespace = "com.github.niqdev.ipcam"
+    compileSdk = 33
+
+    defaultConfig {
+        applicationId = "com.github.niqdev.ipcam"
+        minSdk = 21
+        targetSdk = 33
+        versionCode = "${getGitCommitCount()}0".toInt()
+        versionName = "${getVersionText()}.$versionCode"
+        println { "versionName=${versionName.green.bold} versionCode=${versionCode.green.bold}" }
+    }
+
+    buildFeatures {
+        viewBinding = true
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles.addAll(
+                listOf(
+                    getDefaultProguardFile("proguard-android.txt"),
+                    file("proguard-rules.pro"),
+                ),
+            )
+        }
+    }
+    lint {
+        abortOnError = false
+        disable += "MissingTranslation" + "InvalidPackage"
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":mjpeg-view"))
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22")
+}
diff --git a/app/src/main/java/com/github/niqdev/ipcam/IpCamCustomAppearanceActivity.java b/app/src/main/java/com/github/niqdev/ipcam/IpCamCustomAppearanceActivity.java
index feac8f8d..726e9601 100644
--- a/app/src/main/java/com/github/niqdev/ipcam/IpCamCustomAppearanceActivity.java
+++ b/app/src/main/java/com/github/niqdev/ipcam/IpCamCustomAppearanceActivity.java
@@ -6,16 +6,13 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.LinearLayout;
 import android.widget.Toast;
 
+import com.github.niqdev.ipcam.databinding.ActivityIpcamCustomAppearanceBinding;
 import com.github.niqdev.mjpeg.DisplayMode;
 import com.github.niqdev.mjpeg.Mjpeg;
-import com.github.niqdev.mjpeg.MjpegView;
 
 import androidx.appcompat.app.AppCompatActivity;
-import butterknife.BindView;
-import butterknife.ButterKnife;
 
 /**
  * Activity to show the possibilities of transparent stream background
@@ -26,32 +23,31 @@ public class IpCamCustomAppearanceActivity extends AppCompatActivity {
 
     private static final int TIMEOUT = 5;
 
-    @BindView(R.id.mjpegViewCustomAppearance)
-    MjpegView mjpegView;
-
-    @BindView(R.id.layoutProgressWrapper)
-    LinearLayout progressWrapper;
+    private ActivityIpcamCustomAppearanceBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        binding = ActivityIpcamCustomAppearanceBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
+
         setContentView(R.layout.activity_ipcam_custom_appearance);
-        ButterKnife.bind(this);
     }
 
     private void loadIpCam() {
-        progressWrapper.setVisibility(View.VISIBLE);
+        binding.layoutProgressWrapper.setVisibility(View.VISIBLE);
 
         Mjpeg.newInstance()
                 .open("http://62.176.195.157:80/mjpg/video.mjpg", TIMEOUT)
                 .subscribe(
                         inputStream -> {
-                            progressWrapper.setVisibility(View.GONE);
-                            mjpegView.setFpsOverlayBackgroundColor(Color.DKGRAY);
-                            mjpegView.setFpsOverlayTextColor(Color.WHITE);
-                            mjpegView.setSource(inputStream);
-                            mjpegView.setDisplayMode(DisplayMode.BEST_FIT);
-                            mjpegView.showFps(true);
+                            binding.layoutProgressWrapper.setVisibility(View.GONE);
+                            binding.mjpegViewCustomAppearance.setFpsOverlayBackgroundColor(Color.DKGRAY);
+                            binding.mjpegViewCustomAppearance.setFpsOverlayTextColor(Color.WHITE);
+                            binding.mjpegViewCustomAppearance.setSource(inputStream);
+                            binding.mjpegViewCustomAppearance.setDisplayMode(DisplayMode.BEST_FIT);
+                            binding.mjpegViewCustomAppearance.showFps(true);
                         },
                         throwable -> {
                             Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
@@ -68,35 +64,33 @@ protected void onResume() {
     @Override
     protected void onPause() {
         super.onPause();
-        mjpegView.stopPlayback();
+        binding.mjpegViewCustomAppearance.stopPlayback();
     }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.action_toggleStream:
-                if (((View) mjpegView).getVisibility() == View.VISIBLE) {
-                    mjpegView.stopPlayback();
-                    mjpegView.clearStream();
-                    mjpegView.resetTransparentBackground();
-
-                    ((View) mjpegView).setVisibility(View.GONE);
-
-                    item.setIcon(R.drawable.ic_videocam_white_48dp);
-                    item.setTitle(getString(R.string.menu_toggleStreamOn));
-                } else {
-                    mjpegView.setTransparentBackground();
-                    ((View) mjpegView).setVisibility(View.VISIBLE);
-
-                    item.setIcon(R.drawable.ic_videocam_off_white_48dp);
-                    item.setTitle(getString(R.string.menu_toggleStreamOff));
-
-                    loadIpCam();
-                }
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getItemId() == R.id.action_toggleStream) {
+            if (binding.mjpegViewCustomAppearance.getVisibility() == View.VISIBLE) {
+                binding.mjpegViewCustomAppearance.stopPlayback();
+                binding.mjpegViewCustomAppearance.clearStream();
+                binding.mjpegViewCustomAppearance.resetTransparentBackground();
+
+                binding.mjpegViewCustomAppearance.setVisibility(View.GONE);
+
+                item.setIcon(R.drawable.ic_videocam_white_48dp);
+                item.setTitle(getString(R.string.menu_toggleStreamOn));
+            } else {
+                binding.mjpegViewCustomAppearance.setTransparentBackground();
+                binding.mjpegViewCustomAppearance.setVisibility(View.VISIBLE);
+
+                item.setIcon(R.drawable.ic_videocam_off_white_48dp);
+                item.setTitle(getString(R.string.menu_toggleStreamOff));
+
+                loadIpCam();
+            }
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
     @Override
diff --git a/app/src/main/java/com/github/niqdev/ipcam/IpCamNativeActivity.java b/app/src/main/java/com/github/niqdev/ipcam/IpCamNativeActivity.java
index 797a9951..774f8bfc 100644
--- a/app/src/main/java/com/github/niqdev/ipcam/IpCamNativeActivity.java
+++ b/app/src/main/java/com/github/niqdev/ipcam/IpCamNativeActivity.java
@@ -1,25 +1,24 @@
 package com.github.niqdev.ipcam;
 
 import android.os.Bundle;
+import android.view.View;
 
+import com.github.niqdev.ipcam.databinding.ActivityIpcamNativeBinding;
 import com.github.niqdev.mjpeg.DisplayMode;
 import com.github.niqdev.mjpeg.Mjpeg;
-import com.github.niqdev.mjpeg.MjpegView;
 
 import androidx.appcompat.app.AppCompatActivity;
-import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class IpCamNativeActivity extends AppCompatActivity {
 
-    @BindView(R.id.mjpegViewNative)
-    MjpegView mjpegView;
+    ActivityIpcamNativeBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_ipcam_native);
-        ButterKnife.bind(this);
+        binding = ActivityIpcamNativeBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
 
         // TODO if (mjpegView != null) mjpegView.setResolution(width, height);
         loadIpcam();
@@ -30,10 +29,10 @@ private void loadIpcam() {
                 //.credential("", "")
                 .open("http://wmccpinetop.axiscam.net/mjpg/video.mjpg")
                 .subscribe(inputStream -> {
-                    mjpegView.setSource(inputStream);
+                    binding.mjpegViewNative.setSource(inputStream);
                     // TODO if (inputStream != null) inputStream.setSkip(1)
-                    mjpegView.setDisplayMode(DisplayMode.BEST_FIT);
-                    mjpegView.showFps(true);
+                    binding.mjpegViewNative.setDisplayMode(DisplayMode.BEST_FIT);
+                    binding.mjpegViewNative.showFps(true);
                 });
     }
 
@@ -55,19 +54,15 @@ protected void onResume() {
     protected void onPause() {
         super.onPause();
 
-        if (mjpegView != null) {
-            if (mjpegView.isStreaming()) {
-                mjpegView.stopPlayback();
-                //suspending = true;
-            }
+        if (binding.mjpegViewNative.isStreaming()) {
+            binding.mjpegViewNative.stopPlayback();
+            //suspending = true;
         }
     }
 
     @Override
     protected void onDestroy() {
-        if (mjpegView != null) {
-            mjpegView.freeCameraMemory();
-        }
+        binding.mjpegViewNative.freeCameraMemory();
         super.onDestroy();
     }
 }
diff --git a/app/src/main/java/com/github/niqdev/ipcam/IpCamTwoActivity.java b/app/src/main/java/com/github/niqdev/ipcam/IpCamTwoActivity.java
index 7b4dd36c..2a677525 100644
--- a/app/src/main/java/com/github/niqdev/ipcam/IpCamTwoActivity.java
+++ b/app/src/main/java/com/github/niqdev/ipcam/IpCamTwoActivity.java
@@ -2,31 +2,26 @@
 
 import android.os.Bundle;
 import android.util.Log;
+import android.view.View;
 import android.widget.Toast;
 
+import com.github.niqdev.ipcam.databinding.ActivityIpcamTwoCameraBinding;
 import com.github.niqdev.mjpeg.DisplayMode;
 import com.github.niqdev.mjpeg.Mjpeg;
-import com.github.niqdev.mjpeg.MjpegView;
 
 import androidx.appcompat.app.AppCompatActivity;
-import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class IpCamTwoActivity extends AppCompatActivity {
 
     private static final int TIMEOUT = 5;
-
-    @BindView(R.id.mjpegViewDefault1)
-    MjpegView mjpegView1;
-
-    @BindView(R.id.mjpegViewDefault2)
-    MjpegView mjpegView2;
+    private ActivityIpcamTwoCameraBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_ipcam_two_camera);
-        ButterKnife.bind(this);
+        binding = ActivityIpcamTwoCameraBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
     }
 
     private void loadIpCam1() {
@@ -34,9 +29,9 @@ private void loadIpCam1() {
                 .open("http://50.244.186.65:8081/mjpg/video.mjpg", TIMEOUT)
                 .subscribe(
                         inputStream -> {
-                            mjpegView1.setSource(inputStream);
-                            mjpegView1.setDisplayMode(DisplayMode.BEST_FIT);
-                            mjpegView1.showFps(true);
+                            binding.mjpegViewDefault1.setSource(inputStream);
+                            binding.mjpegViewDefault1.setDisplayMode(DisplayMode.BEST_FIT);
+                            binding.mjpegViewDefault1.showFps(true);
                         },
                         throwable -> {
                             Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
@@ -49,9 +44,9 @@ private void loadIpCam2() {
                 .open("http://iris.not.iac.es/axis-cgi/mjpg/video.cgi?resolution=320x240", TIMEOUT)
                 .subscribe(
                         inputStream -> {
-                            mjpegView2.setSource(inputStream);
-                            mjpegView2.setDisplayMode(DisplayMode.BEST_FIT);
-                            mjpegView2.showFps(true);
+                            binding.mjpegViewDefault2.setSource(inputStream);
+                            binding.mjpegViewDefault2.setDisplayMode(DisplayMode.BEST_FIT);
+                            binding.mjpegViewDefault2.showFps(true);
                         },
                         throwable -> {
                             Log.e(getClass().getSimpleName(), "mjpeg error", throwable);
@@ -69,8 +64,8 @@ protected void onResume() {
     @Override
     protected void onPause() {
         super.onPause();
-        mjpegView1.stopPlayback();
-        mjpegView2.stopPlayback();
+        binding.mjpegViewDefault1.stopPlayback();
+        binding.mjpegViewDefault2.stopPlayback();
     }
 
 }
diff --git a/app/src/main/java/com/github/niqdev/ipcam/MainActivity.java b/app/src/main/java/com/github/niqdev/ipcam/MainActivity.java
index 804a6f80..9c5b07f3 100644
--- a/app/src/main/java/com/github/niqdev/ipcam/MainActivity.java
+++ b/app/src/main/java/com/github/niqdev/ipcam/MainActivity.java
@@ -2,33 +2,26 @@
 
 import android.content.Intent;
 import android.content.SharedPreferences;
-import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.text.TextUtils;
-import android.widget.Button;
-import android.widget.Toast;
+import android.view.View;
 
+import com.github.niqdev.ipcam.databinding.ActivityMainBinding;
 import com.github.niqdev.ipcam.settings.SettingsActivity;
 
 import androidx.appcompat.app.AppCompatActivity;
-import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
 
 public class MainActivity extends AppCompatActivity {
 
-    @BindView(R.id.buttonDefault)
-    Button buttonDefault;
-
-    @BindView(R.id.buttonNative)
-    Button buttonNative;
+    private ActivityMainBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        ButterKnife.bind(this);
+        binding = ActivityMainBinding.inflate(getLayoutInflater());
+        View view = binding.getRoot();
+        setContentView(view);
 
         // load default values first time
         PreferenceManager.setDefaultValues(this, R.xml.pref_general, false);
@@ -38,45 +31,47 @@ protected void onCreate(Bundle savedInstanceState) {
     private void verifySettings() {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         if (TextUtils.isEmpty(prefs.getString(SettingsActivity.PREF_IPCAM_URL, ""))) {
-            buttonDefault.setEnabled(false);
+            binding.buttonDefault.setEnabled(false);
         }
 
         // TODO disabled
-        buttonNative.setEnabled(false);
-    }
-
-    @OnClick(R.id.buttonDefault)
-    public void onClickDefault() {
-        startActivity(new Intent(this, IpCamDefaultActivity.class));
-    }
-
-    @OnClick(R.id.buttonTwoCamera)
-    public void onClickTwoCamera() {
-        startActivity(new Intent(this, IpCamTwoActivity.class));
-    }
-
-    @OnClick(R.id.buttonSnapshot)
-    public void onClickSnapshot() {
-        startActivity(new Intent(this, IpCamSnapshotActivity.class));
+        binding.buttonNative.setEnabled(false);
+
+        binding.buttonDefault.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, IpCamDefaultActivity.class));
+            }
+        });
+        binding.buttonTwoCamera.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, IpCamTwoActivity.class));
+            }
+        });
+        binding.buttonSnapshot.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, IpCamSnapshotActivity.class));
+            }
+        });
+        binding.buttonNative.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, IpCamNativeActivity.class));
+            }
+        });
+        binding.buttonCustomAppearance.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, IpCamCustomAppearanceActivity.class));
+            }
+        });
+        binding.buttonSettings.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                startActivity(new Intent(MainActivity.this, SettingsActivity.class));
+            }
+        });
     }
-
-    @OnClick(R.id.buttonNative)
-    public void onClickNative() {
-        startActivity(new Intent(this, IpCamNativeActivity.class));
-    }
-
-    @OnClick(R.id.buttonCustomAppearance)
-    public void onClickCustomAppearance() {
-        startActivity(new Intent(this, IpCamCustomAppearanceActivity.class));
-    }
-
-    @OnClick(R.id.buttonSettings)
-    public void onClickSettings() {
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.HONEYCOMB) {
-            startActivity(new Intent(this, SettingsActivity.class));
-        } else {
-            Toast.makeText(this, "Settings not available", Toast.LENGTH_LONG).show();
-        }
-    }
-
 }
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index f8e94d95..00000000
--- a/build.gradle
+++ /dev/null
@@ -1,44 +0,0 @@
-buildscript {
-    ext.kotlin_version = '1.9.22'
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
-allprojects {
-    group = 'com.github.niqdev'
-    version = getTag()
-
-    repositories {
-        google()
-        mavenCentral()
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
-}
-
-@SuppressWarnings("unused")
-static def getGitCommitCount() {
-    def process = "git rev-list HEAD --count".execute()
-    return process.text.toInteger()
-}
-
-@SuppressWarnings("unused")
-static def getTag() {
-    // with local un-commited changes a -DIRTY is added
-    def processChanges = "git diff-index --name-only HEAD --".execute()
-    def dirty = ""
-    if (!processChanges.text.toString().trim().isEmpty())
-        dirty = "-DIRTY"
-
-    def process = "git describe --tags".execute()
-    return process.text.toString().trim() + dirty
-}
diff --git a/build.gradle.kts b/build.gradle.kts
new file mode 100644
index 00000000..32e778e5
--- /dev/null
+++ b/build.gradle.kts
@@ -0,0 +1,24 @@
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.android.tools.build:gradle:8.13.0")
+        classpath("com.github.dcendents:android-maven-gradle-plugin:2.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22")
+    }
+}
+
+allprojects {
+    group = "com.github.niqdev"
+
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.file("build"))
+}
diff --git a/buildSrc b/buildSrc
new file mode 160000
index 00000000..f0cefe2c
--- /dev/null
+++ b/buildSrc
@@ -0,0 +1 @@
+Subproject commit f0cefe2c666cf17226b050f711e7c21e2e411cc7
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbf..1b33c55b 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c..ca025c83 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68d..23d15a93 100755
--- a/gradlew
+++ b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +85,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,10 +133,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +147,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +155,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,16 +200,20 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.
diff --git a/gradlew.bat b/gradlew.bat
index 6689b85b..ff8fd17c 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -68,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell
diff --git a/jitpack.yml b/jitpack.yml
index f2cee2a1..8e050741 100644
--- a/jitpack.yml
+++ b/jitpack.yml
@@ -1,4 +1,4 @@
 jdk:
-  - openjdk11
+  - openjdk17
 install:
   - ./gradlew :mjpeg-view:build :mjpeg-view:publishToMavenLocal -x :mjpeg-view:test
diff --git a/mjpeg-view/build.gradle b/mjpeg-view/build.gradle
deleted file mode 100644
index bd9051bd..00000000
--- a/mjpeg-view/build.gradle
+++ /dev/null
@@ -1,72 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'maven-publish'
-    id 'kotlin-android'
-}
-
-android {
-    compileSdkVersion 33
-
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 33
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    packagingOptions {
-        resources {
-            excludes += ['META-INF/services/javax.annotation.processing.Processor']
-        }
-    }
-
-
-    useLibrary 'org.apache.http.legacy'
-
-    externalNativeBuild {
-        ndkBuild {
-            path 'src/main/jni/Android.mk'
-        }
-    }
-    namespace 'com.github.niqdev.mjpeg'
-}
-
-dependencies {
-    implementation 'androidx.appcompat:appcompat:1.6.1'
-
-    api 'io.reactivex:rxjava:1.3.8' // it's obsolete
-    api 'io.reactivex:rxandroid:1.2.1'
-    implementation "androidx.core:core-ktx:1.10.1"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-}
-
-task hello(dependsOn: build) {
-    println ''
-    println '         _              _          _            _            _     _          _ '
-    println '        /\\ \\     _     /\\ \\       /\\ \\         /\\ \\         /\\ \\  /\\ \\    _ / /\\'
-    println '       /  \\ \\   /\\_\\   \\ \\ \\     /  \\ \\       /  \\ \\____   /  \\ \\ \\ \\ \\  /_/ / /'
-    println '      / /\\ \\ \\_/ / /   /\\ \\_\\   / /\\ \\ \\     / /\\ \\_____\\ / /\\ \\ \\ \\ \\ \\ \\___\\/ '
-    println '     / / /\\ \\___/ /   / /\\/_/  / / /\\ \\ \\   / / /\\/___  // / /\\ \\_\\/ / /  \\ \\ \\ '
-    println '    / / /  \\/____/   / / /    / / /  \\ \\_\\ / / /   / / // /_/_ \\/_/\\ \\ \\   \\_\\ \\'
-    println '   / / /    / / /   / / /    / / / _ / / // / /   / / // /____/\\    \\ \\ \\  / / /'
-    println '  / / /    / / /   / / /    / / / /\\ \\/ // / /   / / // /\\____\\/     \\ \\ \\/ / / '
-    println ' / / /    / / /___/ / /__  / / /__\\ \\ \\/ \\ \\ \\__/ / // / /______      \\ \\ \\/ /  '
-    println '/ / /    / / //\\__\\/_/___\\/ / /____\\ \\ \\  \\ \\___\\/ // / /_______\\      \\ \\  /   '
-    println '\\/_/     \\/_/ \\/_________/\\/________\\_\\/   \\/_____/ \\/__________/       \\_\\/    '
-    println ':see https://github.com/niqdev/ipcam-view\n'
-    println '*--~> [' + project.group + ':' + rootProject.name + ':' + project.version + '] <~--*\n'
-}
-
-project.afterEvaluate {
-    publishing {
-        publications {
-            release(MavenPublication) {
-                from components.release
-            }
-        }
-    }
-}
diff --git a/mjpeg-view/build.gradle.kts b/mjpeg-view/build.gradle.kts
new file mode 100644
index 00000000..d4211af6
--- /dev/null
+++ b/mjpeg-view/build.gradle.kts
@@ -0,0 +1,75 @@
+plugins {
+    id("com.android.library")
+    id("maven-publish")
+    id("kotlin-android")
+}
+
+android {
+    namespace = "com.github.niqdev.mjpeg"
+    compileSdk = 33
+
+    defaultConfig {
+        minSdk = 21
+        targetSdk = 33
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles.addAll(
+                listOf(
+                    getDefaultProguardFile("proguard-android.txt"),
+                    file("proguard-rules.pro"),
+                ),
+            )
+        }
+    }
+    packagingOptions {
+        resources {
+            excludes.add("META-INF/services/javax.annotation.processing.Processor")
+        }
+    }
+
+    useLibrary("org.apache.http.legacy")
+
+    externalNativeBuild {
+        ndkBuild {
+            path = File("src/main/jni/Android.mk")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlin {
+        jvmToolchain {
+            languageVersion.set(JavaLanguageVersion.of(17))
+        }
+    }
+}
+
+dependencies {
+    implementation("androidx.appcompat:appcompat:1.6.1")
+    api("io.reactivex:rxjava:1.3.8") // it"s obsolete
+    api("io.reactivex:rxandroid:1.2.1")
+    implementation("androidx.core:core-ktx:1.10.1")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.22")
+}
+
+afterEvaluate {
+    publishing {
+        publications {
+            create<MavenPublication>("maven") {
+                from(components["release"])
+                pom {
+                    licenses {
+                        license {
+                            name = "Apache License Version 2.0"
+                            url = "https://github.com/niqdev/ipcam-view/blob/master/LICENSE"
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/mjpeg-view/src/main/jni/Application.mk b/mjpeg-view/src/main/jni/Application.mk
index 7bacabd9..8fec1ec1 100644
--- a/mjpeg-view/src/main/jni/Application.mk
+++ b/mjpeg-view/src/main/jni/Application.mk
@@ -1,3 +1,2 @@
 # The ARMv7 is significanly faster due to the use of the hardware FPU
-APP_ABI := armeabi-v7a x86 arm64-v8a
-APP_PLATFORM := android-16
+APP_ABI := armeabi-v7a x86 arm64-v8a x86_64
diff --git a/mjpeg-view/src/main/jni/ImageProc/ImageProc.c b/mjpeg-view/src/main/jni/ImageProc/ImageProc.c
index ee85a704..df329eab 100644
--- a/mjpeg-view/src/main/jni/ImageProc/ImageProc.c
+++ b/mjpeg-view/src/main/jni/ImageProc/ImageProc.c
@@ -1,4 +1,5 @@
 #include "ImageProc.h"
+#include <string.h>
 
 METHODDEF(void)
 my_error_exit (j_common_ptr cinfo)
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index 641fe92e..00000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-include ':app', ':mjpeg-view'
diff --git a/settings.gradle.kts b/settings.gradle.kts
new file mode 100644
index 00000000..63574346
--- /dev/null
+++ b/settings.gradle.kts
@@ -0,0 +1,2 @@
+include(":app")
+include(":mjpeg-view")