209 changed files with 3551 additions and 7454 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.10.2
    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.10.2
    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.10.2
    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.10.2
    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.10.2
    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.10.2
    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.10.2
    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.10.2
    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.10.2
    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.10.2
    when:
      event: push
      status: [ success ]
@ -330,8 +300,7 @@ steps:
    commands:
      - mkdir ~/.ssh
      - echo $buildbot_key_b64 > ~/.ssh/id_rsa.b64
-      - ls -lh ~/.ssh/id_rsa.b64
-      - base64 -d -i ~/.ssh/id_rsa.b64 -o ~/.ssh/id_rsa
+      - base64 -d ~/.ssh/id_rsa.b64 > ~/.ssh/id_rsa
      - chmod 400 ~/.ssh/id_rsa
      # force by pass of ssh host key check, less secure
      - ssh-keyscan -H git.openprivacy.ca >> ~/.ssh/known_hosts
@ -350,22 +319,20 @@ steps:
      - ./fetch-tor-macos.sh
      - echo `git describe --tags --abbrev=1` > VERSION
      - echo `git log -1 --format=%cd --date=format:%G-%m-%d-%H-%M` > COMMIT_DATE
-      - export PATH=$PATH:/Users/drone/development/flutter/bin
+      - export PATH=$PATH:/Users/Dan/development/flutter/bin
      - flutter pub get
      - mkdir deploy
      - ./fetch-libcwtch-go-macos.sh
-      # Drone builds in container directories and gem seems to have some weird side effects so have to manually re install these locally
-      - gem install --user-install ffi -v 1.15.5 -- --enable-libffi-alloc
-      # currently unneeded to reinstall but was, and may be again? so saving
-      #- gem install --user-install cocoapods -v 1.11.3
+      - gem install --user-install cocoapods

  - name: build-macos
    commands:
-      - export PATH=$PATH:/Users/drone/bin/flutter/bin
+      - export PATH=$PATH:/Users/Dan/development/flutter/bin
+      - export GEM_HOME=$HOME/.gem
      - export PATH=$GEM_HOME/ruby/2.6.0/bin:$PATH
-      - flutter doctor
+      - flutter config --enable-macos-desktop
      - flutter build macos --dart-define BUILD_VER=`cat VERSION` --dart-define BUILD_DATE=`cat COMMIT_DATE`
-      - export PATH=$PATH:/opt/homebrew/bin/ #create-dmg
+      - export PATH=$PATH:/usr/local/bin #create-dmg
      - macos/package-release.sh
      - mkdir -p deploy
      - mv Cwtch.dmg deploy/Cwtch-`cat VERSION`.dmg
@ -379,7 +346,7 @@ steps:
      status: [ success ]
    commands:
      - echo $BUILDFILES_KEY > ~/id_rsab64
-      - base64 -d -i ~/id_rsab64 -o ~/id_rsa
+      - base64 -d ~/id_rsab64 > ~/id_rsa
      - chmod 400 ~/id_rsa
      - export DIR=flwtch-`cat COMMIT_DATE`-`cat VERSION`
      - mv deploy $DIR
--- a/.gitignore
+++ b/.gitignore
@ -3,6 +3,7 @@
 *.log
 *.pyc
 *.swp
+.DS_Store
 .atom/
 .buildlog/
 .history
@ -35,7 +36,6 @@ test_home
 .pub-cache/
 .pub/
 /build/
-./lib/gen/

 # Web related
 lib/generated_plugin_registrant.dart
@ -59,7 +59,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
+2023-08-02-13-12-v0.0.5-14-g6e06231
--- 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/README.md
+++ b/README.md
@ -21,13 +21,6 @@ Cwtch processes the following environment variables:
 - `LOG_FILE=` will reroute all of libcwtch-go's logging to the specified file instead of the console
 - `LOG_LEVEL=debug` will set the log level to debug instead of info

