diff --git a/.github/workflows/android_build.yml b/.github/workflows/android_build.yml
index fa1fe40b..f54eb6ae 100644
--- a/.github/workflows/android_build.yml
+++ b/.github/workflows/android_build.yml
@@ -3,78 +3,57 @@ name: Android Build
 on:
   push:
     branches:
-      - master  # Change this to your main branch name (e.g., master)
-      - dev
+      - '**'  # Trigger on push to any branch
+
 jobs:
   build-debug:
-    name: Build debug
+    # Build debug APK for all feature branches --> and not master
+    if: github.ref_name != 'master'
     runs-on: ubuntu-latest
-    if: github.ref =='refs/heads/dev'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
 
-      - name: Setup JDK
-        uses: actions/setup-java@v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
           java-version: '17'
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: 7.4.2
-
-      - name: Setup Android NDK
-        uses: nttld/setup-ndk@v1.2.0
-        with:
-          ndk-version: r25c
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x ./gradlew
+      - uses: gradle/actions/setup-gradle@v4
+        with: { gradle-version: 7.4.2 }
+      - uses: nttld/setup-ndk@v1.2.0
+        with: { ndk-version: r25c }
+      - run: chmod +x ./gradlew
 
       - name: Build debug APK
         run: ./gradlew assembleDebug
 
-      - name: Upload APK artifact
+      - name: Upload debug APK
         uses: actions/upload-artifact@v4
         with:
