Formatting + Initial Integration of Enhanced Permissions

2024-01-15 12:27:30 -08:00
170 changed files with 2785 additions and 4277 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -8,7 +8,7 @@ clone:

 steps:
  - name: clone
-    image: openpriv/flutter-desktop:linux-fstable-3.19.3
+    image: openpriv/flutter-desktop:linux-fstable-3.13.4
    environment:
      buildbot_key_b64:
        from_secret: buildbot_key_b64
@ -24,7 +24,7 @@ steps:
      - git checkout $DRONE_COMMIT

  - name: fetch
-    image: openpriv/flutter-desktop:linux-fstable-3.19.3
+    image: openpriv/flutter-desktop:linux-fstable-3.13.4
    volumes:
      - name: deps
        path: /root/.pub-cache
@ -47,7 +47,7 @@ steps:
  #    #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting

  - name: build-linux
-    image: openpriv/flutter-desktop:linux-fstable-3.19.3
+    image: openpriv/flutter-desktop:linux-fstable-3.13.4
    volumes:
      - name: deps
        path: /root/.pub-cache
@ -55,29 +55,14 @@ steps:
      - flutter build linux --dart-define BUILD_VER=`cat VERSION` --dart-define BUILD_DATE=`cat COMMIT_DATE`
      - linux/package-release.sh
      - mkdir -p deploy/cwtch
-      - mkdir -p deploy/deb/cwtch/usr
-      - mkdir -p deploy/deb/cwtch/DEBIAN
-      - export VERSION=`cat VERSION | tr -d 'v'`
-      - sed "s|VERSION|$VERSION|g" linux/deb/control  > deploy/deb/cwtch/DEBIAN/control
      - cp -r build/linux/x64/release/bundle/* deploy/cwtch
      - cd deploy
-      - cd cwtch
-      - INSTALL_PREFIX=./../deb/cwtch/usr DESKTOP_PREFIX=/usr/ ./install.sh
-      - cd ..
-      # we depend on tor, get it from the tor project apt repo
-      - rm -r deb/cwtch/usr/lib/cwtch/Tor
      # Tar archives need a few tricks to make this deterministic, see https://reproducible-builds.org/docs/archives/
      - tar --sort=name --mtime=`cat COMMIT_DATE` --owner=0 --group=0 --numeric-owner --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime -czf cwtch-`cat ../VERSION`.tar.gz cwtch
      - rm -r cwtch
-      - cd deb
-      - dpkg-deb --build cwtch
-      - cd ..
-      - mv deb/cwtch.deb cwtch-$VERSION.deb
-      - rm -r deb
-

  - name: linux-ui-tests
-    image: openpriv/flutter-desktop:linux-fstable-3.19.3
+    image: openpriv/flutter-desktop:linux-fstable-3.13.4
    volumes:
      - name: deps
        path: /root/.pub-cache
@ -86,7 +71,7 @@ steps:
      - ./run-tests-headless.sh "01_general|01_tor|02_global_settings|04_profile_mgmt"

  - name: test-build-android
-    image: openpriv/flutter-desktop:linux-fstable-3.19.3
+    image: openpriv/flutter-desktop:linux-fstable-3.13.4
    when:
      event: pull_request
    volumes:
@ -96,7 +81,7 @@ steps:
      - flutter build apk --debug

  - name: build-android
-    image: openpriv/flutter-desktop:linux-fstable-3.19.3
+    image: openpriv/flutter-desktop:linux-fstable-3.13.4
    when:
      event: push
    environment:
@ -120,7 +105,7 @@ steps:
      #- cp build/app/outputs/flutter-apk/app-debug.apk deploy/android

  - name: widget-tests
-    image:  openpriv/flutter-desktop:linux-fstable-3.19.3
+    image:  openpriv/flutter-desktop:linux-fstable-3.13.4
    volumes:
      - name: deps
        path: /root/.pub-cache
@ -129,21 +114,6 @@ steps:
      - flutter test --coverage
      - genhtml coverage/lcov.info -o coverage/html

-  - name: upload-nightlies
-    image: openpriv/flutter-desktop:linux-fstable-3.19.3
-    environment:
-      GOGS_ACCOUNT_TOKEN:
-        from_secret: gogs_account_token
-    secrets: [gogs_account_token]
-    volumes:
-      - name: deps
-        path: /root/.pub-cache
-    when:
-        event: push
-        status: [ success ]
-    commands:
-      - ./upload-releases.sh deploy/cwtch-`cat VERSION`.apk application/vnd.android.package-archive cwtch-`cat VERSION`.apk
-
  - name: deploy-buildfiles
    image: kroniak/ssh-client
    pull: if-not-exists
@ -208,7 +178,7 @@ clone:

 steps:
  - name: clone
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
    environment:
      buildbot_key_b64:
        from_secret: buildbot_key_b64
@ -226,7 +196,7 @@ steps:
      - git checkout $Env:DRONE_COMMIT

  - name: fetch
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.10.2
    commands:
      - git describe --tags --abbrev=1 > VERSION
      - git log -1 --format=%cd --date=format:'%Y-%m-%d-%H-%M' > COMMIT_DATE
@ -234,12 +204,12 @@ steps:
      - .\fetch-libcwtch-go.ps1

  - name: build-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
    commands:
      - flutter pub get
      - $Env:version += type .\VERSION
      - $Env:commitdate += type .\COMMIT_DATE
-      - $Env:releasedir = "build\\windows\\x64\\runner\\Release\\"
+      - $Env:releasedir = "build\\windows\\runner\\Release\\"
      - flutter build windows --dart-define BUILD_VER=$Env:version --dart-define BUILD_DATE=$Env:commitdate
      - copy windows\libCwtch.dll $Env:releasedir
      # flutter hasn't worked out it's packaging of required dll's so we have to resort to this manual nonsense
@ -266,7 +236,7 @@ steps:
    commands:
      - $Env:version += type .\VERSION
      - $Env:commitdate += type .\COMMIT_DATE
-      - $Env:releasedir = "build\\windows\\x64\\runner\\Release\\"
+      - $Env:releasedir = "build\\windows\\runner\\Release\\"
      - $Env:zip = 'cwtch-' + $Env:version + '.zip'
      - $Env:zipsha = $Env:zip + '.sha512.txt'
      - $Env:buildname = 'flwtch-' + $Env:commitdate + '-' + $Env:version
@ -291,7 +261,7 @@ steps:
      - move *.sha512.txt deploy\$Env:builddir

  - name: deploy-windows
-    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.19.3
+    image: openpriv/flutter-desktop:windows-sdk30-fstable-3.13.4
    when:
      event: push
      status: [ success ]
@ -363,7 +333,6 @@ steps:
    commands:
      - export PATH=$PATH:/Users/drone/bin/flutter/bin
      - export PATH=$GEM_HOME/ruby/2.6.0/bin:$PATH
-      - flutter doctor
      - flutter build macos --dart-define BUILD_VER=`cat VERSION` --dart-define BUILD_DATE=`cat COMMIT_DATE`
      - export PATH=$PATH:/opt/homebrew/bin/ #create-dmg
      - macos/package-release.sh
--- a/.gitignore
+++ b/.gitignore
@ -35,7 +35,6 @@ test_home
 .pub-cache/
 .pub/
 /build/
-./lib/gen/

 # Web related
 lib/generated_plugin_registrant.dart
@ -59,7 +58,7 @@ package.
 # Compiled Libs
 linux/tor
 linux/libCwtch.so
-android/app/cwtch/cwtch.aar
+android/cwtch/cwtch.aar
 android/app/src/main/jniLibs/*/libtor.so
 *.dylib
 integration_test/gherkin_suite_test.g.dart
--- a/LIBCWTCH-GO.version
+++ b/LIBCWTCH-GO.version
@ -1 +1 @@
-2024-02-26-18-01-v0.0.14
+2024-01-03-20-52-v0.0.10-4-g6c0b2e2
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 MIT License
-Copyright (c) 2021-2024 Open Privacy Research Society
+Copyright (c) 2021 Open Privacy Research Society

 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

--- a/NSIS-Notes.md
+++ b/NSIS-Notes.md
@ -1,8 +0,0 @@
-# NSIS Notes
-
-## Images
-
-Requires Windows 3 Compatible Bitmaps.
-
-Can convert to the correct format with e.g. `mogrify -compress none -format bmp3 windows/nsis/cwtch_title.bmp
-`
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@ -1,9 +1,3 @@
-plugins {
-    id "com.android.application"
-    id "kotlin-android"
-    id "dev.flutter.flutter-gradle-plugin"
-}
-
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@ -12,6 +6,11 @@ if (localPropertiesFile.exists()) {
    }
 }

+def flutterRoot = localProperties.getProperty('flutter.sdk')
+if (flutterRoot == null) {
+    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
+}
+
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
    flutterVersionCode = '1'
@ -22,6 +21,10 @@ if (flutterVersionName == null) {
    flutterVersionName = '1.0'
 }

+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
+
 // key.properties MUST have password placeholders filled in (via drone with secrets) and cwtch-upload.jks file must be added (from drone secret)
 def keystoreProperties = new Properties()
 def keystorePropertiesFile = rootProject.file('key.properties')