-## Running Tests
-
-You can run specific tests with `./run-tests-headless.sh`. See also the `.drone.yml` file for information on the specific tests that run.1
-
-The gherkin test framework will occasionally fail silently with incomplete test. This is usually because a previous run resulted in an exception and the underlying Tor
-process was not cleaned up (See #711).
-
 ## Building

 ### Getting Started
--- 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 31
        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) {
@ -101,6 +93,7 @@ class FlwtchWorker(context: Context, parameters: WorkerParameters) :
                        try {
                            val evt = MainActivity.AppbusEvent(Cwtch.getAppBusEvent())
                            // TODO replace this notification block with the NixNotification manager in dart as it has access to contact names and also needs less working around
+
                            if (evt.EventType == "NewMessageFromPeer" || evt.EventType == "NewMessageFromGroup") {
                                val data = JSONObject(evt.Data)
                                val handle = data.getString("RemotePeer");
@ -145,19 +138,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 +146,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 +293,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
@ -27,14 +29,15 @@ import org.json.JSONObject
 import java.nio.file.Files
 import java.nio.file.Paths
 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"
    private val CALL_APP_INFO = "getNativeLibDir"
-    private val CALL_SERVICE_INFO = "getForegroundServiceInfo"
    private val ANDROID_SETTINGS_CHANNEL_NAME = "androidSettings"
    private val ANDROID_SETTINGS_CHANGE_NAME= "androidSettingsChanged"
    private var andoidSettingsChangeChannel: MethodChannel? = null
@ -186,9 +189,7 @@ class MainActivity: FlutterActivity() {
        when (call.method) {
            CALL_APP_INFO -> result.success(getNativeLibDir())
                    ?: result.error("Unavailable", "nativeLibDir not available", null);
-            CALL_SERVICE_INFO -> result.success(getForegroundServiceInfo())
-                    ?: result.error("Unavailable", "getForegroundServiceInfo not available", null);
-           else -> result.notImplemented()
+            else -> result.notImplemented()
        }
    }

@ -223,24 +224,6 @@ class MainActivity: FlutterActivity() {
        return ainfo.nativeLibraryDir
    }

-
-    fun getForegroundServiceInfo(): HashMap<String,String> {
-        var hashMap : HashMap<String, String>
-                = HashMap<String, String> ();
-        val workmanager = WorkManager.getInstance(this);
-        if (workmanager != null) {
-            runBlocking {
-                var lastCancelAllTime = workmanager.getLastCancelAllTimeMillis().await();
-                hashMap.put("workmanager.lastCancelAllTime", lastCancelAllTime.toString());
-            }
-            val works = workmanager.getWorkInfosByTag(WORKER_TAG).get()
-            for (workInfo in works) {
-                hashMap.put("workmanager.${workInfo.id}.state", workInfo.state.toString());
-            }
-        }
-        return hashMap
-    }
-
    // receives messages from the ForegroundService (which provides, ironically enough, the backend)
    private fun handleCwtch(@NonNull call: MethodCall, @NonNull result: Result) {
        var method = call.method
@ -251,7 +234,6 @@ class MainActivity: FlutterActivity() {
        // the frontend calls Start every time it fires up, but we don't want to *actually* call Cwtch.Start()
        // in case the ForegroundService is still running. in both cases, however, we *do* want to re-register
        // the eventbus listener.
-
        when (call.method) {
            "Start" -> {
                val uniqueTag = argmap["torPath"] ?: "nullEventBus"
@ -327,9 +309,8 @@ class MainActivity: FlutterActivity() {
                val conversation: Int = call.argument("conversation") ?: 0
                val indexI: Int = call.argument("index") ?: 0
                val count: Int = call.argument("count") ?: 1
-                val ucount : Int = maxOf(1, count) // don't allow negative counts

-                result.success(Cwtch.getMessages(profile, conversation.toLong(), indexI.toLong(), ucount.toLong()))
+                result.success(Cwtch.getMessages(profile, conversation.toLong(), indexI.toLong(), count.toLong()))
                return
            }
            "SendMessage" -> {
@ -362,7 +343,7 @@ class MainActivity: FlutterActivity() {
                return
            }

-            "RestartFileShare" -> {
+            "RestartSharing" -> {
                val profile: String = call.argument("ProfileOnion") ?: ""
                val filepath: String = call.argument("filekey") ?: ""
                result.success(Cwtch.restartFileShare(profile, filepath))
@ -376,37 +357,13 @@ class MainActivity: FlutterActivity() {
                return
            }

-            "DeleteServerInfo" -> {
-                val profile: String = call.argument("ProfileOnion") ?: ""
-                val handle: String = call.argument("handle") ?: ""
-                result.success(Cwtch.deleteServerInfo(profile, handle))
-                return
-            }
-            "PublishServerUpdate" -> {
-                val profile: String = call.argument("ProfileOnion") ?: ""
-                result.success(Cwtch.publishServerUpdate(profile))
-                return
-            }
            "PeerWithOnion" -> {
                val profile: String = call.argument("ProfileOnion") ?: ""
                val onion: String = call.argument("onion") ?: ""
                Cwtch.peerWithOnion(profile, onion)
            }
-            "QueueJoinServer" -> {
-                val profile: String = call.argument("ProfileOnion") ?: ""
-                val onion: String = call.argument("onion") ?: ""
-                Cwtch.peerWithOnion(profile, onion)
-            }
-            "DisconnectFromPeer" -> {
-                val profile: String = call.argument("ProfileOnion") ?: ""
-                val onion: String = call.argument("onion") ?: ""
-                Cwtch.peerWithOnion(profile, onion)
-            }
-            "DisconnectFromServer" -> {
-                val profile: String = call.argument("ProfileOnion") ?: ""
-                val onion: String = call.argument("onion") ?: ""
-                Cwtch.peerWithOnion(profile, onion)
-            }
+
+
            "CreateProfile" -> {
                val nick: String = call.argument("nick") ?: ""
                val pass: String = call.argument("pass") ?: ""
@ -421,13 +378,6 @@ class MainActivity: FlutterActivity() {
                val profile: String = call.argument("profile") ?: ""
                Cwtch.activatePeerEngine(profile)
            }
-            "ConfigureConnections" -> {
-                val profile: String = call.argument("ProfileOnion") ?: ""
-                val listen: Boolean = call.argument("listen") ?: false
-                val peers: Boolean = call.argument("peers") ?: false
-                val servers: Boolean = call.argument("servers") ?: false
-                Cwtch.configureConnections(profile, listen, peers, servers)
-            }
            "DeactivatePeerEngine" -> {
                val profile: String = call.argument("profile") ?: ""
                Cwtch.deactivatePeerEngine(profile)
@ -517,7 +467,7 @@ class MainActivity: FlutterActivity() {
                val profile: String = call.argument("ProfileOnion") ?: ""
                val server: String = call.argument("server") ?: ""
                val groupName: String = call.argument("groupName") ?: ""
-                Cwtch.startGroup(profile, groupName, server)
+                Cwtch.startGroup(profile, server, groupName)
            }
            "DeleteProfile" -> {
                val profile: String = call.argument("ProfileOnion") ?: ""
@ -573,6 +523,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/fonts/Cwtch.ttf
+++ b/assets/fonts/Cwtch.ttf
--- a/assets/fonts/LICENSE-roboto.txt
+++ b/assets/fonts/LICENSE-roboto.txt
--- a/assets/fonts/NotoColorEmoji-Regular.ttf
+++ b/assets/fonts/NotoColorEmoji-Regular.ttf
--- a/assets/fonts/OFL-noto.txt
+++ b/assets/fonts/OFL-noto.txt
@ -1,93 +0,0 @@
-Copyright 2021 Google Inc. All Rights Reserved.
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
--- a/assets/fonts/OFL-Inter.txt
+++ b/assets/fonts/OFL-Inter.txt
@ -1,93 +1,93 @@
-Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
+Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
--- 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 +0,0 @@
---
-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
--- 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 +0,0 @@
---
-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
--- 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 +0,0 @@
---
-
-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
--- 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 +0,0 @@
---
-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
--- 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 +0,0 @@
---
-
-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
--- 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 +0,0 @@
---
-
-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
--- 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 +0,0 @@
---
-
-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
--- 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 +0,0 @@
---
-
-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
--- 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 +0,0 @@
---
-
-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
--- 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 +0,0 @@
---
-
-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
--- 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/fetch-tor-macos.sh
+++ b/fetch-tor-macos.sh
@ -1,7 +1,7 @@
 #!/bin/sh

 cd macos
-curl https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-macos.tar.gz --output tor.tar.gz
+curl https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-macos-0.4.7.8.tar.gz --output tor.tar.gz
 tar -xzf tor.tar.gz
 chmod a+x Tor/tor.real
 cd ..
--- a/fetch-tor-win.ps1
+++ b/fetch-tor-win.ps1
@ -1,6 +1,6 @@

-Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-win64.zip -OutFile tor.zip
+Invoke-WebRequest -Uri https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-win64-0.4.7.8.zip -OutFile tor.zip

-if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne 'a1c90d9a2f82df5f3d973e260bbfec76e413417cfa276fb70d1668214e2e607cf65be86a25e30c6f7814261dc154a02568459945f31389ae6a22e03d6d0d3c4c' ) { Write-Error 'tor.zip sha512sum mismatch' }
+if ((Get-FileHash tor.zip -Algorithm sha512).Hash -ne '5b8f900a37f6e90d7a945b3903d769383c7478042cb43b2105d2374186e1a536f1a4758a2823d1d5be71d53a81dcfd8243293e04f82812d355983df322823cf4' ) { Write-Error 'tor.zip sha512sum mismatch' }

 Expand-Archive -Path tor.zip -DestinationPath Tor
--- a/fetch-tor.sh
+++ b/fetch-tor.sh
@ -1,14 +1,14 @@
 #!/bin/sh

 cd linux
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-linux-x86_64.tar.gz -O tor.tar.gz
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.8-linux-x86_64.tar.gz -O tor.tar.gz
 tar -xzf tor.tar.gz
 cd ..

 mkdir -p android/app/src/main/jniLibs/arm64-v8a
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-android-arm64 -O android/app/src/main/jniLibs/arm64-v8a/libtor.so
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.10-arm64 -O android/app/src/main/jniLibs/arm64-v8a/libtor.so
 chmod a+x android/app/src/main/jniLibs/arm64-v8a/libtor.so

 mkdir -p android/app/src/main/jniLibs/armeabi-v7a
-wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.8.9-android-arm7 -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so
+wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/branch/master/tor/tor-0.4.7.10-arm7 -O android/app/src/main/jniLibs/armeabi-v7a/libtor.so
 chmod a+x android/app/src/main/jniLibs/armeabi-v7a/libtor.so
--- a/integration_test/features/01_general/02_save_load.feature
+++ b/integration_test/features/01_general/02_save_load.feature
@ -12,16 +12,9 @@ Feature: Settings pane opens and can save settings persistently
    Given I tap the 'OpenSettingsView' button
    And I wait until the text 'Use Light Themes' is present
    When I tap the widget that contains the text "Use Light Themes"
+    And I tap the widget that contains the text "Block Unknown Contacts"
    And I tap the widget that contains the text "Streamer/Presentation Mode"
-    And I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
-    Then I expect the switch that contains the text "Use Light Themes" to be checked
-    When I tap the 'OpenSettingsBehaviour' button
-    And I wait until the text 'Notification Policy' is present
-    When I tap the widget that contains the text "Block Unknown Contacts"
-    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
-    When I tap the 'OpenSettingsExperiments' button
-    And I wait until the text 'Enable Experiments' is present
-    When I tap the widget that contains the text "Enable Experiments"
+    And I tap the widget that contains the text "Enable Experiments"
    Then I wait until the text 'Enable Group Chat' is present
    And I tap the widget that contains the text "Enable Group Chat"
    And I tap the widget that contains the text "Hosting Servers"
@ -31,6 +24,9 @@ Feature: Settings pane opens and can save settings persistently
    And I wait until the text 'Download Folder' is present
    And I fill the "DownloadFolderPicker" field with "/this/is/a/test"
    And I tap the widget that contains the text "Enable Clickable Links"
+    Then I expect the switch that contains the text "Use Light Themes" to be checked
+    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
+    And I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
    And I expect the switch that contains the text "Enable Experiments" to be checked
    And I expect the switch that contains the text "Enable Group Chat" to be checked
    # Not every version of Cwtch Supports Hosting Servers..
@ -46,14 +42,8 @@ Feature: Settings pane opens and can save settings persistently
    Given I tap the 'OpenSettingsView' button
    And I wait until the text 'Use Light Themes' is present
    Then I expect the switch that contains the text "Use Light Themes" to be checked
+    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
    And I expect the switch that contains the text "Streamer/Presentation Mode" to be checked
-    When I tap the 'OpenSettingsBehaviour' button
-    And I wait until the text 'Notification Policy' is present
-    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
-    And I expect the switch that contains the text "Block Unknown Contacts" to be checked
-    When I tap the 'OpenSettingsExperiments' button
-    And I wait until the text 'Enable Experiments' is present
-    And I wait until the text 'Enable Experiments' is present
    And I expect the switch that contains the text "Enable Experiments" to be checked
    And I expect the switch that contains the text "Enable Group Chat" to be checked
    # And I expect the switch that contains the text "Hosting Servers" to be checked
--- a/integration_test/features/02_global_settings/04_block_unknown.feature
+++ b/integration_test/features/02_global_settings/04_block_unknown.feature
@ -3,8 +3,6 @@ Feature: Block unknown contacts setting
  Scenario: Carol adds Alice but Alice doesn't see it because Block Unknowns is enabled
    Given I wait until the widget with type 'ProfileMgrView' is present
    Given I tap the 'OpenSettingsView' button
-    And I wait until the text "Behaviour" is present
-    When I tap the 'OpenSettingsBehaviour button
    And I wait until the text "Block Unknown Contacts" is present
    When I tap the widget that contains the text "Block Unknown Contacts"
    Then I expect the switch that contains the text "Block Unknown Contacts" to be checked
--- a/integration_test/features/04_profile_mgmt/01_create_delete.feature
+++ b/integration_test/features/04_profile_mgmt/01_create_delete.feature
@ -74,7 +74,7 @@ Feature: Basic Profile Management
        When I tap the "IconButton" widget with tooltip "Edit Profile Alice (Encrypted)"
        Then I expect the text 'Display Name' to be present
        Then I fill the "displayNameFormElement" field with "Carol (Encrypted)"
-        And I tap the widget that contains the text "Save Profile"
+        And I tap the "button" widget with label "Save Profile"
        And I wait until the widget with type 'ProfileMgrView' is present
        Then I expect a "ProfileRow" widget with text "Carol (Encrypted)"

@ -90,7 +90,7 @@ Feature: Basic Profile Management
         When I tap the "IconButton" widget with tooltip "Edit Profile Carol (Encrypted)"
         Then I expect the text 'Display Name' to be present
         Then I fill the "currentPasswordFormElement" field with "password1"
-         And I tap the widget that contains the text "Delete"
+         When I tap the button that contains the text "Delete"
         Then I wait for 2 seconds
         When I tap the "button" widget with label "Really Delete Profile"
         And I wait until the widget with type 'ProfileMgrView' is present
--- 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/integration_test/steps/text.dart
+++ b/integration_test/steps/text.dart
@ -40,14 +40,14 @@ StepDefinitionGeneric TorVersionPresent() {
        context.expect(versionString, "#.#.#", reason: "error reading version string from fetch-tor.sh");
        return;
      }
-      context.world.attach(versionString.substring(0, 4), "text/plain", "Then I expect the Tor version to be present");
+      context.world.attach( versionString.substring(0,4), "text/plain", "Then I expect the Tor version to be present");
      //context.reporter.message("test!!!", MessageLevel.info);
      print("looking for version string $versionString");

      return await context.world.appDriver.waitUntil(() async {
        context.world.appDriver.waitForAppToSettle();
        final finder = context.world.appDriver.findBy(
-          versionString.substring(0, 4),
+          versionString.substring(0,4),
          FindType.text,
        );
        return await context.world.appDriver.isPresent(finder);
--- 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
@ -1,20 +1,14 @@
 // To handle profiles that are "unencrypted" (i.e don't require a password to open) we currently create a profile with a defacto, hardcoded password.
 // Details: https://docs.openprivacy.ca/cwtch-security-handbook/profile_encryption_and_storage.html
-import 'dart:collection';
-
 const DefaultPassword = "be gay do crime";

 const LastMessageSeenTimeKey = "profile.lastMessageSeenTime";

 abstract class Cwtch {
-  Future<HashMap<String, String>> PlatformChannelInfo();
-
  // ignore: non_constant_identifier_names
  Future<void> Start();
-
-  Future<String> getCwtchDir();
-
-  String getAssetsDir();
+  // ignore: non_constant_identifier_names
+  Future<void> ReconnectCwtchForeground();

  // ignore: non_constant_identifier_names
  void CreateProfile(String nick, String pass, bool autostart);
@ -48,9 +42,6 @@ abstract class Cwtch {
  void UnblockContact(String profileOnion, int contactHandle);

  void AttemptReconnection(String profileOnion, String onion);
-  void AttemptReconnectionServer(String profileOnion, String onion);
-  void DisconnectFromPeer(String profileOnion, String onion);
-  void DisconnectFromServer(String profileOnion, String onion);

  // ignore: non_constant_identifier_names
  Future<dynamic> GetMessage(String profile, int handle, int index);
@ -155,9 +146,4 @@ abstract class Cwtch {

  // ignore: non_constant_identifier_names
  Future<String> SearchConversations(String profile, String pattern);
-  void DeleteServerInfo(String profile, String handle);
-  void PublishServerUpdate(String onion);
-  Future<void> ConfigureConnections(String onion, bool listen, bool peers, bool servers);
-
-  bool IsLoaded();
 }
--- a/lib/cwtch/cwtchNotifier.dart
+++ b/lib/cwtch/cwtchNotifier.dart
@ -1,12 +1,16 @@
 import 'dart:convert';
-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 +62,6 @@ 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);
-        }
-
        appState.SetCwtchInit();
        break;
      case "CwtchStartError":
@ -74,18 +70,8 @@ class CwtchNotifier {
      case "NewPeer":
        // EnvironmentConfig.debugLog("NewPeer $data");
        // if tag != v1-defaultPassword then it is either encrypted OR it is an unencrypted account created during pre-beta...
-        profileCN.add(
-          data["Identity"],
-          data["name"],
-          data["picture"],
-          data["defaultPicture"],
-          data["ContactsJson"],
-          data["ServerList"],
-          data["Online"] == "true",
-          data["autostart"] == "true",
-          data["tag"] != "v1-defaultPassword",
-          data["appearOffline"] == "true",
-        );
+        profileCN.add(data["Identity"], data["name"], data["picture"], data["defaultPicture"], data["ContactsJson"], data["ServerList"], data["Online"] == "true", data["autostart"] == "true",
+            data["tag"] != "v1-defaultPassword");

        // Update Profile Attributes
        EnvironmentConfig.debugLog("Looking up Profile Attributes ${data["Identity"]} ${profileCN.getProfile(data["Identity"])}");
@ -160,7 +146,7 @@ class CwtchNotifier {
              lastMessageTime: DateTime.now(),
              notificationPolicy: data["notificationPolicy"] ?? "ConversationNotificationPolicy.Default"));

-          profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageReceivedTime(int.parse(data["ConversationID"]), DateTime.now());
+          profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(int.parse(data["ConversationID"]), DateTime.now());
        }
        break;
      case "PeerDeleted":
@ -195,9 +181,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 +208,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 +242,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 +290,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 +334,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...
        }
@ -379,13 +363,8 @@ class CwtchNotifier {
                status: status,
                isGroup: true,
                lastMessageTime: DateTime.now()));
-
-            profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageReceivedTime(identifier, DateTime.fromMillisecondsSinceEpoch(0));
+            profileCN.getProfile(data["ProfileOnion"])?.contactList.updateLastMessageTime(identifier, DateTime.fromMillisecondsSinceEpoch(0));
          }
-          // request a new server update...
-          // NOTE: In the future this should also update the TokenManagerInfo
-          // This is not currently communicated by ServerUpdateInfo (but it probably should be)git
-          flwtchState.cwtch.PublishServerUpdate(data["ProfileOnion"]);
        }
        break;
      case "ServerStateChange":
--- a/lib/cwtch/ffi.dart
+++ b/lib/cwtch/ffi.dart
@ -1,8 +1,8 @@
-import 'dart:collection';
 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:path/path.dart' as path;

@ -12,6 +12,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   ///
@ -43,9 +44,6 @@ typedef VoidFromStringIntStringStringStringFn = void Function(Pointer<Utf8>, int
 typedef void_from_string_string_int_int_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Int64, Int64);
 typedef VoidFromStringStringIntIntFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int, int, int);

-typedef void_from_string_bool_bool_bool = Void Function(Pointer<Utf8>, Int32, Bool, Bool, Bool);
-typedef VoidFromStringBoolBoolBool = void Function(Pointer<Utf8>, int, bool, bool, bool);
-
 typedef void_from_string_string_byte_function = Void Function(Pointer<Utf8>, Int32, Pointer<Utf8>, Int32, Int8);
 typedef VoidFromStringStringByteFn = void Function(Pointer<Utf8>, int, Pointer<Utf8>, int, int);

@ -132,8 +130,6 @@ class CwtchFfi implements Cwtch {
  late Isolate cwtchIsolate;
  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 +164,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()) {
@ -182,44 +179,38 @@ class CwtchFfi implements Cwtch {
        bundledTor = "lib/Tor/tor";
      } else if (await File(path.join(home, ".local/lib/cwtch/Tor/tor")).exists()) {
        bundledTor = path.join(home, ".local/lib/cwtch/Tor/tor");
-        _assetsDir = path.join(home, ".local", "share", "cwtch", "data", "flutter_assets");
      } else if (await File("/usr/lib/cwtch/Tor/tor").exists()) {
        bundledTor = "/usr/lib/cwtch/Tor/tor";
-        _assetsDir = path.join("usr", "share", "cwtch", "data", "flutter_assets");
      } else {
        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;
-        _assetsDir = path.join(Directory.current.absolute.path, "data", "flutter_assets");
      } else {
        String exeDir = path.dirname(Platform.resolvedExecutable);
        bundledTor = path.join(exeDir, "Tor\\Tor\\tor.exe");
-        _assetsDir = path.join(exeDir, "data", "flutter_assets");
      }
    } else if (Platform.isMacOS) {
-      _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";
-        _assetsDir = "Cwtch.app/Contents/Frameworks/App.framework/Versions/Current/Resources/flutter_assets/";
-      } else if (await File("/Applications/Cwtch.app/Contents/MacOS/Tor/tor").exists()) {
-        bundledTor = "/Applications/Cwtch.app/Contents/MacOS/Tor/tor";
-      } else if (await File("/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor").exists()) {
-        bundledTor = "/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor";
-      } else if (await File("/Applications/Tor Browser.app/Contents/MacOS/Tor/tor").exists()) {
-        bundledTor = "/Applications/Tor Browser.app/Contents/MacOS/Tor/tor";
+      cwtchDir = envVars['CWTCH_HOME'] ?? path.join(envVars['HOME']!, "Library/Application Support/Cwtch");
+      if (await File("Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) {
+        bundledTor = "Cwtch.app/Contents/MacOS/Tor/tor.real";
+      } else if (await File("/Applications/Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) {
+        bundledTor = "/Applications/Cwtch.app/Contents/MacOS/Tor/tor.real";
+      } else if (await File("/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor.real").exists()) {
+        bundledTor = "/Volumes/Cwtch/Cwtch.app/Contents/MacOS/Tor/tor.real";
+      } else if (await File("/Applications/Tor Browser.app/Contents/MacOS/Tor/tor.real").exists()) {
+        bundledTor = "/Applications/Tor Browser.app/Contents/MacOS/Tor/tor.real";
        print("We couldn't find Tor in the Cwtch app directory, however we can fall back to the Tor Browser binary");
      } else {
        var splitPath = path.split(dirname(Platform.script.path));
        if (splitPath[0] == "/" && splitPath[1] == "Applications") {
          var appName = splitPath[2];
          print("We're running in /Applications in a non standard app name: $appName");
-          if (await File("/Applications/$appName/Contents/MacOS/Tor/tor").exists()) {
-            bundledTor = "/Applications/$appName/Contents/MacOS/Tor/tor";
+          if (await File("/Applications/$appName/Contents/MacOS/Tor/tor.real").exists()) {
+            bundledTor = "/Applications/$appName/Contents/MacOS/Tor/tor.real";
          }
        }
      }
@ -230,27 +221,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);

@ -262,19 +253,17 @@ class CwtchFfi implements Cwtch {
    });
  }

-  String getAssetsDir() {
-    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
  @override
  void dispose() {
-    EnvironmentConfig.debugLog("tearing down cwtch FFI isolate");
-    library.close();
    cwtchIsolate.kill(priority: Isolate.immediate);
  }

@ -400,7 +389,7 @@ class CwtchFfi implements Cwtch {
  @override
  // ignore: non_constant_identifier_names
  void BlockContact(String profileOnion, int contactHandle) {
-    var blockContact = library.lookup<NativeFunction<string_int_to_void_function>>("c_BlockConversation");
+    var blockContact = library.lookup<NativeFunction<string_int_to_void_function>>("c_BlockContact");
    // ignore: non_constant_identifier_names
    final BlockContact = blockContact.asFunction<VoidFromStringIntFn>();
    final u1 = profileOnion.toNativeUtf8();
@ -411,7 +400,7 @@ class CwtchFfi implements Cwtch {
  @override
  // ignore: non_constant_identifier_names
  void UnblockContact(String profileOnion, int contactHandle) {
-    var unblockContact = library.lookup<NativeFunction<string_int_to_void_function>>("c_UnblockConversation");
+    var unblockContact = library.lookup<NativeFunction<string_int_to_void_function>>("c_UnblockContact");
    // ignore: non_constant_identifier_names
    final UnblockContact = unblockContact.asFunction<VoidFromStringIntFn>();
    final u1 = profileOnion.toNativeUtf8();
@ -891,7 +880,7 @@ class CwtchFfi implements Cwtch {

  @override
  void RestartSharing(String profile, String filekey) {
-    var restartSharingC = library.lookup<NativeFunction<void_from_string_string_function>>("c_RestartFileShare");
+    var restartSharingC = library.lookup<NativeFunction<void_from_string_string_function>>("c_RestartSharing");
    // ignore: non_constant_identifier_names
    final RestartSharing = restartSharingC.asFunction<VoidFromStringStringFn>();
    final utf8profile = profile.toNativeUtf8();
@ -903,7 +892,7 @@ class CwtchFfi implements Cwtch {

  @override
  void StopSharing(String profile, String filekey) {
-    var stopSharingC = library.lookup<NativeFunction<void_from_string_string_function>>("c_StopFileShare");
+    var stopSharingC = library.lookup<NativeFunction<void_from_string_string_function>>("c_StopSharing");
    // ignore: non_constant_identifier_names
    final StopSharing = stopSharingC.asFunction<VoidFromStringStringFn>();
    final utf8profile = profile.toNativeUtf8();
@ -913,18 +902,6 @@ class CwtchFfi implements Cwtch {
    malloc.free(ut8filekey);
  }

-  @override
-  void DeleteServerInfo(String profile, String handle) {
-    var deleteServerInfoC = library.lookup<NativeFunction<void_from_string_string_function>>("c_DeleteServerInfo");
-    // ignore: non_constant_identifier_names
-    final StopSharing = deleteServerInfoC.asFunction<VoidFromStringStringFn>();
-    final utf8profile = profile.toNativeUtf8();
-    final ut8handle = handle.toNativeUtf8();
-    StopSharing(utf8profile, utf8profile.length, ut8handle, ut8handle.length);
-    malloc.free(utf8profile);
-    malloc.free(ut8handle);
-  }
-
  @override
  void UpdateSettings(String json) {
    var updateSettings = library.lookup<NativeFunction<string_to_void_function>>("c_UpdateSettings");
@ -1051,42 +1028,6 @@ class CwtchFfi implements Cwtch {
    malloc.free(utf8onion);
  }

-  @override
-  void AttemptReconnectionServer(String profile, String onion) {
-    // ignore: non_constant_identifier_names
-    var queueJoinServerC = library.lookup<NativeFunction<void_from_string_string_function>>("c_QueueJoinServer");
-    final QueueJoinServerC = queueJoinServerC.asFunction<VoidFromStringStringFn>();
-    final utf8profile = profile.toNativeUtf8();
-    final utf8onion = onion.toNativeUtf8();
-    QueueJoinServerC(utf8profile, utf8profile.length, utf8onion, utf8onion.length);
-    malloc.free(utf8profile);
-    malloc.free(utf8onion);
-  }
-
-  @override
-  void DisconnectFromPeer(String profile, String onion) {
-    // ignore: non_constant_identifier_names
-    var disconnectFromPeerC = library.lookup<NativeFunction<void_from_string_string_function>>("c_DisconnectFromPeer");
-    final DisconnectFromPeerC = disconnectFromPeerC.asFunction<VoidFromStringStringFn>();
-    final utf8profile = profile.toNativeUtf8();
-    final utf8onion = onion.toNativeUtf8();
-    DisconnectFromPeerC(utf8profile, utf8profile.length, utf8onion, utf8onion.length);
-    malloc.free(utf8profile);
-    malloc.free(utf8onion);
-  }
-
-  @override
-  void DisconnectFromServer(String profile, String onion) {
-    // ignore: non_constant_identifier_names
-    var disconnectFromServerC = library.lookup<NativeFunction<void_from_string_string_function>>("c_DisconnectFromServer");
-    final DisconnectFromServerC = disconnectFromServerC.asFunction<VoidFromStringStringFn>();
-    final utf8profile = profile.toNativeUtf8();
-    final utf8onion = onion.toNativeUtf8();
-    DisconnectFromServerC(utf8profile, utf8profile.length, utf8onion, utf8onion.length);
-    malloc.free(utf8profile);
-    malloc.free(utf8onion);
-  }
-
  @override
  Future<String> SearchConversations(String profile, String pattern) async {
    var searchConversationsC = library.lookup<NativeFunction<string_string_to_string_function>>("c_SearchConversations");
@ -1102,37 +1043,4 @@ class CwtchFfi implements Cwtch {
    malloc.free(utf8pattern);
    return searchID;
  }
-
-  @override
-  Future<HashMap<String, String>> PlatformChannelInfo() {
-    return Future.value(HashMap<String, String>());
-  }
-
-  @override
-  Future<void> ConfigureConnections(String profile, bool listen, bool peers, bool servers) async {
-    var configureConnections = library.lookup<NativeFunction<void_from_string_bool_bool_bool>>("c_ConfigureConnections");
-    // ignore: non_constant_identifier_names
-    final ConfigureConnections = configureConnections.asFunction<VoidFromStringBoolBoolBool>();
-    final utf8profile = profile.toNativeUtf8();
-    ConfigureConnections(utf8profile, utf8profile.length, listen, peers, servers);
-    malloc.free(utf8profile);
-    return;
-  }
-
-  @override
-  void PublishServerUpdate(String profile) {
-    var publishServerUpdate = library.lookup<NativeFunction<string_to_void_function>>("c_PublishServerUpdate");
-    // ignore: non_constant_identifier_names
-    final PublishServerUpdate = publishServerUpdate.asFunction<StringFn>();
-    final utf8profile = profile.toNativeUtf8();
-    PublishServerUpdate(utf8profile, utf8profile.length);
-    malloc.free(utf8profile);
-  }
-
-  @override
-  bool IsLoaded() {
-    bool check = library.providesSymbol("c_UpdateSettings");
-    EnvironmentConfig.debugLog("Checking that the FFI Interface is Correctly Loaded... $check");
-    return check;
-  }
 }
--- a/lib/cwtch/gomobile.dart
+++ b/lib/cwtch/gomobile.dart
@ -1,4 +1,3 @@
-import 'dart:collection';
 import 'dart:convert';

 import 'package:cwtch/config.dart';
@ -30,27 +29,9 @@ class CwtchGomobile implements Cwtch {
  late Future<dynamic> androidLibraryDir;
  late Future<dynamic> androidHomeDirectory;
  String androidHomeDirectoryStr = "";
-  String _cwtchDir = "";
  late CwtchNotifier cwtchNotifier;
  bool _isL10nInit = false;

-  @override
-  Future<HashMap<String, String>> PlatformChannelInfo() async {
-    HashMap<String, String> info = HashMap<String, String>();
-
-    info.addAll({"appInfoPlatform.name": appInfoPlatform.name});
-    info.addAll({"appInfoPlatform.codec": appInfoPlatform.codec.toString()});
-    EnvironmentConfig.debugLog("getting foreground service info...");
-    appInfoPlatform.invokeMapMethod('getForegroundServiceInfo').then((foregroundServiceInfoMap) {
-      EnvironmentConfig.debugLog("parsing foreground service info...");
-      foregroundServiceInfoMap?.entries.forEach((element) {
-        info.addAll({element.key.toString(): element.value.toString()});
-      });
-    });
-    EnvironmentConfig.debugLog("returning foreground service info...");
-    return info;
-  }
-
  CwtchGomobile(CwtchNotifier _cwtchNotifier) {
    print("gomobile.dart: CwtchGomobile()");
    cwtchNotifier = _cwtchNotifier;
@ -63,27 +44,23 @@ class CwtchGomobile implements Cwtch {
    appbusEventChannel.setMethodCallHandler(this._handleAppbusEvent);
  }

-  String getAssetsDir() {
-    // TODO
-    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)...");
+    return 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
@ -375,7 +352,7 @@ class CwtchGomobile implements Cwtch {

  @override
  void RestartSharing(String profile, String filekey) {
-    cwtchPlatform.invokeMethod("RestartFileShare", {"ProfileOnion": profile, "filekey": filekey});
+    cwtchPlatform.invokeMethod("RestartSharing", {"ProfileOnion": profile, "filekey": filekey});
  }

  @override
@ -383,11 +360,6 @@ class CwtchGomobile implements Cwtch {
    cwtchPlatform.invokeMethod("StopSharing", {"ProfileOnion": profile, "filekey": filekey});
  }

-  @override
-  void DeleteServerInfo(String profile, String handle) {
-    cwtchPlatform.invokeMethod("DeleteServerInfo", {"ProfileOnion": profile, "handle": handle});
-  }
-
  @override
  void UpdateSettings(String json) {
    cwtchPlatform.invokeMethod("UpdateSettings", {"json": json});
@ -444,39 +416,8 @@ class CwtchGomobile implements Cwtch {
    cwtchPlatform.invokeMethod("PeerWithOnion", {"ProfileOnion": profile, "onion": onion});
  }

-  @override
-  void AttemptReconnectionServer(String profile, String onion) {
-    cwtchPlatform.invokeMethod("QueueJoinServer", {"ProfileOnion": profile, "onion": onion});
-  }
-
-  @override
-  void DisconnectFromPeer(String profile, String onion) {
-    cwtchPlatform.invokeMethod("DisconnectFromPeer", {"ProfileOnion": profile, "onion": onion});
-  }
-
-  @override
-  void DisconnectFromServer(String profile, String onion) {
-    cwtchPlatform.invokeMethod("DisconnectFromServer", {"ProfileOnion": profile, "onion": onion});
-  }
-
  @override
  Future<String> SearchConversations(String profile, String pattern) async {
    return await cwtchPlatform.invokeMethod("SearchConversations", {"ProfileOnion": profile, "pattern": pattern});
  }
-
-  @override
-  Future<void> ConfigureConnections(String profile, bool listen, bool peers, bool servers) async {
-    cwtchPlatform.invokeMethod("ConfigureConnections", {"ProfileOnion": profile, "listen": listen, "peers": peers, "servers": servers});
-    return;
-  }
-
-  @override
-  void PublishServerUpdate(String profile) {
-    cwtchPlatform.invokeMethod("PublishServerUpdate", {"ProfileOnion": profile});
-  }
-
-  @override
-  bool IsLoaded() {
-    return true;
-  }
 }
--- a/lib/cwtch_icons_icons.dart
+++ b/lib/cwtch_icons_icons.dart
@ -1,5 +1,5 @@
 /// Flutter icons Cwtch
-/// Copyright (C) 2021-2023 by Open Privacy Research Society
+/// Copyright (C) 2021-2022 by Open Privacy Research Society
 /// This font was generated by FlutterIcon.com, which is derived from Fontello.
 ///
 /// To use this font, place it in your fonts/ directory and include the
@ -124,7 +124,6 @@ class CwtchIcons {
  static const IconData view_replies = IconData(0xe869, fontFamily: _kFontFam, fontPackage: _kFontPkg);
  static const IconData anti_spam_2 = IconData(0xe86b, fontFamily: _kFontFam, fontPackage: _kFontPkg);
  static const IconData manage_files = IconData(0xe86c, fontFamily: _kFontFam, fontPackage: _kFontPkg);
+  static const IconData attached_file_2 = IconData(0xe86d, fontFamily: _kFontFam, fontPackage: _kFontPkg);
  static const IconData anti_spam_3 = IconData(0xe86e, fontFamily: _kFontFam, fontPackage: _kFontPkg);
-  static const IconData attached_file_3 = IconData(0xe86f, fontFamily: _kFontFam, fontPackage: _kFontPkg);
-  static const IconData disconnect_from_contact = IconData(0xe870, fontFamily: _kFontFam, fontPackage: _kFontPkg);
 }
--- a/lib/l10n/custom_material_delegate.dart
+++ b/lib/l10n/custom_material_delegate.dart
@ -644,24 +644,4 @@ class MaterialLocalizationLu extends MaterialLocalizations {
    // TODO: implement scrimOnTapHint
    throw UnimplementedError();
  }
-
-  @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,38 +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",
-    "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": "Mewn gwirionedd dileu gweinydd",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Grwpiau rydw i'n eu cynnal ar y gweinydd hwn",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -129,6 +97,7 @@
    "serverMetricsLabel": "Metrigau Gweinydd",
    "manageKnownServersLong": "Rheoli Gweinyddwyr Hysbys",
    "manageKnownServersButton": "Rheoli Gweinyddwyr Hysbys",
+    "groupsOnThisServerLabel": "Grwpiau rydw i'n eu cynnal ar y gweinydd hwn",
    "importLocalServerSelectText": "Dewiswch Gweinyddwr Lleol",
    "importLocalServerLabel": "Mewnforio gweinydd a letyir yn lleol",
    "enterCurrentPasswordForDeleteServer": "Rhowch y cyfrinair cyfredol i ddileu'r gweinydd hwn",
@ -144,6 +113,7 @@
    "torSettingsCustomControlPortDescription": "Defnyddiwch borthladd wedi'i deilwra ar gyfer cysylltiadau rheoli i'r dirprwy Tor",
    "torSettingsUseCustomTorServiceConfiguration": "Defnyddiwch Ffurfweddiad Gwasanaeth Custom Tor (torrc)",
    "fileSharingSettingsDownloadFolderDescription": "Pan fydd ffeiliau'n cael eu llwytho i lawr yn awtomatig (ee ffeiliau delwedd, pan fydd rhagolygon delwedd yn cael eu galluogi) mae angen lleoliad rhagosodedig i lawrlwytho'r ffeiliau iddo.",
+    "deleteServerConfirmBtn": "Mewn gwirionedd dileu gweinydd",
    "deleteServerSuccess": "Wedi dileu gweinydd yn llwyddiannus",
    "enterServerPassword": "Rhowch gyfrinair i ddatgloi gweinydd",
    "unlockProfileTip": "Crëwch neu ddatgloi proffil i ddechrau!",
--- a/lib/l10n/intl_da.arb
+++ b/lib/l10n/intl_da.arb
@ -1,38 +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",
-    "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": "Ja fjern server",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Grupper som jeg er vært for på denne server",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -191,6 +159,7 @@
    "displayNameTooltip": "Vælg et navn til præsentation",
    "manageKnownServersButton": "Administrer kendte Servere",
    "fieldDescriptionLabel": "Beskrivelse",
+    "groupsOnThisServerLabel": "Grupper som jeg er vært for på denne server",
    "importLocalServerButton": "Importer %1",
    "importLocalServerSelectText": "Vælg lokal Server",
    "importLocalServerLabel": "Importer en lokalt administreret server",
@ -202,6 +171,7 @@
    "fileSavedTo": "Gemt på",
    "encryptedServerDescription": "Ved at kryptere en server med et password beskytter du mod angreb fra andre brugere af denne enhed. Krypterede servere kan ikke tilgås, aflæses eller vises før det korrekte password er blevet brugt til at åbne dem.",
    "plainServerDescription": "Vi anbefaler at du beskytter dine Cwtch servere med et password. Hvis ikke du sætter et password kan alle med adgang til denne enhed indsamle information om denne server samt hente beskyttede krypteringsnøgler.",
+    "deleteServerConfirmBtn": "Ja fjern server",
    "deleteServerSuccess": "Fjernede server",
    "enterCurrentPasswordForDeleteServer": "Indtast nuværende password for at fjerne denne server",
    "copyAddress": "Kopier Adresse",
--- a/lib/l10n/intl_de.arb
+++ b/lib/l10n/intl_de.arb
@ -1,40 +1,6 @@
 {
    "@@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:",
-    "deleteServerConfirmBtn": "Server wirklich löschen",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "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 +8,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.",
@ -317,6 +285,7 @@
    "copyAddress": "Adresse kopieren",
    "enterCurrentPasswordForDeleteServer": "Bitte gib das aktuelle Passwort ein, um diesen Server zu löschen",
    "deleteServerSuccess": "Server erfolgreich gelöscht",
+    "deleteServerConfirmBtn": "Server wirklich löschen",
    "plainServerDescription": "Wir empfehlen, dass du deinen Cwtch-Server mit einem Passwort schützst. Wenn Du diesen Server nicht mit einem Kennwort versiehst, kann jeder, der Zugang zu diesem Gerät hat, auf Informationen über diesen Server zugreifen, einschließlich sensibler kryptografischer Schlüssel.",
    "encryptedServerDescription": "Das Verschlüsseln eines Servers mit einem Kennwort schützt ihn vor anderen Personen, die dieses Gerät ebenfalls benutzen könnten. Verschlüsselte Server können nicht entschlüsselt, angezeigt oder aufgerufen werden, bis das richtige Kennwort eingegeben wird, um sie zu entsperren.",
    "fileSavedTo": "Gesichert in",
@ -328,6 +297,7 @@
    "importLocalServerLabel": "Importieren eines lokal gehosteten Servers",
    "importLocalServerSelectText": "Lokalen Server auswählen",
    "importLocalServerButton": "%1 importieren",
+    "groupsOnThisServerLabel": "Gruppen, in denen ich bin, werden auf diesem Server gehostet",
    "fieldDescriptionLabel": "Beschreibung",
    "manageKnownServersButton": "Bekannte Server verwalten",
    "displayNameTooltip": "Bitte gib einen Anzeigenamen ein",
--- a/lib/l10n/intl_el.arb
+++ b/lib/l10n/intl_el.arb
@ -1,38 +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",
-    "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": "Really Delete Server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Known Groups on this Cwtch Server",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -234,9 +202,11 @@
    "experimentClickableLinksDescription": "The clickable links experiment allows you to click on URLs shared in messages",
    "enableExperimentClickableLinks": "Enable Clickable Links",
    "serverMetricsLabel": "Server Metrics",
+    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
    "importLocalServerButton": "Import %1",
    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "deleteServerConfirmBtn": "Really delete server",
    "settingServersDescription": "The hosting servers experiment enables hosting and managing Cwtch servers",
    "settingServers": "Hosting Servers",
    "unlockProfileTip": "Please create or unlock a profile to begin!",
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@ -1,38 +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",
-    "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": "Really Delete Server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Known Groups on this Cwtch Server",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -189,6 +157,7 @@
    "displayNameTooltip": "Please enter a display name",
    "manageKnownServersButton": "Manage Known Servers",
    "fieldDescriptionLabel": "Description",
+    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
    "importLocalServerButton": "Import %1",
    "importLocalServerSelectText": "Select Local Server",
    "importLocalServerLabel": "Import a locally hosted server",
@ -201,6 +170,7 @@
    "fileSavedTo": "Saved to",
    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
+    "deleteServerConfirmBtn": "Really delete server",
    "deleteServerSuccess": "Successfully deleted server",
    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
    "copyAddress": "Copy Address",
--- a/lib/l10n/intl_es.arb
+++ b/lib/l10n/intl_es.arb
@ -1,73 +1,41 @@
 {
    "@@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",
-    "settingsGroupAbout": "About",
-    "deleteServerConfirmBtn": "¿Realmente desea borrar el servidor?",
-    "defaultScalingText": "Factor de escala del texto",
-    "groupsOnThisServerLabel": "Grupos alojados en este servidor de Cwtch",
-    "shareMenuQRCode": "Mostrar código QR",
-    "experimentQRCodeDescription": "La compatibilidad con códigos QR permite compartir datos (como la identidad del perfil) mediante códigos QR",
-    "enableExperimentQRCode": "Códigos QR",
-    "localeNl": "Holandés \/ Dutch",
-    "localePtBr": "Portugués brasileño \/ Português do Brasil",
-    "profileAutostartLabel": "Inicio automático",
-    "profileEnabled": "Habilitar",
-    "profileAutostartDescription": "Controla si el perfil se iniciará automáticamente al iniciar Cwtch",
-    "profileEnabledDescription": "Activar o Desactivar el perfil.",
-    "localeSk": "Eslovaco \/ Slovák",
-    "localeKo": "Coreano \/ 한국어",
-    "blodeuweddExperimentEnable": "Asistente Blodeuwedd",
-    "blodeuweddDescription": "El asistente Blodeuwedd agrega nuevas funciones a Cwtch, como el resumen de la transcripción del chat y la traducción de mensajes a través de un modelo de lenguaje alojado localmente.",
-    "blodeuweddNotSupported": "Esta versión de Cwtch se ha compilado sin soporte para Blodeuwedd Assistant.",
-    "blodeuweddPath": "El directorio donde se encuentra Blodeuwedd está en tu computadora.",
-    "blodeuweddSummarize": "Resumir la conversación",
-    "blodeuweddWarning": "Blodeuwedd utiliza un modelo de idioma local y un conjunto de modelos auxiliares para potenciar su funcionalidad. Estas técnicas suelen ser muy efectivas y no están exentas de errores. \n\nSi bien nos hemos esforzado por minimizar el riesgo, todavía existe la posibilidad de que los resultados de Blodeuwedd sean incorrectos, sin-sentido y\/u ofensivos. \n\nDebido a eso, Blodeuwedd requiere descargar dos componentes adicionales separados de Cwtch, el modelo Blodeuwedd (o un modelo compatible) y el Blodeuwedd Runner. \n\nConsulta https:\/\/docs.cwtch.im\/docs\/settings\/experiments\/blodeuwedd para obtener más información sobre cómo obtener estos componentes y configurarlos.",
-    "blodeuweddTranslate": "Traducir mensaje",
-    "blodeuweddProcessing": "Blodeuwedd está procesando...",
-    "availabilityStatusBusy": "Ocupad()",
-    "availabilityStatusAvailable": "Disponible",
-    "availabilityStatusAway": "Ausente",
-    "shareProfileMenuTooltop": "Comparte éste perfil por medio de...",
-    "availabilityStatusTooltip": "Establece tu estado",
-    "profileInfoHint": "Agrega información sobre tí, por ejemplo un blog, sitio web o una breve biografía.",
-    "profileInfoHint2": "Puedes agregar hasta 3 campos.",
-    "profileInfoHint3": "Los contactos podrán ver esta información en la Configuración de la Conversación ",
-    "retryConnection": "Reintentar",
-    "fontScalingDescription": "Ajusta el factor de escala de fuente relativo aplicado al texto y los widgets.",
-    "retryConnectionTooltip": "Cwtch reintenta conectarse a sus pares regularmente, pero puedes decirle a Cwtch que lo intente antes presionando este botón.",
-    "localeJa": "Japonés \/ 日本語",
-    "localeSv": "Sueco \/ Svenska",
-    "localeSw": "Suajili \/ Kiswahili",
-    "localeUk": "Ucraniano \/ українською",
-    "defaultPreserveHistorySetting": "Preservar el historial de conversaciones",
-    "preserveHistorySettingDescription": "De forma predeterminada, Cwtch borrará el historial de conversaciones cuando se cierre Cwtch. Si esta configuración está habilitada, Cwtch preservará el historial de conversaciones de pares.",
-    "serverinfoNoGroupInfo": "No hay grupos asociados co este servidor de Cwtch.",
-    "cannotDeleteServerIfActiveGroups": "Hay grupos activos asociados con este servidor de Cwtch. Elimínalos antes de eliminar esta entrada del servidor de Cwtch.",
-    "profileAppearOffline": "Aparecer sin conexión",
-    "profileAppearOfflineDescription": "De forma predeterminada, cuando el perfil Cwtch está habilitado, intenta conectarse automáticamente para conocer contactos y permite conexiones entrantes. Esta configuración desactiva esas acciones y te permite elegir, manualmente, a qué contactos conectarte.",
-    "contactDisconnect": "Desconectarse del contacto (si no tienes configurado Aparecer sin conexión, es posible que este contacto aún pueda restablecer la conexión contigo)",
-    "profileAppearOnline": "Aparecer en línea",
-    "profileEnableProfile": "Habilitar perfil",
-    "profileDisableProfile": "Deshabilitar perfil",
-    "profileBlockUnknownContacts": "Bloquear contactos desconocidos",
-    "profileAllowUnknownContacts": "Permitir contactos desconocidos",
-    "profileOfflineAtStart": "Aparecer sin conexión al iniciar",
-    "xDaysAgo": "Hace $days días",
-    "xHoursAgo": "Hace $hours horas",
-    "xMinutesAgo": "Hace $minutes minutos",
-    "xSecondsAgo": "Hace $seconds segundos",
-    "now": "Ahora",
-    "localeUzbek": "Uzbeko \/ O'zbekcha",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
+    "localeUk": "Ukrainian \/ українською",
+    "profileEnabledDescription": "Activate or Deactivate the profile.",
+    "localeSw": "Swahili \/ Kiswahili",
+    "localeSv": "Swedish \/ Svenska",
+    "fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
+    "defaultScalingText": "Tamaño predeterminado de texto (factor de escala:",
+    "localeJa": "Japanese \/ 日本語",
+    "retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
+    "retryConnection": "Retry",
+    "availabilityStatusTooltip": "Set your availability status",
+    "profileInfoHint3": "Contacts will be able to see this information in Conversation Settings ",
+    "profileInfoHint2": "You can add up to 3 fields.",
+    "profileInfoHint": "Add some public information about yourself here e.g. blog, websites, brief bio.",
+    "availabilityStatusBusy": "Busy",
+    "availabilityStatusAway": "Away",
+    "availabilityStatusAvailable": "Available",
+    "blodeuweddWarning": "Blodeuwedd uses a local language model and a set of small auxiliary models to power its functionality. These techniques are often very effective they are not without error. \n\nWhile we have taken efforts to minimize the risk, there is still the possibility that Blodeuwedd outputs will be incorrect, hallucinated and\/or offensive.\n\nBecause of that Blodeuwedd requires downloading two additional components separate from Cwtch, the Blodeuwedd Model (or a compatible model) and the Blodeuwedd Runner. \n\nSee https:\/\/docs.cwtch.im\/docs\/settings\/experiments\/blodeuwedd for more information on obtaining these components and setting them up.",
+    "blodeuweddProcessing": "Blodeuwedd is processing...",
+    "blodeuweddTranslate": "Translate Message",
+    "blodeuweddSummarize": "Summarize Conversation",
+    "blodeuweddPath": "The directory where the Blodeuwedd is located on your computer.",
+    "blodeuweddNotSupported": "This version of Cwtch has been compiled without support for the Blodeuwedd Assistant.",
+    "blodeuweddDescription": "The Blodeuwedd assistant adds new features to Cwtch such as chat transcript summarization and message translation via a locally hosted language model.",
+    "blodeuweddExperimentEnable": "Blodeuwedd Assistant",
+    "localeKo": "Korean \/ 한국어",
+    "localeSk": "Slovak \/ Slovák",
+    "profileAutostartDescription": "Controls if the profile will be automatically launched on startup",
+    "profileEnabled": "Enable",
+    "profileAutostartLabel": "Autostart",
+    "localePtBr": "Brazilian Portuguese \/ Português do Brasil",
+    "localeNl": "Dutch \/ Dutch",
+    "experimentQRCodeDescription": "QR Code support allows sharing data (such as profile identity) by QR Codes",
+    "enableExperimentQRCode": "QR Codes",
+    "shareMenuQRCode": "Show QR Code",
+    "shareProfileMenuTooltop": "Share profile via...",
    "tooltipPinConversation": "Fija la conversación en la parte superior de \"Conversaciones\"",
    "errorDownloadDirectoryDoesNotExist": "No se puede habilitar el uso compartido de archivos porque la carpeta de descarga no se ha configurado o se configuró en una carpeta que no existe.",
    "acquiringTicketsFromServer": "Realizando Desafío Antispam",
@ -164,6 +132,8 @@
    "torSettingsCustomControlPort": "Puerto de control personalizado",
    "torSettingsCustomSocksPortDescription": "Usar un puerto personalizad para conexiones de datos al proxy Tor",
    "serverMetricsLabel": "Métricas del servidor",
+    "groupsOnThisServerLabel": "Grupos alojados en este servidor en los que estoy",
+    "deleteServerConfirmBtn": "Realmente eliminar el servidor",
    "settingServersDescription": "El experimento de alojar servidores permite alojar y administrar servidores de Cwtch",
    "settingServers": "Alojar Servidores",
    "unlockProfileTip": "Crea o desbloquea un perfil para comenzar!",
--- a/lib/l10n/intl_fr.arb
+++ b/lib/l10n/intl_fr.arb
@ -1,38 +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",
-    "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": "Supprimer vraiment le serveur",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Les groupes dont je fais partie sont hébergés sur ce serveur",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -200,6 +168,7 @@
    "importLocalServerSelectText": "Sélectionnez le serveur local",
    "importLocalServerLabel": "Importer un serveur hébergé localement",
    "importLocalServerButton": "Importer %1",
+    "groupsOnThisServerLabel": "Les groupes dont je fais partie sont hébergés sur ce serveur",
    "fieldDescriptionLabel": "Description",
    "savePeerHistoryDescription": "Détermine s'il faut ou non supprimer tout historique associé au contact.",
    "newMessagesLabel": "Nouveaux messages",
@ -212,6 +181,7 @@
    "enterCurrentPasswordForDeleteServer": "Veuillez saisir le mot de passe actuel pour supprimer ce serveur",
    "encryptedServerDescription": "Le chiffrement d’un serveur avec un mot de passe le protège des autres personnes qui peuvent également utiliser cet appareil. Les serveurs cryptés ne peuvent pas être déchiffrés, affichés ou accessibles tant que le mot de passe correct n’est pas entré pour les déverrouiller.",
    "deleteServerSuccess": "Le serveur a été supprimé avec succès",
+    "deleteServerConfirmBtn": "Supprimer vraiment le serveur",
    "unlockServerTip": "Veuillez créer ou déverrouiller un serveur pour commencer !",
    "unlockProfileTip": "Veuillez créer ou déverrouiller un profil pour commencer !",
    "settingServersDescription": "L'expérience des serveurs d'hébergement permet d'héberger et de gérer les serveurs Cwtch.",
--- a/lib/l10n/intl_it.arb
+++ b/lib/l10n/intl_it.arb
@ -1,69 +1,37 @@
 {
    "@@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",
-    "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": "Elimina davvero il server",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Gruppi di cui sono parte su questo server",
-    "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",
-    "retryConnectionTooltip": "Cwtch riprova i peer regolarmente, ma puoi dire a Cwtch di provare prima premendo questo pulsante.",
-    "localeJa": "Giapponese \/ 日本語",
-    "fontScalingDescription": "Regola il fattore di scala relativo dei caratteri applicato al testo e ai widget.",
-    "localeSv": "Svedese \/ Svenska",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
+    "localeUk": "Ukrainian \/ українською",
+    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
-    "localeUk": "Ucraino \/українською",
-    "localeNl": "Olandese \/ Dutch",
-    "localePtBr": "Portoghese brasiliano \/ Português do Brasil",
-    "profileAutostartLabel": "Avvio automatico",
-    "profileEnabled": "Abilita",
-    "profileAutostartDescription": "Controlla se il profilo verrà lanciato automaticamente all'avvio.",
-    "profileEnabledDescription": "Attiva o disattiva il profilo.",
-    "localeSk": "Slovacco \/ Slovák",
-    "localeKo": "Coreano \/ 한국어",
-    "blodeuweddExperimentEnable": "Assistente Blodeuwedd",
-    "blodeuweddDescription": "L'assistente Blodeuwedd aggiunge nuove funzionalità a Cwtch come il riepilogo della trascrizione della chat e la traduzione dei messaggi tramite un modello linguistico ospitato localmente.",
-    "blodeuweddNotSupported": "Questa versione di Cwtch è stata compilata senza il supporto per l'assistente Blodeuwedd.",
-    "blodeuweddPath": "La directory in cui si trova Blodeuwedd sul tuo computer.",
-    "blodeuweddSummarize": "Riassumi la conversazione",
-    "blodeuweddTranslate": "Traduci il messaggio",
-    "blodeuweddProcessing": "Blodeuwedd sta elaborando...",
-    "blodeuweddWarning": "Blodeuwedd utilizza un modello linguistico locale e una serie di piccoli modelli ausiliari per alimentare la sua funzionalità. Queste tecniche sono spesso molto efficaci ma non prive di errori. \n\nSebbene ci siamo impegnati per ridurre al minimo il rischio, esiste ancora la possibilità che i risultati di Blodeuwedd siano errati, allucinati e\/o offensivi. \n\nPer questo Blodeuwedd richiede il download di due componenti aggiuntivi separati da Cwtch, il Blodeuwedd Model (o un modello compatibile) e il Blodeuwedd Runner. \n\nVedere https:\/\/docs.cwtch.im\/docs\/settings\/experiments\/blodeuwedd per ulteriori informazioni su come ottenere questi componenti e configurarli.",
-    "availabilityStatusAvailable": "Disponibile",
-    "availabilityStatusAway": "Assente",
-    "availabilityStatusBusy": "Non disponibile",
-    "availabilityStatusTooltip": "Imposta il tuo stato di disponibilità",
-    "profileInfoHint": "Aggiungi qui alcune informazioni personali pubbliche, ad esempio blog, siti web, breve biografia.",
-    "profileInfoHint2": "È possibile aggiungere fino a 3 campi.",
-    "profileInfoHint3": "I contatti potranno vedere queste informazioni nelle Impostazioni di conversazione. ",
-    "retryConnection": "Riprova",
+    "localeSv": "Swedish \/ Svenska",
+    "fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
    "defaultScalingText": "Testo di dimensioni predefinite (fattore di scala:",
+    "localeJa": "Japanese \/ 日本語",
+    "retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
+    "retryConnection": "Retry",
+    "availabilityStatusTooltip": "Set your availability status",
+    "profileInfoHint3": "Contacts will be able to see this information in Conversation Settings ",
+    "profileInfoHint2": "You can add up to 3 fields.",
+    "profileInfoHint": "Add some public information about yourself here e.g. blog, websites, brief bio.",
+    "availabilityStatusBusy": "Busy",
+    "availabilityStatusAway": "Away",
+    "availabilityStatusAvailable": "Available",
+    "blodeuweddWarning": "Blodeuwedd uses a local language model and a set of small auxiliary models to power its functionality. These techniques are often very effective they are not without error. \n\nWhile we have taken efforts to minimize the risk, there is still the possibility that Blodeuwedd outputs will be incorrect, hallucinated and\/or offensive.\n\nBecause of that Blodeuwedd requires downloading two additional components separate from Cwtch, the Blodeuwedd Model (or a compatible model) and the Blodeuwedd Runner. \n\nSee https:\/\/docs.cwtch.im\/docs\/settings\/experiments\/blodeuwedd for more information on obtaining these components and setting them up.",
+    "blodeuweddProcessing": "Blodeuwedd is processing...",
+    "blodeuweddTranslate": "Translate Message",
+    "blodeuweddSummarize": "Summarize Conversation",
+    "blodeuweddPath": "The directory where the Blodeuwedd is located on your computer.",
+    "blodeuweddNotSupported": "This version of Cwtch has been compiled without support for the Blodeuwedd Assistant.",
+    "blodeuweddDescription": "The Blodeuwedd assistant adds new features to Cwtch such as chat transcript summarization and message translation via a locally hosted language model.",
+    "blodeuweddExperimentEnable": "Blodeuwedd Assistant",
+    "localeKo": "Korean \/ 한국어",
+    "localeSk": "Slovak \/ Slovák",
+    "profileAutostartDescription": "Controls if the profile will be automatically launched on startup",
+    "profileEnabled": "Enable",
+    "profileAutostartLabel": "Autostart",
+    "localePtBr": "Brazilian Portuguese \/ Português do Brasil",
+    "localeNl": "Dutch \/ Dutch",
    "tooltipPinConversation": "Aggiungi la conversazione in cima alla lista \"Conversazioni\"",
    "tooltipUnpinConversation": "Rimuovi la conversazione dalla cima della lista \"Conversazioni\"",
    "errorDownloadDirectoryDoesNotExist": "La condivisione file non può essere abilitata perché la destinazione dei download non è stata impostata o è impostata su una cartella che non esiste.",
@ -238,6 +206,7 @@
    "profileOnionLabel": "Invia questo indirizzo ai contatti con cui vuoi connetterti",
    "importLocalServerLabel": "Importa un server ospitato localmente",
    "importLocalServerButton": "Importa %1",
+    "groupsOnThisServerLabel": "Gruppi di cui sono parte su questo server",
    "fieldDescriptionLabel": "Descrizione",
    "displayNameTooltip": "Inserisci un nome visualizzato",
    "manageKnownServersShort": "Server",
@ -299,6 +268,7 @@
    "copyAddress": "Copia indirizzo",
    "enterCurrentPasswordForDeleteServer": "Inserisci la password attuale per eliminare questo server",
    "deleteServerSuccess": "Server eliminato con successo",
+    "deleteServerConfirmBtn": "Elimina davvero il server",
    "encryptedServerDescription": "Criptare un server con una password lo protegge da altre persone che potrebbero usare questo dispositivo. I server criptati non possono essere decriptati, visualizzati o accessibili finché non viene inserita la password corretta per sbloccarli.",
    "fileSavedTo": "Salvato in",
    "fileInterrupted": "Interrotto",
--- a/lib/l10n/intl_ja.arb
+++ b/lib/l10n/intl_ja.arb
@ -1,38 +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",
-    "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": "Really Delete Server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Known Groups on this Cwtch Server",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -218,6 +186,7 @@
    "displayNameTooltip": "Please enter a display name",
    "manageKnownServersButton": "Manage Known Servers",
    "fieldDescriptionLabel": "Description",
+    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
    "importLocalServerButton": "Import %1",
    "importLocalServerSelectText": "Select Local Server",
    "importLocalServerLabel": "Import a locally hosted server",
@ -227,6 +196,7 @@
    "fileCheckingStatus": "Checking download status",
    "fileInterrupted": "Interrupted",
    "fileSavedTo": "Saved to",
+    "deleteServerConfirmBtn": "Really delete server",
    "deleteServerSuccess": "Successfully deleted server",
    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
    "copyAddress": "Copy Address",
--- a/lib/l10n/intl_ko.arb
+++ b/lib/l10n/intl_ko.arb
@ -1,192 +1,12 @@
 {
    "@@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",
-    "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": "Really Delete Server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Known Groups on this Cwtch Server",
-    "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",
-    "showMessageButton": "메시지 표시",
-    "addContactConfirm": "연락처 %1 추가",
-    "addContact": "연락처 추가",
-    "sendMessage": "메시지 보내기",
-    "cancel": "취소",
-    "rejected": "거부!",
-    "accepted": "수락!",
-    "localeIt": "이탈리아어 \/ Italiano",
-    "localeEs": "스페인어 \/ Español",
-    "yourProfiles": "내 프로필",
-    "addNewProfileBtn": "새 프로필 추가",
-    "copiedToClipboardNotification": "클립보드에 복사됨",
-    "tooltipHidePassword": "비밀번호 숨기기",
-    "tooltipShowPassword": "비밀번호 표시",
-    "enterCurrentPasswordForDelete": "이 프로파일을 삭제하려면 현재 비밀번호를 입력하십시오.",
-    "password": "비밀번호",
-    "passwordErrorMatch": "비밀번호가 일치하지 않습니다.",
-    "passwordErrorEmpty": "비밀번호는 비워 둘 수 없습니다.",
-    "password2Label": "비밀번호를 다시 입력하세요",
-    "password1Label": "비밀번호",
-    "currentPasswordLabel": "현제 비밀번호",
-    "noPasswordWarning": "이 계정에서 비밀번호를 사용하지 않으면 로컬에 저장된 모든 데이터가 암호화되지 않습니다",
-    "radioNoPassword": "암호화되지 않음(비밀번호 없음)",
-    "radioUsePassword": "비밀번호",
-    "newPassword": "새 비밀번호",
-    "yesLeave": "이 대화에서 나가기 확인",
-    "leaveConversation": "이 대화에서 나가기",
-    "shutdownCwtchAction": "Cwtch (크치)를 종료",
-    "shutdownCwtchTooltip": "Cwtch (크치)를 종료",
-    "shutdownCwtchDialogTitle": "Cwtch (크치)를 종료하시겠습니까?",
-    "successfullAddedContact": "성공적으로 추가되었습니다.",
-    "titleManageServers": "서버 관리",
-    "cwtchSettingsTitle": "Cwtch (크치) 설정",
-    "titleManageProfiles": "Cwtch (크치) 프로파일 관리",
-    "tooltipAddContact": "새 연락처 또는 대화 추가",
-    "tooltipOpenSettings": "설정 창 열기",
-    "contactAlreadyExists": "연락처가 이미 있음",
-    "conversationSettings": "대화 설정",
-    "titleManageContacts": "대화",
-    "enableGroups": "그룹 채팅 사용",
-    "zoomLabel": "인터페이스 확대\/축소(주로 텍스트 및 버튼 크기에 영향을 줌)",
-    "blockUnknownLabel": "알 수 없는 연락처 차단",
-    "unlock": "잠금 해제",
-    "acceptGroupInviteLabel": "초대를 수락하시겠습니까?",
-    "bulletinsBtn": "게시판",
-    "update": "업데이트",
-    "serverNotSynced": "새 메시지 동기화 중(시간이 걸릴 수 있음)...",
-    "serverConnectivityDisconnected": "서버 연결 끊김",
-    "search": "검색...",
-    "postNewBulletinLabel": "새 게시판 게시",
-    "newBulletinLabel": "새 게시판",
-    "joinGroup": "그룹 가입",
-    "invitation": "초대",
-    "joinGroupTab": "그룹 가입",
-    "displayNameLabel": "표시 이름",
-    "puzzleGameBtn": "퍼즐 게임",
-    "searchList": "목록 검색",
-    "inviteBtn": "초대",
-    "inviteToGroupLabel": "그룹에 초대",
-    "groupNameLabel": "그룹 이름",
-    "viewServerInfo": "서버 정보",
-    "titlePlaceholder": "자격",
-    "addProfileTitle": "새 프로필 추가",
-    "newProfile": "새 프로필",
-    "newConnectionPaneTitle": "새로운 연결",
-    "networkStatusOnline": "온라인",
-    "smallTextLabel": "작은",
-    "themeLight": "밝음",
-    "settingTheme": "밝은 테마 사용",
-    "themeDark": "어둠",
-    "largeTextLabel": "큰",
-    "localeDe": "독일어 \/ Deutsch",
-    "localePt": "포르투갈어 \/ Português",
-    "localeFr": "프랑스어 \/ Français",
-    "localeEn": "영어 \/ English",
-    "settingLanguage": "언어",
-    "yourServers": "서버",
-    "deleteBtn": "삭제",
-    "saveBtn": "저장",
-    "serverSynced": "동기화",
-    "serverConnectivityConnected": "서버 연결됨",
-    "serverInfo": "서버 정보",
-    "invitationLabel": "초대",
-    "serverLabel": "서버",
-    "blocked": "차단됨",
-    "createGroup": "그룹 만들기",
-    "addPeer": "연락처 추가",
-    "groupAddr": "주소",
-    "server": "서버",
-    "peerName": "이름",
-    "peerAddress": "주소",
-    "deleteProfileConfirmBtn": "프로필 삭제 확인",
-    "deleteConfirmLabel": "DELETE를 입력하여 확인",
-    "deleteProfileBtn": "프로필 삭제",
-    "saveProfileBtn": "프로필 저장",
-    "createProfileBtn": "프로필 만들기",
-    "yourDisplayName": "표시 이름",
-    "profileOnionLabel": "연결하려는 연락처에 이 주소를 보냅니다.",
-    "editProfile": "프로필 편집",
-    "defaultProfileName": "앨리스",
-    "profileName": "표시 이름",
-    "editProfileTitle": "프로필 편집",
-    "dontSavePeerHistory": "기록 삭제",
-    "savePeerHistory": "기록 저장",
-    "blockBtn": "연락처 차단",
-    "addressLabel": "주소",
-    "listsBtn": "목록",
-    "chatBtn": "채팅",
-    "acceptGroupBtn": "동의",
-    "rejectGroupBtn": "거부",
-    "newGroupBtn": "새 그룹 만들기",
-    "copyBtn": "복사",
-    "peerOfflineMessage": "연락처가 오프라인 상태이므로 지금은 메시지를 전달할 수 없습니다.",
-    "peerBlockedMessage": "연락처가 차단되었습니다.",
-    "pendingLabel": "보류 중",
-    "acknowledgedLabel": "인정됨",
-    "couldNotSendMsgError": "이 메시지를 보낼 수 없습니다.",
-    "dmTooltip": "DM으로 클릭하세요.",
-    "membershipDescription": "다음은 그룹에 메시지를 보낸 사용자 목록입니다. 이 목록에는 그룹에 액세스할 수 있는 모든 사용자가 표시되지 않을 수 있습니다.",
-    "addListItemBtn": "아이템 추가",
-    "peerNotOnline": "연락처가 오프라인 상태입니다. 지금은 응용 프로그램을 사용할 수 없습니다.",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "프로필 시각 또는 중지",
    "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",
@ -194,6 +14,7 @@
    "addPeerTab": "연락처 추가",
    "createGroupBtn": "창조",
    "defaultGroupName": "굉장한 그룹",
+    "serverLabel": "Server",
    "createGroupTitle": "그룹 만들기",
    "availabilityStatusAway": "자리 비움",
    "availabilityStatusBusy": "바쁘다",
@ -242,6 +63,8 @@
    "notificationContentContactInfo": "대화 정보",
    "newMessageNotificationConversationInfo": "%1의 새로운 메시지",
    "localePl": "폴란드어 \/ Polski",
+    "addContact": "Add contact",
+    "addContactConfirm": "Add contact %1",
    "downloadFileButton": "다운로드",
    "labelFilesize": "크기",
    "messageFileSent": "파일을 보냈습니다.",
@ -349,6 +172,7 @@
    "serverTotalMessagesLabel": "Total Messages",
    "displayNameTooltip": "Please enter a display name",
    "fieldDescriptionLabel": "Description",
+    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
    "importLocalServerSelectText": "Select Local Server",
    "importLocalServerLabel": "Import a locally hosted server",
    "copyServerKeys": "Copy keys",
@ -358,6 +182,7 @@
    "fileSavedTo": "Saved to",
    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "deleteServerConfirmBtn": "Really delete server",
    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
    "settingServersDescription": "The hosting servers experiment enables hosting and managing Cwtch servers",
    "enterServerPassword": "Enter password to unlock server",
@ -382,6 +207,7 @@
    "streamerModeLabel": "Streamer\/Presentation Mode",
    "archiveConversation": "Archive this Conversation",
    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
+    "showMessageButton": "Show Message",
    "blockedMessageMessage": "This message is from a profile you have blocked.",
    "placeholderEnterMessage": "Type a message...",
    "plainProfileDescription": "We recommend that you protect your Cwtch profiles with a password. If you do not set a password on this profile then anyone who has access to this device may be able to access information about this profile, including contacts, messages and sensitive cryptographic keys.",
@ -399,8 +225,13 @@
    "tooltipAcceptContactRequest": "Accept this contact request.",
    "notificationNewMessageFromGroup": "New message in a group!",
    "notificationNewMessageFromPeer": "New message from a contact!",
+    "tooltipHidePassword": "Hide Password",
+    "tooltipShowPassword": "Show Password",
    "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.",
+    "shutdownCwtchAction": "Shutdown Cwtch",
    "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.",
+    "shutdownCwtchDialogTitle": "Shutdown Cwtch?",
+    "shutdownCwtchTooltip": "Shutdown Cwtch",
    "malformedMessage": "Malformed message",
    "profileDeleteSuccess": "Successfully deleted profile",
    "debugLog": "Turn on console debug logging",
@ -410,12 +241,151 @@
    "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",
+    "sendMessage": "Send Message",
+    "cancel": "Cancel",
+    "resetTor": "Reset",
+    "torStatus": "Tor Status",
+    "torVersion": "Tor Version",
+    "sendAnInvitation": "You sent an invitation for: ",
    "contactSuggestion": "This is a contact suggestion for: ",
+    "rejected": "Rejected!",
+    "accepted": "Accepted!",
    "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.",
+    "newPassword": "New Password",
+    "yesLeave": "Yes, Leave This Conversation",
    "reallyLeaveThisGroupPrompt": "Are you sure you want to leave this conversation? All messages and attributes will be deleted.",
+    "leaveConversation": "Leave This Conversation",
    "inviteToGroup": "You have been invited to join a group:",
+    "titleManageServers": "Manage Servers",
+    "successfullAddedContact": "Successfully added ",
    "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."
+    "titleManageProfiles": "Manage Cwtch Profiles",
+    "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password.",
+    "titleManageContacts": "Conversations",
+    "tooltipAddContact": "Add a new contact or conversation",
+    "tooltipOpenSettings": "Open the settings pane",
+    "contactAlreadyExists": "Contact Already Exists",
+    "invalidImportString": "Invalid import string",
+    "conversationSettings": "Conversation Settings",
+    "enterCurrentPasswordForDelete": "Please enter current password to delete this profile.",
+    "enableGroups": "Enable Group Chat",
+    "localeIt": "Italian \/ Italiano",
+    "localeEs": "Spanish \/ Español",
+    "todoPlaceholder": "Todo...",
+    "addNewItem": "Add a new item to the list",
+    "addListItem": "Add a New List Item",
+    "newConnectionPaneTitle": "New Connection",
+    "networkStatusOnline": "Online",
+    "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...",
+    "smallTextLabel": "Small",
+    "builddate": "Built on: %2",
+    "version": "Version %1",
+    "versionTor": "Version %1 with tor %2",
+    "experimentsEnabled": "Enable Experiments",
+    "themeDark": "Dark",
+    "themeLight": "Light",
+    "settingTheme": "Use Light Themes",
+    "largeTextLabel": "Large",
+    "settingInterfaceZoom": "Zoom level",
+    "localeDe": "German \/ Deutsch",
+    "localePt": "Portuguese \/ Portuguesa",
+    "localeFr": "French \/ Français",
+    "localeEn": "English \/ English",
+    "settingLanguage": "Language",
+    "blockUnknownLabel": "Block Unknown Contacts",
+    "zoomLabel": "Interface zoom (mostly affects text and button sizes)",
+    "versionBuilddate": "Version: %1 Built on: %2",
+    "cwtchSettingsTitle": "Cwtch Settings",
+    "unlock": "Unlock",
+    "yourServers": "Your Servers",
+    "yourProfiles": "Your Profiles",
+    "error0ProfilesLoadedForPassword": "0 profiles loaded with that password",
+    "password": "Password",
+    "enterProfilePassword": "Enter a password to view your profiles",
+    "addNewProfileBtn": "Add new profile",
+    "deleteConfirmText": "DELETE",
+    "deleteProfileConfirmBtn": "Really Delete Profile",
+    "deleteConfirmLabel": "Type DELETE to confirm",
+    "deleteProfileBtn": "Delete Profile",
+    "passwordChangeError": "Error changing password: Supplied password rejected",
+    "passwordErrorMatch": "Passwords do not match",
+    "saveProfileBtn": "Save Profile",
+    "createProfileBtn": "Create Profile",
+    "passwordErrorEmpty": "Password cannot be empty",
+    "password2Label": "Reenter password",
+    "password1Label": "Password",
+    "currentPasswordLabel": "Current Password",
+    "yourDisplayName": "Your Display Name",
+    "profileOnionLabel": "Send this address to contacts you want to connect with",
+    "noPasswordWarning": "Not using a password on this account means that all data stored locally will not be encrypted",
+    "radioNoPassword": "Unencrypted (No password)",
+    "radioUsePassword": "Password",
+    "editProfile": "Edit Profile",
+    "newProfile": "New Profile",
+    "defaultProfileName": "Alice",
+    "profileName": "Display name",
+    "editProfileTitle": "Edit Profile",
+    "addProfileTitle": "Add new profile",
+    "deleteBtn": "Delete",
+    "unblockBtn": "Unblock Contact",
+    "dontSavePeerHistory": "Delete History",
+    "savePeerHistoryDescription": "Determines whether to delete any history associated with the contact.",
+    "savePeerHistory": "Save History",
+    "blockBtn": "Block Contact",
+    "saveBtn": "Save",
+    "displayNameLabel": "Display Name",
+    "copiedToClipboardNotification": "Copied to Clipboard",
+    "addressLabel": "Address",
+    "puzzleGameBtn": "Puzzle Game",
+    "bulletinsBtn": "Bulletins",
+    "listsBtn": "Lists",
+    "chatBtn": "Chat",
+    "rejectGroupBtn": "Reject",
+    "acceptGroupBtn": "Accept",
+    "acceptGroupInviteLabel": "Do you want to accept the invitation to",
+    "newGroupBtn": "Create new group",
+    "copyBtn": "Copy",
+    "peerOfflineMessage": "Contact is offline, messages can't be delivered right now",
+    "peerBlockedMessage": "Contact is blocked",
+    "pendingLabel": "Pending",
+    "acknowledgedLabel": "Acknowledged",
+    "couldNotSendMsgError": "Could not send this message",
+    "dmTooltip": "Click to DM",
+    "membershipDescription": "Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.",
+    "addListItemBtn": "Add Item",
+    "peerNotOnline": "Contact is offline. Applications cannot be used right now.",
+    "searchList": "Search List",
+    "update": "Update",
+    "inviteBtn": "Invite",
+    "inviteToGroupLabel": "Invite to group",
+    "groupNameLabel": "Group Name",
+    "viewServerInfo": "Server Info",
+    "serverNotSynced": "Syncing New Messages (This can take some time)...",
+    "serverSynced": "Synced",
+    "serverConnectivityDisconnected": "Server Disconnected",
+    "serverConnectivityConnected": "Server Connected",
+    "serverInfo": "Server Information",
+    "invitationLabel": "Invitation",
+    "search": "Search...",
+    "blocked": "Blocked",
+    "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation",
+    "titlePlaceholder": "title...",
+    "postNewBulletinLabel": "Post new bulletin",
+    "newBulletinLabel": "New Bulletin",
+    "joinGroup": "Join group",
+    "createGroup": "Create group",
+    "addPeer": "Add Contact",
+    "groupAddr": "Address",
+    "invitation": "Invitation",
+    "server": "Server",
+    "peerName": "Name",
+    "peerAddress": "Address",
+    "joinGroupTab": "Join a group"
 }
--- a/lib/l10n/intl_lb.arb
+++ b/lib/l10n/intl_lb.arb
@ -1,38 +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",
-    "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": "Really Delete Server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Known Groups on this Cwtch Server",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -282,6 +250,7 @@
    "displayNameTooltip": "Please enter a display name",
    "manageKnownServersButton": "Manage Known Servers",
    "fieldDescriptionLabel": "Description",
+    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
    "importLocalServerButton": "Import %1",
    "importLocalServerSelectText": "Select Local Server",
    "importLocalServerLabel": "Import a locally hosted server",
@ -293,6 +262,7 @@
    "fileSavedTo": "Saved to",
    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "deleteServerConfirmBtn": "Really delete server",
    "deleteServerSuccess": "Successfully deleted server",
    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
    "copyAddress": "Copy Address",
--- a/lib/l10n/intl_nl.arb
+++ b/lib/l10n/intl_nl.arb
@ -1,63 +1,31 @@
 {
    "@@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",
-    "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 echt verwijderen",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Groepen waarin ik zit gehost op deze server",
-    "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",
-    "profileEnabledDescription": "Activeer of deactiveer het profiel.",
-    "defaultScalingText": "Lettertype schalen",
-    "blodeuweddSummarize": "Gesprek samenvatten",
-    "blodeuweddTranslate": "Bericht vertalen",
-    "blodeuweddProcessing": "Blodeuwedd is aan het verwerken...",
-    "blodeuweddPath": "De map waar de Blodeuwedd zich bevindt op je computer.",
-    "blodeuweddNotSupported": "Deze versie van Cwtch is gecompileerd zonder ondersteuning voor de Blodeuwedd Assistant.",
-    "blodeuweddExperimentEnable": "Blodeuwedd Assistent",
-    "localeKo": "Koreaans \/ 한국어",
-    "fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
-    "availabilityStatusTooltip": "Stel je beschikbaarheidsstatus in",
-    "profileInfoHint2": "Je kunt maximaal 3 velden toevoegen.",
-    "availabilityStatusBusy": "Bezig",
-    "availabilityStatusAway": "Afwezig",
-    "availabilityStatusAvailable": "Beschikbaar",
-    "retryConnection": "Opnieuw",
-    "localeJa": "Japans \/ 日本語",
-    "localeSv": "Zweeds \/ Svenska",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
+    "localeUk": "Ukrainian \/ українською",
+    "profileEnabledDescription": "Start of stop het profiel",
    "localeSw": "Swahili \/ Kiswahili",
-    "localeUk": "Oekraïens \/ українською",
+    "localeSv": "Swedish \/ Svenska",
+    "fontScalingDescription": "Adjust the relative font scaling factor applied to text and widgets.",
+    "defaultScalingText": "Standaardtekstgrootte (schaalfactor:",
+    "localeJa": "Japanese \/ 日本語",
    "retryConnectionTooltip": "Cwtch retries peers regularly, but you can tell Cwtch to try sooner by pushing this button.",
+    "retryConnection": "Retry",
+    "availabilityStatusTooltip": "Set your availability status",
    "profileInfoHint3": "Contacts will be able to see this information in Conversation Settings ",
+    "profileInfoHint2": "You can add up to 3 fields.",
    "profileInfoHint": "Add some public information about yourself here e.g. blog, websites, brief bio.",
+    "availabilityStatusBusy": "Busy",
+    "availabilityStatusAway": "Away",
+    "availabilityStatusAvailable": "Available",
    "blodeuweddWarning": "Blodeuwedd uses a local language model and a set of small auxiliary models to power its functionality. These techniques are often very effective they are not without error. \n\nWhile we have taken efforts to minimize the risk, there is still the possibility that Blodeuwedd outputs will be incorrect, hallucinated and\/or offensive.\n\nBecause of that Blodeuwedd requires downloading two additional components separate from Cwtch, the Blodeuwedd Model (or a compatible model) and the Blodeuwedd Runner. \n\nSee https:\/\/docs.cwtch.im\/docs\/settings\/experiments\/blodeuwedd for more information on obtaining these components and setting them up.",
+    "blodeuweddProcessing": "Blodeuwedd is processing...",
+    "blodeuweddTranslate": "Translate Message",
+    "blodeuweddSummarize": "Summarize Conversation",
+    "blodeuweddPath": "The directory where the Blodeuwedd is located on your computer.",
+    "blodeuweddNotSupported": "This version of Cwtch has been compiled without support for the Blodeuwedd Assistant.",
    "blodeuweddDescription": "The Blodeuwedd assistant adds new features to Cwtch such as chat transcript summarization and message translation via a locally hosted language model.",
+    "blodeuweddExperimentEnable": "Blodeuwedd Assistant",
+    "localeKo": "Korean \/ 한국어",
    "profileAutostartDescription": "Regelt of het profiel automatisch wordt gestart bij het opstarten",
    "profileAutostartLabel": "Automatisch starten",
    "profileEnabled": "Inschakelen",
@ -109,6 +77,7 @@
    "addContactFirst": "Voeg een contact toe of kies een contact om te beginnen met chatten.",
    "experimentClickableLinksDescription": "Het klikbare links experiment maakt het mogelijk op URLs te klikken in berichten",
    "enableExperimentClickableLinks": "Klikbare links inschakelen",
+    "groupsOnThisServerLabel": "Groepen waarin ik zit gehost op deze server",
    "displayNameTooltip": "Voer een weergavenaam in",
    "tooltipBackToMessageEditing": "Terug naar bericht bewerken",
    "editServerTitle": "Server bewerken",
@ -178,6 +147,7 @@
    "fileCheckingStatus": "Downloadstatus controleren",
    "fileInterrupted": "Onderbroken",
    "fileSavedTo": "Opgeslagen in",
+    "deleteServerConfirmBtn": "Server echt verwijderen",
    "deleteServerSuccess": "Server succesvol verwijderd",
    "enterCurrentPasswordForDeleteServer": "Voer huidige wachtwoord in om deze server te verwijderen",
    "settingServersDescription": "Het servers hosten experiment maakt het mogelijk Cwtch-servers te hosten en te beheren",
--- a/lib/l10n/intl_no.arb
+++ b/lib/l10n/intl_no.arb
@ -1,38 +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",
-    "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": "Slette tjener",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Grupper jeg er vert for på denne tjeneren",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -192,6 +160,7 @@
    "displayNameTooltip": "Oppgi visningsnavn",
    "manageKnownServersButton": "Tilpass kjente tjenere",
    "fieldDescriptionLabel": "Beskrivelse",
+    "groupsOnThisServerLabel": "Grupper jeg er vert for på denne tjeneren",
    "importLocalServerButton": "Importér %1",
    "importLocalServerSelectText": "Velg lokal tjener",
    "importLocalServerLabel": "Importér en lokal tjener",
@ -203,6 +172,7 @@
    "fileSavedTo": "Lagret til",
    "encryptedServerDescription": "Kryptering av en tjener med passord beskytter den mot andre som også bruker dette systemet. Krytperte tjenere må låses opp med det korrekte passordet før de kan dekrypteres, vises eller benyttes.",
    "plainServerDescription": "Vi anbefaler at du beskyter Cwetch-tjenere med et passord. Dersom du ikke setter et passord for tjeneren så kan hvem som helst med tilgang til enheten få fult innsyn i informasjon om tjeneren, inklusive kryptonøkler.",
+    "deleteServerConfirmBtn": "Slette tjener",
    "deleteServerSuccess": "Tjener slettet",
    "enterCurrentPasswordForDeleteServer": "Oppgi passord for å slette tjener",
    "copyAddress": "Kopiér adresse",
--- a/lib/l10n/intl_pl.arb
+++ b/lib/l10n/intl_pl.arb
@ -1,38 +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",
-    "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": "Usuń",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Grupy na tym serwerze, których jesteś członkiem",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -293,6 +261,7 @@
    "displayNameTooltip": "Wprowadź nazwę",
    "manageKnownServersButton": "Zarządzaj znanymi serwerami",
    "fieldDescriptionLabel": "Opis",
+    "groupsOnThisServerLabel": "Grupy na tym serwerze, których jesteś członkiem",
    "importLocalServerButton": "Importuj %1",
    "importLocalServerSelectText": "Wybierz lokalny serwer",
    "importLocalServerLabel": "Importuj lokalnie hostowany serwer",
@ -300,6 +269,7 @@
    "fileInterrupted": "Przerwano",
    "encryptedServerDescription": "Zaszyfrowanie serwera hasłem chroni go przed dostępem innych osób korzystających z tego urządzenia.",
    "plainServerDescription": "Zalecamy ustawienie hasła dla  Cwtch. Jeśli hasło nie zostanie ustawione, każdy z dostępem do tego urządzenia uzyska dostęp do tego serwera, w tym do wrażliwych kluczy kryptograficznych.",
+    "deleteServerConfirmBtn": "Usuń",
    "deleteServerSuccess": "Usunięto serwer",
    "settingServersDescription": "Hostowanie serwerów (eksperymentalne) umożliwia tworzenie i zarządzanie serwerami Cwtch",
    "settingServers": "Hostowanie serwerów",
--- a/lib/l10n/intl_pt.arb
+++ b/lib/l10n/intl_pt.arb
@ -1,38 +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",
-    "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": "Really Delete Server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Known Groups on this Cwtch Server",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -187,6 +155,7 @@
    "displayNameTooltip": "Please enter a display name",
    "manageKnownServersButton": "Manage Known Servers",
    "fieldDescriptionLabel": "Description",
+    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
    "importLocalServerButton": "Import %1",
    "importLocalServerSelectText": "Select Local Server",
    "importLocalServerLabel": "Import a locally hosted server",
@ -198,6 +167,7 @@
    "fileSavedTo": "Saved to",
    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "deleteServerConfirmBtn": "Really delete server",
    "deleteServerSuccess": "Successfully deleted server",
    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
    "copyAddress": "Copy Address",
--- a/lib/l10n/intl_pt_BR.arb
+++ b/lib/l10n/intl_pt_BR.arb
@ -1,38 +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",
-    "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": "Realmente excluir servidor",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Grupos nos quais estou hospedado neste servidor",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -179,6 +147,7 @@
    "displayNameTooltip": "Por favor, digite um nome de exibição",
    "manageKnownServersButton": "Gerenciar Servidores Conhecidos",
    "fieldDescriptionLabel": "Descrição",
+    "groupsOnThisServerLabel": "Grupos nos quais estou hospedado neste servidor",
    "importLocalServerButton": "Importar %1",
    "importLocalServerSelectText": "Selecione Servidor Local",
    "importLocalServerLabel": "Importar um servidor hospedado localmente",
@ -191,6 +160,7 @@
    "fileSavedTo": "Salvar em",
    "encryptedServerDescription": "Criptografar um servidor com uma senha o protege de outras pessoas que também podem usar este dispositivo. Os servidores criptografados não podem ser descriptografados, exibidos ou acessados até que a senha correta seja inserida para desbloqueá-los.",
    "plainServerDescription": "Recomendamos que você proteja seus servidores Cwtch com uma senha. Se você não definir uma senha neste servidor, qualquer pessoa que tenha acesso a este dispositivo poderá acessar informações sobre este servidor, incluindo chaves criptográficas sensíveis.",
+    "deleteServerConfirmBtn": "Realmente excluir servidor",
    "deleteServerSuccess": "Servidor excluído com sucesso",
    "enterCurrentPasswordForDeleteServer": "Por favor, digite a senha atual para excluir este servidor",
    "copyAddress": "Copiar endereço",
--- a/lib/l10n/intl_ro.arb
+++ b/lib/l10n/intl_ro.arb
@ -1,38 +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",
-    "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": "Sigur doriți sa ștergeți serverul",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Grupurile în care mă aflu care sunt găzduite pe acest server",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -345,6 +313,7 @@
    "copyAddress": "Copiați adresa",
    "enterCurrentPasswordForDeleteServer": "Vă rugăm să introduceți parola actuală pentru a șterge acest server",
    "deleteServerSuccess": "Serverul a fost șters cu succes",
+    "deleteServerConfirmBtn": "Sigur doriți sa ștergeți serverul",
    "plainServerDescription": "Vă recomandăm să vă protejați serverele Cwtch cu o parolă. Dacă nu setați o parolă pe acest server, atunci oricine are acces la acest dispozitiva are acces la informații despre acest server, inclusiv la chei criptografice importante.",
    "fileSavedTo": "Salvat în",
    "fileInterrupted": "Întrerupt",
@ -355,6 +324,7 @@
    "importLocalServerLabel": "Importați un server găzduit local",
    "importLocalServerSelectText": "Selectați Server local",
    "importLocalServerButton": "Importă %1",
+    "groupsOnThisServerLabel": "Grupurile în care mă aflu care sunt găzduite pe acest server",
    "fieldDescriptionLabel": "Descriere",
    "manageKnownServersButton": "Gestionați serverele cunoscute",
    "displayNameTooltip": "Vă rugăm să introduceți un nume de afișat",
--- a/lib/l10n/intl_ru.arb
+++ b/lib/l10n/intl_ru.arb
@ -1,38 +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",
-    "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": "Вы точно хотите удалить сервер?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Группы, в которых я нахожусь, размещены на этом сервере",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Activate or Deactivate the profile.",
    "localeSw": "Swahili \/ Kiswahili",
@ -163,6 +131,7 @@
    "themeColorLabel": "Основной цвет темы",
    "settingDownloadFolder": "Папка для загрузок",
    "importLocalServerLabel": "Использовать локальный сервер",
+    "deleteServerConfirmBtn": "Вы точно хотите удалить сервер?",
    "unlockProfileTip": "Создайте или импортируйте профиль, чтобы начать",
    "unlockServerTip": "Создайте или импортируйте сервер, чтобы начать",
    "saveServerButton": "Сохранить",
@ -218,6 +187,7 @@
    "displayNameTooltip": "Введите отображаемое имя",
    "manageKnownServersButton": "Управление серверами",
    "fieldDescriptionLabel": "Описание",
+    "groupsOnThisServerLabel": "Группы, в которых я нахожусь, размещены на этом сервере",
    "importLocalServerButton": "Импорт %1",
    "importLocalServerSelectText": "Выбрать локальный сервер",
    "newMessagesLabel": "Новое сообщение",
--- a/lib/l10n/intl_sk.arb
+++ b/lib/l10n/intl_sk.arb
@ -1,38 +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",
-    "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": "Vážne vymazať server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Skupiny ktorých som členom a sú hostované na tomto servery",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Spustiť alebo zastaviť profil",
    "localeSw": "Swahili \/ Kiswahili",
@ -182,6 +150,7 @@
    "displayNameTooltip": "Prosím zadajte zobrazované meno",
    "manageKnownServersButton": "Spravovať Známe Servery",
    "fieldDescriptionLabel": "Popis",
+    "groupsOnThisServerLabel": "Skupiny ktorých som členom a sú hostované na tomto servery",
    "importLocalServerButton": "Importovať %1",
    "importLocalServerSelectText": "Zvoliť Lokálny Server",
    "importLocalServerLabel": "Importovať lokálne hostovaný server",
@ -194,6 +163,7 @@
    "fileSavedTo": "Uložené do",
    "encryptedServerDescription": "Šifrovanie serveru heslom ho chráni pred ostatnými ľuďmi ktorý by mohli toto zariadenie využívať taktiež. Šifrované servery sa nedajú odšifrovať, zobraziť alebo sprístupniť pokiaľ nie je zadané správne heslo.",
    "plainServerDescription": "Odporúčame aby ste si ochránili Cwtch servery heslom. Ak si na servery nenastavíte heslo, každý s prístupom k tomuto zariadeniu bude schopný vidieť informácie o danom servry, vrátane citlivých kryptografických klúčov.",
+    "deleteServerConfirmBtn": "Vážne vymazať server?",
    "deleteServerSuccess": "Server bol úspešne vymazaný",
    "enterCurrentPasswordForDeleteServer": "Prosím zadajte aktuálne heslo pre zmazanie tohoto serveru",
    "copyAddress": "Kopírovať Adresu",
--- a/lib/l10n/intl_sv.arb
+++ b/lib/l10n/intl_sv.arb
@ -1,38 +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",
-    "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": "Bekräfta borttagning av servern",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Grupper jag är med i på den här servern",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainska \/ українською",
    "profileEnabledDescription": "Aktivera eller inaktivera profilen",
    "localeSw": "Swahili \/ Kiswahili",
@ -264,6 +232,7 @@
    "copyAddress": "Kopiera adress",
    "enterCurrentPasswordForDeleteServer": "Ange lösenord för att radera den här servern",
    "deleteServerSuccess": "Servern har tagits bort",
+    "deleteServerConfirmBtn": "Bekräfta borttagning av servern",
    "plainServerDescription": "Vi rekommenderar att du skyddar dina Cwtch-servrar med ett lösenord. Om du inte anger ett lösenord på den här servern kan alla som har åtkomst till den här enheten komma åt information om den här servern, inklusive känsliga kryptografiska nycklar.",
    "encryptedServerDescription": "Genom att kryptera en server med ett lösenord skyddas den från andra personer som också kan använda den här enheten. Krypterade servrar kan inte dekrypteras, visas eller nås förrän rätt lösenord har angetts för att låsa upp dem.",
    "fileSavedTo": "Sparad till",
@ -276,6 +245,7 @@
    "importLocalServerLabel": "Importera en lokal server",
    "importLocalServerSelectText": "Välj lokal server",
    "importLocalServerButton": "Importera %1",
+    "groupsOnThisServerLabel": "Grupper jag är med i på den här servern",
    "fieldDescriptionLabel": "Beskrivning",
    "manageKnownServersButton": "Hantera kända servrar",
    "displayNameTooltip": "Ange ett visningsnamn",
--- a/lib/l10n/intl_sw.arb
+++ b/lib/l10n/intl_sw.arb
@ -1,38 +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",
-    "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": "Futa kabisa seva",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Vikundi nilivyopangishwa kwenye seva hii",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "blodeuweddPath": "Saraka ambapo Blodeuwedd iko kwenye kompyuta yako.",
    "tooltipSuperscript": "Superscript",
    "tooltipStrikethrough": "Mgomo",
@ -268,6 +236,7 @@
    "copyAddress": "Nakili Anwani",
    "enterCurrentPasswordForDeleteServer": "Tafadhali ingiza nywila ya sasa ili kufuta seva hii",
    "deleteServerSuccess": "Seva iliyo fanikiwa futwa",
+    "deleteServerConfirmBtn": "Futa kabisa seva",
    "plainServerDescription": "Tunapendekeza kwamba ulinde seva zako za Cwtch kwa nenosiri. Ikiwa hutaweka nenosiri kwenye seva hii basi mtu yeyote ambaye ana idhini ya kufikia kifaa hiki anaweza kufikia maelezo kuhusu seva hii, ikiwa ni pamoja na funguo nyeti za kriptografia.",
    "encryptedServerDescription": "Kusimba seva kwa nenosiri huilinda dhidi ya watu wengine ambao wanaweza pia kutumia kifaa hiki. Seva zilizosimbwa kwa njia fiche haziwezi kusimbwa, kuonyeshwa au kufikiwa hadi nenosiri sahihi liingizwe ili kuzifungua.",
    "fileSavedTo": "Imehifadhiwa kwa",
@ -280,6 +249,7 @@
    "importLocalServerLabel": "Ingiza seva iliyopangishwa ndani ya nchi",
    "importLocalServerSelectText": "Chagua Seva ya Karibu",
    "importLocalServerButton": "Ingiza %1",
+    "groupsOnThisServerLabel": "Vikundi nilivyopangishwa kwenye seva hii",
    "fieldDescriptionLabel": "Maelezo",
    "manageKnownServersButton": "Dhibiti Seva Zinazojulikana",
    "displayNameTooltip": "Tafadhali ingiza jina la kuonyesha",
--- a/lib/l10n/intl_tr.arb
+++ b/lib/l10n/intl_tr.arb
@ -1,38 +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",
-    "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": "Sunucuyu gerçekten sil",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Bu sunucuda içinde bulunduğum gruplar",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "profileEnabledDescription": "Profili başlat veya durdur",
    "localeSw": "Swahili \/ Kiswahili",
@ -330,6 +298,7 @@
    "copyAddress": "Adresi Kopyala",
    "enterCurrentPasswordForDeleteServer": "Lütfen sunucuyu silmek için şifreyi girin",
    "deleteServerSuccess": "Sunucu başarıyla silindi",
+    "deleteServerConfirmBtn": "Sunucuyu gerçekten sil",
    "plainServerDescription": "Cwtch sunucularınızı bir parola ile korumanızı öneririz. Bir parola belirlemezseniz, bu cihaza erişimi olan herkes kriptografik anahtarlar da dahil olmak üzere sunucunun hassas bilgilerine erişebilir.",
    "encryptedServerDescription": "Bir sunucuyu parola ile şifrelemek, sunucuyu bu aygıtı kullanabilecek diğer kişilerden korur. Doğru şifre girilene kadar şifrelenmiş sunucular görüntülenemez veya erişilemez.",
    "fileSavedTo": "Şuraya kaydedildi",
@ -341,6 +310,7 @@
    "importLocalServerLabel": "Yerel bir sunucuyu içeri aktar",
    "importLocalServerSelectText": "Yerel Sunucu Seç",
    "importLocalServerButton": "%1'i içeri aktar",
+    "groupsOnThisServerLabel": "Bu sunucuda içinde bulunduğum gruplar",
    "fieldDescriptionLabel": "Açıklama",
    "manageKnownServersButton": "Bilinen Sunucuları Yönet",
    "displayNameTooltip": "Lütfen bir ad girin",
--- a/lib/l10n/intl_uk.arb
+++ b/lib/l10n/intl_uk.arb
@ -1,38 +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",
-    "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": "Really Delete Server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Known Groups on this Cwtch Server",
-    "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",
+    "@@last_modified": "2023-06-04T17:50:20+02:00",
    "localeUk": "Ukrainian \/ українською",
    "localeSw": "Swahili \/ Kiswahili",
    "localeSv": "Swedish \/ Svenska",
@ -178,6 +146,7 @@
    "displayNameTooltip": "Please enter a display name",
    "manageKnownServersButton": "Manage Known Servers",
    "fieldDescriptionLabel": "Description",
+    "groupsOnThisServerLabel": "Groups I am in hosted on this server",
    "importLocalServerButton": "Import %1",
    "importLocalServerSelectText": "Select Local Server",
    "importLocalServerLabel": "Import a locally hosted server",
@ -190,6 +159,7 @@
    "fileSavedTo": "Saved to",
    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
+    "deleteServerConfirmBtn": "Really delete server",
    "deleteServerSuccess": "Successfully deleted server",
    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
    "copyAddress": "Copy Address",
--- a/lib/l10n/intl_uz.arb
+++ b/lib/l10n/intl_uz.arb
@ -1,421 +0,0 @@
-{
-    "@@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",
-    "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": "Really Delete Server?",
-    "cannotDeleteServerIfActiveGroups": "There are active groups associated with this Cwtch Server. Please delete them prior to deleting this Cwtch Server entry.",
-    "groupsOnThisServerLabel": "Known Groups on this Cwtch Server",
-    "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",
-    "manageSharedFiles": "Ulashilgan fayllarni boshqarish",
-    "stopSharingFile": "Fayl ulashishni to'xtatish",
-    "restartFileShare": "Fayl ulashishni boshlash",
-    "viewReplies": "Ushbu xabarga berilgan javoblarni ko'rish",
-    "headingReplies": "Javoblar",
-    "messageNoReplies": "Bu xabarga hech qanday javob yo‘q.",
-    "replyingTo": "%1 ga javob yozish",
-    "tooltipUnpinConversation": "Suhbatni \"Suhbatlar menyu\"sining yuqorisidan olish tashlash",
-    "tooltipPinConversation": "Suhbatni \"Suhbatlar menyu\"sining yuqorisiga joylashtirish",
-    "errorDownloadDirectoryDoesNotExist": "Fayl ulashish amalga oshirilmadi, chunki Yuklash katalogi belgilanmagan yoki mavjud emas katalog kiritilgan.",
-    "localeTr": "Turk tili",
-    "acquiredTicketsFromServer": "Antispam Tekshiruvi yakunlandi",
-    "acquiringTicketsFromServer": "Antispam Tekshiruvi amalga oshirilmoqda",
-    "shareProfileMenuTooltop": "Profilni ulashish...",
-    "shareMenuQRCode": "QR kodni ko'rsatish",
-    "enableExperimentQRCode": "QR kodlar",
-    "experimentQRCodeDescription": "QR kod ma'lumot bo'lishishga yordam beradi (masalan profil)",
-    "localeNl": "Golland tili",
-    "localePtBr": "Brazil Portugal tili",
-    "profileAutostartLabel": "Avtostart",
-    "profileEnabled": "Yoqish",
-    "profileEnabledDescription": "Profilni faollashtirish yoki o'chirish.",
-    "localeSk": "Slovak tili",
-    "localeKo": "Koreys tili",
-    "blodeuweddNotSupported": "Cwtchning ushbu versiyasi Blodeuwedd Assistentini qo'llab quvvatlamaydi.",
-    "blodeuweddPath": "Blodeuweddning kompyuteringizda joylashgan katalogi",
-    "blodeuweddSummarize": "Suhbatni umumlashtirish",
-    "blodeuweddTranslate": "Xabarni tarjima qilish",
-    "blodeuweddProcessing": "Blodeuwedd ma'lumotlarni tahlil qilmoqda...",
-    "availabilityStatusAvailable": "Mavjud",
-    "availabilityStatusAway": "Mavjud emas",
-    "availabilityStatusBusy": "Band",
-    "availabilityStatusTooltip": "Tarmoqdagi holatingizni belgilang",
-    "profileInfoHint": "Bu yerga oʻzingiz haqingizda maʼlumotlarni qoʻshing (masalan, blog, veb-saytlar, qisqacha bio)",
-    "profileInfoHint2": "3 tagacha maydon qo'shishingiz mumkin.",
-    "profileInfoHint3": "Kontaktlar ushbu ma'lumotni Suhbat sozlamari menyusida ko'rishlari mumkin bo'ladi",
-    "retryConnection": "Qayta urinish",
-    "retryConnectionTooltip": "Cwtch sheriklarni doimiy ravishda tekshirib turadi, lekin ushbu tugmani bosish orqali hoziroq rangilashingiz mumkin.",
-    "localeJa": "Yapon tili",
-    "fontScalingDescription": "Matn va vidjetlarga nisbatan qo‘llaniladigan shrift masshtablash faktorini sozlang",
-    "localeSv": "Shved tili",
-    "localeSw": "Suahili tili",
-    "loadingCwtch": "Cwtch yuklanmoqda...",
-    "btnSendFile": "Faylni yuborish",
-    "localeUk": "Ukrain tili",
-    "blodeuweddWarning": "Blodeuwedd uses a local language model and a set of small auxiliary models to power its functionality. These techniques are often very effective they are not without error. \n\nWhile we have taken efforts to minimize the risk, there is still the possibility that Blodeuwedd outputs will be incorrect, hallucinated and\/or offensive.\n\nBecause of that Blodeuwedd requires downloading two additional components separate from Cwtch, the Blodeuwedd Model (or a compatible model) and the Blodeuwedd Runner. \n\nSee https:\/\/docs.cwtch.im\/docs\/settings\/experiments\/blodeuwedd for more information on obtaining these components and setting them up.",
-    "blodeuweddDescription": "The Blodeuwedd assistant adds new features to Cwtch such as chat transcript summarization and message translation via a locally hosted language model.",
-    "blodeuweddExperimentEnable": "Blodeuwedd Assistant",
-    "profileAutostartDescription": "Controls if the profile will be automatically launched on startup",
-    "fileDownloadUnavailable": "This file appears unavailable for download. The sender may have disabled downloads for this file.",
-    "tooltipPreviewFormatting": "Preview Message Formatting",
-    "tooltipCode": "Code \/ Monospace",
-    "tooltipStrikethrough": "Strikethrough",
-    "tooltipSubscript": "Subscript",
-    "tooltipSuperscript": "Superscript",
-    "tooltipItalicize": "Italic",
-    "tooltipBackToMessageEditing": "Back to Message Editing",
-    "tooltipBoldText": "Bold",
-    "okButton": "OK",
-    "settingsAndroidPowerReenablePopup": "Cannot re-enable Battery Optimization from within Cwtch. Please go to Android \/ Settings \/ Apps \/ Cwtch \/ Battery and set Usage to 'Optimized'",
-    "settingAndroidPowerExemptionDescription": "Optional: Request Android to exempt Cwtch from optimized power management. This will result in better stability at the cost of greater battery use.",
-    "settingAndroidPowerExemption": "Android Ignore Battery Optimizations",
-    "thisFeatureRequiresGroupExpermientsToBeEnabled": "This feature requires the Groups Experiment to be enabled in Settings",
-    "messageFormattingDescription": "Enable rich text formatting in displayed messages e.g. **bold** and *italic*",
-    "formattingExperiment": "Message Formatting",
-    "clickableLinkError": "Error encountered while attempting to open URL",
-    "clickableLinksCopy": "Copy URL",
-    "clickableLinkOpen": "Open URL",
-    "clickableLinksWarning": "Opening this URL will launch an application outside of Cwtch and may reveal metadata or otherwise compromise the security of Cwtch. Only open URLs from people you trust. Are you sure you want to continue?",
-    "shuttingDownApp": "Shutting down...",
-    "successfullyImportedProfile": "Successfully Imported Profile: %profile",
-    "failedToImportProfile": "Error Importing Profile",
-    "importProfileTooltip": "Use an encrypted Cwtch backup to bring in a profile created in another instance of Cwtch.",
-    "importProfile": "Import Profile",
-    "exportProfileTooltip": "Backup this profile to an encrypted file. The encrypted file can be imported into another Cwtch app.",
-    "exportProfile": "Export Profile",
-    "localeDa": "Danish \/ Dansk",
-    "localeCy": "Welsh \/ Cymraeg",
-    "localeEl": "Greek \/ Ελληνικά",
-    "localeNo": "Norwegian \/ Norsk",
-    "localeLb": "Luxembourgish \/ Lëtzebuergesch",
-    "localeRo": "Romanian \/ Română",
-    "newMessageNotificationConversationInfo": "New Message From %1",
-    "newMessageNotificationSimple": "New Message",
-    "notificationContentContactInfo": "Conversation Information",
-    "notificationContentSimpleEvent": "Plain Event",
-    "conversationNotificationPolicySettingDescription": "Control notification behaviour for this conversation",
-    "conversationNotificationPolicySettingLabel": "Conversation Notification Policy",
-    "settingsGroupExperiments": "Experiments",
-    "settingsGroupAppearance": "Appearance",
-    "settingGroupBehaviour": "Behaviour",
-    "notificationContentSettingDescription": "Controls the contents of conversation notifications",
-    "notificationPolicySettingDescription": "Controls the default application notification behaviour",
-    "notificationContentSettingLabel": "Notification Content",
-    "notificationPolicySettingLabel": "Notification Policy",
-    "conversationNotificationPolicyNever": "Never",
-    "conversationNotificationPolicyOptIn": "Opt In",
-    "conversationNotificationPolicyDefault": "Default",
-    "notificationPolicyDefaultAll": "Default All",
-    "notificationPolicyOptIn": "Opt In",
-    "notificationPolicyMute": "Mute",
-    "tooltipSelectACustomProfileImage": "Select a Custom Profile Image",
-    "torSettingsEnabledCacheDescription": "Cache the current downloaded Tor consensus to reuse next time Cwtch is opened. This will allow Tor to start faster. When disabled, Cwtch will purge cached data on start up.",
-    "torSettingsEnableCache": "Cache Tor Consensus",
-    "labelTorNetwork": "Tor Network",
-    "descriptionACNCircuitInfo": "In depth information about the path that the anonymous communication network is using to connect to this conversation.",
-    "labelACNCircuitInfo": "ACN Circuit Info",
-    "fileSharingSettingsDownloadFolderTooltip": "Browse to select a different default folder for downloaded files.",
-    "fileSharingSettingsDownloadFolderDescription": "When files are downloaded automatically (e.g. image files, when image previews are enabled) a default location to download the files to is needed.",
-    "torSettingsErrorSettingPort": "Port Number must be between 1 and 65535",
-    "torSettingsUseCustomTorServiceConfigurastionDescription": "Override the default tor configuration. Warning: This could be dangerous. Only turn this on if you know what you are doing.",
-    "torSettingsUseCustomTorServiceConfiguration": "Use a Custom Tor Service Configuration (torrc)",
-    "torSettingsCustomControlPortDescription": "Use a custom port for control connections to the Tor proxy",
-    "torSettingsCustomControlPort": "Custom Control Port",
-    "torSettingsCustomSocksPortDescription": "Use a custom port for data connections to the Tor proxy",
-    "torSettingsCustomSocksPort": "Custom SOCKS Port",
-    "torSettingsEnabledAdvancedDescription": "Use an existing Tor service on your system, or change the parameters of the Cwtch Tor Service",
-    "torSettingsEnabledAdvanced": "Enable Advanced Tor Configuration",
-    "msgAddToAccept": "Add this account to your contacts in order to accept this file.",
-    "msgConfirmSend": "Are you sure you want to send",
-    "msgFileTooBig": "File size cannot exceed 10 GB",
-    "storageMigrationModalMessage": "Migrating profiles to new storage format. This could take a few minutes...",
-    "themeColorLabel": "Color Theme",
-    "themeNameNeon2": "Neon2",
-    "themeNameNeon1": "Neon1",
-    "themeNameMidnight": "Midnight",
-    "themeNameMermaid": "Mermaid",
-    "themeNamePumpkin": "Pumpkin",
-    "themeNameGhost": "Ghost",
-    "themeNameVampire": "Vampire",
-    "themeNameWitch": "Witch",
-    "themeNameCwtch": "Cwtch",
-    "settingDownloadFolder": "Download Folder",
-    "settingImagePreviewsDescription": "Images and Profile Pictures will be downloaded and previewed automatically. We recommend that you do not enable this Experiment if you use Cwtch with untrusted contacts.",
-    "settingImagePreviews": "Image Previews and Profile Pictures",
-    "experimentClickableLinksDescription": "The clickable links experiment allows you to click on URLs shared in messages",
-    "enableExperimentClickableLinks": "Enable Clickable Links",
-    "serverConnectionsLabel": "Connection",
-    "serverTotalMessagesLabel": "Total Messages",
-    "serverMetricsLabel": "Server Metrics",
-    "manageKnownServersShort": "Servers",
-    "manageKnownServersLong": "Manage Known Servers",
-    "displayNameTooltip": "Please enter a display name",
-    "manageKnownServersButton": "Manage Known Servers",
-    "fieldDescriptionLabel": "Description",
-    "importLocalServerButton": "Import %1",
-    "importLocalServerSelectText": "Select Local Server",
-    "importLocalServerLabel": "Import a locally hosted server",
-    "newMessagesLabel": "New Messages",
-    "localeRU": "Russian \/ Русский",
-    "copyServerKeys": "Copy keys",
-    "verfiyResumeButton": "Verify\/resume",
-    "fileCheckingStatus": "Checking download status",
-    "fileInterrupted": "Interrupted",
-    "fileSavedTo": "Saved to",
-    "encryptedServerDescription": "Encrypting a server with a password protects it from other people who may also use this device. Encrypted servers cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
-    "plainServerDescription": "We recommend that you protect your Cwtch servers with a password. If you do not set a password on this server then anyone who has access to this device may be able to access information about this server, including sensitive cryptographic keys.",
-    "deleteServerSuccess": "Successfully deleted server",
-    "enterCurrentPasswordForDeleteServer": "Please enter current password to delete this server",
-    "copyAddress": "Copy Address",
-    "settingServersDescription": "The hosting servers experiment enables hosting and managing Cwtch servers",
-    "settingServers": "Hosting Servers",
-    "enterServerPassword": "Enter password to unlock server",
-    "unlockProfileTip": "Please create or unlock a profile to begin!",
-    "unlockServerTip": "Please create or unlock a server to begin!",
-    "addServerTooltip": "Add new server",
-    "serversManagerTitleShort": "Servers",
-    "serversManagerTitleLong": "Servers You Host",
-    "saveServerButton": "Save Server",
-    "serverAutostartDescription": "Controls if the application will automatically launch the server on start",
-    "serverAutostartLabel": "Autostart",
-    "serverEnabledDescription": "Start or stop the server",
-    "serverEnabled": "Server Enabled",
-    "serverDescriptionDescription": "Your description of the server for personal management use only, will never be shared",
-    "serverDescriptionLabel": "Server Description",
-    "serverAddress": "Server Address",
-    "editServerTitle": "Edit Server",
-    "addServerTitle": "Add Server",
-    "titleManageProfilesShort": "Profiles",
-    "descriptionFileSharing": "The file sharing experiment allows you to send and receive files from Cwtch contacts and groups. Note that sharing a file with a group will result in members of that group connecting with you directly over Cwtch to download it.",
-    "settingFileSharing": "File Sharing",
-    "tooltipSendFile": "Send File",
-    "messageFileOffered": "Contact is offering to send you a file",
-    "messageFileSent": "You sent a file",
-    "messageEnableFileSharing": "Enable the file sharing experiment to view this message.",
-    "labelFilesize": "Size",
-    "labelFilename": "Filename",
-    "downloadFileButton": "Download",
-    "openFolderButton": "Open Folder",
-    "retrievingManifestMessage": "Retrieving file information...",
-    "descriptionStreamerMode": "If turned on, this option makes the app more visually private for streaming or presenting with, for example, hiding profile and contact addresses",
-    "streamerModeLabel": "Streamer\/Presentation Mode",
-    "archiveConversation": "Archive this Conversation",
-    "blockUnknownConnectionsEnabledDescription": "Connections from unknown contacts are blocked. You can change this in Settings",
-    "showMessageButton": "Show Message",
-    "blockedMessageMessage": "This message is from a profile you have blocked.",
-    "placeholderEnterMessage": "Type a message...",
-    "plainProfileDescription": "We recommend that you protect your Cwtch profiles with a password. If you do not set a password on this profile then anyone who has access to this device may be able to access information about this profile, including contacts, messages and sensitive cryptographic keys.",
-    "encryptedProfileDescription": "Encrypting a profile with a password protects it from other people who may also use this device. Encrypted profiles cannot be decrypted, displayed or accessed until the correct password is entered to unlock them.",
-    "addContactConfirm": "Add contact %1",
-    "addContact": "Add contact",
-    "contactGoto": "Go to conversation with %1",
-    "settingUIColumnOptionSame": "Same as portrait mode setting",
-    "settingUIColumnDouble14Ratio": "Double (1:4)",
-    "settingUIColumnDouble12Ratio": "Double (1:2)",
-    "settingUIColumnSingle": "Single",
-    "settingUIColumnLandscape": "UI Columns in Landscape Mode",
-    "settingUIColumnPortrait": "UI Columns in Portrait Mode",
-    "localePl": "Polish \/ Polski",
-    "tooltipRemoveThisQuotedMessage": "Remove quoted message.",
-    "tooltipReplyToThisMessage": "Reply to this message",
-    "tooltipRejectContactRequest": "Reject this contact request",
-    "tooltipAcceptContactRequest": "Accept this contact request.",
-    "notificationNewMessageFromGroup": "New message in a group!",
-    "notificationNewMessageFromPeer": "New message from a contact!",
-    "tooltipHidePassword": "Hide Password",
-    "tooltipShowPassword": "Show Password",
-    "groupInviteSettingsWarning": "You have been invited to join a group! Please enable the Group Chat Experiment in Settings to view this Invitation.",
-    "shutdownCwtchAction": "Shutdown Cwtch",
-    "shutdownCwtchDialog": "Are you sure you want to shutdown Cwtch? This will close all connections, and exit the application.",
-    "shutdownCwtchDialogTitle": "Shutdown Cwtch?",
-    "shutdownCwtchTooltip": "Shutdown Cwtch",
-    "malformedMessage": "Malformed message",
-    "profileDeleteSuccess": "Successfully deleted profile",
-    "debugLog": "Turn on console debug logging",
-    "torNetworkStatus": "Tor network status",
-    "addContactFirst": "Add or pick a contact to begin chatting.",
-    "createProfileToBegin": "Please create or unlock a profile to begin",
-    "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",
-    "sendMessage": "Send Message",
-    "cancel": "Cancel",
-    "resetTor": "Reset",
-    "torStatus": "Tor Status",
-    "torVersion": "Tor Version",
-    "sendAnInvitation": "You sent an invitation for: ",
-    "contactSuggestion": "This is a contact suggestion for: ",
-    "rejected": "Rejected!",
-    "accepted": "Accepted!",
-    "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.",
-    "newPassword": "New Password",
-    "yesLeave": "Yes, Leave This Conversation",
-    "reallyLeaveThisGroupPrompt": "Are you sure you want to leave this conversation? All messages and attributes will be deleted.",
-    "leaveConversation": "Leave This Conversation",
-    "inviteToGroup": "You have been invited to join a group:",
-    "titleManageServers": "Manage Servers",
-    "successfullAddedContact": "Successfully added ",
-    "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.",
-    "titleManageProfiles": "Manage Cwtch Profiles",
-    "tooltipUnlockProfiles": "Unlock encrypted profiles by entering their password.",
-    "titleManageContacts": "Conversations",
-    "tooltipAddContact": "Add a new contact or conversation",
-    "tooltipOpenSettings": "Open the settings pane",
-    "contactAlreadyExists": "Contact Already Exists",
-    "invalidImportString": "Invalid import string",
-    "conversationSettings": "Conversation Settings",
-    "enterCurrentPasswordForDelete": "Please enter current password to delete this profile.",
-    "enableGroups": "Enable Group Chat",
-    "localeIt": "Italian \/ Italiano",
-    "localeEs": "Spanish \/ Español",
-    "todoPlaceholder": "Todo...",
-    "addNewItem": "Add a new item to the list",
-    "addListItem": "Add a New List Item",
-    "newConnectionPaneTitle": "New Connection",
-    "networkStatusOnline": "Online",
-    "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...",
-    "smallTextLabel": "Small",
-    "defaultScalingText": "Font Scaling",
-    "builddate": "Built on: %2",
-    "version": "Version %1",
-    "versionTor": "Version %1 with tor %2",
-    "experimentsEnabled": "Enable Experiments",
-    "themeDark": "Dark",
-    "themeLight": "Light",
-    "settingTheme": "Use Light Themes",
-    "largeTextLabel": "Large",
-    "settingInterfaceZoom": "Zoom level",
-    "localeDe": "German \/ Deutsch",
-    "localePt": "Portuguese \/ Portuguesa",
-    "localeFr": "French \/ Français",
-    "localeEn": "English \/ English",
-    "settingLanguage": "Language",
-    "blockUnknownLabel": "Block Unknown Contacts",
-    "zoomLabel": "Interface zoom (mostly affects text and button sizes)",
-    "versionBuilddate": "Version: %1 Built on: %2",
-    "cwtchSettingsTitle": "Cwtch Settings",
-    "unlock": "Unlock",
-    "yourServers": "Your Servers",
-    "yourProfiles": "Your Profiles",
-    "error0ProfilesLoadedForPassword": "0 profiles loaded with that password",
-    "password": "Password",
-    "enterProfilePassword": "Enter a password to view your profiles",
-    "addNewProfileBtn": "Add new profile",
-    "deleteConfirmText": "DELETE",
-    "deleteProfileConfirmBtn": "Really Delete Profile",
-    "deleteConfirmLabel": "Type DELETE to confirm",
-    "deleteProfileBtn": "Delete Profile",
-    "passwordChangeError": "Error changing password: Supplied password rejected",
-    "passwordErrorMatch": "Passwords do not match",
-    "saveProfileBtn": "Save Profile",
-    "createProfileBtn": "Create Profile",
-    "passwordErrorEmpty": "Password cannot be empty",
-    "password2Label": "Reenter password",
-    "password1Label": "Password",
-    "currentPasswordLabel": "Current Password",
-    "yourDisplayName": "Your Display Name",
-    "profileOnionLabel": "Send this address to contacts you want to connect with",
-    "noPasswordWarning": "Not using a password on this account means that all data stored locally will not be encrypted",
-    "radioNoPassword": "Unencrypted (No password)",
-    "radioUsePassword": "Password",
-    "editProfile": "Edit Profile",
-    "newProfile": "New Profile",
-    "defaultProfileName": "Alice",
-    "profileName": "Display name",
-    "editProfileTitle": "Edit Profile",
-    "addProfileTitle": "Add new profile",
-    "deleteBtn": "Delete",
-    "unblockBtn": "Unblock Contact",
-    "dontSavePeerHistory": "Delete History",
-    "savePeerHistoryDescription": "Determines whether to delete any history associated with the contact.",
-    "savePeerHistory": "Save History",
-    "blockBtn": "Block Contact",
-    "saveBtn": "Save",
-    "displayNameLabel": "Display Name",
-    "copiedToClipboardNotification": "Copied to Clipboard",
-    "addressLabel": "Address",
-    "puzzleGameBtn": "Puzzle Game",
-    "bulletinsBtn": "Bulletins",
-    "listsBtn": "Lists",
-    "chatBtn": "Chat",
-    "rejectGroupBtn": "Reject",
-    "acceptGroupBtn": "Accept",
-    "acceptGroupInviteLabel": "Do you want to accept the invitation to",
-    "newGroupBtn": "Create new group",
-    "copyBtn": "Copy",
-    "peerOfflineMessage": "Contact is offline, messages can't be delivered right now",
-    "peerBlockedMessage": "Contact is blocked",
-    "pendingLabel": "Pending",
-    "acknowledgedLabel": "Acknowledged",
-    "couldNotSendMsgError": "Could not send this message",
-    "dmTooltip": "Click to DM",
-    "membershipDescription": "Below is a list of users who have sent messages to the group. This list may not reflect all users who have access to the group.",
-    "addListItemBtn": "Add Item",
-    "peerNotOnline": "Contact is offline. Applications cannot be used right now.",
-    "searchList": "Search List",
-    "update": "Update",
-    "inviteBtn": "Invite",
-    "inviteToGroupLabel": "Invite to group",
-    "groupNameLabel": "Group Name",
-    "viewServerInfo": "Server Info",
-    "serverNotSynced": "Syncing New Messages (This can take some time)...",
-    "serverSynced": "Synced",
-    "serverConnectivityDisconnected": "Server Disconnected",
-    "serverConnectivityConnected": "Server Connected",
-    "serverInfo": "Server Information",
-    "invitationLabel": "Invitation",
-    "serverLabel": "Server",
-    "search": "Search...",
-    "blocked": "Blocked",
-    "pasteAddressToAddContact": "Paste a cwtch address, invitation or key bundle here to add a new conversation",
-    "titlePlaceholder": "title...",
-    "postNewBulletinLabel": "Post new bulletin",
-    "newBulletinLabel": "New Bulletin",
-    "joinGroup": "Join group",
-    "createGroup": "Create group",
-    "addPeer": "Add Contact",
-    "groupAddr": "Address",
-    "invitation": "Invitation",
-    "server": "Server",
-    "peerName": "Name",
-    "peerAddress": "Address",
-    "joinGroupTab": "Join a group",
-    "createGroupTab": "Create a group",
-    "addPeerTab": "Add a contact",
-    "createGroupBtn": "Create",
-    "defaultGroupName": "Awesome Group",
-    "createGroupTitle": "Create Group"
-}
--- a/lib/licenses.dart
+++ b/lib/licenses.dart
@ -4,7 +4,7 @@ Stream<LicenseEntry> licenses() async* {
  /// Open Privacy Code
  yield LicenseEntryWithLineBreaks(["cwtch", "tapir", "connectivity", "log"], '''MIT License
  
-   Copyright (c) 2018-2023 Open Privacy Research Society
+   Copyright (c) 2018 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:
  
@ -645,102 +645,7 @@ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
 OTHER DEALINGS IN THE FONT SOFTWARE.

  ''');
-  yield LicenseEntryWithLineBreaks(["Noto Color Emoji Fonts"], '''
-  Copyright 2021 Google Inc. All Rights Reserved.

-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
-----------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-
-  ''');
  yield LicenseEntryWithLineBreaks(["Roboto fonts"], '''
  
                                 Apache License
--- a/lib/main.dart
+++ b/lib/main.dart
@ -2,6 +2,7 @@ import 'dart:async';
 import 'dart:convert';
 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 +32,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 +79,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,21 +106,10 @@ class FlwtchState extends State<Flwtch> with WindowListener {
          new CwtchNotifier(profs, globalSettings, globalErrorHandler, globalTorStatus, newDesktopNotificationsManager(_notificationSelectConvo), globalAppState, globalServersList, this);
      cwtch = CwtchFfi(cwtchNotifier);
    }
-    // 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);
-        });
-      });
-    });
+    print("initState: invoking cwtch.Start()");
+    cwtch.Start();
    print("initState: starting connectivityListener");
-    if (EnvironmentConfig.TEST_MODE == false) {
-      startConnectivityListener();
-    } else {
-      connectivityStream = null;
-    }
+    startConnectivityListener();
    print("initState: done!");
    super.initState();
  }
@ -127,7 +119,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 +152,6 @@ class FlwtchState extends State<Flwtch> with WindowListener {
  @override
  Widget build(BuildContext context) {
    globalSettings.initPackageInfo();
-
    return MultiProvider(
      providers: [
        getFlwtchStateProvider(),
@ -189,7 +180,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) ? SplashView() : ProfileMgrView(),
          ),
        );
      },
@ -252,6 +243,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/appstate.dart
+++ b/lib/models/appstate.dart
@ -1,7 +1,6 @@
 import 'dart:async';

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

 enum ModalState { none, storageMigration, shutdown }
@ -18,8 +17,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 +32,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 +85,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,7 +1,8 @@
+import 'dart:ffi';
+
 import 'package:cwtch/main.dart';
 import 'package:cwtch/models/message_draft.dart';
 import 'package:cwtch/models/profile.dart';
-import 'package:cwtch/models/redaction.dart';
 import 'package:cwtch/themes/opaque.dart';
 import 'package:cwtch/views/contactsview.dart';
 import 'package:cwtch/widgets/messagerow.dart';
@ -11,6 +12,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 {
@ -49,8 +51,7 @@ class ContactInfoState extends ChangeNotifier {
  late String _savePeerHistory;
  late int _unreadMessages = 0;
  late int _totalMessages = 0;
-  late DateTime _lastMessageReceivedTime; // last time we received a message, for sorting
-  late DateTime _lastMessageSentTime; // last time a message reported being sent, for display
+  late DateTime _lastMessageTime;
  late Map<String, GlobalKey<MessageRowState>> keys;
  int _newMarkerMsgIndex = -1;
  late MessageCache messageCache;
@ -69,11 +70,6 @@ class ContactInfoState extends ChangeNotifier {
  var _hoveredIndex = -1;
  var _pendingScroll = -1;

-  DateTime _lastRetryTime = DateTime.now();
-  DateTime loaded = DateTime.now();
-
-  List<ContactEvent> contactEvents = List.empty(growable: true);
-
  ContactInfoState(
    this.profileOnion,
    this.identifier,
@ -106,8 +102,7 @@ class ContactInfoState extends ChangeNotifier {
    this._totalMessages = numMessages;
    this._unreadMessages = numUnread;
    this._savePeerHistory = savePeerHistory;
-    this._lastMessageReceivedTime = lastMessageTime == null ? DateTime.fromMillisecondsSinceEpoch(0) : lastMessageTime;
-    this._lastMessageSentTime = _lastMessageReceivedTime;
+    this._lastMessageTime = lastMessageTime == null ? DateTime.fromMillisecondsSinceEpoch(0) : lastMessageTime;
    this._server = server;
    this._archived = archived;
    this._notificationPolicy = notificationPolicyFromString(notificationPolicy);
@ -129,12 +124,6 @@ class ContactInfoState extends ChangeNotifier {

  MessageDraft get messageDraft => this._messageDraft;

-  DateTime get lastRetryTime => this._lastRetryTime;
-  set lastRetryTime(DateTime lastRetryTime) {
-    this._lastRetryTime = lastRetryTime;
-    notifyListeners();
-  }
-
  set antispamTickets(int antispamTickets) {
    this._antispamTickets = antispamTickets;
    notifyListeners();
@ -197,7 +186,6 @@ class ContactInfoState extends ChangeNotifier {

  set status(String newVal) {
    this._status = newVal;
-    this.contactEvents.add(ContactEvent("Update Peer Status Received: $newVal"));
    notifyListeners();
  }

@ -258,21 +246,10 @@ class ContactInfoState extends ChangeNotifier {
    notifyListeners();
  }

-  // This is last message received time (local) and to be used for sorting only
-  // for instance, group sync, we want to pop to the top, so we set to time.Now() for new messages
-  // but it should not be used for display
-  DateTime get lastMessageReceivedTime => this._lastMessageReceivedTime;
+  DateTime get lastMessageTime => this._lastMessageTime;

-  set lastMessageReceivedTime(DateTime newVal) {
-    this._lastMessageReceivedTime = newVal;
-    notifyListeners();
-  }
-
-  // This is last message sent time and is based on message reports of sent times
-  // this can be used to display in the contact list a last time a message was received
-  DateTime get lastMessageSentTime => this._lastMessageSentTime;
-  set lastMessageSentTime(DateTime newVal) {
-    this._lastMessageSentTime = newVal;
+  set lastMessageTime(DateTime newVal) {
+    this._lastMessageTime = newVal;
    notifyListeners();
  }

@ -335,8 +312,7 @@ class ContactInfoState extends ChangeNotifier {
      _newMarkerMsgIndex++;
    }

-    this._lastMessageReceivedTime = timestamp;
-    this._lastMessageSentTime = timestamp;
+    this._lastMessageTime = timestamp;
    this.messageCache.addNew(profileOnion, identifier, messageID, timestamp, senderHandle, senderImage, isAuto, data, contenthash);
    this.totalMessages += 1;

@ -446,17 +422,13 @@ class ContactInfoState extends ChangeNotifier {
          return theme.portraitOnlineAwayColor;
        case ProfileStatusMenu.busy:
          return theme.portraitOnlineBusyColor;
-        default:
-          // noop not a valid status...
-          break;
      }
    }
    return theme.portraitOfflineBorderColor;
  }

  String augmentedNickname(BuildContext context) {
-    var nick = redactedNick(context, this.onion, this.nickname);
-    return nick + (this.availabilityStatus == ProfileStatusMenu.available ? "" : " (" + this.statusString(context) + ")");
+    return this.nickname + (this.availabilityStatus == ProfileStatusMenu.available ? "" : " (" + this.statusString(context) + ")");
  }

  // Never use this for message lookup - can be a non-indexed value
@ -481,16 +453,6 @@ class ContactInfoState extends ChangeNotifier {
        return AppLocalizations.of(context)!.availabilityStatusAway;
      case ProfileStatusMenu.busy:
        return AppLocalizations.of(context)!.availabilityStatusBusy;
-      default:
-        throw UnimplementedError("not a valid status");
    }
  }
 }
-
-class ContactEvent {
-  String summary;
-  late DateTime timestamp;
-  ContactEvent(this.summary) {
-    this.timestamp = DateTime.now();
-  }
-}
--- a/lib/models/contactlist.dart
+++ b/lib/models/contactlist.dart
@ -1,4 +1,3 @@
-import 'package:cwtch/config.dart';
 import 'package:flutter/widgets.dart';

 import 'contact.dart';
@ -41,21 +40,6 @@ class ContactListState extends ChangeNotifier {
  void add(ContactInfoState newContact) {
    _contacts.add(newContact);
    if (newContact.isGroup) {
-      // Copy the current known antispam value for the server
-      // to the new contact. This lets us send messages straight away without
-      // waiting for another update (or restarting the peer)...
-      // Note for NEW servers we expect TokenServerInfo events to arrive after adding the group
-      // this flow is only for existing servers...
-      // FIXME: in Cwtch 1.14
-      // NOTE: This is a bit hacky. Ideally this information would be stored per
-      // Server not per Group, and creating a group would also trigger sharing
-      // this information...on the backend all the accounting is done correctly.
-      var otherGroups = servers?.getServer(newContact.server ?? "")?.groups;
-      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;
-      }
      servers?.addGroup(newContact);
    }
    resort();
@ -82,7 +66,7 @@ class ContactListState extends ChangeNotifier {
      if (!a.isInvitation && b.isInvitation) return 1;

      // special sorting for contacts with no messages in either history
-      if (a.lastMessageReceivedTime.millisecondsSinceEpoch == 0 && b.lastMessageReceivedTime.millisecondsSinceEpoch == 0) {
+      if (a.lastMessageTime.millisecondsSinceEpoch == 0 && b.lastMessageTime.millisecondsSinceEpoch == 0) {
        // online contacts first
        if (a.isOnline() && !b.isOnline()) return -1;
        if (!a.isOnline() && b.isOnline()) return 1;
@ -90,27 +74,27 @@ class ContactListState extends ChangeNotifier {
        return a.onion.toString().compareTo(b.onion.toString());
      }
      // finally... most recent history first
-      if (a.lastMessageReceivedTime.millisecondsSinceEpoch == 0) return 1;
-      if (b.lastMessageReceivedTime.millisecondsSinceEpoch == 0) return -1;
-      return b.lastMessageReceivedTime.compareTo(a.lastMessageReceivedTime);
+      if (a.lastMessageTime.millisecondsSinceEpoch == 0) return 1;
+      if (b.lastMessageTime.millisecondsSinceEpoch == 0) return -1;
+      return b.lastMessageTime.compareTo(a.lastMessageTime);
    });
    //<todo> if(changed) {
    notifyListeners();
    //} </todo>
  }

-  void updateLastMessageReceivedTime(int forIdentifier, DateTime newMessageTime) {
+  void updateLastMessageTime(int forIdentifier, DateTime newMessageTime) {
    var contact = getContact(forIdentifier);
    if (contact == null) return;

    // Assert that the new time is after the current last message time AND that
    // new message time is before the current time.
-    if (newMessageTime.isAfter(contact.lastMessageReceivedTime)) {
+    if (newMessageTime.isAfter(contact.lastMessageTime)) {
      if (newMessageTime.isBefore(DateTime.now().toLocal())) {
-        contact.lastMessageReceivedTime = newMessageTime;
+        contact.lastMessageTime = newMessageTime;
      } else {
        // Otherwise set the last message time to now...
-        contact.lastMessageReceivedTime = DateTime.now().toLocal();
+        contact.lastMessageTime = DateTime.now().toLocal();
      }
      resort();
    }
@ -144,7 +128,7 @@ class ContactListState extends ChangeNotifier {

  void newMessage(int identifier, int messageID, DateTime timestamp, String senderHandle, String senderImage, bool isAuto, String data, String contenthash, bool selectedConversation) {
    getContact(identifier)?.newMessage(identifier, messageID, timestamp, senderHandle, senderImage, isAuto, data, contenthash, selectedConversation);
-    updateLastMessageReceivedTime(identifier, DateTime.now());
+    updateLastMessageTime(identifier, DateTime.now());
  }

  int cacheMemUsage() {
--- a/Show More
+++ b/Show More