-          name: RECORDA-debug  # Change this to your desired artifact name
-          path: ./app/build/outputs/apk/debug/*.apk
+          name: RECORDA-debug
+          path: app/build/outputs/apk/debug/*.apk
 
-  build-master:
-    name: Build master
+  build-release:
+    # Build release APK ONLY for master branch
+    if: github.ref_name == 'master'
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master'
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
 
-      - name: Setup JDK
-        uses: actions/setup-java@v3
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: '17'  # Change this to the required Java version for your Android project
-
-      - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v3
-        with:
-          gradle-version: 7.4.2
-
-      - name: Setup Android NDK
-        uses: nttld/setup-ndk@v1.2.0
-        with:
-          ndk-version: r25c
-
-      - name: Grant execute permission for gradlew
-        run: chmod +x ./gradlew
+          java-version: '17'
+      - uses: gradle/actions/setup-gradle@v4
+        with: { gradle-version: 7.4.2 }
+      - uses: nttld/setup-ndk@v1.2.0
+        with: { ndk-version: r25c }
+      - run: chmod +x ./gradlew
 
       - name: Build release APK
         run: ./gradlew assembleRelease
 
       - name: Sign app APK
         uses: r0adkll/sign-android-release@v1
-        # ID used to access action output
         id: sign_app
         with:
           releaseDirectory: app/build/outputs/apk/release
@@ -83,11 +62,10 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         env:
-          # override default build-tools version (33.0.0) -- optional
           BUILD_TOOLS_VERSION: "34.0.0"
-      - name: Upload APK artifact
+
+      - name: Upload release APK
         uses: actions/upload-artifact@v4
         with:
-          name: RECORDA-release  # Change this to your desired artifact name
-          path: ${{steps.sign_app.outputs.signedReleaseFile}}  # Change the path to the location of your APK file
-
+          name: RECORDA-release
+          path: ${{ steps.sign_app.outputs.signedReleaseFile }}
diff --git a/.gitignore b/.gitignore
index c964fd95..7a9c4c48 100755
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ output.json
 obj/
 .externalNativeBuild
 app/.cxx/
+/TODO.md
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8dbfdc61..ff58b59e 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,10 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="GRADLE" />
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="11" />
+        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..2518976d
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,52 @@
+# Changelog
+
+All notable changes to RECORDA will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+---
+
+## [1.4] – 2026-05-22
+
+### Added
+- **Dark theme support** – RECORDA now follows the system-wide dark/light mode setting. Dark-mode colours are aligned with the companion app [SENDA](https://github.com/NeuropsyOL/SENDA).
+- **In-app tutorial** – a step-by-step guide is available via the new tutorial button in the main toolbar, helping new users get started quickly.
+
+### Fixed
+- App crash caused by a missing runtime permission request.
+- Release APK signing now uses GitHub repository secrets for secure, reproducible builds.
+
+### Changed
+- GitHub Actions CI workflows refactored: reduced code duplication, fixed branch name references, and bumped all action versions to their latest supported releases.
+
+---
+
+## [1.3] – 2023-12-12
+
+### Added
+- Quality monitoring for recorded LSL streams (good / laggy / bad states with colour highlighting and heads-up notifications).
+- Support for both regular and irregular LSL streams in quality checks.
+- Configurable thresholds for laggy/bad detection (timeout and sampling-rate deviation).
+
+### Fixed
+- Incorrect stream-list indexing when scrolling (quality-indicator updates).
+
+---
+
+## [1.2] – 2023
+
+### Added
+- Settings dialog with optional custom recording name.
+- Automatic unique file-name generation if no name is provided.
+
+---
+
+## [1.1] – 2022
+
+### Added
+- Initial public release of RECORDA.
+- Detect and record LSL streams to XDF format on Android 8.0+.
+- Refresh button to rescan the network for available streams.
+- Start/Stop recording with on-device file-finalisation notification.
+
diff --git a/README.md b/README.md
index d4c5ac5f..070c4415 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 [![Android Build](https://github.com/NeuropsyOL/RECORDA/actions/workflows/android_build.yml/badge.svg)](https://github.com/NeuropsyOL/RECORDA/actions/workflows/android_build.yml)
 
 # RECORDA
+> 📋 See [CHANGELOG.md](CHANGELOG.md) for the full version history.
+
 ## Overview
 
 **RECORDA** is an Android application to record [LabStreamingLayer](https://labstreaminglayer.readthedocs.io/) (LSL) streams directly on a smartphone. 
@@ -24,11 +26,17 @@ However, since **RECORDA** is using the LSL framework, it can record any kind of
 ### Getting the APK file
 Download the [latest release](https://github.com/NeuropsyOL/RECORDA/releases/latest) and install the apk on your smartphone or tablet running Android 8.0 or higher. 
 
+### In-App Tutorial
+Tap the tutorial button in the main toolbar to open a step-by-step walkthrough of the app's features.
+
 ### Recording Data: 
 After the start of the application, the user is presented with the home screen, containing all main UI elements. 
 The user can refresh the list of available network streams by clicking the refresh button at the top right. All available streams are then listed in the list view below in the format *Stream Name (Sampling Rate)*. The desired streams should be selected from this list before starting the recording. Recording is initiated by pressing the *Start* button. Once the experiment is complete, the user should press the *Stop* button and wait while the file is finalized. The application will display a notification when the file is ready, including the file’s location on the device.
 The gear button on the top left opens a *settings* dialog. An optional recording name can be configured in the settings; if no name is provided, a unique name will be automatically generated for each new file. 
 
+## Dark Theme
+RECORDA supports the system-wide dark/light mode. When dark mode is active on your device, the app automatically switches to a dark colour scheme that is visually aligned with the [SENDA](https://github.com/NeuropsyOL/SENDA) companion app.
+
 
 ## Quality Monitoring
 During a recording, **RECORDA** monitors the quality of the selected streams. 
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index f8e6e8b3..0a027138 100755
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 # Sets the minimum version of CMake required to build the native library.
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.12)
 
 # Creates and names a library, sets it as either STATIC
 # or SHARED, and provides the relative paths to its source code.
diff --git a/app/build.gradle b/app/build.gradle
index 9fd64a86..ffee803a 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,23 +1,23 @@
 apply plugin: 'com.android.application'
+apply plugin: 'org.jetbrains.kotlin.android'
 
 android {
-    compileSdk 33
+    compileSdk 34
+    namespace "de.uol.neuropsy.recorda"
     ndkVersion "25.2.9519653"
     defaultConfig {
-        applicationId "com.uol.neuropsy.LSLReceiver"
+        applicationId "de.uol.neuropsy.recorda"
         minSdkVersion 26
-        targetSdkVersion 31
-        versionCode 4       // increment with every release
-        versionName '1.3'   // change with every release
+        targetSdkVersion 34
+        versionCode 5       // increment with every release
+        versionName '1.4'   // change with every release
         setProperty("archivesBaseName", "RECORDA-$versionName")
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {
                 cppFlags "-std=c++11 -frtti -fexceptions"
                 arguments '-DANDROID_STL=c++_shared'
             }
         }
-
     }
 
     buildTypes {
@@ -33,10 +33,9 @@ android {
             }
         }
     }
-    externalNativeBuild {
-        cmake {
+    externalNativeBuild.cmake {
+            version '3.24.1+'
             path "../libxdf/CMakeLists.txt"
-        }
     }
 
 }
@@ -47,8 +46,10 @@ dependencies {
     androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
+    implementation "androidx.viewpager2:viewpager2:1.0.0"
     //noinspection GradleCompatible
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    implementation 'com.google.android.material:material:1.11.0'
     testImplementation 'junit:junit:4.13'
     //noinspection GradleCompatible
     implementation 'com.android.support:cardview-v7:28.0.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 59a0577d..240c1439 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,6 +9,7 @@
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
 
 
     <application android:allowBackup="true"
@@ -36,10 +37,17 @@
             android:screenOrientation="portrait"
             android:theme="@style/AppTheme.NoActionBar"/>
 
+        <activity
+            android:name="de.uol.neuropsy.recorda.TutorialActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"/>
+
+
         <service
             android:name="de.uol.neuropsy.recorda.LSLService"
             android:enabled="true"
-            android:exported="true"></service>
+            android:exported="true"
+            android:foregroundServiceType="dataSync"></service>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/de/uol/neuropsy/recorda/LSLService.java b/app/src/main/java/de/uol/neuropsy/recorda/LSLService.java
index e5e3ce0c..c7e91991 100755
--- a/app/src/main/java/de/uol/neuropsy/recorda/LSLService.java
+++ b/app/src/main/java/de/uol/neuropsy/recorda/LSLService.java
@@ -7,16 +7,16 @@
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ServiceInfo;
 import android.graphics.Color;
 import android.os.Binder;
-import android.os.Build;
 import android.os.Environment;
 import android.os.IBinder;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.widget.Toast;
 
+import androidx.core.app.NotificationCompat;
+
 import java.nio.file.Path;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -61,57 +61,83 @@ public class LSLService extends Service {
     public int onStartCommand(final Intent intent, int flags, int startId) {
         Log.i(TAG, "Service onStartCommand");
         MainActivity.isRunning = true;
-        Toast.makeText(this,"Recording LSL!", Toast.LENGTH_SHORT).show();
-
-        // this method is part of the mechanisms that allow this to be a foreground service
-        // a notification channel must also registered in the system before we can send notifications
-        // to the user
-        createNotificationChannel();
-
-        xdfWriter = new XdfWriter();
-        Path xdfFilePath = freshRecordingFilePath();;
-        xdfWriter.setXdfFilePath(xdfFilePath);
-
-        // resolve all streams that are in the network
-        LSL.StreamInfo[] lslStreams = LSL.resolve_streams();
-
-        Collection<String> selectedLslStreams = MainActivity.selectedStreamNames.stream()
-                .map(stream -> stream.lslName)
-                .collect(Collectors.toSet());
-
-        int xdfStreamIndex = 0;
-        synchronized (this) {
-            streamNames = new ArrayList<>();
-            for (LSL.StreamInfo availableStream : lslStreams) {
-                boolean isSelectedToBeRecorded = selectedLslStreams.contains(availableStream.name());
-                if (isSelectedToBeRecorded) {
-                    StreamRecording rec = prepareRecording(availableStream, xdfStreamIndex++);
-                    if (rec != null) {
-                        activeRecordings.add(rec);
-                        streamNames.add(availableStream.name());
+        safeShowToast("Recording LSL!", Toast.LENGTH_SHORT);
+
+        try {
+            // this method is part of the mechanisms that allow this to be a foreground service
+            // a notification channel must also registered in the system before we can send notifications
+            // to the user
+            createNotificationChannel();
+
+            xdfWriter = new XdfWriter();
+            Path xdfFilePath = freshRecordingFilePath();
+            xdfWriter.setXdfFilePath(xdfFilePath);
+            Log.i(TAG, "XDF file path set to: " + xdfFilePath);
+
+            // resolve all streams that are in the network
+            LSL.StreamInfo[] lslStreams = LSL.resolve_streams();
+            Log.i(TAG, "Found " + lslStreams.length + " LSL streams");
+
+            Collection<String> selectedLslStreams = MainActivity.selectedStreamNames.stream()
+                    .map(stream -> stream.lslName)
+                    .collect(Collectors.toSet());
+
+            int xdfStreamIndex = 0;
+            synchronized (this) {
+                streamNames = new ArrayList<>();
+                for (LSL.StreamInfo availableStream : lslStreams) {
+                    boolean isSelectedToBeRecorded = selectedLslStreams.contains(availableStream.name());
+                    if (isSelectedToBeRecorded) {
+                        StreamRecording rec = prepareRecording(availableStream, xdfStreamIndex++);
+                        if (rec != null) {
+                            activeRecordings.add(rec);
+                            streamNames.add(availableStream.name());
+                        }
                     }
                 }
+                streamQualities = new QualityState[activeRecordings.size()];
+                Arrays.fill(streamQualities, QualityState.OK);
             }
-            streamQualities = new QualityState[activeRecordings.size()];
-            Arrays.fill(streamQualities, QualityState.OK);
-        }
 
-        activeRecordings.forEach(streamRecording -> {
-            streamRecording.registerQualityListener((int streamIndex, QualityMetrics q) -> {
-                QualityState qualityNow = q.getCurrentQuality();
-                Log.i(TAG, "Stream " + streamIndex + " srate: " + q.getCurrentSamplingRate() + " q: " + qualityNow);
-                if (streamQualities[streamIndex] != qualityNow) {
-                    streamQualities[streamIndex] = qualityNow;
-                    if (qualityNow != QualityState.OK) {
-                        postStreamQualityNotification(streamNames.get(streamIndex), qualityNow);
+            Log.i(TAG, "Prepared " + activeRecordings.size() + " recordings");
+
+            activeRecordings.forEach(streamRecording -> {
+                streamRecording.registerQualityListener((int streamIndex, QualityMetrics q) -> {
+                    QualityState qualityNow = q.getCurrentQuality();
+                    Log.i(TAG, "Stream " + streamIndex + " srate: " + q.getCurrentSamplingRate() + " q: " + qualityNow);
+                    if (streamQualities[streamIndex] != qualityNow) {
+                        streamQualities[streamIndex] = qualityNow;
+                        if (qualityNow != QualityState.OK) {
+                            postStreamQualityNotification(streamNames.get(streamIndex), qualityNow);
+                        }
                     }
-                }
+                });
+                streamRecording.spawnRecorderThread();
             });
-            streamRecording.spawnRecorderThread();
-        });
 
             startMyOwnForeground();
-            Toast.makeText(this, "LSL Recorder can safely run in background!", Toast.LENGTH_LONG).show();
+            safeShowToast("LSL Recorder can safely run in background!", Toast.LENGTH_LONG);
+            Log.i(TAG, "Service started successfully");
+
+        } catch (Exception e) {
+            Log.e(TAG, "CRITICAL: Error starting LSL recording service", e);
+            safeShowToast("Failed to start recording: " + e.getMessage(), Toast.LENGTH_LONG);
+
+            // Clean up partial initialization
+            try {
+                if (xdfWriter != null) {
+                    Log.w(TAG, "Cleaning up partial initialization");
+                }
+                activeRecordings.clear();
+                MainActivity.isRunning = false;
+            } catch (Exception cleanupError) {
+                Log.e(TAG, "Error during cleanup", cleanupError);
+            }
+
+            // Stop the service since initialization failed
+            stopSelf();
+        }
+
         return START_NOT_STICKY;
     }
 
@@ -172,7 +198,13 @@ private void startMyOwnForeground() {
                 .setCategory(Notification.CATEGORY_SERVICE)
                 .build();
         int information_id = 2; // this must be unique and not 0, otherwise it does not have a meaning
-        startForeground(information_id, notification);
+
+        // For Android 14+ (API 34+), we need to specify the foreground service type
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
+            startForeground(information_id, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC);
+        } else {
+            startForeground(information_id, notification);
+        }
     }
 
     @Override
@@ -183,30 +215,93 @@ public IBinder onBind(Intent arg0) {
 
     @Override
     public void onDestroy() {
-        stopRecordings();
-        finishXdf();
+        Log.i(TAG, "Service onDestroy called");
+
+        try {
+            stopRecordings();
+
+            // Only try to finish XDF if it was initialized
+            if (xdfWriter != null) {
+                finishXdf();
+            } else {
+                Log.w(TAG, "Service destroyed before xdfWriter was initialized - no file to save");
+            }
 
-        // Forget about recordings after saving
-        activeRecordings.clear();
-        MainActivity.isComplete = true;
+            // Forget about recordings after saving
+            activeRecordings.clear();
+            MainActivity.isComplete = true;
+
+        } catch (Exception e) {
+            Log.e(TAG, "Error during service destruction", e);
+            // Continue with cleanup even if there's an error
+            activeRecordings.clear();
+            MainActivity.isComplete = true;
+        }
     }
 
     /**
      * Stop all ongoing asynchronous recordings and wait for them to finish.
      */
     private void stopRecordings() {
-        // Send stop signals to all recordings
-        MainActivity.isRunning = false;
-        activeRecordings.forEach(StreamRecording::stop);
-        Log.i(TAG, "Sent stop signal. Waiting for recording threads to terminate...");
-        activeRecordings.forEach(StreamRecording::waitFinished);
-        Log.i(TAG, "All recording threads terminated.");
+        try {
+            // Send stop signals to all recordings
+            MainActivity.isRunning = false;
+            Log.i(TAG, "Stopping " + activeRecordings.size() + " recordings");
+
+            activeRecordings.forEach(recording -> {
+                try {
+                    recording.stop();
+                } catch (Exception e) {
+                    Log.e(TAG, "Error stopping recording", e);
+                }
+            });
+
+            Log.i(TAG, "Sent stop signal. Waiting for recording threads to terminate...");
+
+            activeRecordings.forEach(recording -> {
+                try {
+                    recording.waitFinished();
+                } catch (Exception e) {
+                    Log.e(TAG, "Error waiting for recording to finish", e);
+                }
+            });
+
+            Log.i(TAG, "All recording threads terminated.");
+        } catch (Exception e) {
+            Log.e(TAG, "Error during stopRecordings", e);
+        }
     }
 
     private void finishXdf() {
-        Toast.makeText(this, "Finishing XDF file...", Toast.LENGTH_LONG).show();
-        activeRecordings.forEach(StreamRecording::writeStreamFooter);
-        Toast.makeText(this, "File written at: " + xdfWriter.getXdfFilePath(), Toast.LENGTH_LONG).show();
+        try {
+            safeShowToast("Finishing XDF file...", Toast.LENGTH_LONG);
+
+            // Write stream footers for all active recordings
+            activeRecordings.forEach(recording -> {
+                try {
+                    recording.writeStreamFooter();
+                } catch (Exception e) {
+                    Log.e(TAG, "Error writing stream footer", e);
+                }
+            });
+
+            // Show completion message with file path
+            if (xdfWriter != null) {
+                String filePath = xdfWriter.getXdfFilePath();
+                if (filePath != null && !filePath.isEmpty()) {
+                    safeShowToast("File written at: " + filePath, Toast.LENGTH_LONG);
+                    Log.i(TAG, "XDF file written successfully: " + filePath);
+                } else {
+                    Log.w(TAG, "XDF file path is null or empty");
+                }
+            } else {
+                Log.w(TAG, "xdfWriter is null, cannot get file path");
+            }
+
+        } catch (Exception e) {
+            Log.e(TAG, "Error finishing XDF file", e);
+            safeShowToast("Error saving recording file", Toast.LENGTH_SHORT);
+        }
     }
 
     private static Path freshRecordingFilePath() {
@@ -214,8 +309,13 @@ private static Path freshRecordingFilePath() {
         String fileNameSafeTime = isoTime.replace(':', '-');
         String filename = MainActivity.filenamevalue + "-" + fileNameSafeTime + ".xdf";
 
-        Path path = Environment.getExternalStorageDirectory().toPath().resolve("Download");
-        return path.resolve(filename);
+        Path folder;
+        if (MainActivity.saveFolderPath != null && !MainActivity.saveFolderPath.isEmpty()) {
+            folder = new java.io.File(MainActivity.saveFolderPath).toPath();
+        } else {
+            folder = Environment.getExternalStorageDirectory().toPath().resolve("Download");
+        }
+        return folder.resolve(filename);
     }
 
     private void createNotificationChannel() {
@@ -262,6 +362,20 @@ private void postStreamQualityNotification(String streamName, QualityState quali
         notifyManager.notify(1007, notification);
     }
 
+    /**
+     * Safely show a Toast message, catching DeadObjectException that can occur
+     * when the app process is being destroyed.
+     */
+    private void safeShowToast(String message, int duration) {
+        try {
+            Toast.makeText(this, message, duration).show();
+        } catch (Exception e) {
+            // DeadObjectException or other exceptions can occur if the app is being destroyed
+            // Log it but don't crash
+            Log.w(TAG, "Failed to show toast: " + message, e);
+        }
+    }
+
 
     class LocalBinder extends Binder {
         public LSLService getLSLService() {
diff --git a/app/src/main/java/de/uol/neuropsy/recorda/MainActivity.java b/app/src/main/java/de/uol/neuropsy/recorda/MainActivity.java
deleted file mode 100755
index a2ab09bd..00000000
--- a/app/src/main/java/de/uol/neuropsy/recorda/MainActivity.java
+++ /dev/null
@@ -1,473 +0,0 @@
-package de.uol.neuropsy.recorda;
-
-import static de.uol.neuropsy.recorda.recorder.QualityState.LAGGY;
-
-import android.Manifest;
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.pm.PackageManager;
-import android.graphics.Color;
-import android.graphics.PorterDuff;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.PowerManager;
-import android.support.annotation.RequiresApi;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.ImageView;
-import android.widget.ListView;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-
-import de.uol.neuropsy.recorda.recorder.QualityState;
-import de.uol.neuropsy.recorda.util.ResolveStreamsTask;
-import edu.ucsd.sccn.LSL;
-
-/**
- * Edited by Sarah Blum on 21/08/2020
- * <p>
- * Changes: file handling adapted, storage location fixed
- */
-public class MainActivity extends Activity {
-
-    public static final int COLOR_QUALITY_RED = Color.rgb(210, 25, 25);
-    public static final int COLOR_QUALITY_YELLOW = Color.rgb(255, 220, 0);
-    public static ListView lv;
-    public static List<StreamName> LSLStreamName = new ArrayList<>();
-    public static List<StreamName> selectedStreamNames = new ArrayList<>();
-    public static boolean writePermission = true;
-    public static String filenamevalue;
-    public static boolean isComplete = false;
-    static TextView tv;
-    static volatile boolean isRunning = false;
-
-    private ServiceConnection serviceConnection;
-    private volatile LSLService lslService;
-
-    private static final String TAG = "MainActivity";
-
-    //Elapsed Time
-    //Create placeholder for user's consent to record_audio permission.
-    //This will be used in handling callback
-    private final int MY_PERMISSIONS_WRITE_LSL = 1;
-    public TextView tdate;
-    //Initializing Sensor data Variables
-    public Thread t;
-
-    public Long startMillis;
-    ArrayAdapter<String> adapter;
-    Button start, stop;
-    List<String> stream;
-    ImageView refresh;
-    //Settings button
-    ImageView settings_button;
-
-
-    @SuppressLint({"SetTextI18n", "ClickableViewAccessibility"})
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-        tv = (TextView) findViewById(R.id.tv);
-        start = (Button) findViewById(R.id.startLSL);
-        stop = (Button) findViewById(R.id.stopLSL);
-        refresh = (ImageButton) findViewById(R.id.refreshStreams);
-        tdate = (TextView) findViewById(R.id.elapsedTime);
-        requestWritePermissions();
-        // set filename so that is not null, it gets changed if the user enters settings screen
-        filenamevalue = "recording";
-        lv = (ListView) findViewById(R.id.streams);
-        lv.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE);
-        settings_button = (ImageView) findViewById(R.id.settings_btn);
-        settings_button.setVisibility(View.VISIBLE);
-
-        final Intent intent = new Intent(this, LSLService.class);
-
-        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-
-        serviceConnection = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName name, IBinder service) {
-                lslService = ((LSLService.LocalBinder)service).getLSLService();
-
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName name) {
-                lslService = null;
-            }
-        };
-
-        start.setOnClickListener(new View.OnClickListener() {
-            Long tsLong = System.currentTimeMillis() / 1000;
-            String ts = tsLong.toString();
-
-            @Override
-            public void onClick(View v) {
-                if (selectedStreamNames.isEmpty()) {
-                    return;
-                }
-                if (!isRunning) {
-                    if (!writePermission) {
-                        requestWritePermissions();
-                        //Log.i("Path", path);
-                    }
-
-                    if (StringUtils.isEmpty(filenamevalue)) {
-                        filenamevalue = "recording";
-                    }
-                    LSL.StreamInfo[] available_streams = LSL.resolve_streams();
-                    Boolean allOkay = true;
-                    for (StreamName streamName : selectedStreamNames) {
-                        if (Arrays.stream(available_streams).anyMatch(s -> s.name().equals(streamName.lslName))){
-                            Log.i(TAG,"Found "+streamName.lslName);
-                        }
-                        else {
-                            Log.e(TAG,"Did not find: "+streamName.lslName);
-                            allOkay = false;
-                            forceUpdateQualityIndicator(streamName.lslName, QualityState.NOT_RESPONDING);
-                        }
-                    }
-                    if (!allOkay) {
-                        Toast.makeText(MainActivity.this, "At least one of the streams you selected is no longer available. Refresh and try again.", Toast.LENGTH_LONG).show();
-                        return;
-                    }
-                    lv.setEnabled(false);
-                    // make this a foreground service so that android does not kill it while it is in the background
-                        myStartForegroundService(intent);
-
-                    bindService(intent, serviceConnection, 0);
-                    startMillis = System.currentTimeMillis();
-                    tdate.setText("00:00");
-                    ElapsedTime();
-                }
-            }
-        });
-
-        refresh.setOnTouchListener(new View.OnTouchListener() {
-            @Override
-            public boolean onTouch(View v, MotionEvent event) {
-                switch (event.getAction()) {
-                    case MotionEvent.ACTION_DOWN: {
-                        Toast.makeText(MainActivity.this, "Refreshing Streams...",
-                                Toast.LENGTH_LONG).show();
-                        ImageButton view = (ImageButton) v;
-                        view.getBackground().setColorFilter(0x77000000, PorterDuff.Mode.SRC_ATOP);
-                        view.invalidate();
-                        break;
-                    }
-                    case MotionEvent.ACTION_UP:
-                        RefreshStreams();
-
-                    case MotionEvent.ACTION_CANCEL: {
-                        ImageButton view = (ImageButton) v;
-                        view.getBackground().clearColorFilter();
-                        view.invalidate();
-                        break;
-                    }
-                }
-
-                return true;
-            }
-        });
-
-        stop.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (intent != null && t!= null) {
-
-                    if (lslService != null) {
-                        lslService = null;
-                        stopService(intent);
-                        unbindService(serviceConnection);
-                    }
-                    t.interrupt();
-                    lv.setEnabled(true);
-                }
-            }
-        });
-
-        settings_button.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(MainActivity.this, SettingsActivity.class);
-                startActivity(intent);
-            }
-        });
-
-        tv.setText("Available Streams: ");
-        lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
-            public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                // selected item
-                ArrayAdapter<StreamName> adapter = (ArrayAdapter<StreamName>) parent.getAdapter();
-                StreamName selectedItem = adapter.getItem (position);
-
-                if (selectedStreamNames.contains(selectedItem))
-                    selectedStreamNames.remove(selectedItem); //remove deselected item from the list of selected items
-                else
-                    selectedStreamNames.add(selectedItem); //add selected item to the list of selected items
-                showSelectedItems();
-            }
-        });
-        PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE);
-        assert powerManager != null;
-        PowerManager.WakeLock wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "LSLRec:MyWakelockTag");
-        wakeLock.acquire();
-    }
-
-
-    public static String getElapsedTimeMinutesSecondsString(Long miliseconds) {
-        Long elapsedTime = miliseconds;
-        @SuppressLint("DefaultLocale") String format = String.format("%%0%dd", 2);
-        String seconds = String.format(format, (elapsedTime / 1000) % 60);
-        String minutes = String.format(format, ((elapsedTime / (1000 * 60)) % 60));
-        String hours = String.format(format, ((elapsedTime / (1000 * 60 * 60)) % 24));
-        return hours + ":" + minutes + ":" + seconds;
-    }
-
-    public void RefreshStreams() {
-        selectedStreamNames.clear();
-        LSLStreamName.clear();
-        new ResolveStreamsTask().execute(this);
-    }
-
-    public void onStreamRefresh(LSL.StreamInfo[] streams) {
-        ArrayAdapter<StreamName> adapter = new ArrayAdapter<>(this, R.layout.list_view_text, LSLStreamName);
-        lv.setEnabled(true);
-        lv.setAdapter(adapter);
-        for (LSL.StreamInfo stream1 : streams) {
-            adapter.add(new StreamName(stream1));
-        }
-        for (int i = 0; i < lv.getAdapter().getCount(); i++) {
-            lv.setItemChecked(i, true);
-        }
-        selectedStreamNames.addAll(LSLStreamName);
-    }
-
-    private static String streamDisplayNameOf(LSL.StreamInfo streamInfo) {
-        String samplingRateAsString = samplingRateAsText(streamInfo.nominal_srate());
-        return streamInfo.name() + " (" + samplingRateAsString + ")";
-    }
-
-    private static String samplingRateAsText(double rate) {
-        if (rate == LSL.IRREGULAR_RATE) {
-            return "irreg.";
-        }
-        if (rate < 10000.0) {
-            return (int) rate + " Hz";
-        }
-        return String.format("%.1f kHz", rate / 1000.0);
-    }
-
-    public void ElapsedTime() {
-        t = new Thread() {
-            @Override
-            public void run() {
-                try {
-                    while (!isInterrupted()) {
-                        Thread.sleep(1000);
-                        runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                long now = System.currentTimeMillis();
-                                long difference = now - startMillis;
-                                tdate.setText(getElapsedTimeMinutesSecondsString(difference));
-                                updateStreamQualityIndicators();
-                            }
-                        });
-                    }
-                } catch (InterruptedException e) {
-                }
-            }
-        };
-        t.start();
-    }
-
-    private void forceUpdateQualityIndicator(String lslName, QualityState quality) {
-        ArrayAdapter<StreamName> adapter = (ArrayAdapter<StreamName>) lv.getAdapter();
-        for (int i = 0; i < adapter.getCount(); i++) {
-            StreamName stream = adapter.getItem(i);
-            if (lslName == stream.lslName) {
-                if (i < lv.getFirstVisiblePosition() || i > lv.getLastVisiblePosition()) {
-                    Log.d("RECORDA", stream.lslName + " not visible, skipping");
-                    return;
-                }
-                TextView listItem = (TextView) lv.getChildAt(i);
-                if (listItem == null)
-                    Log.e("RECORDA", "Could not find child: " + stream.lslName + " with id: " + i);
-                else {
-                    Log.e("RECORDA", "Setting quality for: " + stream.lslName + " with id: " + i);
-                    setColorBasedOnQuality(listItem, quality);
-                }
-            }
-        }
-    }
-
-    private void updateStreamQualityIndicators() {
-        LSLService lsl = lslService;
-        if (!isRunning || lsl == null) {
-            return;
-        }
-        for (int i = lv.getFirstVisiblePosition(); i <= lv.getLastVisiblePosition(); i++) {
-            StreamName stream = (StreamName) lv.getItemAtPosition(i);
-            if (stream == null) {
-                Log.w(TAG, "Unexpected: No data item at position " + i);
-                continue;
-            }
-            QualityState quality = lsl.getCurrentStreamQuality(stream.lslName);
-            if (quality == null) {
-                continue; // that stream is not being recorded
-            }
-            TextView listItem = (TextView) lv.getChildAt(i - lv.getFirstVisiblePosition());
-            if (listItem == null) {
-                Log.w(TAG, "Unexpected: No view at index " + i);
-                continue;
-            }
-            Log.i(TAG,"Trying to set stream quality for "+stream.lslName+" got:"+listItem.getText());
-            setColorBasedOnQuality(listItem, quality);
-            double currentSamplingRate = lsl.getCurrentSamplingRate(stream.lslName);
-            setTextBasedOnSamplingRate(listItem, stream, currentSamplingRate);
-        }
-    }
-
-    private static void setColorBasedOnQuality(TextView view, QualityState q) {
-        int backgroundColor =
-                q == QualityState.NOT_RESPONDING ? COLOR_QUALITY_RED
-                        : q == LAGGY ? COLOR_QUALITY_YELLOW
-                        : Color.TRANSPARENT;
-        view.setBackgroundColor(backgroundColor);
-        int textColor;
-        if (Color.luminance(backgroundColor) > 0.5f || backgroundColor == Color.TRANSPARENT) {
-            textColor = Color.BLACK;
-        } else {
-            textColor = Color.WHITE;
-        }
-        view.setTextColor(textColor);
-    }
-
-    private static void setTextBasedOnSamplingRate(TextView view, StreamName stream, double samplingRate) {
-        double currentRate = samplingRate;
-        String streamNameWithSamplingRate = stream.displayName;
-        if (currentRate > 0.0) {
-            streamNameWithSamplingRate += " " + samplingRateAsText(currentRate);
-        }
-        view.setText(streamNameWithSamplingRate);
-    }
-
-    /*
-    We do not need to ask the user for write permissions for every single folder, since the app is
-    prompting the user in the beginning for writing access to external storage.
-     */
-    private void requestWritePermissions() {
-        if (ContextCompat.checkSelfPermission(this,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE)
-                != PackageManager.PERMISSION_GRANTED) {
-
-            //When permission is not granted by user, show them message why this permission is needed.
-            if (ActivityCompat.shouldShowRequestPermissionRationale(this,
-                    Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                Toast.makeText(this, "Please grant permissions to write XDF file",
-                        Toast.LENGTH_LONG).show();
-                writePermission = false;
-
-                //Give user option to still opt-in the permissions
-                ActivityCompat.requestPermissions(this,
-                        new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                        MY_PERMISSIONS_WRITE_LSL);
-
-            } else {
-                // Show user dialog to grant permission to record audio
-                ActivityCompat.requestPermissions(this,
-                        new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                        MY_PERMISSIONS_WRITE_LSL);
-                filenamevalue = "hardcoded.xdf";
-            }
-        }
-    }
-
-    //Handling callback
-    @Override
-    public void onRequestPermissionsResult(int requestCode,
-                                           String permissions[], int[] grantResults) {
-        switch (requestCode) {
-            case MY_PERMISSIONS_WRITE_LSL: {
-                if (grantResults.length > 0
-                        && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                    writePermission = true;
-                    // permission was granted, yay!
-                } else {
-                    // permission denied, boo! Disable the
-                    // functionality that depends on this permission.
-                    writePermission = false;
-                }
-            }
-        }
-    }
-
-    private void showSelectedItems() {
-        String selItems = "";
-        for (StreamName item : selectedStreamNames) {
-            if (selItems == "")
-                selItems = item.lslName;
-            else
-                selItems += "/" + item;
-        }
-        //Toast.makeText(this, selItems, Toast.LENGTH_LONG).show();
-    }
-
-    public void myStartForegroundService(Intent intent) {
-        intent.putExtra("inputExtra", "Foreground Service Example in Android");
-        ContextCompat.startForegroundService(this, intent);
-    }
-
-    /**
-     * An LSL stream's name which is used to identify which stream to record, paired with a display
-     * string that includes its nominal sampling rate.
-     */
-    static final class StreamName {
-        public final String lslName;
-        public final String displayName;
-
-        public StreamName(LSL.StreamInfo streamInfo) {
-            lslName = Objects.requireNonNull(streamInfo.name());
-            displayName = streamDisplayNameOf(streamInfo);
-        }
-
-        @Override
-        public String toString() {
-            return displayName;
-        }
-
-        @Override
-        public boolean equals(Object o) {
-            if (this == o) return true;
-            if (o == null || getClass() != o.getClass()) return false;
-            StreamName that = (StreamName) o;
-            return lslName.equals(that.lslName) && displayName.equals(that.displayName);
-        }
-
-        @Override
-        public int hashCode() {
-            return Objects.hash(lslName, displayName);
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/de/uol/neuropsy/recorda/MainActivity.kt b/app/src/main/java/de/uol/neuropsy/recorda/MainActivity.kt
new file mode 100755
index 00000000..7209fb4f
--- /dev/null
+++ b/app/src/main/java/de/uol/neuropsy/recorda/MainActivity.kt
@@ -0,0 +1,517 @@
+package de.uol.neuropsy.recorda
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.ComponentName
+import android.content.Intent
+import android.content.ServiceConnection
+import android.content.pm.PackageManager
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.os.IBinder
+import android.os.PowerManager
+import android.util.Log
+import android.view.Menu
+import android.view.MenuItem
+import android.view.MotionEvent
+import android.view.View
+import android.view.View.OnTouchListener
+import android.view.WindowManager
+import android.widget.AdapterView.OnItemClickListener
+import android.widget.ArrayAdapter
+import android.widget.Button
+import android.widget.ImageButton
+import android.widget.ImageView
+import android.widget.ListView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.core.content.ContextCompat
+import com.google.android.material.appbar.MaterialToolbar
+import de.uol.neuropsy.recorda.LSLService.LocalBinder
+import de.uol.neuropsy.recorda.recorder.QualityState
+import de.uol.neuropsy.recorda.util.ResolveStreamsTask
+import edu.ucsd.sccn.LSL
+import edu.ucsd.sccn.LSL.StreamInfo
+import org.apache.commons.lang3.StringUtils
+import java.util.Arrays
+import java.util.Objects
+
+/**
+ * Edited by Sarah Blum on 21/08/2020
+ *
+ *
+ * Changes: file handling adapted, storage location fixed
+ */
+class MainActivity : AppCompatActivity() {
+    private var serviceConnection: ServiceConnection? = null
+
+    @Volatile
+    private var lslService: LSLService? = null
+
+    //Elapsed Time
+    //Create placeholder for user's consent to record_audio permission.
+    //This will be used in handling callback
+    private val MY_PERMISSIONS_WRITE_LSL = 1
+    var tdate: TextView? = null
+
+    //Initializing Sensor data Variables
+    var t: Thread? = null
+    var startMillis: Long? = null
+    var adapter: ArrayAdapter<String>? = null
+    var start: Button? = null
+    var stop: Button? = null
+    var stream: List<String>? = null
+    var refresh: ImageView? = null
+
+    @SuppressLint("SetTextI18n", "ClickableViewAccessibility")
+    public override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        // Wire the toolbar as the action bar
+        val toolbar = findViewById<MaterialToolbar>(R.id.toolbar)
+        setSupportActionBar(toolbar)
+
+        tv = findViewById<View>(R.id.tv) as TextView
+        start = findViewById<View>(R.id.startLSL) as Button
+        stop = findViewById<View>(R.id.stopLSL) as Button
+        refresh = findViewById<View>(R.id.refreshStreams) as ImageButton
+        tdate = findViewById<View>(R.id.elapsedTime) as TextView
+        requestWritePermissions()
+        // set filename so that is not null, it gets changed if the user enters settings screen
+        filenamevalue = "recording"
+        lv = findViewById<View>(R.id.streams) as ListView
+        lv!!.choiceMode = ListView.CHOICE_MODE_MULTIPLE
+        lv!!.emptyView = findViewById(R.id.emptyStreamsText)
+        val intent = Intent(this, LSLService::class.java)
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        serviceConnection = object : ServiceConnection {
+            override fun onServiceConnected(name: ComponentName, service: IBinder) {
+                lslService = (service as LocalBinder).lslService
+            }
+
+            override fun onServiceDisconnected(name: ComponentName) {
+                lslService = null
+            }
+        }
+        start!!.setOnClickListener(object : View.OnClickListener {
+            var tsLong = System.currentTimeMillis() / 1000
+            var ts = tsLong.toString()
+            override fun onClick(v: View) {
+                if (selectedStreamNames.isEmpty()) {
+                    return
+                }
+                if (!isRunning) {
+                    if (!writePermission) {
+                        requestWritePermissions()
+                        //Log.i("Path", path);
+                    }
+                    if (StringUtils.isEmpty(filenamevalue)) {
+                        filenamevalue = "recording"
+                    }
+                    val available_streams = LSL.resolve_streams()
+                    var allOkay = true
+                    for (streamName in selectedStreamNames) {
+                        if (Arrays.stream<StreamInfo>(available_streams)
+                                .anyMatch { s: StreamInfo -> s.name() == streamName!!.lslName }
+                        ) {
+                            Log.i(TAG, "Found " + streamName!!.lslName)
+                        } else {
+                            Log.e(TAG, "Did not find: " + streamName!!.lslName)
+                            allOkay = false
+                            forceUpdateQualityIndicator(
+                                streamName.lslName,
+                                QualityState.NOT_RESPONDING
+                            )
+                        }
+                    }
+                    if (!allOkay) {
+                        safeShowToast(
+                            "At least one of the streams you selected is no longer available. Refresh and try again.",
+                            Toast.LENGTH_LONG
+                        )
+                        return
+                    }
+                    lv!!.isEnabled = false
+                    // make this a foreground service so that android does not kill it while it is in the background
+                    myStartForegroundService(intent)
+                    bindService(intent, serviceConnection!!, 0)
+                    startMillis = System.currentTimeMillis()
+                    tdate!!.text = "00:00"
+                    ElapsedTime()
+                    updateButtonStates(recording = true)
+                }
+            }
+        })
+        refresh!!.setOnTouchListener(object : OnTouchListener {
+            override fun onTouch(v: View, event: MotionEvent): Boolean {
+                when (event.action) {
+                    MotionEvent.ACTION_DOWN -> {
+                        safeShowToast(
+                            "Refreshing Streams...",
+                            Toast.LENGTH_LONG
+                        )
+                        val view = v as ImageButton
+                        view.background.setColorFilter(0x77000000, PorterDuff.Mode.SRC_ATOP)
+                        view.invalidate()
+                    }
+
+                    MotionEvent.ACTION_UP -> {
+                        RefreshStreams()
+                        run {
+                            val view = v as ImageButton
+                            view.background.clearColorFilter()
+                            view.invalidate()
+                        }
+                    }
+
+                    MotionEvent.ACTION_CANCEL -> {
+                        val view = v as ImageButton
+                        view.background.clearColorFilter()
+                        view.invalidate()
+                    }
+                }
+                return true
+            }
+        })
+        stop!!.setOnClickListener {
+            if (intent != null && t != null) {
+                if (lslService != null) {
+                    lslService = null
+                    stopService(intent)
+                    unbindService(serviceConnection!!)
+                }
+                t!!.interrupt()
+                lv!!.isEnabled = true
+                updateButtonStates(recording = false)
+            }
+        }
+        tv!!.text = "Available Streams: "
+        lv!!.onItemClickListener =
+            OnItemClickListener { parent, view, position, id ->
+                val adapter = parent.adapter as ArrayAdapter<StreamName>
+                val selectedItem = adapter.getItem(position)
+                if (selectedStreamNames.contains(selectedItem)) selectedStreamNames.remove(selectedItem)
+                else selectedStreamNames.add(selectedItem)
+                showSelectedItems()
+            }
+
+
+        val powerManager = (getSystemService(POWER_SERVICE) as PowerManager)
+        val wakeLock =
+            powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "LSLRec:MyWakelockTag")
+        wakeLock.acquire()
+    }
+
+    /** Swaps button colours to highlight the next meaningful action. */
+    private fun updateButtonStates(recording: Boolean) {
+        val primary = ContextCompat.getDrawable(this, R.drawable.shape_primary)
+        val secondary = ContextCompat.getDrawable(this, R.drawable.shape)
+        if (recording) {
+            start!!.background = secondary   // grey — not the active action
+            stop!!.background  = primary     // blue  — next action
+        } else {
+            start!!.background = primary     // blue  — next action
+            stop!!.background  = secondary   // grey  — not the active action
+        }
+    }
+
+    fun RefreshStreams() {
+        LSLStreamName.clear()
+        ResolveStreamsTask().execute(this)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            R.id.action_settings -> {
+                startActivity(Intent(this, SettingsActivity::class.java))
+                true
+            }
+            R.id.action_tutorial -> {
+                startActivity(Intent(this, TutorialActivity::class.java))
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
+
+    fun onStreamRefresh(streams: Array<StreamInfo>) {
+        val adapter = ArrayAdapter(this, R.layout.list_view_text, LSLStreamName)
+        lv!!.isEnabled = true
+        lv!!.adapter = adapter
+        for (stream1 in streams) {
+            adapter.add(StreamName(stream1))
+        }
+        for (i in 0 until lv!!.adapter.count) {
+            lv!!.setItemChecked(i, true)
+        }
+        selectedStreamNames.addAll(LSLStreamName)
+    }
+
+    fun ElapsedTime() {
+        t = object : Thread() {
+            override fun run() {
+                try {
+                    while (!isInterrupted) {
+                        sleep(1000)
+                        runOnUiThread {
+                            val now = System.currentTimeMillis()
+                            val difference = now - startMillis!!
+                            tdate!!.text = getElapsedTimeMinutesSecondsString(difference)
+                            updateStreamQualityIndicators()
+                        }
+                    }
+                } catch (e: InterruptedException) {
+                }
+            }
+        }
+        t!!.start()
+    }
+
+    private fun forceUpdateQualityIndicator(lslName: String, quality: QualityState) {
+        val adapter = lv!!.adapter as ArrayAdapter<StreamName>
+        for (i in 0 until adapter.count) {
+            val stream = adapter.getItem(i)
+            if (lslName === stream!!.lslName) {
+                if (i < lv!!.firstVisiblePosition || i > lv!!.lastVisiblePosition) {
+                    Log.d("RECORDA", stream!!.lslName + " not visible, skipping")
+                    return
+                }
+                val listItem = lv!!.getChildAt(i) as TextView
+                if (listItem == null) Log.e(
+                    "RECORDA",
+                    "Could not find child: " + stream!!.lslName + " with id: " + i
+                ) else {
+                    Log.e("RECORDA", "Setting quality for: " + stream!!.lslName + " with id: " + i)
+                    setColorBasedOnQuality(this, listItem, quality)
+                }
+            }
+        }
+    }
+
+    private fun updateStreamQualityIndicators() {
+        val lsl = lslService
+        if (!isRunning || lsl == null) {
+            return
+        }
+        for (i in lv!!.firstVisiblePosition..lv!!.lastVisiblePosition) {
+            val stream = lv!!.getItemAtPosition(i) as StreamName
+            if (stream == null) {
+                Log.w(TAG, "Unexpected: No data item at position $i")
+                continue
+            }
+            val quality = lsl.getCurrentStreamQuality(stream.lslName)
+                ?: continue  // that stream is not being recorded
+            val listItem = lv!!.getChildAt(i - lv!!.firstVisiblePosition) as TextView
+            if (listItem == null) {
+                Log.w(TAG, "Unexpected: No view at index $i")
+                continue
+            }
+            Log.i(
+                TAG,
+                "Trying to set stream quality for " + stream.lslName + " got:" + listItem.text
+            )
+            setColorBasedOnQuality(this, listItem, quality)
+            val currentSamplingRate = lsl.getCurrentSamplingRate(stream.lslName)
+            setTextBasedOnSamplingRate(listItem, stream, currentSamplingRate)
+        }
+    }
+
+    /*
+    We do not need to ask the user for write permissions for every single folder, since the app is
+    prompting the user in the beginning for writing access to external storage.
+     */
+    private fun requestWritePermissions() {
+        if (ContextCompat.checkSelfPermission(
+                this,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE
+            )
+            != PackageManager.PERMISSION_GRANTED
+        ) {
+
+            //When permission is not granted by user, show them message why this permission is needed.
+            if (ActivityCompat.shouldShowRequestPermissionRationale(
+                    this,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE
+                )
+            ) {
+                safeShowToast(
+                    "Please grant permissions to write XDF file",
+                    Toast.LENGTH_LONG
+                )
+                writePermission = false
+
+                //Give user option to still opt-in the permissions
+                ActivityCompat.requestPermissions(
+                    this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+                    MY_PERMISSIONS_WRITE_LSL
+                )
+            } else {
+                // Show user dialog to grant permission to record audio
+                ActivityCompat.requestPermissions(
+                    this, arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+                    MY_PERMISSIONS_WRITE_LSL
+                )
+                filenamevalue = "recording"
+            }
+        }
+    }
+
+    //Handling callback
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<String>, grantResults: IntArray
+    ) {
+        when (requestCode) {
+            MY_PERMISSIONS_WRITE_LSL -> {
+                if (grantResults.size > 0
+                    && grantResults[0] == PackageManager.PERMISSION_GRANTED
+                ) {
+                    writePermission = true
+                    // permission was granted, yay!
+                } else {
+                    // permission denied, boo! Disable the
+                    // functionality that depends on this permission.
+                    writePermission = false
+                }
+            }
+        }
+    }
+
+    private fun showSelectedItems() {
+        var selItems = ""
+        for (item in selectedStreamNames) {
+            if (selItems === "") selItems = item!!.lslName else selItems += "/$item"
+        }
+        //Toast.makeText(this, selItems, Toast.LENGTH_LONG).show();
+    }
+
+    fun myStartForegroundService(intent: Intent?) {
+        intent!!.putExtra("inputExtra", "Foreground Service Example in Android")
+        ContextCompat.startForegroundService(this, intent)
+    }
+
+    /**
+     * An LSL stream's name which is used to identify which stream to record, paired with a display
+     * string that includes its nominal sampling rate.
+     */
+    class StreamName(streamInfo: StreamInfo) {
+        @JvmField
+        val lslName: String
+        val displayName: String
+
+        init {
+            lslName = Objects.requireNonNull(streamInfo.name())
+            displayName = streamDisplayNameOf(streamInfo)
+        }
+
+        override fun toString(): String {
+            return displayName
+        }
+
+        override fun equals(o: Any?): Boolean {
+            if (this === o) return true
+            if (o == null || javaClass != o.javaClass) return false
+            val that = o as StreamName
+            return lslName == that.lslName && displayName == that.displayName
+        }
+
+        override fun hashCode(): Int {
+            return Objects.hash(lslName, displayName)
+        }
+    }
+
+    /**
+     * Safely show a Toast message, catching DeadObjectException that can occur
+     * when the app process is being destroyed.
+     */
+    private fun safeShowToast(message: String, duration: Int) {
+        try {
+            Toast.makeText(this, message, duration).show()
+        } catch (e: Exception) {
+            // DeadObjectException or other exceptions can occur if the app is being destroyed
+            // Log it but don't crash
+            Log.w(TAG, "Failed to show toast: $message", e)
+        }
+    }
+
+    companion object {
+        var lv: ListView? = null
+        var LSLStreamName: MutableList<StreamName?> = ArrayList()
+        @JvmField
+        var selectedStreamNames: MutableList<StreamName?> = ArrayList()
+        var writePermission = true
+        @JvmField
+        var filenamevalue: String? = null
+        @JvmField
+        var saveFolderPath: String? = null   // user-chosen save directory, null = default Downloads
+        @JvmField
+        var isComplete = false
+        var tv: TextView? = null
+
+        @JvmField
+        @Volatile
+        var isRunning = false
+        private const val TAG = "MainActivity"
+        fun getElapsedTimeMinutesSecondsString(miliseconds: Long): String {
+            @SuppressLint("DefaultLocale") val format = String.format("%%0%dd", 2)
+            val seconds = String.format(format, miliseconds / 1000 % 60)
+            val minutes = String.format(format, miliseconds / (1000 * 60) % 60)
+            val hours = String.format(format, miliseconds / (1000 * 60 * 60) % 24)
+            return "$hours:$minutes:$seconds"
+        }
+
+        private fun streamDisplayNameOf(streamInfo: StreamInfo): String {
+            val samplingRateAsString = samplingRateAsText(streamInfo.nominal_srate())
+            return streamInfo.name() + " (" + samplingRateAsString + ")"
+        }
+
+        private fun samplingRateAsText(rate: Double): String {
+            if (rate == LSL.IRREGULAR_RATE) {
+                return "irreg."
+            }
+            return if (rate < 10000.0) {
+                rate.toInt().toString() + " Hz"
+            } else String.format("%.1f kHz", rate / 1000.0)
+        }
+
+        private fun setColorBasedOnQuality(context: AppCompatActivity, view: TextView, q: QualityState) {
+            val colorRed = ContextCompat.getColor(context, R.color.color_quality_red)
+            val colorYellow = ContextCompat.getColor(context, R.color.color_quality_yellow)
+            val backgroundColor =
+                if (q == QualityState.NOT_RESPONDING) colorRed
+                else if (q == QualityState.LAGGY) colorYellow
+                else Color.TRANSPARENT
+            view.setBackgroundColor(backgroundColor)
+            val textColor =
+                if (Color.luminance(backgroundColor) > 0.5f || backgroundColor == Color.TRANSPARENT) {
+                    ContextCompat.getColor(context, R.color.stream_list_text)
+                } else {
+                    Color.WHITE
+                }
+            view.setTextColor(textColor)
+        }
+
+        private fun setTextBasedOnSamplingRate(
+            view: TextView,
+            stream: StreamName,
+            samplingRate: Double
+        ) {
+            var streamNameWithSamplingRate = stream.displayName
+            if (samplingRate > 0.0) {
+                streamNameWithSamplingRate += " " + samplingRateAsText(
+                    samplingRate
+                )
+            }
+            view.text = streamNameWithSamplingRate
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/uol/neuropsy/recorda/SettingsActivity.java b/app/src/main/java/de/uol/neuropsy/recorda/SettingsActivity.java
index cfefc323..5ebc8ed0 100644
--- a/app/src/main/java/de/uol/neuropsy/recorda/SettingsActivity.java
+++ b/app/src/main/java/de/uol/neuropsy/recorda/SettingsActivity.java
@@ -6,27 +6,30 @@
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
-import android.support.annotation.RequiresApi;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.Button;
 import android.widget.EditText;
-
+import android.widget.TextView;
 import de.uol.neuropsy.recorda.R;
+import androidx.appcompat.app.AppCompatActivity;
+
 public class SettingsActivity extends AppCompatActivity {
 
     public static Boolean samplingRate_set_Check = Boolean.FALSE;
 
+    private static final int REQUEST_CHOOSE_FOLDER = 9999;
+
     //Button for setting values
     Button samplingSet;
     @SuppressLint("StaticFieldLeak")
     public static EditText filename;
 
+    private TextView saveFolderPathView;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -34,37 +37,57 @@ public void onCreate(Bundle savedInstanceState) {
 
         samplingRate_set_Check = Boolean.TRUE;
 
-        //TODO for now, the location handling is not implemented, every file is stored in
-        // external storage - Download/
         MainActivity.isComplete = true;
         filename = (EditText) findViewById(R.id.filenametext);
         filename.setText(MainActivity.filenamevalue);
-    }
 
-    // In case the user did not change the directory and left the settings view by using the back button
+        saveFolderPathView = (TextView) findViewById(R.id.saveFolderPath);
+        if (MainActivity.saveFolderPath != null) {
+            saveFolderPathView.setText(MainActivity.saveFolderPath);
+        }
+
+        Button chooseFolderButton = (Button) findViewById(R.id.chooseFolderButton);
+        chooseFolderButton.setOnClickListener(v -> {
+            Intent intent = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+            startActivityForResult(intent, REQUEST_CHOOSE_FOLDER);
+        });
+    }
 
     @Override
     public void onBackPressed() {
         super.onBackPressed();
-        setFilenameOnMainAcitity();
+        setFilenameOnMainActivity();
     }
 
-    private void setFilenameOnMainAcitity() {
+    private void setFilenameOnMainActivity() {
         filename = (EditText) findViewById(R.id.filenametext);
         MainActivity.filenamevalue = String.valueOf(filename.getText());
     }
 
     private static final String TAG = "SettingsActivity";
+
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == 9999) {
-            Uri uri = data.getData();
-            Uri docUri = DocumentsContract.buildDocumentUriUsingTree(uri,
-                        DocumentsContract.getTreeDocumentId(uri));
-            //MainActivity.path = getPath(this, docUri);
-            Log.d(TAG, "onActivityResult: "+"File name starts with: " + MainActivity.filenamevalue);
-            Intent intent = new Intent(SettingsActivity.this, MainActivity.class);
-            startActivity(intent);
+        super.onActivityResult(requestCode, resultCode, data);
+        if (requestCode == REQUEST_CHOOSE_FOLDER && resultCode == RESULT_OK && data != null) {
+            Uri treeUri = data.getData();
+            if (treeUri != null) {
+                // Persist access permission so the app can use it across restarts
+                getContentResolver().takePersistableUriPermission(
+                        treeUri,
+                        Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                );
+                Uri docUri = DocumentsContract.buildDocumentUriUsingTree(
+                        treeUri, DocumentsContract.getTreeDocumentId(treeUri));
+                String resolvedPath = getPath(this, docUri);
+                if (resolvedPath != null) {
+                    MainActivity.saveFolderPath = resolvedPath;
+                    saveFolderPathView.setText(resolvedPath);
+                    Log.d(TAG, "Save folder set to: " + resolvedPath);
+                } else {
+                    Log.w(TAG, "Could not resolve path for URI: " + treeUri);
+                }
+            }
         }
     }
 
diff --git a/app/src/main/java/de/uol/neuropsy/recorda/TutorialActivity.kt b/app/src/main/java/de/uol/neuropsy/recorda/TutorialActivity.kt
new file mode 100644
index 00000000..9fd1de9b
--- /dev/null
+++ b/app/src/main/java/de/uol/neuropsy/recorda/TutorialActivity.kt
@@ -0,0 +1,40 @@
+package de.uol.neuropsy.recorda
+
+import android.os.Bundle
+import android.widget.Button
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import de.uol.neuropsy.recorda.R
+
+/**
+ * The number of pages (wizard steps) to show in this demo.
+ */
+private const val NUM_PAGES = 5
+
+
+class TutorialActivity : FragmentActivity() {
+    protected lateinit var viewPager: ViewPager2
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_tutorial)
+
+        // Instantiate a ViewPager2 and a PagerAdapter.
+        viewPager = findViewById(R.id.pager)
+        // The pager adapter, which provides the pages to the view pager widget.
+        val pagerAdapter = ScreenSlidePagerAdapter(this)
+        viewPager.adapter = pagerAdapter
+    }
+
+    /**
+     * A simple pager adapter that represents ScreenSlidePageFragment objects, in
+     * sequence.
+     */
+    private inner class ScreenSlidePagerAdapter(fa: FragmentActivity) : FragmentStateAdapter(fa) {
+        override fun getItemCount(): Int = NUM_PAGES
+        override fun createFragment(position: Int): Fragment {
+            return TutorialPageFragment.newInstance(position)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/de/uol/neuropsy/recorda/TutorialPageFragment.kt b/app/src/main/java/de/uol/neuropsy/recorda/TutorialPageFragment.kt
new file mode 100644
index 00000000..33956ee2
--- /dev/null
+++ b/app/src/main/java/de/uol/neuropsy/recorda/TutorialPageFragment.kt
@@ -0,0 +1,54 @@
+package de.uol.neuropsy.recorda
+
+import android.content.SharedPreferences
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import androidx.fragment.app.Fragment
+
+class TutorialPageFragment() : Fragment() {
+
+    companion object {
+        // Factory method that creates a new instance of TutorialPageFragment with position as an argument.
+        fun newInstance(position: Int): TutorialPageFragment {
+            val fragment = TutorialPageFragment()
+            val args = Bundle()
+            args.putInt("position", position)
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Choose a layout based on the page position. While our layouts are very similar,
+        // this enables us to use totally different layouts for each tutorial page.
+        val layoutResId = when (arguments?.getInt("position") ?: 0) {
+            0 -> R.layout.tutorial_page_one  // For example, a layout for the first tutorial page.
+            1 -> R.layout.tutorial_page_two
+            2 -> R.layout.tutorial_page_three
+            3 -> R.layout.tutorial_page_four
+            4 -> R.layout.tutorial_end
+            else -> R.layout.tutorial_page_default // A default layout.
+        }
+
+        val view = inflater.inflate(layoutResId, container, false)
+
+        view.findViewById<Button>(R.id.close_tutorial_button)?.setOnClickListener({activity?.finish()})
+        view.findViewById<Button>(R.id.buttonClose)?.setOnClickListener { activity?.finish() }
+        view.findViewById<Button>(R.id.buttonCloseForever)?.setOnClickListener {
+            val sharedPref: SharedPreferences =
+                requireContext().getSharedPreferences("MyPref", 0)
+            val editor = sharedPref.edit()
+            editor.putBoolean("shouldShowTutorial", false)
+            editor.apply()
+            activity?.finish()
+        }
+        return view
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/boundary.xml b/app/src/main/res/drawable/boundary.xml
index 927d8281..d4c55704 100644
--- a/app/src/main/res/drawable/boundary.xml
+++ b/app/src/main/res/drawable/boundary.xml
@@ -3,6 +3,6 @@
     <!-- use this for transparent -->
     <!-- <solid android:color="#00000000" /> -->
     <!-- use this for a background colour -->
-    <solid android:color="#FFF" />
-    <stroke android:width="2dip" android:color="#040404" />
+    <solid android:color="@color/surface_white" />
+    <stroke android:width="2dip" android:color="@color/surface_stroke" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 02e750b6..5d2a0cc4 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector android:height="24dp" android:viewportHeight="478.703"
     android:viewportWidth="478.703" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M454.2,189.1l-33.6,-5.7c-3.5,-11.3 -8,-22.2 -13.5,-32.6l19.8,-27.7c8.4,-11.8 7.1,-27.9 -3.2,-38.1l-29.8,-29.8c-5.6,-5.6 -13,-8.7 -20.9,-8.7c-6.2,0 -12.1,1.9 -17.1,5.5l-27.8,19.8c-10.8,-5.7 -22.1,-10.4 -33.8,-13.9l-5.6,-33.2c-2.4,-14.3 -14.7,-24.7 -29.2,-24.7h-42.1c-14.5,0 -26.8,10.4 -29.2,24.7l-5.8,34c-11.2,3.5 -22.1,8.1 -32.5,13.7l-27.5,-19.8c-5,-3.6 -11,-5.5 -17.2,-5.5c-7.9,0 -15.4,3.1 -20.9,8.7l-29.9,29.8c-10.2,10.2 -11.6,26.3 -3.2,38.1l20,28.1c-5.5,10.5 -9.9,21.4 -13.3,32.7l-33.2,5.6c-14.3,2.4 -24.7,14.7 -24.7,29.2v42.1c0,14.5 10.4,26.8 24.7,29.2l34,5.8c3.5,11.2 8.1,22.1 13.7,32.5l-19.7,27.4c-8.4,11.8 -7.1,27.9 3.2,38.1l29.8,29.8c5.6,5.6 13,8.7 20.9,8.7c6.2,0 12.1,-1.9 17.1,-5.5l28.1,-20c10.1,5.3 20.7,9.6 31.6,13l5.6,33.6c2.4,14.3 14.7,24.7 29.2,24.7h42.2c14.5,0 26.8,-10.4 29.2,-24.7l5.7,-33.6c11.3,-3.5 22.2,-8 32.6,-13.5l27.7,19.8c5,3.6 11,5.5 17.2,5.5l0,0c7.9,0 15.3,-3.1 20.9,-8.7l29.8,-29.8c10.2,-10.2 11.6,-26.3 3.2,-38.1l-19.8,-27.8c5.5,-10.5 10.1,-21.4 13.5,-32.6l33.6,-5.6c14.3,-2.4 24.7,-14.7 24.7,-29.2v-42.1C478.9,203.8 468.5,191.5 454.2,189.1zM451.9,260.4c0,1.3 -0.9,2.4 -2.2,2.6l-42,7c-5.3,0.9 -9.5,4.8 -10.8,9.9c-3.8,14.7 -9.6,28.8 -17.4,41.9c-2.7,4.6 -2.5,10.3 0.6,14.7l24.7,34.8c0.7,1 0.6,2.5 -0.3,3.4l-29.8,29.8c-0.7,0.7 -1.4,0.8 -1.9,0.8c-0.6,0 -1.1,-0.2 -1.5,-0.5l-34.7,-24.7c-4.3,-3.1 -10.1,-3.3 -14.7,-0.6c-13.1,7.8 -27.2,13.6 -41.9,17.4c-5.2,1.3 -9.1,5.6 -9.9,10.8l-7.1,42c-0.2,1.3 -1.3,2.2 -2.6,2.2h-42.1c-1.3,0 -2.4,-0.9 -2.6,-2.2l-7,-42c-0.9,-5.3 -4.8,-9.5 -9.9,-10.8c-14.3,-3.7 -28.1,-9.4 -41,-16.8c-2.1,-1.2 -4.5,-1.8 -6.8,-1.8c-2.7,0 -5.5,0.8 -7.8,2.5l-35,24.9c-0.5,0.3 -1,0.5 -1.5,0.5c-0.4,0 -1.2,-0.1 -1.9,-0.8l-29.8,-29.8c-0.9,-0.9 -1,-2.3 -0.3,-3.4l24.6,-34.5c3.1,-4.4 3.3,-10.2 0.6,-14.8c-7.8,-13 -13.8,-27.1 -17.6,-41.8c-1.4,-5.1 -5.6,-9 -10.8,-9.9l-42.3,-7.2c-1.3,-0.2 -2.2,-1.3 -2.2,-2.6v-42.1c0,-1.3 0.9,-2.4 2.2,-2.6l41.7,-7c5.3,-0.9 9.6,-4.8 10.9,-10c3.7,-14.7 9.4,-28.9 17.1,-42c2.7,-4.6 2.4,-10.3 -0.7,-14.6l-24.9,-35c-0.7,-1 -0.6,-2.5 0.3,-3.4l29.8,-29.8c0.7,-0.7 1.4,-0.8 1.9,-0.8c0.6,0 1.1,0.2 1.5,0.5l34.5,24.6c4.4,3.1 10.2,3.3 14.8,0.6c13,-7.8 27.1,-13.8 41.8,-17.6c5.1,-1.4 9,-5.6 9.9,-10.8l7.2,-42.3c0.2,-1.3 1.3,-2.2 2.6,-2.2h42.1c1.3,0 2.4,0.9 2.6,2.2l7,41.7c0.9,5.3 4.8,9.6 10,10.9c15.1,3.8 29.5,9.7 42.9,17.6c4.6,2.7 10.3,2.5 14.7,-0.6l34.5,-24.8c0.5,-0.3 1,-0.5 1.5,-0.5c0.4,0 1.2,0.1 1.9,0.8l29.8,29.8c0.9,0.9 1,2.3 0.3,3.4l-24.7,34.7c-3.1,4.3 -3.3,10.1 -0.6,14.7c7.8,13.1 13.6,27.2 17.4,41.9c1.3,5.2 5.6,9.1 10.8,9.9l42,7.1c1.3,0.2 2.2,1.3 2.2,2.6v42.1H451.9z"/>
-    <path android:fillColor="#FF000000" android:pathData="M239.4,136c-57,0 -103.3,46.3 -103.3,103.3s46.3,103.3 103.3,103.3s103.3,-46.3 103.3,-103.3S296.4,136 239.4,136zM239.4,315.6c-42.1,0 -76.3,-34.2 -76.3,-76.3s34.2,-76.3 76.3,-76.3s76.3,34.2 76.3,76.3S281.5,315.6 239.4,315.6z"/>
+    <path android:fillColor="@color/stream_list_text" android:pathData="M454.2,189.1l-33.6,-5.7c-3.5,-11.3 -8,-22.2 -13.5,-32.6l19.8,-27.7c8.4,-11.8 7.1,-27.9 -3.2,-38.1l-29.8,-29.8c-5.6,-5.6 -13,-8.7 -20.9,-8.7c-6.2,0 -12.1,1.9 -17.1,5.5l-27.8,19.8c-10.8,-5.7 -22.1,-10.4 -33.8,-13.9l-5.6,-33.2c-2.4,-14.3 -14.7,-24.7 -29.2,-24.7h-42.1c-14.5,0 -26.8,10.4 -29.2,24.7l-5.8,34c-11.2,3.5 -22.1,8.1 -32.5,13.7l-27.5,-19.8c-5,-3.6 -11,-5.5 -17.2,-5.5c-7.9,0 -15.4,3.1 -20.9,8.7l-29.9,29.8c-10.2,10.2 -11.6,26.3 -3.2,38.1l20,28.1c-5.5,10.5 -9.9,21.4 -13.3,32.7l-33.2,5.6c-14.3,2.4 -24.7,14.7 -24.7,29.2v42.1c0,14.5 10.4,26.8 24.7,29.2l34,5.8c3.5,11.2 8.1,22.1 13.7,32.5l-19.7,27.4c-8.4,11.8 -7.1,27.9 3.2,38.1l29.8,29.8c5.6,5.6 13,8.7 20.9,8.7c6.2,0 12.1,-1.9 17.1,-5.5l28.1,-20c10.1,5.3 20.7,9.6 31.6,13l5.6,33.6c2.4,14.3 14.7,24.7 29.2,24.7h42.2c14.5,0 26.8,-10.4 29.2,-24.7l5.7,-33.6c11.3,-3.5 22.2,-8 32.6,-13.5l27.7,19.8c5,3.6 11,5.5 17.2,5.5l0,0c7.9,0 15.3,-3.1 20.9,-8.7l29.8,-29.8c10.2,-10.2 11.6,-26.3 3.2,-38.1l-19.8,-27.8c5.5,-10.5 10.1,-21.4 13.5,-32.6l33.6,-5.6c14.3,-2.4 24.7,-14.7 24.7,-29.2v-42.1C478.9,203.8 468.5,191.5 454.2,189.1zM451.9,260.4c0,1.3 -0.9,2.4 -2.2,2.6l-42,7c-5.3,0.9 -9.5,4.8 -10.8,9.9c-3.8,14.7 -9.6,28.8 -17.4,41.9c-2.7,4.6 -2.5,10.3 0.6,14.7l24.7,34.8c0.7,1 0.6,2.5 -0.3,3.4l-29.8,29.8c-0.7,0.7 -1.4,0.8 -1.9,0.8c-0.6,0 -1.1,-0.2 -1.5,-0.5l-34.7,-24.7c-4.3,-3.1 -10.1,-3.3 -14.7,-0.6c-13.1,7.8 -27.2,13.6 -41.9,17.4c-5.2,1.3 -9.1,5.6 -9.9,10.8l-7.1,42c-0.2,1.3 -1.3,2.2 -2.6,2.2h-42.1c-1.3,0 -2.4,-0.9 -2.6,-2.2l-7,-42c-0.9,-5.3 -4.8,-9.5 -9.9,-10.8c-14.3,-3.7 -28.1,-9.4 -41,-16.8c-2.1,-1.2 -4.5,-1.8 -6.8,-1.8c-2.7,0 -5.5,0.8 -7.8,2.5l-35,24.9c-0.5,0.3 -1,0.5 -1.5,0.5c-0.4,0 -1.2,-0.1 -1.9,-0.8l-29.8,-29.8c-0.9,-0.9 -1,-2.3 -0.3,-3.4l24.6,-34.5c3.1,-4.4 3.3,-10.2 0.6,-14.8c-7.8,-13 -13.8,-27.1 -17.6,-41.8c-1.4,-5.1 -5.6,-9 -10.8,-9.9l-42.3,-7.2c-1.3,-0.2 -2.2,-1.3 -2.2,-2.6v-42.1c0,-1.3 0.9,-2.4 2.2,-2.6l41.7,-7c5.3,-0.9 9.6,-4.8 10.9,-10c3.7,-14.7 9.4,-28.9 17.1,-42c2.7,-4.6 2.4,-10.3 -0.7,-14.6l-24.9,-35c-0.7,-1 -0.6,-2.5 0.3,-3.4l29.8,-29.8c0.7,-0.7 1.4,-0.8 1.9,-0.8c0.6,0 1.1,0.2 1.5,0.5l34.5,24.6c4.4,3.1 10.2,3.3 14.8,0.6c13,-7.8 27.1,-13.8 41.8,-17.6c5.1,-1.4 9,-5.6 9.9,-10.8l7.2,-42.3c0.2,-1.3 1.3,-2.2 2.6,-2.2h42.1c1.3,0 2.4,0.9 2.6,2.2l7,41.7c0.9,5.3 4.8,9.6 10,10.9c15.1,3.8 29.5,9.7 42.9,17.6c4.6,2.7 10.3,2.5 14.7,-0.6l34.5,-24.8c0.5,-0.3 1,-0.5 1.5,-0.5c0.4,0 1.2,0.1 1.9,0.8l29.8,29.8c0.9,0.9 1,2.3 0.3,3.4l-24.7,34.7c-3.1,4.3 -3.3,10.1 -0.6,14.7c7.8,13.1 13.6,27.2 17.4,41.9c1.3,5.2 5.6,9.1 10.8,9.9l42,7.1c1.3,0.2 2.2,1.3 2.2,2.6v42.1H451.9z"/>
+    <path android:fillColor="@color/stream_list_text" android:pathData="M239.4,136c-57,0 -103.3,46.3 -103.3,103.3s46.3,103.3 103.3,103.3s103.3,-46.3 103.3,-103.3S296.4,136 239.4,136zM239.4,315.6c-42.1,0 -76.3,-34.2 -76.3,-76.3s34.2,-76.3 76.3,-76.3s76.3,34.2 76.3,76.3S281.5,315.6 239.4,315.6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_settings_white.xml b/app/src/main/res/drawable/ic_settings_white.xml
new file mode 100644
index 00000000..67b103bf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_white.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.05,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z"/>
+</vector>
+
diff --git a/app/src/main/res/drawable/ic_tutorial.xml b/app/src/main/res/drawable/ic_tutorial.xml
new file mode 100644
index 00000000..8772d8b0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tutorial.xml
@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp">
+    <path android:fillColor="@android:color/white" android:pathData="M11.07,12.85c0.77,-1.39 2.25,-2.21 3.11,-3.44c0.91,-1.29 0.4,-3.7 -2.18,-3.7c-1.69,0 -2.52,1.28 -2.87,2.34L6.54,6.96C7.25,4.83 9.18,3 11.99,3c2.35,0 3.96,1.07 4.78,2.41c0.7,1.15 1.11,3.3 0.03,4.9c-1.2,1.77 -2.35,2.31 -2.97,3.45c-0.25,0.46 -0.35,0.76 -0.35,2.24h-2.89C10.58,15.22 10.46,13.95 11.07,12.85zM14,20c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2S14,18.9 14,20z"/>
+</vector>
+
diff --git a/app/src/main/res/drawable/recorda_broken.png b/app/src/main/res/drawable/recorda_broken.png
new file mode 100644
index 00000000..8f9d192d
Binary files /dev/null and b/app/src/main/res/drawable/recorda_broken.png differ
diff --git a/app/src/main/res/drawable/recorda_laggy.png b/app/src/main/res/drawable/recorda_laggy.png
new file mode 100644
index 00000000..9af3151c
Binary files /dev/null and b/app/src/main/res/drawable/recorda_laggy.png differ
diff --git a/app/src/main/res/drawable/recorda_main.png b/app/src/main/res/drawable/recorda_main.png
new file mode 100644
index 00000000..53687a30
Binary files /dev/null and b/app/src/main/res/drawable/recorda_main.png differ
diff --git a/app/src/main/res/drawable/recorda_settings.png b/app/src/main/res/drawable/recorda_settings.png
new file mode 100644
index 00000000..6d19af34
Binary files /dev/null and b/app/src/main/res/drawable/recorda_settings.png differ
diff --git a/app/src/main/res/drawable/shape.xml b/app/src/main/res/drawable/shape.xml
index 97b688a0..e8446861 100644
--- a/app/src/main/res/drawable/shape.xml
+++ b/app/src/main/res/drawable/shape.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-    <stroke android:width="2dp"
-        android:color="#FFFFFF"/>
-    <gradient
-        android:angle="225"
-        android:startColor="#DD5C686C"
-        android:endColor="#DD292626"/>
-    <corners
-        android:bottomLeftRadius="12dp"
-        android:bottomRightRadius="12dp"
-        android:topLeftRadius="12dp"
-        android:topRightRadius="12dp" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:padding="10dp">
+    <solid android:color="@color/button_color"/>
+    <corners android:radius="20dp"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_primary.xml b/app/src/main/res/drawable/shape_primary.xml
new file mode 100644
index 00000000..1a1923cf
--- /dev/null
+++ b/app/src/main/res/drawable/shape_primary.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:padding="10dp">
+    <solid android:color="@color/button_primary_color"/>
+    <corners android:radius="20dp"/>
+</shape>
+
diff --git a/app/src/main/res/drawable/shape_status.xml b/app/src/main/res/drawable/shape_status.xml
new file mode 100644
index 00000000..c08df88d
--- /dev/null
+++ b/app/src/main/res/drawable/shape_status.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"
+    android:padding="10dp">
+    <solid android:color="@color/elapsed_bar_color"/>
+    <corners android:radius="20dp"/>
+</shape>
+
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 7bf1bf58..b572aa87 100755
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_lsldemo"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/senda_background"
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.example.aliayubkhan.LSLReceiver.de.example.aliayubkhan.LSLReceiver.MainActivity">
+    tools:context="de.uol.neuropsy.recorda.MainActivity">
 
     <LinearLayout
         android:id="@+id/linearHorizontal"
@@ -32,7 +33,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginEnd="8dp"
             android:text="START LSL"
+            android:textColor="@color/button_text_light"
             android:background="@drawable/shape"/>
 
         <Button
@@ -40,7 +43,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
+            android:layout_marginStart="8dp"
             android:text="STOP LSL"
+            android:textColor="@color/button_text_light"
             android:background="@drawable/shape"/>
     </LinearLayout>
 
@@ -75,7 +80,7 @@
                 android:layout_marginStart="28dp"
                 android:text="TextView"
                 android:textAlignment="center"
-                android:textColor="@color/black"
+                android:textColor="@color/stream_list_text"
                 android:textSize="25sp" />
 
             <ImageButton
@@ -105,8 +110,7 @@
             android:layout_width="match_parent"
             android:layout_height="110dp"
             android:layout_marginTop="10dp"
-            android:dividerHeight="1dp"
-            android:background="@drawable/boundary"/>
+            android:dividerHeight="1dp"/>
 
     </LinearLayout>
-</android.support.constraint.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 286ffcb1..ada0559f 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,175 +1,177 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_lsldemo"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context="com.example.aliayubkhan.LSLReceiver.de.example.aliayubkhan.LSLReceiver.MainActivity">
-
-    <LinearLayout
-        android:id="@+id/linearHorizontal"
-        android:layout_width="335dp"
-        android:layout_height="50dp"
-        android:layout_alignParentTop="false"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="50dp"
-        android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearVertical">
-
-        <Button
-            android:id="@+id/startLSL"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/shape"
-            android:text="@string/start"
-            android:textColor="#FFFFFF"
-            android:textSize="17dp" />
-
-        <Button
-            android:id="@+id/stopLSL"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/shape"
-            android:text="@string/stop"
-            android:textColor="#FFFFFF"
-            android:textSize="17dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearVertical"
-        android:layout_width="0dp"
+    android:orientation="vertical"
+    tools:context="de.uol.neuropsy.recorda.MainActivity">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        app:titleTextColor="@android:color/white"
+        app:title="RECORDA"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="86dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="142dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/linearLayout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal">
+        android:layout_weight="1"
+        android:background="@color/senda_background"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingBottom="@dimen/activity_vertical_margin">
 
-            <TextView
-                android:id="@+id/tv"
+        <LinearLayout
+            android:id="@+id/linearHorizontal"
+            android:layout_width="335dp"
+            android:layout_height="50dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="50dp"
+            android:orientation="horizontal"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/linearVertical">
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/startLSL"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginStart="28dp"
-                android:text="TextView"
-                android:textAlignment="center"
-                android:textColor="@color/black"
-                android:textSize="25sp" />
-
-            <ImageButton
-                android:id="@+id/refreshStreams"
+                android:layout_weight="1"
+                android:layout_marginEnd="8dp"
+                android:background="@drawable/shape_primary"
+                android:text="@string/start"
+                android:textColor="@color/button_text_light"
+                android:textSize="17dp" />
+
+            <androidx.appcompat.widget.AppCompatButton
+                android:id="@+id/stopLSL"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:layout_alignParentEnd="true"
-                android:adjustViewBounds="true"
-                android:background="@drawable/ic_loading"
-                android:contentDescription="@string/refreshing_streams"
-                android:cropToPadding="false"
-                android:padding="16dp" />
-
-
-        </RelativeLayout>
-
-
-        <ListView
-            android:id="@+id/streams"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="10dp"
-            android:dividerHeight="1dp"
-            android:background="@drawable/boundary"
-            />
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        </ScrollView>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/linearLayout"
-        android:layout_width="0dp"
-        android:layout_height="50dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="10dp"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/linearVertical">
+                android:layout_weight="1"
+                android:layout_marginStart="8dp"
+                android:background="@drawable/shape"
+                android:text="@string/stop"
+                android:textColor="@color/button_text_light"
+                android:textSize="17dp" />
+        </LinearLayout>
 
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:background="@drawable/shape">
+            android:id="@+id/linearVertical"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="142dp"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toTopOf="@+id/linearLayout"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/tv"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
+                    android:layout_alignParentTop="true"
+                    android:layout_marginStart="8dp"
+                    android:text="TextView"
+                    android:textAlignment="center"
+                    android:textColor="@color/stream_list_text"
+                    android:textSize="25sp" />
+
+                <ImageButton
+                    android:id="@+id/refreshStreams"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentEnd="true"
+                    android:adjustViewBounds="true"
+                    android:background="@drawable/ic_loading"
+                    android:contentDescription="@string/refreshing_streams"
+                    android:cropToPadding="false"
+                    android:padding="16dp" />
+
+            </RelativeLayout>
+
+            <ListView
+                android:id="@+id/streams"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:dividerHeight="1dp" />
 
             <TextView
-                android:id="@+id/Timer"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_weight="1"
-                android:paddingLeft="10dp"
-                android:text="@string/elapsed_time"
-                android:textColor="#FFFFFF"
-                android:textSize="20sp" />
+                android:id="@+id/emptyStreamsText"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="No streams found yet.\nTap the refresh button to search."
+                android:textColor="@color/stream_list_text"
+                android:textSize="16sp"
+                android:visibility="gone" />
 
-            <TextView
-                android:id="@+id/elapsedTime"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:paddingRight="10dp"
-                android:text="00:00"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF"
-                android:textSize="20sp" />
         </LinearLayout>
 
-    </LinearLayout>
+        <LinearLayout
+            android:id="@+id/linearLayout"
+            android:layout_width="0dp"
+            android:layout_height="50dp"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="10dp"
+            android:orientation="vertical"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/linearVertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:background="@drawable/shape_status">
+
+                <TextView
+                    android:id="@+id/Timer"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_weight="1"
+                    android:paddingLeft="10dp"
+                    android:text="@string/elapsed_time"
+                    android:textColor="@color/button_text_light"
+                    android:textSize="20sp" />
+
+                <TextView
+                    android:id="@+id/elapsedTime"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:paddingRight="10dp"
+                    android:text="00:00"
+                    android:textAlignment="center"
+                    android:textColor="@color/button_text_light"
+                    android:textSize="20sp" />
+            </LinearLayout>
 
-    <ImageButton
-        android:id="@+id/settings_btn"
-        style="?android:attr/borderlessButtonStyle"
-        android:layout_width="45dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="28dp"
-        android:background="@drawable/boundary"
-        android:src="@drawable/ic_settings"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.063"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</android.support.constraint.ConstraintLayout>
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_tutorial.xml b/app/src/main/res/layout/activity_tutorial.xml
new file mode 100644
index 00000000..9ed1ebea
--- /dev/null
+++ b/app/src/main/res/layout/activity_tutorial.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/linearLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"></androidx.viewpager2.widget.ViewPager2>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/close_tutorial_button.xml b/app/src/main/res/layout/close_tutorial_button.xml
new file mode 100644
index 00000000..df42e54c
--- /dev/null
+++ b/app/src/main/res/layout/close_tutorial_button.xml
@@ -0,0 +1,10 @@
+<Button xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/close_tutorial_button"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@android:color/transparent"
+    android:text="X"
+    android:textColor="#20000000"
+    android:textSize="48sp"
+    android:translationY="-16dp"
+    />
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_view_text.xml b/app/src/main/res/layout/list_view_text.xml
index 71c5a919..8f5ed0e1 100755
--- a/app/src/main/res/layout/list_view_text.xml
+++ b/app/src/main/res/layout/list_view_text.xml
@@ -8,5 +8,5 @@
     android:checkMark="?android:attr/listChoiceIndicatorMultiple"
     android:padding="5sp"
     android:textSize="25sp"
-    android:textColor="@color/black"
+    android:textColor="@color/stream_list_text"
     />
\ No newline at end of file
diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml
index 658f7369..c01680b6 100644
--- a/app/src/main/res/layout/settings_activity.xml
+++ b/app/src/main/res/layout/settings_activity.xml
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="@color/senda_background">
 
     <LinearLayout
         android:id="@+id/linearLayout2"
@@ -32,6 +33,7 @@
                 android:layout_marginTop="70dp"
                 android:layout_weight="1"
                 android:text="Filename:"
+                android:textColor="@color/stream_list_text"
                 android:textSize="24sp" />
 
         </LinearLayout>
@@ -42,16 +44,6 @@
             android:gravity="center"
             android:textAlignment="center">
 
-            <!--            <Button
-                android:id="@+id/locationButton"
-                android:layout_width="155dp"
-                android:layout_height="wrap_content"
-                android:background="@drawable/shape"
-                android:gravity="center"
-                android:text="Select Location"
-                android:textAlignment="center"
-                android:textColor="#FFFFFF" />-->
-
             <EditText
                 android:id="@+id/filenametext"
                 android:layout_width="250dp"
@@ -61,6 +53,7 @@
                 android:inputType="textLongMessage"
                 android:singleLine="true"
                 android:text="recording"
+                android:textColor="@color/stream_list_text"
                 android:textSize="18sp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent" />
@@ -72,8 +65,47 @@
                 android:ems="10"
                 android:inputType="none"
                 android:singleLine="true"
-                android:text=".xdf" />
+                android:text=".xdf"
+                android:textColor="@color/stream_list_text" />
+        </LinearLayout>
+
+        <TextView
+            android:id="@+id/saveFolderLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="Save folder:"
+            android:textColor="@color/stream_list_text"
+            android:textSize="24sp" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/saveFolderPath"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ellipsize="start"
+                android:singleLine="true"
+                android:text="Downloads (default)"
+                android:textColor="@color/stream_list_text"
+                android:textSize="14sp" />
+
+            <Button
+                android:id="@+id/chooseFolderButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:background="@drawable/shape"
+                android:text="Choose"
+                android:textColor="@color/button_text_light" />
+
         </LinearLayout>
 
     </LinearLayout>
-</android.support.constraint.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_end.xml b/app/src/main/res/layout/tutorial_end.xml
new file mode 100644
index 00000000..a0d56262
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_end.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/constraintLayout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin">
+
+    <include
+        layout="@layout/close_tutorial_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/tutorial_text_end"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/tutorial_end"
+        app:layout_constraintBottom_toTopOf="@+id/buttonClose"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
+    <Button
+        android:id="@+id/buttonClose"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="1dp"
+        android:text="Close tutorial"
+        app:layout_constraintBottom_toTopOf="@+id/buttonCloseForever"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="packed" />
+
+    <Button
+        android:id="@+id/buttonCloseForever"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="34dp"
+        android:layout_marginRight="34dp"
+        android:text="Close and do not show tutorial again"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/buttonClose" />  <!-- Optional spacing -->
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_image.xml b/app/src/main/res/layout/tutorial_image.xml
new file mode 100644
index 00000000..f499ca4c
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_image.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+android:id="@+id/imageView3"
+android:layout_width="wrap_content"
+android:layout_height="wrap_content"
+android:contentDescription="First picture"
+android:src="@drawable/ic_receiver"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_page_default.xml b/app/src/main/res/layout/tutorial_page_default.xml
new file mode 100644
index 00000000..3ecee7d4
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_page_default.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/textView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:text="Page Default" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_page_five.xml b/app/src/main/res/layout/tutorial_page_five.xml
new file mode 100644
index 00000000..8fa737e6
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_page_five.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tutorial_page_5"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin">
+
+    <include
+        layout="@layout/close_tutorial_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <include
+        layout="@layout/tutorial_image"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/close_tutorial_button" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_page_four.xml b/app/src/main/res/layout/tutorial_page_four.xml
new file mode 100644
index 00000000..d6717214
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_page_four.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tutorial_page_4"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin">
+
+    <include
+        layout="@layout/close_tutorial_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/tutorial_image_3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="Fourth picture"
+        android:src="@drawable/recorda_broken"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/close_tutorial_button"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_page_one.xml b/app/src/main/res/layout/tutorial_page_one.xml
new file mode 100644
index 00000000..154c03fd
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_page_one.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tutorial_page_1"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin">
+
+    <include
+        layout="@layout/close_tutorial_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        />
+
+
+    <ImageView
+        android:id="@+id/tutorial_image_1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="First picture"
+        android:src="@drawable/recorda_main"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/close_tutorial_button"
+        />
+
+    <TextView
+        android:id="@+id/tutorial_text_page_1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=""
+        app:layout_constraintTop_toBottomOf="@+id/close_tutorial_button"
+        app:layout_constraintStart_toStartOf="@+id/parent"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_page_three.xml b/app/src/main/res/layout/tutorial_page_three.xml
new file mode 100644
index 00000000..abd1c7d8
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_page_three.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tutorial_page_3"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin">
+
+    <include
+        layout="@layout/close_tutorial_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/tutorial_image_3"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="Third picture"
+        android:src="@drawable/recorda_laggy"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/close_tutorial_button"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/tutorial_page_two.xml b/app/src/main/res/layout/tutorial_page_two.xml
new file mode 100644
index 00000000..cab1bb5e
--- /dev/null
+++ b/app/src/main/res/layout/tutorial_page_two.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/tutorial_page_2"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin">
+
+    <include
+        layout="@layout/close_tutorial_button"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageView
+        android:id="@+id/tutorial_image_2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="Second picture"
+        android:src="@drawable/recorda_settings"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/close_tutorial_button"
+        />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index c36d1dcb..154b163e 100755
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,7 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:context="edu.ucsd.sccn.receivestringmarkers.MainActivity">
-    <item android:id="@+id/action_settings" android:orderInCategory="100"
-        android:title="@string/action_settings" app:showAsAction="never" />
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_tutorial"
+        android:icon="@drawable/ic_tutorial"
+        android:title="Show tutorial"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/action_settings"
+        android:icon="@drawable/ic_settings_white"
+        android:title="Settings"
+        app:showAsAction="always" />
+
+    <item
+        android:id="@+id/action_about"
+        android:title="About"
+        app:showAsAction="never" />
+
 </menu>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 00000000..cabbcaf2
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="senda_primary">#3F51B5</color>
+    <color name="senda_primary_dark">#303F9F</color>
+    <color name="senda_accent">#FF4081</color>
+
+    <!-- Exact SENDA stream-list palette (night) -->
+    <color name="stream_list_background">#00000000</color>
+    <color name="stream_list_stroke">#444444</color>
+    <color name="stream_list_text">#CCCCCC</color>
+
+    <!-- Screen background (dark) -->
+    <color name="screen_background">#121212</color>
+
+    <!-- Quality warning colors (night – brighter/softer for dark backgrounds) -->
+    <color name="color_quality_red">#FF5252</color>
+    <color name="color_quality_yellow">#FFD740</color>
+
+    <!-- Compatibility names used by current RECORDA layouts -->
+    <color name="senda_background">@color/screen_background</color>
+    <!-- button_color and elapsed_bar_color intentionally not overridden — stays #595959 to match Senda -->
+    <color name="button_text_light">#F2F2F2</color>
+    <color name="shape_stroke">#666666</color>
+    <color name="shape_gradient_start">#DD5C686C</color>
+    <color name="shape_gradient_end">#DD292626</color>
+    <color name="surface_white">@color/stream_list_background</color>
+    <color name="surface_stroke">@color/stream_list_stroke</color>
+
+    <color name="colorPrimary">@color/senda_primary</color>
+    <color name="colorPrimaryDark">@color/senda_primary_dark</color>
+    <color name="colorAccent">@color/senda_accent</color>
+    <color name="black">#E0E0E0</color>
+</resources>
+
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6b23c86e..fd142a80 100755
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -3,6 +3,6 @@
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 50eda084..607f54c5 100755
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
-    <color name="black">#000000</color>
+    <color name="senda_primary">#3F51B5</color>
+    <color name="senda_primary_dark">#303F9F</color>
+    <color name="senda_accent">#FF4081</color>
+
+    <!-- Exact SENDA stream-list palette (day) -->
+    <color name="stream_list_background">#FFFFFF</color>
+    <color name="stream_list_stroke">#040404</color>
+    <color name="stream_list_text">#595959</color>
+
+    <!-- Screen background (light neutral for contrast) -->
+    <color name="screen_background">#F5F5F5</color>
+
+    <!-- Quality warning colors (day) -->
+    <color name="color_quality_red">#D21919</color>
+    <color name="color_quality_yellow">#FFDC00</color>
+
+    <!-- Compatibility names used by current RECORDA layouts -->
+    <color name="senda_background">@color/screen_background</color>
+    <color name="button_color">#595959</color>
+    <color name="button_primary_color">@color/senda_primary</color>
+    <color name="elapsed_bar_color">#595959</color>
+    <color name="button_text_light">#F2F2F2</color>
+    <color name="shape_stroke">#E4EAF1</color>
+    <color name="shape_gradient_start">#DD5C686C</color>
+    <color name="shape_gradient_end">#DD292626</color>
+    <color name="surface_white">@color/stream_list_background</color>
+    <color name="surface_stroke">@color/stream_list_stroke</color>
+
+    <color name="colorPrimary">@color/senda_primary</color>
+    <color name="colorPrimaryDark">@color/senda_primary_dark</color>
+    <color name="colorAccent">@color/senda_accent</color>
+    <color name="black">#474747</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 99c4a540..ac5a0b4b 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -5,4 +5,7 @@
     <string name="start">START</string>
     <string name="stop">STOP</string>
     <string name="elapsed_time">Elapsed Time:</string>
+    <string name="tutorial_end">This concludes the tutorial. You can always show it again by pressing the question mark in the top right corner of the main screen.
+    If you have any questions, please do not hesitate to contact the authors at https://github.com/organizations/NeuropsyOL/RECORDA.
+    </string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 44f664f2..019eb720 100755
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,13 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+        <!-- Use MaterialComponents button style so explicit android:background is respected -->
+        <item name="materialButtonStyle">@style/Widget.MaterialComponents.Button</item>
+        <item name="materialAlertDialogTheme">@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog</item>
     </style>
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
diff --git a/build.gradle b/build.gradle
index 7a546dd5..fe94bf0c 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,27 +1,21 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    
+
     repositories {
         google()
         jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:7.4.2'
-        
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
     }
 }
 
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
-        maven { url "https://jitpack.io" }
-    }
+plugins {
+    id 'com.android.application' version '7.3.0' apply false
+    id 'com.android.library' version '7.3.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
 }
 
 task clean(type: Delete) {
diff --git a/gradle.properties b/gradle.properties
index 92f86bde..f40f6043 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -12,3 +12,5 @@
 # org.gradle.parallel=true
 #Mon Sep 07 09:31:47 CEST 2020
 org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+android.useAndroidX=true
+android.enableJetifier=true
\ No newline at end of file
diff --git a/liblsl-Java/build.gradle b/liblsl-Java/build.gradle
index da86a353..bc821b45 100755
--- a/liblsl-Java/build.gradle
+++ b/liblsl-Java/build.gradle
@@ -7,13 +7,9 @@
 // in the app's build.gradle
 
 buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.+'
+        classpath 'com.android.tools.build:gradle:7.2.2'
     }
 }
 
@@ -21,11 +17,6 @@ plugins {
     id 'com.android.library'
 }
 
-repositories {
-    google()
-    mavenCentral()
-}
-
 dependencies {
     implementation 'net.java.dev.jna:jna:5.12.0@aar'
 }
@@ -50,5 +41,4 @@ android {
         path(properties['liblsl_path'] ?: '../liblsl/CMakeLists.txt')
 
     }
-    ndkVersion '25.2.9519653'
 }
diff --git a/libxdf/CMakeLists.txt b/libxdf/CMakeLists.txt
index 48258032..fe8ea401 100755
--- a/libxdf/CMakeLists.txt
+++ b/libxdf/CMakeLists.txt
@@ -2,7 +2,7 @@
 # library. You should either keep the default value or only pass a
 # value of 3.4.0 or lower.
 
-cmake_minimum_required(VERSION 3.4.1)
+cmake_minimum_required(VERSION 3.12)
 PROJECT(generate_xdf)
 
 add_library( # Sets the name of the library.
diff --git a/settings.gradle b/settings.gradle
index 391cb766..06d8c4de 100755
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,15 +1,20 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 include ':app'
 
 // Add a project stub for liblsl-Java
 include 'liblsl-Java'
-
-// Tell gradle where to find liblsl-Java
-if(hasProperty("liblsl_java_dir")) {
-    println("Looking for liblsl-Java in " + liblsl_java_dir)
-    project(':liblsl-Java').projectDir = new File(liblsl_java_dir)
-}
-else {
-    println("Looking for liblsl-Java in the default path.")
-    println("Change this via 'gradle -Pliblsl_java_dir=path/here if this fails")
-    project(':liblsl-Java').projectDir = new File("./liblsl-Java")
-}
\ No newline at end of file
+project(':liblsl-Java').projectDir = new File('./liblsl-Java')
\ No newline at end of file