@ -30,7 +33,7 @@ if (keystorePropertiesFile.exists()) {
 }

 android {
-    compileSdkVersion 34
+    compileSdkVersion 33

    sourceSets {
        main.java.srcDirs += 'src/main/kotlin'
@ -51,7 +54,7 @@ android {
        // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
        applicationId "im.cwtch.flwtch"
        minSdkVersion 19
-        targetSdkVersion 34
+        targetSdkVersion 33
        versionCode flutterVersionCode.toInteger()
        versionName flutterVersionName
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -90,11 +93,11 @@ flutter {
 }

 dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.21" // same as kotlin version in settings.gradle
-    implementation fileTree( dir: 'cwtch')
-    implementation files ('cwtch/cwtch.aar')
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation project(':cwtch')
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.2"
    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
+    implementation "com.airbnb.android:lottie:5.2.0"
    implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
    implementation "com.android.support.constraint:constraint-layout:2.0.4"

--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@ -1,4 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="im.cwtch.flwtch">
    <!-- io.flutter.app.FlutterApplication is an android.app.Application that
         calls FlutterMain.startInitialization(this); in its onCreate method.
@ -13,7 +13,7 @@
        <activity
            android:name=".MainActivity"
            android:launchMode="singleTop"
-            android:theme="@style/LaunchTheme"
+            android:theme="@style/NormalTheme"
            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
            android:hardwareAccelerated="true"
            android:windowSoftInputMode="adjustResize"
@ -38,30 +38,22 @@
            android:name="flutterEmbedding"
            android:value="2" />

-        <!--Needed to run in background (lol)-->
-        <service
-            android:name="androidx.work.impl.foreground.SystemForegroundService"
-            android:foregroundServiceType="dataSync"
-            tools:node="merge" />

    </application>

    <!--Needed to access Tor socket-->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.INTERNET" />

-    <!-- Needed for running in the background -->
+    <!--Needed to run in background (lol)-->
    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <!-- As of Android 13 this permission is required -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />

    <!-- Ability to ask user to exempt app from power management (which can kill it more frequently especially on some devices.
         Allows app to use ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS -->
    <uses-permission-sdk-23 android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />

-
+    <!-- TODO when we support sdk 31
    <uses-permission-sdk-23 android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
-
+    -->

    <!--Needed to check if activity is foregrounded or if messages from the service should be queued-->
    <uses-permission android:name="android.permission.GET_TASKS" />
--- a/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt
+++ b/android/app/src/main/kotlin/im/cwtch/flwtch/FlwtchWorker.kt
@ -11,7 +11,6 @@ import android.graphics.Color
 import android.net.Uri
 import android.os.Build
 import android.util.Log
-import android.content.pm.ServiceInfo
 import androidx.annotation.RequiresApi
 import androidx.core.app.NotificationCompat
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
@ -23,13 +22,6 @@ import io.flutter.FlutterInjector
 import org.json.JSONObject
 import java.nio.file.Files
 import java.nio.file.Paths
-import java.io.FileInputStream
-
-
-import java.io.File
-
-
-

 class FlwtchWorker(context: Context, parameters: WorkerParameters) :
        CoroutineWorker(context, parameters) {
@ -145,19 +137,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                                        Log.i(TAG, "notification for " + evt.EventType + " " + handle + " " + conversationId + " " + channelId)
                                        Log.i(TAG, data.toString());
                                        val key = loader.getLookupKeyForAsset(data.getString("picture"))//"assets/profiles/001-centaur.png")
-                                        var fh : java.io.InputStream? = null;
-                                        try {
-                                            fh = applicationContext.assets.open(key)
-                                        } catch (e: Exception) {
-                                            Log.d("FlwtchWorker->ContactInfo", e.toString() + " :: " + e.getStackTrace());
-                                        }
-
-                                        try {
-                                            val file = File(data.getString("picture"))
-                                            fh = FileInputStream(file)
-                                        } catch (e: Exception) {
-                                            Log.d("FlwtchWorker->ContactInfo", e.toString() + " :: " + e.getStackTrace());
-                                        }
+                                        val fh = applicationContext.assets.open(key)

                                        val clickIntent = Intent(applicationContext, MainActivity::class.java).also { intent ->
                                            intent.action = Intent.ACTION_RUN
@ -165,21 +145,18 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                                            intent.putExtra("ProfileOnion", data.getString("ProfileOnion"))
                                            intent.putExtra("Handle", handle)
                                        }
-                                        val image : android.graphics.Bitmap?  = if (fh != null) BitmapFactory.decodeStream(fh ) else null;
+
                                        val newNotification = NotificationCompat.Builder(applicationContext, channelId)
                                                .setContentTitle(data.getString("Nick"))
                                                .setContentText((notificationConversationInfo
                                                        ?: "New Message From %1").replace("%1", data.getString("Nick")))
-                                                .setLargeIcon(image)
+                                                .setLargeIcon(BitmapFactory.decodeStream(fh))
                                                .setSmallIcon(R.mipmap.knott_transparent)
                                                .setContentIntent(PendingIntent.getActivity(applicationContext, 1, clickIntent, flags))
                                                .setAutoCancel(true)
                                                .build()

                                        notificationManager.notify(getNotificationID(data.getString("ProfileOnion"), channelId), newNotification)
-                                        if (fh != null) {
-                                            fh.close()
-                                        }
                                    }

                                }
@ -315,7 +292,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                .addAction(android.R.drawable.ic_delete, cancel, PendingIntent.getActivity(applicationContext, 2, cancelIntent, flags))
                .build()

-        return ForegroundInfo(101, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_DATA_SYNC)
+        return ForegroundInfo(101, notification)
    }

    @RequiresApi(Build.VERSION_CODES.O)
--- a/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
+++ b/android/app/src/main/kotlin/im/cwtch/flwtch/MainActivity.kt
@ -1,5 +1,6 @@
 package im.cwtch.flwtch

+import SplashView
 import android.annotation.TargetApi
 import android.content.BroadcastReceiver
 import android.content.Context
@ -18,6 +19,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.work.*
 import cwtch.Cwtch
 import io.flutter.embedding.android.FlutterActivity
+import io.flutter.embedding.android.SplashScreen
 import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.ErrorLogResult
 import io.flutter.plugin.common.MethodCall
@ -30,6 +32,8 @@ import java.util.concurrent.TimeUnit
 import kotlinx.coroutines.*

 class MainActivity: FlutterActivity() {
+    override fun provideSplashScreen(): SplashScreen? = SplashView()
+

    // Channel to get app info
    private val CHANNEL_APP_INFO = "test.flutter.dev/applicationInfo"
@ -573,6 +577,9 @@ class MainActivity: FlutterActivity() {
                result.success(Cwtch.searchConversations(profile, pattern))
                return
            }
+            "ReconnectCwtchForeground" -> {
+                Cwtch.reconnectCwtchForeground()
+            }
            "Shutdown" -> {
                Cwtch.shutdownCwtch();
            }
--- a/android/app/src/main/kotlin/im/cwtch/flwtch/SplashView.kt
+++ b/android/app/src/main/kotlin/im/cwtch/flwtch/SplashView.kt
@ -0,0 +1,15 @@
+import android.content.Context
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import im.cwtch.flwtch.R
+import io.flutter.embedding.android.SplashScreen
+
+class SplashView : SplashScreen {
+    override fun createSplashView(context: Context, savedInstanceState: Bundle?): View? =
+            LayoutInflater.from(context).inflate(R.layout.splash_view, null, false)
+
+    override fun transitionToFlutter(onTransitionComplete: Runnable) {
+        onTransitionComplete.run()
+    }
+}
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/darkGreyPurple" />
+    <item android:drawable="?android:colorBackground" />

    <!-- You can insert your own image assets here -->
-    <item>
+    <!-- <item>
        <bitmap
            android:gravity="center"
-            android:src="@mipmap/knott" />
-    </item>
+            android:src="@mipmap/launch_image" />
+    </item> -->
 </layer-list>
--- a/android/app/src/main/res/drawable/knott.xml
+++ b/android/app/src/main/res/drawable/knott.xml
@ -1,81 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="500dp"
-    android:height="500dp"
-    android:viewportWidth="500"
-    android:viewportHeight="500">
-  <path
-      android:pathData="M436.2,215c-0.6,3 -2,6.4 -4.3,10.4l18.2,18.2c2.4,-4.8 6.2,-13.1 8.2,-22.9c4.1,-20.2 -0.5,-37.1 -13.7,-50.3c-24.2,-24.2 -49.4,-26.4 -81.8,-7.3c-7.8,4.6 -16.1,10.6 -24.6,17.7c-19.5,16.3 -41.3,39.5 -64.9,69.2c15.4,19.4 30.2,36.2 43.8,49.8c6.3,6.3 12.4,12 18.3,17.1l16.2,-16.2c-5.9,-5 -12.1,-10.7 -18.4,-17c-9,-9 -18.5,-19.5 -28.4,-31.2l-2.1,-2.5l2.1,-2.5c18.1,-21.5 35,-38.6 50.1,-50.9c9.6,-7.8 18.6,-13.8 26.7,-17.7c7,-3.4 13.4,-5.3 19,-5.6c2.7,-0.2 6.9,-0.1 12.1,2c5,2.1 10.2,5.8 15.7,11.3c2.1,2.1 5,5.4 6.8,10.4C437.1,202.1 437.5,208 436.2,215L436.2,215z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M340.9,354.7l81.5,-81.5c-4.8,-7.1 -11.1,-14 -14.6,-17.7L327.3,336C332.5,342.4 337.1,348.6 340.9,354.7z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M444.6,329.6c13.2,-13.2 17.8,-30.1 13.7,-50.3c-2.8,-14 -9.1,-24.9 -10.3,-26.9L382.6,187c-6,3.1 -12.5,7.4 -19.4,12.8l50.1,50.1l0,0c4.1,4.3 12.1,13 17.4,21.6c3.2,5.2 5.1,9.7 5.6,13.5c1.2,6.9 0.9,12.7 -0.9,17.9c-1.8,5 -4.8,8.3 -6.8,10.4c-5.9,5.9 -11.3,9.7 -16.7,11.7c-5.5,2 -10,1.8 -13.3,1.4c-4.4,-0.5 -9.2,-2 -14.3,-4.2l-17,17C397.5,355.7 421.5,352.7 444.6,329.6z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M303.1,64.7c5,1.8 8.3,4.8 10.4,6.8c5.9,5.9 9.7,11.3 11.7,16.7c2,5.5 1.8,10 1.4,13.3c-0.5,4.4 -2,9.2 -4.2,14.3l17,17c16.4,-30.3 13.3,-54.4 -9.7,-77.4c-13.2,-13.2 -30.1,-17.8 -50.3,-13.7c-14,2.8 -24.9,9.1 -26.9,10.3L187,117.4c3.1,6 7.4,12.5 12.8,19.4L250,86.7l0,0c4.3,-4.1 13,-12.1 21.6,-17.4c5.2,-3.2 9.7,-5.1 13.5,-5.6C292,62.6 297.9,62.9 303.1,64.7z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M170.4,55.4c-24.2,24.2 -26.4,49.4 -7.3,81.8c4.6,7.8 10.6,16.1 17.7,24.6c16.3,19.5 39.5,41.3 69.2,64.9c19.4,-15.4 36.2,-30.2 49.8,-43.8c6.3,-6.3 12,-12.4 17.1,-18.3l-16.2,-16.2c-5,5.9 -10.7,12.1 -17,18.4c-9,9 -19.5,18.5 -31.2,28.4l-2.5,2.1l-2.5,-2.1c-21.5,-18.1 -38.6,-35 -50.9,-50.1c-7.8,-9.6 -13.8,-18.6 -17.7,-26.7c-3.4,-7 -5.3,-13.4 -5.6,-19c-0.2,-2.7 -0.1,-6.9 2,-12.1c2.1,-5 5.8,-10.2 11.3,-15.7c2.1,-2.1 5.4,-5 10.4,-6.8c5.2,-1.9 11.1,-2.2 18,-0.9l0.1,0c3,0.6 6.4,2 10.4,4.3l18.2,-18.2c-4.8,-2.4 -13.1,-6.2 -23,-8.2C200.5,37.6 183.6,42.2 170.4,55.4z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M273.2,77.6c-7.1,4.8 -14,11.1 -17.7,14.6l80.5,80.5c6.4,-5.2 12.7,-9.7 18.7,-13.6L273.2,77.6z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M55.4,329.6c24.2,24.2 49.4,26.4 81.8,7.3c7.8,-4.6 16.1,-10.6 24.6,-17.7c19.5,-16.3 41.3,-39.5 64.9,-69.2c-15.4,-19.4 -30.2,-36.2 -43.8,-49.8c-6.3,-6.3 -12.4,-12 -18.3,-17.1l-16.2,16.2c5.9,5 12.1,10.7 18.4,17c9,9 18.5,19.5 28.4,31.2l2.1,2.5l-2.1,2.5c-18.1,21.5 -35,38.6 -50.1,50.9c-9.6,7.8 -18.6,13.8 -26.7,17.7c-7,3.4 -13.4,5.3 -19,5.6c-2.7,0.2 -6.9,0.1 -12.1,-2c-5,-2.1 -10.2,-5.8 -15.7,-11.3c-2.1,-2.1 -5,-5.4 -6.8,-10.4c-1.9,-5.2 -2.2,-11.1 -0.9,-18l0,-0.1c0.6,-3 2,-6.4 4.3,-10.4l-18.2,-18.2c-2.4,4.8 -6.2,13.1 -8.2,23C37.6,299.5 42.2,316.4 55.4,329.6z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M86.7,250L86.7,250c-4.1,-4.4 -12,-13.1 -17.3,-21.6c-3.2,-5.2 -5.1,-9.7 -5.6,-13.5c-1.2,-6.9 -0.9,-12.7 0.9,-17.9c1.8,-5 4.8,-8.3 6.8,-10.4c5.9,-5.9 11.3,-9.7 16.7,-11.7c5.5,-2 10,-1.8 13.3,-1.4c4.4,0.5 9.2,2 14.3,4.2l17,-17c-30.3,-16.4 -54.4,-13.3 -77.4,9.7c-13.2,13.2 -17.8,30.1 -13.7,50.3c2.8,14 9.1,24.9 10.3,26.9l65.4,65.4c6,-3.1 12.5,-7.4 19.4,-12.8L86.7,250z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M92.2,244.5l80.5,-80.5c-5.2,-6.4 -9.7,-12.7 -13.6,-18.7l-81.5,81.5C82.4,233.9 88.6,240.8 92.2,244.5z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M329.6,444.6c24.2,-24.2 26.4,-49.4 7.3,-81.8c-4.6,-7.8 -10.6,-16.1 -17.7,-24.6c-16.3,-19.5 -39.5,-41.3 -69.2,-64.9c-19.4,15.4 -36.2,30.2 -49.8,43.8c-6.3,6.3 -12,12.4 -17.1,18.3l16.2,16.2c5,-5.9 10.7,-12.1 17,-18.4c9,-9 19.5,-18.5 31.2,-28.4l2.5,-2.1l2.5,2.1c21.5,18.1 38.6,35 50.9,50.1c7.8,9.6 13.8,18.6 17.7,26.7c3.4,7 5.3,13.4 5.6,19c0.2,2.7 0.1,6.9 -2,12.1c-2.1,5 -5.8,10.2 -11.3,15.7c-2.1,2.1 -5.4,5 -10.4,6.8c-5.2,1.9 -11.1,2.2 -18,0.9l-0.1,0c-3,-0.6 -6.4,-2 -10.4,-4.3l-18.2,18.2c4.7,2.4 13.1,6.1 22.9,8.2C299.4,462.4 316.4,457.8 329.6,444.6z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M244.5,407.8L164,327.3c-6.4,5.2 -12.7,9.7 -18.7,13.6l81.5,81.5C233.9,417.6 240.8,411.4 244.5,407.8z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M483.4,250c2.6,-6.3 5.3,-14 7.1,-22.7c6.3,-30.8 -1.8,-59.2 -22.7,-80.1c-19.7,-19.7 -41.7,-29.7 -65.5,-29.7c-7.5,0 -15.1,1 -22.8,3c2.9,-11.3 3.7,-22.3 2.3,-33.2c-2.5,-19.8 -12.3,-38.3 -29,-55.1C336.6,15.9 315.9,7.4 293,7.4c-6.6,0 -13.4,0.7 -20.2,2.1c-8.7,1.8 -16.5,4.5 -22.7,7.1c-6.3,-2.6 -14.1,-5.3 -22.8,-7.1c-6.9,-1.4 -13.7,-2.1 -20.2,-2.1c-22.9,0 -43.6,8.6 -59.9,24.8c-17.6,17.6 -27.5,37.2 -29.4,58.1c-0.9,9.9 0,19.9 2.7,30.2c-7.7,-2 -15.3,-3 -22.8,-3c-23.8,0 -45.8,10 -65.5,29.7c-20.9,20.9 -28.9,49.3 -22.7,80.1c1.8,8.7 4.5,16.5 7.1,22.7c-2.6,6.3 -5.3,14.1 -7.1,22.8c-6.2,30.8 1.8,59.2 22.7,80.1c19.7,19.7 41.7,29.7 65.5,29.7c0,0 0,0 0,0c7.5,0 15.1,-1 22.8,-3c-2.9,11.3 -3.7,22.3 -2.3,33.2c2.5,19.8 12.3,38.3 29,55.1c16.2,16.2 36.9,24.8 59.8,24.8c0,0 0,0 0,0c6.6,0 13.4,-0.7 20.2,-2.1c8.7,-1.8 16.5,-4.4 22.7,-7.1c6.3,2.6 14,5.3 22.7,7.1c6.9,1.4 13.7,2.1 20.3,2.1c0,0 0,0 0,0c22.9,0 43.6,-8.6 59.9,-24.8c17.6,-17.6 27.5,-37.2 29.4,-58.1c0.9,-9.9 0,-19.9 -2.7,-30.2c7.7,2 15.3,3 22.8,3c0,0 0,0 0,0c23.8,0 45.8,-10 65.5,-29.7c20.9,-20.9 29,-49.3 22.7,-80.1C488.8,264 486.1,256.3 483.4,250z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M170.4,444.6c13.2,13.2 30.1,17.8 50.3,13.7c14,-2.8 24.9,-9.1 26.9,-10.3l65.4,-65.4c-3.1,-6 -7.4,-12.5 -12.8,-19.4L250,413.3l0,0c-4.3,4.1 -13,12.1 -21.6,17.4c-5.2,3.2 -9.7,5.1 -13.5,5.6c-6.9,1.2 -12.7,0.9 -17.9,-0.9c-5,-1.8 -8.3,-4.8 -10.4,-6.8c-5.9,-5.9 -9.7,-11.3 -11.7,-16.7c-2,-5.5 -1.8,-10 -1.4,-13.3c0.5,-4.4 2,-9.2 4.2,-14.3l-17,-17C144.3,397.5 147.3,421.5 170.4,444.6z"
-      android:fillColor="#242425"/>
-  <path
-      android:pathData="M436.2,215c-0.6,3 -2,6.4 -4.3,10.4l18.2,18.2c2.4,-4.8 6.2,-13.1 8.2,-22.9c4.1,-20.2 -0.5,-37.1 -13.7,-50.3c-24.2,-24.2 -49.4,-26.4 -81.8,-7.3c-7.8,4.6 -16.1,10.6 -24.6,17.7c-19.5,16.3 -41.3,39.5 -64.9,69.2c15.4,19.4 30.2,36.2 43.8,49.8c6.3,6.3 12.4,12 18.3,17.1l16.2,-16.2c-5.9,-5 -12.1,-10.7 -18.4,-17c-9,-9 -18.5,-19.5 -28.4,-31.2l-2.1,-2.5l2.1,-2.5c18.1,-21.5 35,-38.6 50.1,-50.9c9.6,-7.8 18.6,-13.8 26.7,-17.7c7,-3.4 13.4,-5.3 19,-5.6c2.7,-0.2 6.9,-0.1 12.1,2c5,2.1 10.2,5.8 15.7,11.3c2.1,2.1 5,5.4 6.8,10.4C437.1,202.1 437.5,208 436.2,215L436.2,215z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M340.9,354.7l81.5,-81.5c-4.8,-7.1 -11.1,-14 -14.6,-17.7L327.3,336C332.5,342.4 337.1,348.6 340.9,354.7z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M444.6,329.6c13.2,-13.2 17.8,-30.1 13.7,-50.3c-2.8,-14 -9.1,-24.9 -10.3,-26.9L382.6,187c-6,3.1 -12.5,7.4 -19.4,12.8l50.1,50.1l0,0c4.1,4.3 12.1,13 17.4,21.6c3.2,5.2 5.1,9.7 5.6,13.5c1.2,6.9 0.9,12.7 -0.9,17.9c-1.8,5 -4.8,8.3 -6.8,10.4c-5.9,5.9 -11.3,9.7 -16.7,11.7c-5.5,2 -10,1.8 -13.3,1.4c-4.4,-0.5 -9.2,-2 -14.3,-4.2l-17,17C397.5,355.7 421.5,352.7 444.6,329.6z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M303.1,64.7c5,1.8 8.3,4.8 10.4,6.8c5.9,5.9 9.7,11.3 11.7,16.7c2,5.5 1.8,10 1.4,13.3c-0.5,4.4 -2,9.2 -4.2,14.3l17,17c16.4,-30.3 13.3,-54.4 -9.7,-77.4c-13.2,-13.2 -30.1,-17.8 -50.3,-13.7c-14,2.8 -24.9,9.1 -26.9,10.3L187,117.4c3.1,6 7.4,12.5 12.8,19.4L250,86.7l0,0c4.3,-4.1 13,-12.1 21.6,-17.4c5.2,-3.2 9.7,-5.1 13.5,-5.6C292,62.6 297.9,62.9 303.1,64.7z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M170.4,55.4c-24.2,24.2 -26.4,49.4 -7.3,81.8c4.6,7.8 10.6,16.1 17.7,24.6c16.3,19.5 39.5,41.3 69.2,64.9c19.4,-15.4 36.2,-30.2 49.8,-43.8c6.3,-6.3 12,-12.4 17.1,-18.3l-16.2,-16.2c-5,5.9 -10.7,12.1 -17,18.4c-9,9 -19.5,18.5 -31.2,28.4l-2.5,2.1l-2.5,-2.1c-21.5,-18.1 -38.6,-35 -50.9,-50.1c-7.8,-9.6 -13.8,-18.6 -17.7,-26.7c-3.4,-7 -5.3,-13.4 -5.6,-19c-0.2,-2.7 -0.1,-6.9 2,-12.1c2.1,-5 5.8,-10.2 11.3,-15.7c2.1,-2.1 5.4,-5 10.4,-6.8c5.2,-1.9 11.1,-2.2 18,-0.9l0.1,0c3,0.6 6.4,2 10.4,4.3l18.2,-18.2c-4.8,-2.4 -13.1,-6.2 -23,-8.2C200.5,37.6 183.6,42.2 170.4,55.4z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M273.2,77.6c-7.1,4.8 -14,11.1 -17.7,14.6l80.5,80.5c6.4,-5.2 12.7,-9.7 18.7,-13.6L273.2,77.6z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M55.4,329.6c24.2,24.2 49.4,26.4 81.8,7.3c7.8,-4.6 16.1,-10.6 24.6,-17.7c19.5,-16.3 41.3,-39.5 64.9,-69.2c-15.4,-19.4 -30.2,-36.2 -43.8,-49.8c-6.3,-6.3 -12.4,-12 -18.3,-17.1l-16.2,16.2c5.9,5 12.1,10.7 18.4,17c9,9 18.5,19.5 28.4,31.2l2.1,2.5l-2.1,2.5c-18.1,21.5 -35,38.6 -50.1,50.9c-9.6,7.8 -18.6,13.8 -26.7,17.7c-7,3.4 -13.4,5.3 -19,5.6c-2.7,0.2 -6.9,0.1 -12.1,-2c-5,-2.1 -10.2,-5.8 -15.7,-11.3c-2.1,-2.1 -5,-5.4 -6.8,-10.4c-1.9,-5.2 -2.2,-11.1 -0.9,-18l0,-0.1c0.6,-3 2,-6.4 4.3,-10.4l-18.2,-18.2c-2.4,4.8 -6.2,13.1 -8.2,23C37.6,299.5 42.2,316.4 55.4,329.6z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M86.7,250L86.7,250c-4.1,-4.4 -12,-13.1 -17.3,-21.6c-3.2,-5.2 -5.1,-9.7 -5.6,-13.5c-1.2,-6.9 -0.9,-12.7 0.9,-17.9c1.8,-5 4.8,-8.3 6.8,-10.4c5.9,-5.9 11.3,-9.7 16.7,-11.7c5.5,-2 10,-1.8 13.3,-1.4c4.4,0.5 9.2,2 14.3,4.2l17,-17c-30.3,-16.4 -54.4,-13.3 -77.4,9.7c-13.2,13.2 -17.8,30.1 -13.7,50.3c2.8,14 9.1,24.9 10.3,26.9l65.4,65.4c6,-3.1 12.5,-7.4 19.4,-12.8L86.7,250z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M92.2,244.5l80.5,-80.5c-5.2,-6.4 -9.7,-12.7 -13.6,-18.7l-81.5,81.5C82.4,233.9 88.6,240.8 92.2,244.5z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M329.6,444.6c24.2,-24.2 26.4,-49.4 7.3,-81.8c-4.6,-7.8 -10.6,-16.1 -17.7,-24.6c-16.3,-19.5 -39.5,-41.3 -69.2,-64.9c-19.4,15.4 -36.2,30.2 -49.8,43.8c-6.3,6.3 -12,12.4 -17.1,18.3l16.2,16.2c5,-5.9 10.7,-12.1 17,-18.4c9,-9 19.5,-18.5 31.2,-28.4l2.5,-2.1l2.5,2.1c21.5,18.1 38.6,35 50.9,50.1c7.8,9.6 13.8,18.6 17.7,26.7c3.4,7 5.3,13.4 5.6,19c0.2,2.7 0.1,6.9 -2,12.1c-2.1,5 -5.8,10.2 -11.3,15.7c-2.1,2.1 -5.4,5 -10.4,6.8c-5.2,1.9 -11.1,2.2 -18,0.9l-0.1,0c-3,-0.6 -6.4,-2 -10.4,-4.3l-18.2,18.2c4.7,2.4 13.1,6.1 22.9,8.2C299.4,462.4 316.4,457.8 329.6,444.6z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M244.5,407.8L164,327.3c-6.4,5.2 -12.7,9.7 -18.7,13.6l81.5,81.5C233.9,417.6 240.8,411.4 244.5,407.8z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M170.4,444.6c13.2,13.2 30.1,17.8 50.3,13.7c14,-2.8 24.9,-9.1 26.9,-10.3l65.4,-65.4c-3.1,-6 -7.4,-12.5 -12.8,-19.4L250,413.3l0,0c-4.3,4.1 -13,12.1 -21.6,17.4c-5.2,3.2 -9.7,5.1 -13.5,5.6c-6.9,1.2 -12.7,0.9 -17.9,-0.9c-5,-1.8 -8.3,-4.8 -10.4,-6.8c-5.9,-5.9 -9.7,-11.3 -11.7,-16.7c-2,-5.5 -1.8,-10 -1.4,-13.3c0.5,-4.4 2,-9.2 4.2,-14.3l-17,-17C144.3,397.5 147.3,421.5 170.4,444.6z"
-      android:fillColor="#FFFFFF"/>
-</vector>
--- a/android/app/src/main/res/drawable/launch_background.xml
+++ b/android/app/src/main/res/drawable/launch_background.xml
@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/darkGreyPurple" />
+    <item android:drawable="@android:color/white" />

    <!-- You can insert your own image assets here -->
-    <item android:drawable="@drawable/knott"
-        android:gravity="center"
-        />
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
 </layer-list>
--- a/android/app/src/main/res/layout/splash_view.xml
+++ b/android/app/src/main/res/layout/splash_view.xml
@ -0,0 +1,19 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <com.airbnb.lottie.LottieAnimationView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:lottie_autoPlay="true"
+        app:lottie_rawRes="@raw/cwtch_animated_logo_op"
+        app:lottie_loop="true"
+        app:lottie_speed="1.00"
+        app:lottie_enableMergePathsForKitKatAndAbove="true" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/knott"/>
-</adaptive-icon>
--- a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
--- a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
+++ b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
--- a/android/app/src/main/res/raw/cwtch_animated_logo_op.json
+++ b/android/app/src/main/res/raw/cwtch_animated_logo_op.json
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@ -1,23 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
-    <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
        <!-- Show a splash screen on the activity. Automatically removed when
-             the Flutter engine draws its first frame -->
+             Flutter draws its first frame -->
        <item name="android:windowBackground">@drawable/launch_background</item>
    </style>
-
-
-
-
-
    <!-- Theme applied to the Android Window as soon as the process has started.
         This theme determines the color of the Android Window while your
         Flutter UI initializes, as well as behind your Flutter UI while its
         running.
-
+         
         This Theme is only used starting with V2 of Flutter's Android embedding. -->
-    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
        <item name="android:windowBackground">?android:colorBackground</item>
    </style>
-</resources>
+</resources>
--- a/android/app/src/main/res/values-v26/styles.xml
+++ b/android/app/src/main/res/values-v26/styles.xml
@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
-        <item name="android:windowSplashScreenBackground">@color/darkGreyPurple</item>
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/knott</item>
-        <item name="android:windowSplashScreenIconBackgroundColor">@color/darkGreyPurple</item>
-    </style>
-
-    <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
-    </style>
-
-</resources>
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@ -1,5 +0,0 @@
-<resources>
-    <color name="darkGreyPurple">#281831</color>
-    <color name="testGreen">#00ff00</color>
-    <color name="ic_launcher_background">@color/darkGreyPurple</color>
-</resources>
--- a/android/build.gradle
+++ b/android/build.gradle
@ -1,3 +1,18 @@
+buildscript {
+    ext.kotlin_version = '1.8.21'
+    repositories {
+        google()
+        // jCenter() no longer exists... https://blog.gradle.org/jcenter-shutdown
+        mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.0.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+
+    }
+}
+
 allprojects {
    repositories {
        google()
@ -13,6 +28,7 @@ subprojects {
    project.evaluationDependsOn(':app')
 }

-tasks.register("clean", Delete) {
-    delete rootProject.buildDir
-}
+//removed due to gradle namespace conflicts that are beyond erinn's mere mortal understanding
+//task clean(type: Delete) {
+//    delete rootProject.buildDir
+//}
--- a/android/app/cwtch/build.gradle
+++ b/android/app/cwtch/build.gradle
--- a/android/settings.gradle
+++ b/android/settings.gradle
@ -1,25 +1,11 @@
-pluginManagement {
-    def flutterSdkPath = {
-        def properties = new Properties()
-        file("local.properties").withInputStream { properties.load(it) }
-        def flutterSdkPath = properties.getProperty("flutter.sdk")
-        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-        return flutterSdkPath
-    }()
+include ':app', ':cwtch'

-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()

-    repositories {
-        google()
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
+assert localPropertiesFile.exists()
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }

-plugins {
-    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.8.21" apply false
-}
-
-include ":app"
+def flutterSdkPath = properties.getProperty("flutter.sdk")
+assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
--- a/assets/themes/cwtch/Cwtch.png
+++ b/assets/themes/cwtch/Cwtch.png
--- a/assets/themes/cwtch/theme.yml
+++ b/assets/themes/cwtch/theme.yml
@ -1,107 +1,104 @@
---
-colors:
-  darkGreyPurple: 0x281831
-  deepPurple: 0x422850
-  mauvePurple: 0x8E64A5
-  whiteishPurple: 0xE3DFE4
-  lightGrey: 0x9E9E9E
-  softGreen: 0xA0FFB0
-  softRed: 0xFFA0B0
-  whitePurple: 0xFFFDFF
-  softPurple: 0xFDF3FC
-  purple: 0xDFB9DE
-  brightPurple: 0xD1B0E0  # not in new: portrait badge color
-  darkPurple: 0x350052
-  greyPurple: 0x775F84  # not in new: portrait borders
-  pink: 0xE85DA1  # not in new: active button color
-  hotPink: 0xD20070  # #D01972)
-  softGrey: 0xB3B6B3  # not in new theme: blocked
-themes:
-  name: cwtch
-  dark:
-    colors:
-      background: darkGreyPurple
-      header: darkGreyPurple
-      userBubble: mauvePurple
-      peerBubble: deepPurple
-      font: whiteishPurple
-      settings: whiteishPurple
-      accent: hotPink
-    theme:
-      backgroundHilightElementColor: deepPurple
-      backgroundMainColor: background  # darkGreyPurple
-      backgroundPaneColor: header  # darkGreyPurple
-      defaultButtonColor: accent  # hotPink
-      defaultButtonDisabledColor: lightGrey
-      defaultButtonDisabledTextColor: darkGreyPurple
-      defaultButtonTextColor: whiteishPurple
-      dropShadowColor: mauvePurple
-      hilightElementColor: purple
-      mainTextColor: font  # whiteishPurple
-      messageFromMeBackgroundColor: userBubble  # mauvePurple
-      messageFromMeTextColor: font  # whiteishPurple
-      messageFromOtherBackgroundColor: peerBubble  # deepPurple
-      messageFromOtherTextColor: font  # whiteishPurple
-      portraitBackgroundColor: deepPurple
-      portraitBlockedBorderColor: lightGrey
-      portraitBlockedTextColor: lightGrey
-      portraitContactBadgeColor: hotPink
-      portraitContactBadgeTextColor: whiteishPurple
-      portraitOfflineBorderColor: purple
-      portraitOnlineBorderColor: whiteishPurple
-      portraitProfileBadgeColor: hotPink
-      portraitProfileBadgeTextColor: whiteishPurple
-      scrollbarDefaultColor: purple
-      sendHintTextColor: mauvePurple
-      chatReactionIconColor: mauvePurple
-      textfieldBackgroundColor: deepPurple
-      textfieldBorderColor: deepPurple
-      textfieldErrorColor: hotPink
-      textfieldHintColor: mainTextColor
-      toolbarIconColor: settings  # whiteishPurple
-      topbarColor: header  # darkGreyPurple
-      chatImage: Cwtch.png
-      chatImageColor: peerBubble
-  light:
-    colors:
-      background: whitePurple
-      header: softPurple
-      userBubble: purple
-      peerBubble: softPurple
-      font: 0x281831
-      settings: 0x281831
-      accent: hotPink
-    theme:
-      backgroundHilightElementColor: softPurple
-      backgroundMainColor: background  # whitePurple
-      backgroundPaneColor: background  # whitePurple
-      defaultButtonColor: accent  # hotPink
-      defaultButtonDisabledColor: softGrey
-      defaultButtonTextColor: whitePurple  # ?
-      dropShadowColor: purple
-      hilightElementColor: purple
-      mainTextColor: settings
-      messageFromMeBackgroundColor: userBubble  # brightPurple
-      messageFromMeTextColor: font  # mainTextColor
-      messageFromOtherBackgroundColor: peerBubble  # purple
-      messageFromOtherTextColor: font  # darkPurple
-      portraitBackgroundColor: softPurple
-      portraitBlockedBorderColor: softGrey
-      portraitBlockedTextColor: softGrey
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: whitePurple
-      portraitOfflineBorderColor: greyPurple
-      portraitOnlineBorderColor: font
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: whitePurple
-      scrollbarDefaultColor: accent
-      sendHintTextColor: purple
-      chatReactionIconColor: purple
-      textfieldBackgroundColor: purple
-      textfieldBorderColor: purple
-      textfieldErrorColor: hotPink
-      textfieldHintColor: font
-      toolbarIconColor: background  # darkPurple
-      topbarColor: header  # softPurple
-      chatImage: Cwtch.png
-      chatImageColor: 0xf1dff0
+---
+colors:
+  darkGreyPurple: 0x281831
+  deepPurple: 0x422850
+  mauvePurple: 0x8E64A5
+  whiteishPurple: 0xE3DFE4
+  lightGrey: 0x9E9E9E
+  softGreen: 0xA0FFB0
+  softRed: 0xFFA0B0
+  whitePurple: 0xFFFDFF
+  softPurple: 0xFDF3FC
+  purple: 0xDFB9DE
+  brightPurple: 0xD1B0E0  # not in new: portrait badge color
+  darkPurple: 0x350052
+  greyPurple: 0x775F84  # not in new: portrait borders
+  pink: 0xE85DA1  # not in new: active button color
+  hotPink: 0xD20070  # #D01972)
+  softGrey: 0xB3B6B3  # not in new theme: blocked
+
+themes:
+  name: cwtch
+  dark:
+    colors:
+      background: darkGreyPurple
+      header: darkGreyPurple
+      userBubble: mauvePurple
+      peerBubble: deepPurple
+      font: whiteishPurple
+      settings: whiteishPurple
+      accent: hotPink
+    theme:
+      backgroundHilightElementColor: deepPurple
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      defaultButtonDisabledColor: lightGrey
+      defaultButtonDisabledTextColor: darkGreyPurple
+      defaultButtonTextColor: whiteishPurple
+      dropShadowColor: mauvePurple
+      hilightElementColor: purple
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  # mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      portraitBackgroundColor: deepPurple
+      portraitBlockedBorderColor: lightGrey
+      portraitBlockedTextColor: lightGrey
+      portraitContactBadgeColor: hotPink
+      portraitContactBadgeTextColor: whiteishPurple
+      portraitOfflineBorderColor: purple
+      portraitOnlineBorderColor: whiteishPurple
+      portraitProfileBadgeColor: hotPink
+      portraitProfileBadgeTextColor: whiteishPurple
+      scrollbarDefaultColor: purple
+      sendHintTextColor: mauvePurple
+      chatReactionIconColor: mauvePurple
+      textfieldBackgroundColor: deepPurple
+      textfieldBorderColor: deepPurple
+      textfieldErrorColor: hotPink
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+  light:
+    colors:
+      background: whitePurple
+      header: softPurple
+      userBubble: purple
+      peerBubble: softPurple
+      font: darkPurple
+      settings: darkPurple
+      accent: hotPink
+    theme:
+      backgroundHilightElementColor: softPurple
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      defaultButtonDisabledColor: softGrey
+      defaultButtonTextColor: whitePurple  # ?
+      dropShadowColor: purple
+      hilightElementColor: purple
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitBackgroundColor: softPurple
+      portraitBlockedBorderColor: softGrey
+      portraitBlockedTextColor: softGrey
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: whitePurple
+      portraitOfflineBorderColor: greyPurple
+      portraitOnlineBorderColor: greyPurple
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: whitePurple
+      scrollbarDefaultColor: accent
+      sendHintTextColor: purple
+      chatReactionIconColor: purple
+      textfieldBackgroundColor: purple
+      textfieldBorderColor: purple
+      textfieldErrorColor: hotPink
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
--- a/assets/themes/ghost/Ghost.png
+++ b/assets/themes/ghost/Ghost.png
--- a/assets/themes/ghost/theme.yml
+++ b/assets/themes/ghost/theme.yml
@ -1,86 +1,68 @@
---
-colors:
-  darkDarkBlue: 0x0E1628
-  darkLightBlue: 0x19243E
-  white: 0xE6E9F4
-  darkBlue: 0x131B2E
-  lighterDarkBlue: 0x19243E
-  lightBlue: 0xC0C8E5
-
-themes:
-  name: ghost
-  dark:
-    colors:
-      background: 0x131B2E
-      header: 0x0E1628
-      userBubble: 0x25355A
-      peerBubble: 0x19243E
-      font: 0xE6E9F4
-      settings: 0xE6E9F4
-      accent: 0xD20070
-      reaction: 0x96A5D4
-    theme:
-      backgroundHilightElementColor: darkDarkBlue
-      backgroundMainColor: background
-      backgroundPaneColor: header
-      defaultButtonColor: accent
-      dropShadowColor: darkBlue
-      mainTextColor: font
-      messageFromMeBackgroundColor: userBubble
-      messageFromMeTextColor: font
-      messageFromOtherBackgroundColor: peerBubble
-      messageFromOtherTextColor: font
-      portraitOfflineBorderColor: 0x96A5D4
-      portraitOnlineBorderColor: font
-      portraitBackgroundColor: background
-      scrollbarDefaultColor: darkLightBlue
-      sendHintTextColor: userBubble
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      textfieldHintColor: font
-      toolbarIconColor: settings
-      topbarColor: header
-      chatReactionIconColor: reaction
-      chatImage: Ghost.png
-      chatImageColor: userBubble
-      snackbarBackgroundColor: accent
-      snackbarTextColor: 0xE6E9F4
-  light:
-    colors:
-      background: 0xE6E9F4
-      header: 0x96A5D4
-      userBubble: 0x96A5D4
-      peerBubble: 0xC0C8E5
-      font: 0x131B2E
-      settings: 0x131B2E
-      accent: 0xD20070
-      reaction: 0x96A5D4
-    theme:
-      backgroundHilightElementColor: peerBubble
-      backgroundMainColor: background
-      backgroundPaneColor: background
-      defaultButtonColor: accent
-      defaultButtonActiveColor: lighterDarkBlue
-      defaultButtonDisabledColor: userBubble
-      dropShadowColor: darkBlue
-      mainTextColor: settings
-      messageFromMeBackgroundColor: userBubble
-      messageFromMeTextColor: font
-      messageFromOtherBackgroundColor: peerBubble
-      messageFromOtherTextColor: font
-      portraitContactBadgeColor: accent
-      portraitOfflineBorderColor: header
-      portraitOnlineBorderColor: font
-      portraitBackgroundColor: background
-      scrollbarDefaultColor: accent
-      sendHintTextColor: peerBubble
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      textfieldHintColor: font
-      toolbarIconColor: 0xffffff
-      topbarColor: header
-      chatReactionIconColor: reaction
-      chatImage: Ghost.png
-      chatImageColor: peerBubble
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
+---
+colors:
+  darkDarkBlue: 0x000051
+  darkLightBlue: 0x1A237E
+  white: 0xFFFFFF
+  darkBlue: 0xAAB6FE
+  lighterDarkBlue: 0xC3CCFE
+  lightBlue: 0xE8EAF6
+
+themes:
+  name: ghost
+  dark:
+    colors:
+      background: 0x0D0D1F
+      header: 0x0D0D1F
+      userBubble: darkLightBlue
+      peerBubble: darkDarkBlue
+      font: white
+      settings: 0xDFFFD
+      accent: darkLightBlue  # Color(0xFFD20070)
+    theme:
+      backgroundHilightElementColor: darkDarkBlue
+      backgroundMainColor: background
+      backgroundPaneColor: header
+      defaultButtonColor: accent
+      dropShadowColor: darkBlue
+      mainTextColor: font
+      messageFromMeBackgroundColor: userBubble
+      messageFromMeTextColor: font
+      messageFromOtherBackgroundColor: peerBubble
+      messageFromOtherTextColor: font
+      scrollbarDefaultColor: darkLightBlue
+      sendHintTextColor: darkBlue
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings
+      topbarColor: header
+  light:
+    colors:
+      background: 0xFDFDFF
+      header: darkBlue
+      userBubble: darkBlue
+      peerBubble: lightBlue
+      font: 0x0D0D1F
+      settings: 0x0D0D1F
+      accent: darkBlue
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background
+      backgroundPaneColor: background
+      defaultButtonColor: accent
+      defaultButtonActiveColor: lighterDarkBlue
+      defaultButtonDisabledColor: peerBubble
+      dropShadowColor: darkBlue
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble
+      messageFromMeTextColor: font
+      messageFromOtherBackgroundColor: peerBubble
+      messageFromOtherTextColor: font
+      portraitContactBadgeColor: accent
+      scrollbarDefaultColor: accent
+      sendHintTextColor: lightBlue
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings
+      topbarColor: header
--- a/assets/themes/juniper/JuniperDark.png
+++ b/assets/themes/juniper/JuniperDark.png
--- a/assets/themes/juniper/theme.yml
+++ b/assets/themes/juniper/theme.yml
@ -1,53 +1,48 @@
---
-
-themes:
-  name: juniper
-  dark:
-    colors:
-      background: 0x1B1B1B
-      backgroundAlt: 0x494949
-      header: 0x1B1B1B
-      userBubble: 0x373737
-      peerBubble: 0x494949
-      font: 0xFFFFFF
-      settings: 0xFFFDFF
-      accent: 0x9E6A56
-      accentAlt: 0x9E6A56
-    theme:
-      backgroundMainColor: background
-      backgroundPaneColor: header
-      topbarColor: header
-      mainTextColor: font
-      defaultButtonColor: accent
-      textfieldHintColor: mainTextColor
-      toolbarIconColor: settings
-      messageFromMeBackgroundColor: userBubble
-      messageFromMeTextColor: font
-      messageFromOtherBackgroundColor: peerBubble
-      messageFromOtherTextColor: font
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      backgroundHilightElementColor: accent
-      sendHintTextColor: accentAlt
-      hilightElementColor: accentAlt
-      defaultButtonTextColor: mainTextColor
-      defaultButtonDisabledColor: peerBubble
-      defaultButtonDisabledTextColor: peerBubble
-      textfieldErrorColor: accent
-      scrollbarDefaultColor: accent
-      portraitBackgroundColor: header
-      portraitOnlineBorderColor: font
-      portraitOfflineBorderColor: peerBubble
-      portraitBlockedBorderColor: peerBubble
-      portraitBlockedTextColor: peerBubble
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: mainTextColor
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: mainTextColor
-      dropShadowColor: accentAlt
-      chatReactionIconColor: accentAlt
-      chatImage: JuniperDark.png
-      chatImageColor: userBubble
-      messageSelectionColor: accent
-      textfieldSelectionColor: accent
-      menuBackgroundColor: accent
+---
+
+themes:
+  name: juniper
+  dark:
+    colors:
+      background: 0x1B1B1B
+      backgroundAlt: 0x494949
+      header: 0x1B1B1B
+      userBubble: 0x373737
+      peerBubble: 0x494949
+      font: 0xFFFFFF
+      settings: 0xFFFDFF
+      accent: 0x9E6A56
+      accentAlt: 0x9E6A56
+    theme:
+      backgroundMainColor: background
+      backgroundPaneColor: header
+      topbarColor: header
+      mainTextColor: font
+      defaultButtonColor: accent
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings
+      messageFromMeBackgroundColor: userBubble
+      messageFromMeTextColor: font
+      messageFromOtherBackgroundColor: peerBubble
+      messageFromOtherTextColor: font
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      backgroundHilightElementColor: accent
+      sendHintTextColor: accentAlt
+      hilightElementColor: accentAlt
+      defaultButtonTextColor: mainTextColor
+      defaultButtonDisabledColor: peerBubble
+      defaultButtonDisabledTextColor: peerBubble
+      textfieldErrorColor: accent
+      scrollbarDefaultColor: accent
+      portraitBackgroundColor: header
+      portraitOnlineBorderColor: font
+      portraitOfflineBorderColor: peerBubble
+      portraitBlockedBorderColor: peerBubble
+      portraitBlockedTextColor: peerBubble
+      portraitContactBadgeColor: accent
+      portraitContactBadgeTextColor: mainTextColor
+      portraitProfileBadgeColor: accent
+      portraitProfileBadgeTextColor: mainTextColor
+      dropShadowColor: accentAlt
+      chatReactionIconColor: accentAlt
--- a/assets/themes/mermaid/Mermaid.png
+++ b/assets/themes/mermaid/Mermaid.png
--- a/assets/themes/mermaid/theme.yml
+++ b/assets/themes/mermaid/theme.yml
@ -1,91 +1,58 @@
---
-colors:
-  lavender: 0xB194C1
-
-themes:
-  name: mermaid
-  dark:
-    colors:
-      background: 0x15282A
-      header: 0x15282A
-      userBubble: 0x1d5754
-      peerBubble: 0x253D3F
-      font: 0xEDFAFC
-      settings: 0xEDFAFC
-      accent: 0x8E64A5
-      reaction: 0x8E64A5
-    theme:
-      backgroundHilightElementColor: peerBubble
-      backgroundMainColor: background  # darkGreyPurple
-      backgroundPaneColor: header  # darkGreyPurple
-      defaultButtonColor: accent  # hotPink
-      dropShadowColor: lavender
-      mainTextColor: font  # whiteishPurple
-      messageFromMeBackgroundColor: userBubble  # mauvePurple
-      messageFromMeTextColor: font  # whiteishPurple
-      messageFromOtherBackgroundColor: peerBubble  # deepPurple
-      messageFromOtherTextColor: font  # whiteishPurple
-      portraitOfflineBorderColor: userBubble
-      portraitOnlineBorderColor: font
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: 0xffffff
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: 0xffffff
-      portraitBackgroundColor: background
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      textfieldHintColor: mainTextColor
-      toolbarIconColor: settings  # whiteishPurple
-      topbarColor: header  # darkGreyPurple
-      sendHintTextColor: userBubble
-      chatReactionIconColor: reaction
-      chatImage: Mermaid.png
-      chatImageColor: peerBubble
-      snackbarBackgroundColor: accent
-      snackbarTextColor: 0xEDFAFC
-      messageSelectionColor: accent
-      textfieldSelectionColor: accent
-      menuBackgroundColor: accent
-  light:
-    colors:
-      background: 0xEDFAFC
-      header: 0x71C1BF
-      userBubble: 0x71C1BF
-      peerBubble: 0xD2EFF3
-      font: 0x15282A
-      settings: 0x15282A
-      accent: 0x8E64A5
-      reaction: 0x71C1BF
-    theme:
-      backgroundHilightElementColor: peerBubble
-      backgroundMainColor: background  # whitePurple
-      backgroundPaneColor: background  # whitePurple
-      defaultButtonColor: accent  # hotPink
-      dropShadowColor: peerBubble
-      mainTextColor: settings
-      messageFromMeBackgroundColor: userBubble  # brightPurple
-      messageFromMeTextColor: font  # mainTextColor
-      messageFromOtherBackgroundColor: peerBubble  # purple
-      messageFromOtherTextColor: font  # darkPurple
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: 0xffffff
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: 0xffffff
-      portraitOfflineBorderColor: userBubble
-      portraitOnlineBorderColor: font
-      portraitBackgroundColor: background
-      scrollbarDefaultColor: accent
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      textfieldHintColor: font
-      toolbarIconColor: 0xffffff
-      topbarColor: header  # softPurple
-      sendHintTextColor: userBubble
-      chatReactionIconColor: reaction
-      chatImage: Mermaid.png
-      chatImageColor: peerBubble
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
-      messageSelectionColor: 0xb1e3ea
-      textfieldSelectionColor: 0xb1e3ea
-      menuBackgroundColor: 0xb1e3ea
+---
+colors:
+  lavender: 0xB194C1
+
+themes:
+  name: mermaid
+  dark:
+    colors:
+      background: 0x102426
+      header: 0x102426
+      userBubble: 0x00838F
+      peerBubble: 0x00363A
+      font: 0xFFFFFF
+      settings: 0xF7FCFD
+      accent: 0x8E64A5
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: lavender
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  # mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+  light:
+    colors:
+      background: 0xF7FCFD
+      header: 0x56C8D8
+      userBubble: 0x56C8D8
+      peerBubble: 0xB2EBF2
+      font: 0x102426
+      settings: 0x102426
+      accent: 0x8E64A5
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: peerBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
--- a/assets/themes/midnight/Midnight.png
+++ b/assets/themes/midnight/Midnight.png
--- a/assets/themes/midnight/theme.yml
+++ b/assets/themes/midnight/theme.yml
@ -1,77 +1,59 @@
---
-
-themes:
-  name: midnight
-  dark:
-    colors:
-      accentGray: 0xE0E0E0
-      background: 0x111111
-      backgroundAlt: 0x494949
-      header: 0x111111
-      userBubble: 0x2D2D2D
-      peerBubble: 0x1B1B1B
-      font: 0xF0F1F1
-      settings: 0xF0F1F1
-      accent: 0xD20070
-      reaction: 0xD20070
-    theme:
-      backgroundHilightElementColor: backgroundAlt
-      backgroundMainColor: background  # darkGreyPurple
-      backgroundPaneColor: header  # darkGreyPurple
-      defaultButtonColor: accent  # hotPink
-      dropShadowColor: accentGray
-      mainTextColor: font  # whiteishPurple
-      messageFromMeBackgroundColor: userBubble  #  mauvePurple
-      messageFromMeTextColor: font  # whiteishPurple
-      messageFromOtherBackgroundColor: peerBubble  # deepPurple
-      messageFromOtherTextColor: font  # whiteishPurple
-      scrollbarDefaultColor: accentGray
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      textfieldHintColor: mainTextColor
-      portraitOfflineBorderColor: 0x676767
-      portraitOnlineBorderColor: font
-      portraitBackgroundColor: background
-      toolbarIconColor: settings  # whiteishPurple
-      topbarColor: header  # darkGreyPurple
-      sendHintTextColor: userBubble
-      chatReactionIconColor: reaction
-      chatImage: Midnight.png
-      chatImageColor: userBubble
-      snackbarBackgroundColor: accent
-      snackbarTextColor: 0xF0F1F1 
-  light:
-    colors:
-      background: 0xF0F1F1  # Color( 0xFFFDFF)
-      header: 0xE0E0E0
-      userBubble: 0xBABDBE
-      peerBubble: 0xE0E0E0
-      font: 0x111111
-      settings: 0x111111
-      accent: 0xD20070
-      reaction: 0xD20070
-    theme:
-      backgroundHilightElementColor: peerBubble
-      backgroundMainColor: background  # whitePurple
-      backgroundPaneColor: background  # whitePurple
-      defaultButtonColor: accent  # hotPink
-      mainTextColor: settings
-      messageFromMeBackgroundColor: userBubble  # brightPurple
-      messageFromMeTextColor: font  # mainTextColor
-      messageFromOtherBackgroundColor: peerBubble  # purple
-      messageFromOtherTextColor: font  # darkPurple
-      portraitContactBadgeColor: accent
-      portraitOfflineBorderColor: userBubble
-      portraitOnlineBorderColor: font
-      portraitBackgroundColor: background
-      scrollbarDefaultColor: accent
-      textfieldBackgroundColor: userBubble
-      textfieldHintColor: font
-      toolbarIconColor: 0xffffff
-      topbarColor: header  # softPurple
-      sendHintTextColor: userBubble
-      chatReactionIconColor: reaction
-      chatImage: Midnight.png
-      chatImageColor: peerBubble
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
+---
+
+themes:
+  name: midnight
+  dark:
+    colors:
+      accentGray: 0xE0E0E0
+      background: 0x1B1B1B
+      backgroundAlt: 0x494949
+      header: 0x1B1B1B
+      userBubble: 0x373737
+      peerBubble: 0x494949
+      font: 0xFFFFFF
+      settings: 0xFFFDFF
+      accent: 0xD20070
+    theme:
+      backgroundHilightElementColor: backgroundAlt
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: accentGray
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      scrollbarDefaultColor: accentGray
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+  light:
+    colors:
+      background: 0xFBFBFB  # Color( 0xFFFDFF)
+      header: 0xE0E0E0
+      userBubble: 0xE0E0E0
+      peerBubble: 0xBABDBE
+      font: 0x1B1B1B
+      settings: 0x1B1B1B
+      accent: 0xD20070
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      portraitOfflineBorderColor: peerBubble
+      portraitOnlineBorderColor: font
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
--- a/assets/themes/neon1/Neon1.png
+++ b/assets/themes/neon1/Neon1.png
--- a/assets/themes/neon1/theme.yml
+++ b/assets/themes/neon1/theme.yml
@ -1,86 +1,54 @@
---
-
-themes:
-  name: neon1
-  dark:
-    colors:
-      background: 0x281831
-      header: 0x281831
-      userBubble: 0x7F00C5
-      peerBubble: 0x422850
-      font: 0xFBF3FF
-      settings: 0x281831
-      accent: 0x56DCD8
-      reaction: 0xD891FF
-    theme:
-      backgroundMainColor: background  # darkGreyPurple
-      backgroundPaneColor: header  # darkGreyPurple
-      defaultButtonColor: accent  # hotPink
-      mainTextColor: 0xFBF3FF  # whiteishPurple
-      messageFromMeBackgroundColor: userBubble  #  mauvePurple
-      messageFromMeTextColor: font  # whiteishPurple
-      messageFromOtherBackgroundColor: peerBubble  # deepPurple
-      messageFromOtherTextColor: font  # whiteishPurple
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: background
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: background
-      portraitBackgroundColor: background
-      portraitOfflineBorderColor: 0x775F84
-      portraitOnlineBorderColor: font
-      scrollbarDefaultColor: accent
-      textfieldHintColor: mainTextColor
-      toolbarIconColor: settings  # whiteishPurple
-      topbarColor: header  # darkGreyPurple
-      sendHintTextColor: userBubble
-      chatReactionIconColor: reaction
-      defaultButtonTextColor: 0x281831
-      chatImage: Neon1.png
-      chatImageColor: 0x4f3060
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
-      messageSelectionColor: 0x775F84
-      textfieldSelectionColor: 0x775F84
-      menuBackgroundColor: 0x775F84
-  light:
-    colors:
-      background: 0xFBF3FF
-      header: 0x56DCD8
-      userBubble: 0x56DCD8
-      peerBubble: 0xF5E1FF
-      font: 0x281831
-      settings: 0x281831
-      accent: 0xD891FF
-      reaction: 0xD891FF
-    theme:
-      backgroundMainColor: background  # whitePurple
-      backgroundPaneColor: background  # whitePurple
-      defaultButtonColor: accent  # hotPink
-      dropShadowColor: userBubble
-      mainTextColor: settings
-      messageFromMeBackgroundColor: userBubble  # brightPurple
-      messageFromMeTextColor: font  # mainTextColor
-      messageFromOtherBackgroundColor: peerBubble  # purple
-      messageFromOtherTextColor: font  # darkPurple
-      portraitOfflineBorderColor: 0xeac1ff
-      portraitOnlineBorderColor: font
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: font
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: font
-      scrollbarDefaultColor: accent
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      textfieldHintColor: font
-      toolbarIconColor: settings  # darkPurple
-      topbarColor: header  # softPurple
-      sendHintTextColor: 0xeac1ff
-      chatReactionIconColor: reaction
-      chatImage: Neon1.png
-      chatImageColor: 0xeac1ff
-      defaultButtonTextColor: font
-      snackbarBackgroundColor: accent
-      snackbarTextColor: font
-      messageSelectionColor: accent
-      textfieldSelectionColor: accent
-      menuBackgroundColor: accent
+---
+
+themes:
+  name: neon1
+  dark:
+    colors:
+      background: 0x290826
+      header: 0x290826
+      userBubble: 0xD20070
+      peerBubble: 0x26A9A4
+      font: 0xFFFFFF
+      settings: 0xFFFDFF
+      accent: 0xA604FE
+    theme:
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      scrollbarDefaultColor: accent
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+  light:
+    colors:
+      background: 0xFFFDFF
+      header: 0xFF94C2
+      userBubble: 0xFF94C2
+      peerBubble: 0xE7F6F6
+      font: 0x290826
+      settings: 0x290826
+      accent: 0xA604FE
+    theme:
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: userBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      portraitOfflineBorderColor: peerBubble
+      portraitOnlineBorderColor: font
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
--- a/assets/themes/neon2/Neon2.png
+++ b/assets/themes/neon2/Neon2.png
--- a/assets/themes/neon2/theme.yml
+++ b/assets/themes/neon2/theme.yml
@ -1,83 +1,55 @@
---
-
-themes:
-  name: neon2
-  dark:
-    colors:
-      background: 0x281831
-      header: 0x281831
-      userBubble: 0x7F00C5
-      peerBubble: 0x422850
-      font: 0xFBF3FF
-      settings: 0x281831
-      accent: 0x90EE02
-      reaction: 0xD891FF
-    theme:
-      backgroundMainColor: background  # darkGreyPurple
-      backgroundPaneColor: header  # darkGreyPurple
-      defaultButtonColor: accent  # hotPink
-      mainTextColor: font  # whiteishPurple
-      messageFromMeBackgroundColor: userBubble  # mauvePurple
-      messageFromMeTextColor: font  # whiteishPurple
-      messageFromOtherBackgroundColor: peerBubble  # deepPurple
-      messageFromOtherTextColor: font  # whiteishPurple
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: 0x281831
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: 0x281831
-      scrollbarDefaultColor: accent
-      textfieldHintColor: mainTextColor
-      toolbarIconColor: settings  # whiteishPurple
-      topbarColor: header  # darkGreyPurple
-      sendHintTextColor: userBubble
-      chatReactionIconColor: reaction
-      defaultButtonTextColor: background
-      chatImage: Neon2.png
-      chatImageColor: 0x573569
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
-      messageSelectionColor: 0x775F84
-      textfieldSelectionColor: 0x775F84
-      menuBackgroundColor: 0x775F84
-  light:
-    colors:
-      paleGreen: 0xE7F6F6
-      background: 0xFBFFF6
-      header: 0x90EE02
-      userBubble: 0x90EE02
-      peerBubble: 0xF3FFE4
-      font: 0x281831
-      settings: 0x281831
-      accent: 0x7F00C5
-      reaction: 0x7F00C5
-    theme:
-      backgroundMainColor: background  # whitePurple
-      backgroundPaneColor: background  # whitePurple
-      defaultButtonColor: accent  # hotPink
-      dropShadowColor: userBubble
-      mainTextColor: settings
-      messageFromMeBackgroundColor: userBubble  # brightPurple
-      messageFromMeTextColor: font  # mainTextColor
-      messageFromOtherBackgroundColor: peerBubble  # purple
-      messageFromOtherTextColor: font  # darkPurple
-      portraitOfflineBorderColor: 0x775F84
-      portraitOnlineBorderColor: font
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: background
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: background
-      portraitBackgroundColor: background
-      scrollbarDefaultColor: accent
-      textfieldBackgroundColor: paleGreen
-      textfieldBorderColor: peerBubble
-      textfieldHintColor: font
-      toolbarIconColor: background  # darkPurple
-      topbarColor: header  # softPurple
-      chatReactionIconColor: accent
-      chatImage: Neon2.png
-      chatImageColor: 0xd9ffa8
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
-      messageSelectionColor: 0xd9ffa8
-      textfieldSelectionColor: 0xd9ffa8
-      menuBackgroundColor: 0xd9ffa8
+---
+
+themes:
+  name: neon2
+  dark:
+    colors:
+      background: 0x290826
+      header: 0x290826
+      userBubble: 0xA604FE
+      peerBubble: 0x03AD00
+      font: 0xFFFFFF
+      settings: 0xFFFDFF
+      accent: 0xA604FE
+    theme:
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  # mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      scrollbarDefaultColor: accent
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+  light:
+    colors:
+      paleGreen: 0xE7F6F6
+      background: 0xFFFDFF
+      header: 0xD8C7E1
+      userBubble: 0xD8C7E1
+      peerBubble: 0x80E27E
+      font: 0x290826
+      settings: 0x290826
+      accent: 0xA604FE
+    theme:
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: userBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      portraitOfflineBorderColor: peerBubble
+      portraitOnlineBorderColor: font
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: paleGreen
+      textfieldBorderColor: peerBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
--- a/assets/themes/pumpkin/Pumpkin.png
+++ b/assets/themes/pumpkin/Pumpkin.png
--- a/assets/themes/pumpkin/theme.yml
+++ b/assets/themes/pumpkin/theme.yml
@ -1,84 +1,49 @@
---
-
-themes:
-  name: pumpkin
-  dark:
-    colors:
-      background: 0x281831
-      header: 0x281831
-      userBubble: 0x873C14
-      peerBubble: 0x422850
-      font: 0xFFFAF2
-      settings: 0xFFFAF2
-      accent: 0x873C14
-      reaction: 0x873C14
-    theme:
-      backgroundMainColor: background  # darkGreyPurple
-      backgroundPaneColor: header  # darkGreyPurple
-      defaultButtonColor: accent  # hotPink
-      mainTextColor: font  # whiteishPurple
-      messageFromMeBackgroundColor: userBubble  #  mauvePurple
-      messageFromMeTextColor: font  # whiteishPurple
-      messageFromOtherBackgroundColor: peerBubble  # deepPurple
-      messageFromOtherTextColor: font  # whiteishPurple
-      scrollbarDefaultColor: accent
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: 0xFFFAF2
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: 0xFFFAF2
-      portraitOfflineBorderColor: 0x775F84
-      portraitOnlineBorderColor: font
-      textfieldHintColor: mainTextColor
-      toolbarIconColor: settings  # whiteishPurple
-      topbarColor: header  # darkGreyPurple
-      sendHintTextColor: peerBubble
-      chatReactionIconColor: reaction
-      chatImage: Pumpkin.png
-      chatImageColor: 0x573569
-      snackbarBackgroundColor: accent
-      snackbarTextColor: 0xFFFAF2
-      messageSelectionColor: 0x775F84
-      textfieldSelectionColor: 0x775F84
-      menuBackgroundColor: 0x775F84
-  light:
-    colors:
-      background: 0xFFFAF2
-      header: 0xFF9800
-      userBubble: 0xFF9800
-      peerBubble: 0xFFF3E0
-      font: 0x281831
-      settings: 0x281831
-      accent: 0x422850
-      reaction: 0xFF9800
-    theme:
-      backgroundHilightElementColor: peerBubble
-      backgroundMainColor: background  # whitePurple
-      backgroundPaneColor: background  # whitePurple
-      defaultButtonColor: accent  # hotPink
-      dropShadowColor: peerBubble
-      mainTextColor: settings
-      messageFromMeBackgroundColor: userBubble  # brightPurple
-      messageFromMeTextColor: font  # mainTextColor
-      messageFromOtherBackgroundColor: peerBubble  # purple
-      messageFromOtherTextColor: font  # darkPurple
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: 0xFFFAF2
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: 0xFFFAF2
-      portraitOfflineBorderColor: 0x775F84
-      portraitOnlineBorderColor: font
-      scrollbarDefaultColor: accent
-      textfieldBackgroundColor: background
-      textfieldBorderColor: userBubble
-      textfieldHintColor:  mainTextColor
-      toolbarIconColor: background  # darkPurple
-      topbarColor: header  # softPurple
-      sendHintTextColor: 0xffd494
-      chatReactionIconColor: reaction
-      chatImage: Pumpkin.png
-      chatImageColor: 0xFFDCA8
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
-      messageSelectionColor: 0xFFDCA8
-      textfieldSelectionColor: 0xFFDCA8
-      menuBackgroundColor: 0xFFDCA8
+---
+
+themes:
+  name: pumpkin
+  dark:
+    colors:
+      background: 0x281831
+      header: 0x281831
+      userBubble: 0xB53D00
+      peerBubble: 0x422850
+      font: 0xFFFFFF
+      settings: 0xFFFBF6
+      accent: 0x8E64A5
+    theme:
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+  light:
+    colors:
+      background: 0xFFFBF6
+      header: 0xFF9800
+      userBubble: 0xFF9800
+      peerBubble: 0xD8C7E1
+      font: 0x281831
+      settings: 0x281831
+      accent: 0x8E64A5
+    theme:
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: peerBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      scrollbarDefaultColor: accent
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
--- a/assets/themes/vampire/Vampire.png
+++ b/assets/themes/vampire/Vampire.png
--- a/assets/themes/vampire/theme.yml
+++ b/assets/themes/vampire/theme.yml
@ -1,85 +1,52 @@
---
-
-themes:
-  name: vampire
-  dark:
-    colors:
-      background: 0x27141B
-      header: 0x27141B
-      userBubble: 0x422850
-      peerBubble: 0x502033
-      font: 0xFBF4F7
-      settings: 0xFBF4F7
-      accent: 0x502033
-      reaction: 0xC86B89
-    theme:
-      backgroundMainColor: background  # darkGreyPurple
-      backgroundPaneColor: header  # darkGreyPurple
-      defaultButtonColor: accent  # hotPink
-      mainTextColor: font  # whiteishPurple
-      messageFromMeBackgroundColor: userBubble  #  mauvePurple
-      messageFromMeTextColor: font  # whiteishPurple
-      messageFromOtherBackgroundColor: peerBubble  # deepPurple
-      messageFromOtherTextColor: font  # whiteishPurple
-      portraitContactBadgeColor: 0x863655
-      portraitContactBadgeTextColor: 0xFBF4F7
-      portraitProfileBadgeColor: 0x863655
-      portraitProfileBadgeTextColor: 0xFBF4F7
-      portraitBackgroundColor: peerBubble
-      portraitOfflineBorderColor: 0x863655
-      portraitOnlineBorderColor: font
-      scrollbarDefaultColor: accent
-      textfieldHintColor: mainTextColor
-      toolbarIconColor: settings  # whiteishPurple
-      topbarColor: header  # darkGreyPurple
-      sendHintTextColor: peerBubble
-      chatReactionIconColor: reaction
-      chatImage: Vampire.png
-      chatImageColor: peerBubble
-      snackbarBackgroundColor: accent
-      snackbarTextColor: 0xFBF4F7
-      messageSelectionColor: 0x863655
-      textfieldSelectionColor: 0x863655
-      menuBackgroundColor: 0x863655
-  light:
-    colors:
-      background: 0xFBF4F7
-      header: 0xC86B89
-      userBubble: 0xDA94A9
-      peerBubble: 0xF7EAF0
-      font: 0x27141B
-      settings: 0xFBF4F7
-      accent: 0x502033
-      reaction: 0xDA94A9
-    theme:
-      backgroundMainColor: background  # whitePurple
-      backgroundPaneColor: background  # whitePurple
-      defaultButtonColor: accent  # hotPink
-      dropShadowColor: userBubble
-      mainTextColor: font
-      messageFromMeBackgroundColor: userBubble  # brightPurple
-      messageFromMeTextColor: font  # mainTextColor
-      messageFromOtherBackgroundColor: peerBubble  # purple
-      messageFromOtherTextColor: font  # darkPurple
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: 0xFBF4F7
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: 0xFBF4F7
-      portraitOfflineBorderColor: 0x775F84
-      portraitOnlineBorderColor: font
-      portraitBackgroundColor: background
-      scrollbarDefaultColor: accent
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      textfieldHintColor: font
-      toolbarIconColor: settings  # darkPurple
-      topbarColor: header  # softPurple
-      sendHintTextColor: userBubble
-      chatReactionIconColor: reaction
-      chatImage: Vampire.png
-      chatImageColor: 0xE9BFCD
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
-      messageSelectionColor: header
-      textfieldSelectionColor: header
-      menuBackgroundColor: header
+---
+
+themes:
+  name: vampire
+  dark:
+    colors:
+      background: 0x281831
+      header: 0x281831
+      userBubble: 0x9A1218
+      peerBubble: 0x422850
+      font: 0xFFFFFF
+      settings: 0xFDFFFD
+      accent: 0x8E64A5
+    theme:
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      scrollbarDefaultColor: accent
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+  light:
+    colors:
+      background: 0xFFFDFD
+      header: 0xD8C7E1
+      userBubble: 0xD8C7E1
+      peerBubble: 0xFFEBEE
+      font: 0x281831
+      settings: 0x281831
+      accent: 0x8E64A5
+    theme:
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      dropShadowColor: userBubble
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
--- a/assets/themes/witch/Witch.png
+++ b/assets/themes/witch/Witch.png
--- a/assets/themes/witch/theme.yml
+++ b/assets/themes/witch/theme.yml
@ -1,86 +1,55 @@
---
-
-themes:
-  name: witch
-  dark:
-    colors:
-      background: 0x111b11
-      header: 0x0E1E0E
-      userBubble: 0x3B5132
-      peerBubble: 0x152716
-      font: 0xF1F3EC
-      settings: 0xE3ECD3
-      accent: 0x8E64A5
-      reaction: 0x97AF6E
-    theme:
-      backgroundHilightElementColor: peerBubble
-      backgroundMainColor: background  # darkGreyPurple
-      backgroundPaneColor: header  # darkGreyPurple
-      defaultButtonColor: accent  # hotPink
-      mainTextColor: font  # whiteishPurple
-      messageFromMeBackgroundColor: userBubble  #  mauvePurple
-      messageFromMeTextColor: font  # whiteishPurple
-      messageFromOtherBackgroundColor: peerBubble  # deepPurple
-      messageFromOtherTextColor: font  # whiteishPurple
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: 0xF1F3EC
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: 0xF1F3EC
-      portraitOfflineBorderColor: 0x355934
-      portraitOnlineBorderColor: font
-      portraitBackgroundColor: peerBubble
-      scrollbarDefaultColor: accent
-      textfieldBackgroundColor: peerBubble
-      textfieldBorderColor: userBubble
-      textfieldHintColor: mainTextColor
-      toolbarIconColor: settings  # whiteishPurple
-      topbarColor: header  # darkGreyPurple
-      chatReactionIconColor: reaction
-      chatImage: Witch.png
-      chatImageColor: 0x1E321D
-      snackbarBackgroundColor: accent
-      snackbarTextColor: 0xF1F3EC
-      messageSelectionColor: accent
-      textfieldSelectionColor: accent
-      menuBackgroundColor: accent
-  light:
-    colors:
-      background: 0xF1F3EC
-      header: 0x97af6e
-      userBubble: 0x97AF6E
-      peerBubble: 0xE3ECD3
-      font: 0x111b11
-      settings: 0x0E1E0E
-      accent: 0x8E64A5
-      reaction: 0x97AF6E
-    theme:
-      backgroundHilightElementColor: peerBubble
-      backgroundMainColor: background  # whitePurple
-      backgroundPaneColor: background  # whitePurple
-      defaultButtonColor: accent  # hotPink
-      mainTextColor: settings
-      messageFromMeBackgroundColor: userBubble  # brightPurple
-      messageFromMeTextColor: font  # mainTextColor
-      messageFromOtherBackgroundColor: peerBubble  # purple
-      messageFromOtherTextColor: font  # darkPurple
-      portraitContactBadgeColor: accent
-      portraitContactBadgeTextColor: 0xF1F3EC
-      portraitProfileBadgeColor: accent
-      portraitProfileBadgeTextColor: 0xF1F3EC
-      portraitOfflineBorderColor: userBubble
-      portraitOnlineBorderColor: font
-      portraitBackgroundColor: background
-      scrollbarDefaultColor: accent
-      textfieldBackgroundColor: background
-      textfieldBorderColor: userBubble
-      textfieldHintColor: font
-      toolbarIconColor: settings  # darkPurple
-      topbarColor: header  # softPurple
-      chatReactionIconColor: reaction
-      chatImage: Witch.png
-      chatImageColor: 0xD0DDBA
-      snackbarBackgroundColor: accent
-      snackbarTextColor: background
-      messageSelectionColor: accent
-      textfieldSelectionColor: accent
-      menuBackgroundColor: accent
+---
+
+themes:
+  name: witch
+  dark:
+    colors:
+      background: 0x0E1E0E
+      header: 0x0E1E0E
+      userBubble: 0x1B5E20
+      peerBubble: 0x003300
+      font: 0xFFFFFF
+      settings: 0xFDFFFD
+      accent: 0xD20070
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # darkGreyPurple
+      backgroundPaneColor: header  # darkGreyPurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: font  # whiteishPurple
+      messageFromMeBackgroundColor: userBubble  #  mauvePurple
+      messageFromMeTextColor: font  # whiteishPurple
+      messageFromOtherBackgroundColor: peerBubble  # deepPurple
+      messageFromOtherTextColor: font  # whiteishPurple
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: mainTextColor
+      toolbarIconColor: settings  # whiteishPurple
+      topbarColor: header  # darkGreyPurple
+  light:
+    colors:
+      background: 0xFDFFFD
+      header: 0x80E27E
+      userBubble: 0x80E27E
+      peerBubble: 0xE8F5E9
+      font: 0x0E1E0E
+      settings: 0x0E1E0E
+      accent: 0xD20070
+    theme:
+      backgroundHilightElementColor: peerBubble
+      backgroundMainColor: background  # whitePurple
+      backgroundPaneColor: background  # whitePurple
+      defaultButtonColor: accent  # hotPink
+      mainTextColor: settings
+      messageFromMeBackgroundColor: userBubble  # brightPurple
+      messageFromMeTextColor: font  # mainTextColor
+      messageFromOtherBackgroundColor: peerBubble  # purple
+      messageFromOtherTextColor: font  # darkPurple
+      portraitContactBadgeColor: accent
+      scrollbarDefaultColor: accent
+      textfieldBackgroundColor: peerBubble
+      textfieldBorderColor: userBubble
+      textfieldHintColor: font
+      toolbarIconColor: settings  # darkPurple
+      topbarColor: header  # softPurple
--- a/fetch-libcwtch-go.sh
+++ b/fetch-libcwtch-go.sh
@ -3,6 +3,6 @@
 VERSION=`cat LIBCWTCH-GO.version`
 echo $VERSION

-curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/android/cwtch.aar --output android/app/cwtch/cwtch.aar
+curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/android/cwtch.aar --output android/cwtch/cwtch.aar
 # FIXME...at some point we need to support different linux architectures...for now rely on existing expectations and rename x64 lib
-curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/linux/libCwtch.x64.so --output linux/libCwtch.so
+curl --fail  https://build.openprivacy.ca/files/libCwtch-autobindings-$VERSION/linux/libCwtch.x64.so --output linux/libCwtch.so
--- a/integration_test/steps/chat.dart
+++ b/integration_test/steps/chat.dart
@ -1,8 +1,17 @@
+import 'package:cwtch/main.dart';
+import 'package:cwtch/widgets/messagebubble.dart';
+import 'package:cwtch/widgets/profilerow.dart';
 import 'package:cwtch/widgets/quotedmessage.dart';
+import 'package:cwtch/widgets/tor_icon.dart';
+import 'package:cwtch/views/profilemgrview.dart';
 import 'package:flutter_gherkin/flutter_gherkin.dart';
+import 'package:flutter_gherkin/src/flutter/parameters/existence_parameter.dart';
+import 'package:flutter_gherkin/src/flutter/parameters/swipe_direction_parameter.dart';
 import 'package:gherkin/gherkin.dart';

+import 'package:flutter/material.dart';

+import 'overrides.dart';

 StepDefinitionGeneric ExpectReply() {
  return given3<String, String, int, FlutterWorld>(
--- a/integration_test/steps/form_elements.dart
+++ b/integration_test/steps/form_elements.dart
@ -1,7 +1,10 @@
+import 'dart:convert';

 import 'package:flutter/material.dart';
+import 'package:flutter_driver/flutter_driver.dart';
 import 'package:flutter_gherkin/flutter_gherkin.dart';
 import 'package:gherkin/gherkin.dart';
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';

 enum SwitchState { checked, unchecked }

@ -14,7 +17,6 @@ class SwitchStateParameter extends CustomParameter<SwitchState> {
            case "unchecked":
              return SwitchState.unchecked;
          }
-          return null;
        });
 }

--- a/lib/controllers/open_link_modal.dart
+++ b/lib/controllers/open_link_modal.dart
@ -1,5 +1,6 @@
 import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/third_party/linkify/linkify.dart';
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@ -37,7 +38,7 @@ void modalOpenLink(BuildContext ctx, LinkableElement link) {
                              final snackBar = SnackBar(
                                content: Text(
                                  AppLocalizations.of(bcontext)!.copiedToClipboardNotification,
-                                  style: Provider.of<Settings>(bcontext, listen: false).scaleFonts(defaultTextButtonStyle),
+                                  style: Provider.of<Settings>(bcontext).scaleFonts(defaultTextButtonStyle),
                                ),
                              );

--- a/lib/cwtch/cwtch.dart
+++ b/lib/cwtch/cwtch.dart
@ -2,6 +2,8 @@
 // Details: https://docs.openprivacy.ca/cwtch-security-handbook/profile_encryption_and_storage.html
 import 'dart:collection';

+import '../models/acl.dart';
+
 const DefaultPassword = "be gay do crime";

 const LastMessageSeenTimeKey = "profile.lastMessageSeenTime";
@ -11,8 +13,8 @@ abstract class Cwtch {

  // ignore: non_constant_identifier_names
  Future<void> Start();
-
-  Future<String> getCwtchDir();
+  // ignore: non_constant_identifier_names
+  Future<void> ReconnectCwtchForeground();

  String getAssetsDir();

@ -159,5 +161,7 @@ abstract class Cwtch {
  void PublishServerUpdate(String onion);
  Future<void> ConfigureConnections(String onion, bool listen, bool peers, bool servers);

+  Future<AccessControlList> GetConversationAccessControlList(String profile, int conversation);
+
  bool IsLoaded();
 }
--- a/lib/cwtch/cwtchNotifier.dart
+++ b/lib/cwtch/cwtchNotifier.dart
@ -3,10 +3,15 @@ import 'package:cwtch/cwtch/cwtch.dart';
 import 'package:cwtch/main.dart';
 import 'package:cwtch/models/appstate.dart';
 import 'package:cwtch/models/contact.dart';
+import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/profilelist.dart';
+import 'package:cwtch/models/profileservers.dart';
 import 'package:cwtch/models/remoteserver.dart';
 import 'package:cwtch/models/servers.dart';
 import 'package:cwtch/notification_manager.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
+import 'package:provider/provider.dart';

 import 'package:cwtch/torstatus.dart';

@ -58,14 +63,7 @@ class CwtchNotifier {
    // EnvironmentConfig.debugLog("NewEvent $type $data");
    switch (type) {
      case "CwtchStarted":
-        if (data["Reload"] == "true" && profileCN.num > 0) {
-          // don't reload...
-          // unless we have loaded no profiles...then there isnt a risk and this
-          // might be a first time (e.g. new apk, existing service)
-        } else {
-          flwtchState.cwtch.LoadProfiles(DefaultPassword);
-        }
-
+        flwtchState.cwtch.LoadProfiles(DefaultPassword);
        appState.SetCwtchInit();
        break;
      case "CwtchStartError":
@ -195,9 +193,21 @@ class CwtchNotifier {
        var senderImage = data['picture'];
        var isAuto = data['Auto'] == "true";
        String contenthash = data['ContentHash'];
-
        var selectedProfile = appState.selectedProfile == data["ProfileOnion"];
        var selectedConversation = selectedProfile && appState.selectedConversation == identifier;
+        var notification = data["notification"];
+
+        if (selectedConversation && seenMessageCallback != null) {
+          seenMessageCallback!(data["ProfileOnion"]!, identifier, DateTime.now().toUtc());
+        }
+
+        if (notification == "SimpleEvent") {
+          notificationManager.notify(notificationSimple ?? "New Message", "", 0);
+        } else if (notification == "ContactInfo") {
+          var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier);
+          notificationManager.notify((notificationConversationInfo ?? "New Message from %1").replaceFirst("%1", (contact?.nickname ?? senderHandle.toString())), data["ProfileOnion"], identifier);
+        }
+
        profileCN.getProfile(data["ProfileOnion"])?.newMessage(
              identifier,
              messageID,
@ -210,19 +220,6 @@ class CwtchNotifier {
              selectedProfile,
              selectedConversation,
            );
-
-        // Now perform the notification logic...
-        var notification = data["notification"];
-        if (selectedConversation && seenMessageCallback != null) {
-          seenMessageCallback!(data["ProfileOnion"]!, identifier, DateTime.now().toUtc());
-        }
-
-        if (notification == "SimpleEvent") {
-          notificationManager.notify(notificationSimple ?? "New Message", "", 0);
-        } else if (notification == "ContactInfo") {
-          var contact = profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(identifier);
-          notificationManager.notify((notificationConversationInfo ?? "New Message from %1").replaceFirst("%1", (contact?.nickname ?? senderHandle.toString())), data["ProfileOnion"], identifier);
-        }
        appState.notifyProfileUnread();
        break;
      case "PeerAcknowledgement":
@ -257,7 +254,7 @@ class CwtchNotifier {
          var notification = data["notification"];

          // Only bother to do anything if we know about the group and the provided index is greater than our current total...
-          if (idx >= currentTotal) {
+          if (currentTotal != null && idx >= currentTotal) {
            // TODO: There are 2 timestamps associated with a new group message - time sent and time received.
            // Sent refers to the time a profile alleges they sent a message
            // Received refers to the time we actually saw the message from the server
@ -305,7 +302,6 @@ class CwtchNotifier {
        break;
      case "UpdateGlobalSettings":
        settings.handleUpdate(jsonDecode(data["Data"]));
-        appState.settingsLoaded = true;
        break;
      case "UpdatedProfileAttribute":
        if (data["Key"] == "public.profile.name") {
@ -350,7 +346,7 @@ class CwtchNotifier {
          associatedGroups.forEach((identifier) {
            profileCN.getProfile(data["ProfileOnion"])?.contactList.getContact(int.parse(identifier.toString()))!.antispamTickets = count;
          });
-          EnvironmentConfig.debugLog("update server token count for $associatedGroups, $count");
+          EnvironmentConfig.debugLog("update server token count for ${associatedGroups}, $count");
        } catch (e) {
          //  No tokens in data...
        }
--- a/lib/cwtch/ffi.dart
+++ b/lib/cwtch/ffi.dart
@ -3,7 +3,9 @@ import 'dart:convert';
 import 'dart:ffi';
 import 'dart:io';
 import 'dart:isolate';
+import 'dart:io' show Platform;
 import 'package:cwtch/cwtch/cwtchNotifier.dart';
+import 'package:cwtch/models/acl.dart';
 import 'package:path/path.dart' as path;

 import 'package:ffi/ffi.dart';
@ -12,6 +14,7 @@ import 'package:cwtch/cwtch/cwtch.dart';
 import '../config.dart';

 import "package:path/path.dart" show dirname, join;
+import 'dart:io' show Platform;

 /////////////////////
 ///   Cwtch API   ///
@ -133,7 +136,6 @@ class CwtchFfi implements Cwtch {
  ReceivePort _receivePort = ReceivePort();
  bool _isL10nInit = false;
  String _assetsDir = path.join(Directory.current.path, "data", "flutter_assets");
-  String _cwtchDir = "";

  static String getLibraryPath() {
    if (Platform.isWindows) {
@ -168,12 +170,13 @@ class CwtchFfi implements Cwtch {
    String home = "";
    String bundledTor = "";
    Map<String, String> envVars = Platform.environment;
+    String cwtchDir = "";
    if (Platform.isLinux) {
      home = envVars['HOME'] ?? "";
      if (EnvironmentConfig.TEST_MODE) {
-        _cwtchDir = envVars['CWTCH_HOME']!;
+        cwtchDir = envVars['CWTCH_HOME']!;
      } else {
-        _cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, ".cwtch");
+        cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, ".cwtch");
      }

      if (await File("linux/Tor/tor").exists()) {
@ -190,7 +193,7 @@ class CwtchFfi implements Cwtch {
        bundledTor = "tor";
      }
    } else if (Platform.isWindows) {
-      _cwtchDir = envVars['CWTCH_DIR'] ?? path.join(envVars['UserProfile']!, ".cwtch");
+      cwtchDir = envVars['CWTCH_DIR'] ?? path.join(envVars['UserProfile']!, ".cwtch");
      String currentTor = path.join(Directory.current.absolute.path, "Tor\\Tor\\tor.exe");
      if (await File(currentTor).exists()) {
        bundledTor = currentTor;
@ -201,7 +204,7 @@ class CwtchFfi implements Cwtch {
        _assetsDir = path.join(exeDir, "data", "flutter_assets");
      }
    } else if (Platform.isMacOS) {
-      _cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, "Library/Application Support/Cwtch");
+      cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, "Library/Application Support/Cwtch");
      _assetsDir = "/Applications/Cwtch.app/Contents/Frameworks/App.framework/Versions/Current/Resources/flutter_assets/";
      if (await File("Cwtch.app/Contents/MacOS/Tor/tor").exists()) {
        bundledTor = "Cwtch.app/Contents/MacOS/Tor/tor";
@ -230,27 +233,27 @@ class CwtchFfi implements Cwtch {
    // if macOs and release build and no profile and is dev profile
    // copy dev profile to release profile
    if (Platform.isMacOS && EnvironmentConfig.BUILD_VER != dev_version) {
-      var devProfileExists = await Directory(path.join(_cwtchDir, "dev", "profiles")).exists();
-      var releaseProfileExists = await Directory(path.join(_cwtchDir, "profiles")).exists();
+      var devProfileExists = await Directory(path.join(cwtchDir, "dev", "profiles")).exists();
+      var releaseProfileExists = await Directory(path.join(cwtchDir, "profiles")).exists();
      if (devProfileExists && !releaseProfileExists) {
        print("MacOS one time dev -> release profile migration...");
-        await Process.run("cp", ["-r", "-p", path.join(_cwtchDir, "dev", "profiles"), _cwtchDir]);
-        await Process.run("cp", ["-r", "-p", path.join(_cwtchDir, "dev", "SALT"), _cwtchDir]);
-        await Process.run("cp", ["-r", "-p", path.join(_cwtchDir, "dev", "ui.globals"), _cwtchDir]);
+        await Process.run("cp", ["-r", "-p", path.join(cwtchDir, "dev", "profiles"), cwtchDir]);
+        await Process.run("cp", ["-r", "-p", path.join(cwtchDir, "dev", "SALT"), cwtchDir]);
+        await Process.run("cp", ["-r", "-p", path.join(cwtchDir, "dev", "ui.globals"), cwtchDir]);
      }
    }

    if (EnvironmentConfig.BUILD_VER == dev_version) {
-      _cwtchDir = path.join(_cwtchDir, "dev");
+      cwtchDir = path.join(cwtchDir, "dev");
    }

-    print("StartCwtch( cwtchdir: $_cwtchDir, torPath: $bundledTor )");
+    print("StartCwtch( cwtchdir: $cwtchDir, torPath: $bundledTor )");

    var startCwtchC = library.lookup<NativeFunction<start_cwtch_function>>("c_StartCwtch");
    // ignore: non_constant_identifier_names
    final StartCwtch = startCwtchC.asFunction<StartCwtchFn>();

-    final utf8CwtchDir = _cwtchDir.toNativeUtf8();
+    final utf8CwtchDir = cwtchDir.toNativeUtf8();
    StartCwtch(utf8CwtchDir, utf8CwtchDir.length, bundledTor.toNativeUtf8(), bundledTor.length);
    malloc.free(utf8CwtchDir);

@ -266,8 +269,12 @@ class CwtchFfi implements Cwtch {
    return _assetsDir;
  }

-  Future<String> getCwtchDir() async {
-    return _cwtchDir;
+  // ignore: non_constant_identifier_names
+  Future<void> ReconnectCwtchForeground() async {
+    var reconnectCwtch = library.lookup<NativeFunction<Void Function()>>("c_ReconnectCwtchForeground");
+    // ignore: non_constant_identifier_names
+    final ReconnectCwtchForeground = reconnectCwtch.asFunction<void Function()>();
+    ReconnectCwtchForeground();
  }

  // Called on object being disposed to (presumably on app close) to close the isolate that's listening to libcwtch-go events
@ -1135,4 +1142,17 @@ class CwtchFfi implements Cwtch {
    EnvironmentConfig.debugLog("Checking that the FFI Interface is Correctly Loaded... $check");
    return check;
  }
+
+  @override
+  Future<AccessControlList> GetConversationAccessControlList(String profile, int conversation) {
+    var getConversationACLC = library.lookup<NativeFunction<get_json_blob_from_str_int_function>>("c_GetConversationAccessControlList");
+    // ignore: non_constant_identifier_names
+    final GetConversationACL = getConversationACLC.asFunction<GetJsonBlobFromStrIntFn>();
+    final utf8profile = profile.toNativeUtf8();
+    Pointer<Utf8> aclRaw = GetConversationACL(utf8profile, utf8profile.length, conversation);
+    AccessControlList acl = AccessControl.FromJson(aclRaw.toDartString());
+    _UnsafeFreePointerAnyUseOfThisFunctionMustBeDoubleApproved(aclRaw);
+    malloc.free(utf8profile);
+    return Future.value(acl);
+  }
 }
--- a/lib/cwtch/gomobile.dart
+++ b/lib/cwtch/gomobile.dart
@ -2,6 +2,7 @@ import 'dart:collection';
 import 'dart:convert';

 import 'package:cwtch/config.dart';
+import 'package:cwtch/models/acl.dart';
 import 'package:flutter/services.dart';
 import 'package:path_provider/path_provider.dart';
 import 'dart:async';
@ -30,7 +31,6 @@ class CwtchGomobile implements Cwtch {
  late Future<dynamic> androidLibraryDir;
  late Future<dynamic> androidHomeDirectory;
  String androidHomeDirectoryStr = "";
-  String _cwtchDir = "";
  late CwtchNotifier cwtchNotifier;
  bool _isL10nInit = false;

@ -68,22 +68,23 @@ class CwtchGomobile implements Cwtch {
    return "";
  }

-  // Requires Start() to have been run to initialize
-  Future<String> getCwtchDir() async {
-    return _cwtchDir;
-  }
-
  // ignore: non_constant_identifier_names
  Future<void> Start() async {
    print("gomobile.dart: Start()...");
    androidHomeDirectoryStr = (await androidHomeDirectory).path;
-    _cwtchDir = path.join(androidHomeDirectoryStr, ".cwtch");
+    var cwtchDir = path.join(androidHomeDirectoryStr, ".cwtch");
    if (EnvironmentConfig.BUILD_VER == dev_version) {
-      _cwtchDir = path.join(_cwtchDir, "dev");
+      cwtchDir = path.join(cwtchDir, "dev");
    }
    String torPath = path.join(await androidLibraryDir, "libtor.so");
-    print("gomobile.dart: Start invokeMethod Start($_cwtchDir, $torPath)...");
-    cwtchPlatform.invokeMethod("Start", {"appDir": _cwtchDir, "torPath": torPath});
+    print("gomobile.dart: Start invokeMethod Start($cwtchDir, $torPath)...");
+    cwtchPlatform.invokeMethod("Start", {"appDir": cwtchDir, "torPath": torPath});
+  }
+
+  @override
+  // ignore: non_constant_identifier_names
+  Future<void> ReconnectCwtchForeground() async {
+    cwtchPlatform.invokeMethod("ReconnectCwtchForeground", {});
  }

  // Handle libcwtch-go events (received via kotlin) and dispatch to the cwtchNotifier
@ -479,4 +480,12 @@ class CwtchGomobile implements Cwtch {
  bool IsLoaded() {
    return true;
  }
+
+  @override
+  Future<AccessControlList> GetConversationAccessControlList(String profile, int conversation) async {
+    return await cwtchPlatform.invokeMethod("GetConversationAttribute", {"ProfileOnion": profile, "conversation": conversation}).then((dynamic json) {
+      AccessControlList acl = AccessControl.FromJson(json);
+      return acl;
+    });
+  }
 }
--- a/lib/l10n/custom_material_delegate.dart
+++ b/lib/l10n/custom_material_delegate.dart
@ -648,20 +648,4 @@ class MaterialLocalizationLu extends MaterialLocalizations {
  @override
  // TODO: implement scanTextButtonLabel
  String get scanTextButtonLabel => throw UnimplementedError();
-
-  @override
-  // TODO: implement lookUpButtonLabel
-  String get lookUpButtonLabel => throw UnimplementedError();
-
-  @override
-  // TODO: implement menuDismissLabel
-  String get menuDismissLabel => throw UnimplementedError();
-
-  @override
-  // TODO: implement searchWebButtonLabel
-  String get searchWebButtonLabel => throw UnimplementedError();
-
-  @override
-  // TODO: implement shareButtonLabel
-  String get shareButtonLabel => throw UnimplementedError();
 }
--- a/lib/l10n/intl_cy.arb
+++ b/lib/l10n/intl_cy.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "cy",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_da.arb
+++ b/lib/l10n/intl_da.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "da",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_de.arb
+++ b/lib/l10n/intl_de.arb
@ -1,40 +1,28 @@
 {
    "@@locale": "de",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceTitle": "Leistungs-Overlay anzeigen",
-    "settingsExperimentsShowPerformanceDescription": "Zeigt ein Overlay-Diagramm der Renderzeit an.",
-    "defaultScalingText": "Text in Standardgröße (Skalierungsfaktor:",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
+    "settingsGroupAbout": "About",
+    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
+    "profileOfflineAtStart": "Appear Offline at Startup",
+    "now": "Now",
+    "xSecondsAgo": "$seconds seconds ago",
+    "xMinutesAgo": "$minutes minutes ago",
+    "xHoursAgo": "$hours hours ago",
+    "xDaysAgo": "$days days ago",
+    "profileAllowUnknownContacts": "Allow Unknown Contacts",
+    "profileBlockUnknownContacts": "Block Unknown Contacts",
+    "profileDisableProfile": "Disable Profile",
+    "profileEnableProfile": "Enable Profile",
+    "profileAppearOnline": "Appear Online",
+    "contactDisconnect": "Disconnect  from Contact (if you do not have Appear Offline set this contact may still be able to reestablish a connection to you)",
+    "profileAppearOfflineDescription": "By default, when  Cwtch profile is enabled it automatically attempts to connect to know contacts, and allows inbound connections. This settings disables those actions and allows you to choose, manually, which contacts to connect to.",
+    "profileAppearOffline": "Appear Offline",
    "deleteServerConfirmBtn": "Server wirklich löschen",
+    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
    "groupsOnThisServerLabel": "Gruppen, in denen ich bin, werden auf diesem Server gehostet",
-    "profileEnabledDescription": "Starten oder Stoppen des Profils",
-    "defaultPreserveHistorySetting": "Konversationsverlauf bewahren",
-    "preserveHistorySettingDescription": "Standardmäßig löscht Cwtch den Gesprächsverlauf, wenn Cwtch heruntergefahren wird. Wenn diese Einstellung aktiviert ist, bewahrt Cwtch den Gesprächsverlauf von Peer-Unterhaltungen auf.",
-    "serverinfoNoGroupInfo": "Es gibt keine Gruppen, die mit diesem Cwtch Server verbunden sind.",
-    "cannotDeleteServerIfActiveGroups": "Es gibt aktive Gruppen, die mit diesem Cwtch Server verbunden sind. Bitte lösche diese, bevor du diesen Cwtch-Server-Eintrag löschst.",
-    "profileAppearOnline": "Online erscheinen",
-    "profileAppearOffline": "Offline erscheinen",
-    "profileAppearOfflineDescription": "Standardmäßig wird bei aktiviertem Cwtch-Profil automatisch versucht, eine Verbindung zu bekannten Kontakten herzustellen und es werden eingehende Verbindungen zugelassen. Mit dieser Einstellung werden diese Aktionen deaktiviert und du kannst manuell auswählen, mit welchen Kontakten eine Verbindung hergestellt werden soll.",
-    "contactDisconnect": "Trenne die Verbindung mit dem Kontakt (wenn du die Funktion Offline erscheinen nicht aktiviert habst, kann der Kontakt trotzdem eine Verbindung zu dir herstellen)",
-    "profileEnableProfile": "Profil aktivieren",
-    "profileDisableProfile": "Profil deaktivieren",
-    "profileBlockUnknownContacts": "Unbekannte Kontakte blockieren",
-    "profileAllowUnknownContacts": "Unbekannte Kontakte zulassen",
-    "profileOfflineAtStart": "Beim Start offline erscheinen",
-    "xDaysAgo": "vor $days Tagen",
-    "xHoursAgo": "vor $hours Stunden",
-    "xMinutesAgo": "vor $minutes Minuten",
-    "xSecondsAgo": "vor $seconds Sekunden",
-    "now": "Jetzt",
-    "localeUzbek": "Usbekisch \/ Oʻzbekcha",
-    "settingsGroupAbout": "Über",
-    "settingsThemeImages": "Theme Bilder",
-    "settingsThemeImagesDescription": "Aktiviere die Anzeige von Bildern aus Themes",
-    "settingThemeOverwriteConfirm": "Bestätigen",
-    "settingThemeOverwriteQuestion": "Theme $themeName existiert bereits, Überschreiben bestätigen?",
-    "settingsThemeErrorInvalid": "Fehler: Konnte $themeName nicht importieren, theme.yml fehlt, kein Theme-Verzeichnis",
-    "settingsImportThemeTitle": "Theme importieren",
-    "settingsImportThemeDescription": "Wähle das Theme-Verzeichnis aus, das zur Verwendung in Cwtch importiert werden soll",
-    "settingsImportThemeButton": "Theme importieren",
+    "serverinfoNoGroupInfo": "There are no groups associated with this Cwtch Server.",
+    "preserveHistorySettingDescription": "By default, Cwtch will purge conversation history when Cwtch is shutdown. If this setting is enabled, Cwtch will preserve the conversation history of peer conversations.",
+    "defaultPreserveHistorySetting": "Preserve Conversation History",
    "retryConnection": "Wiederholen",
    "retryConnectionTooltip": "Cwtch wiederholt die Versuche regelmäßig, aber du kannst Cwtch anweisen, es früher zu versuchen, indem du diese Taste drückst.",
    "localeJa": "Japanisch \/ 日本語",
@ -42,6 +30,8 @@
    "localeSv": "Schwedisch \/ Svenska",
    "localeSw": "Suaheli \/ Kiswahili",
    "localeUk": "Ukrainisch \/ українською",
+    "profileEnabledDescription": "Starten oder Stoppen des Profils",
+    "defaultScalingText": "Text in Standardgröße (Skalierungsfaktor:",
    "blodeuweddExperimentEnable": "Blodeuwedd Assistent",
    "blodeuweddDescription": "Der Blodeuwedd-Assistent erweitert Cwtch um neue Funktionen wie die Zusammenfassung von Chat-Transkripten und die Übersetzung von Nachrichten über ein lokal gehostetes Sprachmodell.",
    "blodeuweddNotSupported": "Diese Version von Cwtch wurde ohne Unterstützung für den Blodeuwedd-Assistenten kompiliert.",
--- a/lib/l10n/intl_el.arb
+++ b/lib/l10n/intl_el.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "el",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "en",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_es.arb
+++ b/lib/l10n/intl_es.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "es",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "deleteServerConfirmBtn": "¿Realmente desea borrar el servidor?",
    "defaultScalingText": "Factor de escala del texto",
--- a/lib/l10n/intl_fr.arb
+++ b/lib/l10n/intl_fr.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "fr",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_it.arb
+++ b/lib/l10n/intl_it.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "it",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_ja.arb
+++ b/lib/l10n/intl_ja.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "ja",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_ko.arb
+++ b/lib/l10n/intl_ko.arb
@ -1,44 +1,6 @@
 {
    "@@locale": "ko",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "sendAnInvitation": "초대를 보냈습니다: ",
-    "sendInvite": "연락처 또는 그룹 초대 보내기",
-    "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation",
-    "invalidImportString": "잘못된 가져오기 문자열",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "resetTor": "초기화",
-    "torStatus": "Tor 상태",
-    "torVersion": "Tor 버전",
-    "passwordChangeError": "암호 변경 오류: 제공된 암호가 거부되었습니다.",
-    "enterProfilePassword": "프로필을 보려면 암호를 입력하세요.",
-    "todoPlaceholder": "할 일...",
-    "addNewItem": "목록에 새 항목 추가",
-    "addListItem": "새 목록 항목 추가",
-    "networkStatusConnecting": "네트워크 및 연락처에 연결 중...",
-    "networkStatusAttemptingTor": "Tor 네트워크에 연결을 시도 중",
-    "networkStatusDisconnected": "인터넷 연결 끊김, 연결 확인하세요",
-    "viewGroupMembershipTooltip": "그룹 구성원 보기",
-    "defaultScalingText": "글꼴 크기 조정",
-    "experimentsEnabled": "실험 사용",
-    "loadingTor": "tor 로딩 중...",
-    "builddate": "빌드 대상: %2",
-    "version": "버전: %1",
-    "versionTor": "버전 %1 및 tor %2",
-    "settingInterfaceZoom": "확대\/축소 수준",
-    "versionBuilddate": "버전: %1 빌드 대상: %2",
-    "error0ProfilesLoadedForPassword": "해당 비밀번호가 포함된 프로필이 0개 로드되었습니다.",
-    "deleteConfirmText": "삭제",
-    "unblockBtn": "연락처 차단 해제",
-    "savePeerHistoryDescription": "연락처와 연결된 기록을 삭제할지 여부를 결정합니다.",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
@ -152,6 +114,7 @@
    "server": "서버",
    "peerName": "이름",
    "peerAddress": "주소",
+    "builddate": "Built on: %2",
    "deleteProfileConfirmBtn": "프로필 삭제 확인",
    "deleteConfirmLabel": "DELETE를 입력하여 확인",
    "deleteProfileBtn": "프로필 삭제",
@ -187,6 +150,7 @@
    "localeSw": "Swahili \/ Kiswahili",
    "localeSv": "Swedish \/ Svenska",
    "fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
+    "defaultScalingText": "Font Scaling",
    "localeJa": "Japanese \/ 日本語",
    "retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
    "retryConnection": "Retry",
@ -410,6 +374,11 @@
    "nickChangeSuccess": "Profile nickname changed successfully",
    "addServerFirst": "You need to add a server before you can create a group",
    "deleteProfileSuccess": "Successfully deleted profile",
+    "sendInvite": "Send a contact or group invite",
+    "resetTor": "Reset",
+    "torStatus": "Tor Status",
+    "torVersion": "Tor Version",
+    "sendAnInvitation": "You sent an invitation for: ",
    "contactSuggestion": "This is a contact suggestion for: ",
    "chatHistoryDefault": "This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.",
    "reallyLeaveThisGroupPrompt": "Are you sure you want to leave this conversation? All messages and attributes will be deleted.",
@ -417,5 +386,26 @@
    "descriptionBlockUnknownConnections": "If turned on, this option will automatically close connections from Cwtch users that have not been added to your contact list.",
    "descriptionExperimentsGroups": "The group experiment allows Cwtch to connect with untrusted server infrastructure to facilitate communication with more than one contact.",
    "descriptionExperiments": "Cwtch experiments are optional, opt-in features that add additional functionality to Cwtch that may have different privacy considerations than traditional 1:1 metadata resistant chat e.g. group chat, bot integration etc.",
-    "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password."
+    "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password.",
+    "invalidImportString": "Invalid import string",
+    "todoPlaceholder": "Todo...",
+    "addNewItem": "Add a new item to the list",
+    "addListItem": "Add a New List Item",
+    "networkStatusConnecting": "Connecting to network and contacts...",
+    "networkStatusAttemptingTor": "Attempting to connect to Tor network",
+    "networkStatusDisconnected": "Disconnected from the internet, check your connection",
+    "viewGroupMembershipTooltip": "View Group Membership",
+    "loadingTor": "Loading tor...",
+    "version": "Version %1",
+    "versionTor": "Version %1 with tor %2",
+    "experimentsEnabled": "Enable Experiments",
+    "settingInterfaceZoom": "Zoom level",
+    "versionBuilddate": "Version: %1 Built on: %2",
+    "error0ProfilesLoadedForPassword": "0 profiles loaded with that password",
+    "enterProfilePassword": "Enter a password to view your profiles",
+    "deleteConfirmText": "DELETE",
+    "passwordChangeError": "Error changing password: Supplied password rejected",
+    "unblockBtn": "Unblock Contact",
+    "savePeerHistoryDescription": "Determines whether to delete any history associated with the contact.",
+    "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation"
 }
--- a/lib/l10n/intl_lb.arb
+++ b/lib/l10n/intl_lb.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "lb",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_nl.arb
+++ b/lib/l10n/intl_nl.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "nl",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_no.arb
+++ b/lib/l10n/intl_no.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "no",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_pl.arb
+++ b/lib/l10n/intl_pl.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "pl",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_pt.arb
+++ b/lib/l10n/intl_pt.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "pt",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_pt_BR.arb
+++ b/lib/l10n/intl_pt_BR.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "pt_BR",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_ro.arb
+++ b/lib/l10n/intl_ro.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "ro",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_ru.arb
+++ b/lib/l10n/intl_ru.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "ru",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_sk.arb
+++ b/lib/l10n/intl_sk.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "sk",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_sv.arb
+++ b/lib/l10n/intl_sv.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "sv",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_sw.arb
+++ b/lib/l10n/intl_sw.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "sw",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_tr.arb
+++ b/lib/l10n/intl_tr.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "tr",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_uk.arb
+++ b/lib/l10n/intl_uk.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "uk",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/l10n/intl_uz.arb
+++ b/lib/l10n/intl_uz.arb
@ -1,16 +1,6 @@
 {
    "@@locale": "uz",
-    "@@last_modified": "2024-02-12T08:05:24+01:00",
-    "settingsExperimentsShowPerformanceDescription": "Display an overlay graph of render time.",
-    "settingsExperimentsShowPerformanceTitle": "Show Performance Overlay",
-    "settingsImportThemeButton": "Import Theme",
-    "settingsImportThemeDescription": "Select theme directory to import for use in Cwtch",
-    "settingsImportThemeTitle": "Import Theme",
-    "settingsThemeErrorInvalid": "Error: Could not import $themeName, theme.yml missing, not a theme directory",
-    "settingThemeOverwriteQuestion": "Theme $themeName already exists, confirm overwrite?",
-    "settingThemeOverwriteConfirm": "Confirm",
-    "settingsThemeImagesDescription": "Enable display of images from themes",
-    "settingsThemeImages": "Theme Images",
+    "@@last_modified": "2024-01-04T10:56:20+01:00",
    "settingsGroupAbout": "About",
    "localeUzbek": "Uzbek  \/ Oʻzbekcha",
    "profileOfflineAtStart": "Appear Offline at Startup",
--- a/lib/main.dart
+++ b/lib/main.dart
@ -1,7 +1,9 @@
 import 'dart:async';
 import 'dart:convert';
+import 'dart:isolate';
 import 'package:cwtch/config.dart';
 import 'package:cwtch/notification_manager.dart';
+import 'package:cwtch/themes/cwtch.dart';
 import 'package:cwtch/views/doublecolview.dart';
 import 'package:cwtch/views/messageview.dart';
 import 'package:flutter/foundation.dart';
@ -31,7 +33,9 @@ import 'themes/opaque.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';

-var globalSettings = Settings(Locale("en", ''));
+import 'package:intl/intl.dart' as intl;
+
+var globalSettings = Settings(Locale("en", ''), CwtchDark());
 var globalErrorHandler = ErrorHandler();
 var globalTorStatus = TorStatus();
 var globalAppState = AppState();
@ -76,7 +80,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
  @override
  initState() {
    print("initState() started, setting up handlers");
-    globalSettings = Settings(Locale("en", ''));
+    globalSettings = Settings(Locale("en", ''), CwtchDark());
    globalErrorHandler = ErrorHandler();
    globalTorStatus = TorStatus();
    globalAppState = AppState();
@ -103,14 +107,12 @@ class FlwtchState extends State<Flwtch> with WindowListener {
          new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, newDesktopNotificationsManager(_notificationSelectConvo), globalAppState, globalServersList, this);
      cwtch = CwtchFfi(cwtchNotifier);
    }
+    print("initState: invoking cwtch.Start()");
    // Cwtch.start can take time, we don't want it blocking first splash screen draw, so postpone a smidge to let splash render
-    Future.delayed(const Duration(milliseconds: 100), () {
-      print("initState delayed: invoking cwtch.Start()");
-      cwtch.Start().then((v) {
-        cwtch.getCwtchDir().then((dir) {
-          globalSettings.themeloader.LoadThemes(dir);
-        });
-      });
+    Future.delayed(const Duration(milliseconds: 50), () {
+      print("actually invoking cwtch.cwtch()!!!");
+      cwtch.Start();
+      LoadAssetThemes();
    });
    print("initState: starting connectivityListener");
    if (EnvironmentConfig.TEST_MODE == false) {
@ -127,7 +129,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
  // gracefully fails and NOPs, as it's not a required functionality
  startConnectivityListener() async {
    try {
-      connectivityStream = Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
+      connectivityStream = await Connectivity().onConnectivityChanged.listen((ConnectivityResult result) {
        // Got a new connectivity status!
        if (result == ConnectivityResult.none) {
          connectivityState = ConnectivityState.confirmed_offline;
@ -160,7 +162,6 @@ class FlwtchState extends State<Flwtch> with WindowListener {
  @override
  Widget build(BuildContext context) {
    globalSettings.initPackageInfo();
-
    return MultiProvider(
      providers: [
        getFlwtchStateProvider(),
@ -172,6 +173,10 @@ class FlwtchState extends State<Flwtch> with WindowListener {
        getServerListStateProvider(),
      ],
      builder: (context, widget) {
+        // in test mode...rebuild everything every second...if cwtch isn't loaded...
+        if (EnvironmentConfig.TEST_MODE && cwtch.IsLoaded() == false) {
+          Timer t = new Timer.periodic(Duration(seconds: 1), (Timer t) => setState(() {}));
+        }
        return Consumer2<Settings, AppState>(
          builder: (context, settings, appState, child) => MaterialApp(
            key: Key('app'),
@ -189,7 +194,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
            title: 'Cwtch',
            showSemanticsDebugger: settings.useSemanticDebugger,
            theme: mkThemeData(settings),
-            home: (!appState.loaded) ? SplashView() : ProfileMgrView(),
+            home: (!appState.cwtchInit || appState.modalState != ModalState.none) || !cwtch.IsLoaded() ? SplashView() : ProfileMgrView(),
          ),
        );
      },
@ -252,6 +257,7 @@ class FlwtchState extends State<Flwtch> with WindowListener {
        exit(0);
      }
    }
+    ;
  }

  // Invoked via notificationClickChannel by MyBroadcastReceiver in MainActivity.kt
--- a/lib/main_test.dart
+++ b/lib/main_test.dart
@ -1,3 +1,4 @@
+import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/material.dart';
@ -7,14 +8,16 @@ import 'package:glob/list_local_fs.dart';
 import 'config.dart';
 import 'licenses.dart';
 import 'main.dart';
+import 'themes/opaque.dart';

 import 'dart:convert';
 import 'dart:io';
+import 'dart:typed_data';
 import "package:flutter_driver/driver_extension.dart";
 import 'package:flutter_test/flutter_test.dart';
 import 'package:glob/glob.dart';

-var globalSettings = Settings(Locale("en", ''));
+var globalSettings = Settings(Locale("en", ''), CwtchDark());
 var globalErrorHandler = ErrorHandler();

 Future<void> main() async {
--- a/lib/models/acl.dart
+++ b/lib/models/acl.dart
@ -0,0 +1,24 @@
+import 'dart:convert';
+
+typedef AccessControlList = Map<String, AccessControl>;
+
+class AccessControl {
+  bool Blocked = false;
+  bool AutoConnect = false;
+  bool ExchangeAttributes = false;
+  bool ShareFiles = false;
+  bool RenderImages = false;
+  AccessControl({this.Blocked = false, this.AutoConnect = false, this.ExchangeAttributes = false, this.ShareFiles = false, this.RenderImages = false});
+
+  static AccessControlList FromJson(String json) {
+    Map<String, dynamic> accessControlList = jsonDecode(json);
+    return accessControlList.map((key, value) => MapEntry(
+        key,
+        AccessControl(
+            Blocked: value["Blocked"], ExchangeAttributes: value["ExchangeAttributes"], AutoConnect: value["AutoConnect"], RenderImages: value["RenderImages"], ShareFiles: value["ShareFiles"])));
+  }
+
+  Map<String, dynamic> toJson() {
+    return {'Blocked': Blocked, 'AutoConnect': AutoConnect, 'ExchangeAttributes': ExchangeAttributes, 'ShareFiles': ShareFiles, 'RenderImages': RenderImages};
+  }
+}
--- a/lib/models/appstate.dart
+++ b/lib/models/appstate.dart
@ -1,7 +1,7 @@
 import 'dart:async';
+import 'dart:io';

 import 'package:cwtch/config.dart';
-import 'package:cwtch/main.dart';
 import 'package:flutter/widgets.dart';

 enum ModalState { none, storageMigration, shutdown }
@ -18,8 +18,6 @@ class AppState extends ChangeNotifier {
  bool _unreadMessagesBelow = false;
  bool _disableFilePicker = false;
  bool _focus = true;
-  bool _settingsLoaded = false;
-  bool _themesLoaded = false;

  StreamController<bool> _profilesUnreadNotifyControler = StreamController<bool>();
  late Stream<bool> profilesUnreadNotify;
@ -35,13 +33,13 @@ class AppState extends ChangeNotifier {

  void SetAppError(String error) {
    appError = error;
-    EnvironmentConfig.debugLog("App Error: $appError");
+    EnvironmentConfig.debugLog("App Error: ${appError}");
    notifyListeners();
  }

  void SetModalState(ModalState newState) {
    modalState = newState;
-    EnvironmentConfig.debugLog("Modal State: $newState");
+    EnvironmentConfig.debugLog("Modal State: ${newState}");
    notifyListeners();
  }

@ -88,18 +86,6 @@ class AppState extends ChangeNotifier {
    notifyListeners();
  }

-  set settingsLoaded(bool newVal) {
-    _settingsLoaded = newVal;
-    notifyListeners();
-  }
-
-  set themesLoaded(bool newVal) {
-    _themesLoaded = newVal;
-    notifyListeners();
-  }
-
-  bool get loaded => cwtchInit && _settingsLoaded && globalSettings.themeloader.themes.length > 0 && modalState == ModalState.none;
-
  bool isLandscape(BuildContext c) => MediaQuery.of(c).size.width > MediaQuery.of(c).size.height;

  void notifyProfileUnread() {
--- a/lib/models/contact.dart
+++ b/lib/models/contact.dart
@ -1,3 +1,5 @@
+import 'dart:ffi';
+
 import 'package:cwtch/main.dart';
 import 'package:cwtch/models/message_draft.dart';
 import 'package:cwtch/models/profile.dart';
@ -11,6 +13,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:provider/provider.dart';
 import 'package:scrollable_positioned_list/scrollable_positioned_list.dart';

+import 'message.dart';
 import 'messagecache.dart';

 enum ConversationNotificationPolicy {
--- a/lib/models/contactlist.dart
+++ b/lib/models/contactlist.dart
@ -54,7 +54,7 @@ class ContactListState extends ChangeNotifier {
      if (otherGroups != null && otherGroups.isNotEmpty) {
        EnvironmentConfig.debugLog("sharing antispam tickets to new group. FIXME: in Cwtch 1.14");
        var antispamTickets = otherGroups[0].antispamTickets;
-        _contacts.last.antispamTickets = antispamTickets;
+        _contacts.last!.antispamTickets = antispamTickets;
      }
      servers?.addGroup(newContact);
    }
--- a/lib/models/message.dart
+++ b/lib/models/message.dart
@ -34,7 +34,7 @@ abstract class Message {

  Widget getWidget(BuildContext context, Key key, int index);

-  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints});
+  Widget getPreviewWidget(BuildContext context);
 }

 Message compileOverlay(MessageInfo messageInfo) {
@ -64,7 +64,6 @@ Message compileOverlay(MessageInfo messageInfo) {

 abstract class CacheHandler {
  Future<MessageInfo?> get(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache);
-  Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache);
 }

 class ByIndex implements CacheHandler {
@ -129,8 +128,7 @@ class ByIndex implements CacheHandler {
      List<dynamic> messagesWrapper = jsonDecode(msgs);

      for (; i < messagesWrapper.length; i++) {
-        var messageInfo = MessageWrapperToInfo(profileOnion, conversationIdentifier, messagesWrapper[i]);
-        messageInfo.metadata.lastChecked = DateTime.now();
+        var messageInfo = messageWrapperToInfo(profileOnion, conversationIdentifier, messagesWrapper[i]);
        cache.addIndexed(messageInfo, start + i);
      }
    } catch (e, stacktrace) {
@ -145,13 +143,6 @@ class ByIndex implements CacheHandler {
  void add(MessageCache cache, MessageInfo messageInfo) {
    cache.addIndexed(messageInfo, index);
  }
-
-  @override
-  Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
-    EnvironmentConfig.debugLog("performing a resync on message ${index}");
-    fetchAndProcess(index, 1, cwtch, profileOnion, conversationIdentifier, cache);
-    return get(cwtch, profileOnion, conversationIdentifier, cache);
-  }
 }

 class ById implements CacheHandler {
@ -181,11 +172,6 @@ class ById implements CacheHandler {
    }
    return fetch(cwtch, profileOnion, conversationIdentifier, cache);
  }
-
-  @override
-  Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
-    return get(cwtch, profileOnion, conversationIdentifier, cache);
-  }
 }

 class ByContentHash implements CacheHandler {
@ -214,11 +200,6 @@ class ByContentHash implements CacheHandler {
    }
    return fetch(cwtch, profileOnion, conversationIdentifier, cache);
  }
-
-  @override
-  Future<MessageInfo?> sync(Cwtch cwtch, String profileOnion, int conversationIdentifier, MessageCache cache) {
-    return get(cwtch, profileOnion, conversationIdentifier, cache);
-  }
 }

 List<Message> getReplies(MessageCache cache, int messageIdentifier) {
@ -276,16 +257,6 @@ Future<Message> messageHandler(BuildContext context, String profileOnion, int co

  MessageInfo? messageInfo = await cacheHandler.get(cwtch, profileOnion, conversationIdentifier, cache);

-  if (messageInfo != null) {
-    if (messageInfo.metadata.ackd == false) {
-      if (messageInfo.metadata.lastChecked == null || messageInfo.metadata.lastChecked!.difference(DateTime.now()).abs().inSeconds > 30) {
-        messageInfo.metadata.lastChecked = DateTime.now();
-        // NOTE: Only ByIndex lookups will trigger
-        messageInfo = await cacheHandler.sync(cwtch, profileOnion, conversationIdentifier, cache);
-      }
-    }
-  }
-
  if (messageInfo != null) {
    return compileOverlay(messageInfo);
  } else {
@ -301,14 +272,14 @@ MessageInfo? messageJsonToInfo(String profileOnion, int conversationIdentifier,
      return null;
    }

-    return MessageWrapperToInfo(profileOnion, conversationIdentifier, messageWrapper);
+    return messageWrapperToInfo(profileOnion, conversationIdentifier, messageWrapper);
  } catch (e, stacktrace) {
    EnvironmentConfig.debugLog("message handler exception on parse message and cache: " + e.toString() + " " + stacktrace.toString());
    return null;
  }
 }

-MessageInfo MessageWrapperToInfo(String profileOnion, int conversationIdentifier, dynamic messageWrapper) {
+MessageInfo messageWrapperToInfo(String profileOnion, int conversationIdentifier, dynamic messageWrapper) {
  // Construct the initial metadata
  var messageID = messageWrapper['ID'];
  var timestamp = DateTime.tryParse(messageWrapper['Timestamp'])!;
@ -341,7 +312,6 @@ class MessageMetadata extends ChangeNotifier {

  final String? signature;
  final String contenthash;
-  DateTime? lastChecked;

  dynamic get attributes => this._attributes;

--- a/lib/models/message_draft.dart
+++ b/lib/models/message_draft.dart
@ -1,4 +1,5 @@
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';

 /// A "MessageDraft" structure that stores information about in-progress message drafts.
 /// MessageDraft stores text, quoted replies, and attached images.
@ -49,8 +50,6 @@ class MessageDraft extends ChangeNotifier {
  void clearDraft() {
    this._quotedReference = null;
    this.ctrlCompose.clear();
-    this.ctrlCompose.clearComposing();
-    this.ctrlCompose.text = "";
    this._inviteHandle = null;
    notifyListeners();
  }
--- a/lib/models/messagecache.dart
+++ b/lib/models/messagecache.dart
@ -128,9 +128,8 @@ class MessageCache extends ChangeNotifier {

  void addNew(String profileOnion, int conversation, int messageID, DateTime timestamp, String senderHandle, String senderImage, bool isAuto, String data, String contenthash) {
    this.cache[messageID] = MessageInfo(MessageMetadata(profileOnion, conversation, messageID, timestamp, senderHandle, senderImage, "", {}, false, false, isAuto, contenthash), data);
-    this.cache[messageID]?.metadata.lastChecked = DateTime.now(); // Don't check straight away...
    this.cacheByIndex.insert(0, LocalIndexMessage(messageID));
-    if (contenthash != "") {
+    if (contenthash != null && contenthash != "") {
      this.cacheByHash[contenthash] = messageID;
    }
  }
--- a/lib/models/messages/filemessage.dart
+++ b/lib/models/messages/filemessage.dart
@ -49,27 +49,24 @@ class FileMessage extends Message {
  }

  @override
-  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
+  Widget getPreviewWidget(BuildContext context) {
    return ChangeNotifierProvider.value(
        value: this.metadata,
        builder: (bcontext, child) {
          dynamic shareObj = jsonDecode(this.content);
          if (shareObj == null) {
-            return MalformedBubble();
+            return MessageRow(MalformedBubble(), 0);
          }
          String nameSuggestion = shareObj['f'] as String;
          String rootHash = shareObj['h'] as String;
          String nonce = shareObj['n'] as String;
          int fileSize = shareObj['s'] as int;
          if (!validHash(rootHash, nonce)) {
-            return MalformedBubble();
+            return MessageRow(MalformedBubble(), 0);
          }
          return Container(
-              padding: EdgeInsets.all(1.0),
-              decoration: BoxDecoration(),
-              clipBehavior: Clip.antiAliasWithSaveLayer,
-              constraints: BoxConstraints(minHeight: 50, maxHeight: 50, minWidth: 50, maxWidth: 300),
-              alignment: Alignment.centerLeft,
+              alignment: Alignment.center,
+              height: 100,
              child: FileBubble(
                nameSuggestion,
                rootHash,
--- a/lib/models/messages/invitemessage.dart
+++ b/lib/models/messages/invitemessage.dart
@ -48,7 +48,7 @@ class InviteMessage extends Message {
  }

  @override
-  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
+  Widget getPreviewWidget(BuildContext context) {
    return ChangeNotifierProvider.value(
        value: this.metadata,
        builder: (bcontext, child) {
--- a/lib/models/messages/malformedmessage.dart
+++ b/lib/models/messages/malformedmessage.dart
@ -18,7 +18,7 @@ class MalformedMessage extends Message {
  }

  @override
-  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
+  Widget getPreviewWidget(BuildContext context) {
    return ChangeNotifierProvider.value(
        value: this.metadata,
        builder: (bcontext, child) {
--- a/lib/models/messages/quotedmessage.dart
+++ b/lib/models/messages/quotedmessage.dart
@ -1,5 +1,6 @@
 import 'dart:convert';

+import 'package:cwtch/config.dart';
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/messages/malformedmessage.dart';
 import 'package:cwtch/widgets/malformedbubble.dart';
@ -10,6 +11,7 @@ import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';

 import '../../settings.dart';
+import '../../third_party/linkify/flutter_linkify.dart';

 class QuotedMessageStructure {
  final String quotedHash;
@ -28,7 +30,7 @@ class QuotedMessage extends Message {
  QuotedMessage(this.metadata, this.content);

  @override
-  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
+  Widget getPreviewWidget(BuildContext context) {
    return ChangeNotifierProvider.value(
        value: this.metadata,
        builder: (bcontext, child) {
@ -38,7 +40,7 @@ class QuotedMessage extends Message {
            );
            var content = message["body"];
            var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
-            return compileMessageContentWidget(context, constraints ?? BoxConstraints.loose(MediaQuery.sizeOf(context)), false, content, FocusNode(), formatMessages, false);
+            return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);
          } catch (e) {
            return MalformedBubble();
          }
--- a/lib/models/messages/textmessage.dart
+++ b/lib/models/messages/textmessage.dart
@ -1,11 +1,17 @@
+import 'dart:math';
+
 import 'package:cwtch/models/message.dart';
+import 'package:cwtch/models/messages/malformedmessage.dart';
+import 'package:cwtch/widgets/malformedbubble.dart';
 import 'package:cwtch/widgets/messagebubble.dart';
+import 'package:cwtch/widgets/messageloadingbubble.dart';
 import 'package:cwtch/widgets/messagerow.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:provider/provider.dart';

 import '../../settings.dart';
+import '../../third_party/linkify/flutter_linkify.dart';
 import '../../widgets/messageBubbleWidgetHelpers.dart';

 class TextMessage extends Message {
@ -15,12 +21,13 @@ class TextMessage extends Message {
  TextMessage(this.metadata, this.content);

  @override
-  Widget getPreviewWidget(BuildContext context, {BoxConstraints? constraints}) {
+  Widget getPreviewWidget(BuildContext context) {
    return ChangeNotifierProvider.value(
        value: this.metadata,
        builder: (bcontext, child) {
          var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
-          return compileMessageContentWidget(context, constraints ?? BoxConstraints.loose(MediaQuery.sizeOf(context)), false, content, FocusNode(), formatMessages, false);
+          return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);
+          ;
        });
  }

--- a/lib/models/profile.dart
+++ b/lib/models/profile.dart
@ -14,6 +14,8 @@ import '../views/contactsview.dart';
 import 'contact.dart';
 import 'contactlist.dart';
 import 'filedownloadprogress.dart';
+import 'message.dart';
+import 'messagecache.dart';
 import 'profileservers.dart';

 class ProfileInfoState extends ChangeNotifier {
@ -239,7 +241,7 @@ class ProfileInfoState extends ChangeNotifier {
    this._unreadMessages = 0;
    this.replaceServers(serverJson);

-    if (contactsJson != "" && contactsJson != "null") {
+    if (contactsJson != null && contactsJson != "" && contactsJson != "null") {
      List<dynamic> contacts = jsonDecode(contactsJson);
      contacts.forEach((contact) {
        var profileContact = this._contacts.getContact(contact["identifier"]);
--- a/lib/models/profilelist.dart
+++ b/lib/models/profilelist.dart
@ -1,3 +1,6 @@
+import 'dart:ui';
+
+import 'package:cwtch/config.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/widgets.dart';

--- a/lib/models/redaction.dart
+++ b/lib/models/redaction.dart
@ -1,3 +1,5 @@
+import 'dart:io';
+
 import 'package:flutter/cupertino.dart';
 import 'package:provider/provider.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
@ -37,7 +39,5 @@ String prettyDateString(BuildContext context, DateTime date) {
    // }
    return AppLocalizations.of(context)!.now;
  }
-  // note: explicitly overriding the 'locale' here to force
-  // a consistent YYYY-mm-dd HH::MM format.
-  return DateFormat.yMd('en_CA').add_jm().format(date.toLocal());
+  return DateFormat.yMd(Platform.localeName).add_jm().format(date.toLocal());
 }
--- a/lib/models/remoteserver.dart
+++ b/lib/models/remoteserver.dart
@ -1,3 +1,4 @@
+import 'package:cwtch/config.dart';
 import 'package:flutter/cupertino.dart';

 import 'contact.dart';
--- a/lib/notification_manager.dart
+++ b/lib/notification_manager.dart
@ -3,8 +3,13 @@ import 'dart:convert';
 import 'dart:io';

 import 'package:cwtch/main.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter/widgets.dart';
 import 'package:win_toast/win_toast.dart';
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
+import 'package:flutter_local_notifications_linux/flutter_local_notifications_linux.dart';
+import 'package:flutter_local_notifications_linux/src/model/hint.dart';
+import 'package:flutter_local_notifications_linux/src/model/icon.dart';

 import 'package:path/path.dart' as path;

--- a/lib/settings.dart
+++ b/lib/settings.dart
@ -1,6 +1,8 @@
 import 'dart:collection';
+import 'dart:ui';
 import 'dart:core';

+import 'package:cwtch/themes/cwtch.dart';
 import 'package:flutter/material.dart';
 import 'package:package_info_plus/package_info_plus.dart';

@ -40,7 +42,7 @@ enum NotificationContent {
 class Settings extends ChangeNotifier {
  Locale locale;
  late PackageInfo packageInfo;
-  bool _themeImages = false;
+  OpaqueThemeType theme;

  // explicitly set experiments to false until told otherwise...
  bool experimentsEnabled = false;
@ -67,8 +69,6 @@ class Settings extends ChangeNotifier {
  bool _useSemanticDebugger = false;
  double _fontScaling = 1.0;

-  ThemeLoader themeloader = ThemeLoader();
-
  String get torCacheDir => _torCacheDir;

  // Whether to show the profiling interface, not saved
@ -87,19 +87,8 @@ class Settings extends ChangeNotifier {

  bool get useSemanticDebugger => _useSemanticDebugger;

-  String? _themeId;
-  String? get themeId => _themeId;
-  String? _mode;
-  OpaqueThemeType get theme => themeloader.getTheme(_themeId, _mode);
  void setTheme(String themeId, String mode) {
-    _themeId = themeId;
-    _mode = mode;
-    notifyListeners();
-  }
-
-  bool get themeImages => _themeImages;
-  set themeImages(bool newVal) {
-    _themeImages = newVal;
+    theme = getTheme(themeId, mode);
    notifyListeners();
  }

@ -138,7 +127,6 @@ class Settings extends ChangeNotifier {
  handleUpdate(dynamic settings) {
    // Set Theme and notify listeners
    this.setTheme(settings["Theme"], settings["ThemeMode"] ?? mode_dark);
-    _themeImages = settings["ThemeImages"] ?? false;

    // Set Locale and notify listeners
    switchLocaleByCode(settings["Locale"]);
@ -408,12 +396,9 @@ class Settings extends ChangeNotifier {
  // checks experiment settings and file extension for image previews
  // (ignores file size; if the user manually accepts the file, assume it's okay to preview)
  bool shouldPreview(String path) {
-    return isExperimentEnabled(ImagePreviewsExperiment) && isImage(path);
-  }
-
-  bool isImage(String path) {
    var lpath = path.toLowerCase();
-    return (lpath.endsWith(".jpg") || lpath.endsWith(".jpeg") || lpath.endsWith(".png") || lpath.endsWith(".gif") || lpath.endsWith(".webp") || lpath.endsWith(".bmp"));
+    return isExperimentEnabled(ImagePreviewsExperiment) &&
+        (lpath.endsWith(".jpg") || lpath.endsWith(".jpeg") || lpath.endsWith(".png") || lpath.endsWith(".gif") || lpath.endsWith(".webp") || lpath.endsWith(".bmp"));
  }

  String get downloadPath => _downloadPath;
@ -468,7 +453,7 @@ class Settings extends ChangeNotifier {
  }

  /// Construct a default settings object.
-  Settings(this.locale);
+  Settings(this.locale, this.theme);

  String _blodeuweddPath = "";
  String get blodeuweddPath => _blodeuweddPath;
@ -482,9 +467,8 @@ class Settings extends ChangeNotifier {
  dynamic asJson() {
    return {
      "Locale": this.locale.toString(),
-      "Theme": _themeId,
+      "Theme": theme.theme,
      "ThemeMode": theme.mode,
-      "ThemeImages": _themeImages,
      "PreviousPid": -1,
      "BlockUnknownConnections": blockUnknownConnections,
      "NotificationPolicy": _notificationPolicy.toString(),
--- a/Show More
+++ b/Show More