Add drone.yml to build images.

2023-01-16 11:10:50 -08:00
197 changed files with 85469 additions and 69839 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -0,0 +1,15 @@
+---
+# Drone file for Co-op Cloud image building, see https://git.coopcloud.tech/coop-cloud-chaos-patchs/fluffychat
+kind: pipeline
+name: publish docker image
+steps:
+  - name: build and publish
+    image: plugins/docker
+    settings:
+      auto_tag: true
+      username: 3wordchant
+      password:
+        from_secret: git_coopcloud_tech_token_3wc
+      repo: git.coopcloud.tech/coop-cloud-chaos-patchs/fluffychat
+      tags: latest
+      registry: git.coopcloud.tech
--- a/.gitignore
+++ b/.gitignore
@ -10,6 +10,7 @@
 .buildlog/
 .history
 .svn/
+lib/generated_plugin_registrant.dart
 prime

 # libolm package
@ -37,6 +38,7 @@ prime
 /build/

 # Web related
+lib/generated_plugin_registrant.dart
 docs/build/
 docs/.jekyll-cache/
 docs/_site/
@ -60,4 +62,3 @@ ios/Podfile.lock
 /linux/out
 /macos/out
 .vs
-olm
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,9 +1,7 @@
 variables:
-  FLUTTER_VERSION: 3.3.9
+  FLUTTER_VERSION: 3.3.8

-image:
-  name: cirrusci/flutter:${FLUTTER_VERSION}
-  pull_policy: if-not-present
+image: cirrusci/flutter:${FLUTTER_VERSION}

 .shared_windows_runners:
  tags:
@ -18,184 +16,135 @@ stages:

 code_analyze:
  stage: test
-  script: [ ./scripts/code_analyze.sh ]
+  script: [./scripts/code_analyze.sh]
  artifacts:
    reports:
      codequality: code-quality-report.json
-  tags:
-    - docker
-    - famedly

 widget_test:
  stage: test
-  script: [ flutter test ]
-  tags:
-    - docker
-    - famedly
+  script: [flutter test]

 # the basic integration test configuration testing FLOSS builds on Synapse
-integration_test:
+.integration_test:
  image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/integration/stable:${FLUTTER_VERSION}
  stage: test
  services:
    - name: docker:dind
      alias: docker
-  parallel:
-    matrix:
-      - HOMESERVER_IMPLEMENTATION:
-          - synapse
-          - dendrite
-          - conduit
  variables:
    # activate container-to-container networking
    FF_NETWORK_PER_BUILD: "true"
    # Tell docker CLI how to talk to Docker daemon.
    DOCKER_HOST: tcp://docker:2375/
-    # Use the btrfs driver for improved performance.
-    DOCKER_DRIVER: btrfs
+    # Use the overlayfs driver for improved performance.
+    DOCKER_DRIVER: overlay2
    # Disable TLS since we're running inside local network.
    DOCKER_TLS_CERTDIR: ""
-    HOMESERVER: docker
  before_script:
-    - scripts/integration-prepare-host.sh
-    # create test user environment variables
-    - source scripts/integration-create-environment-variables.sh
+    # start AVD and keep running in background
+    - scripts/integration-start-avd.sh &
+    - scripts/integration-prepare-alpine.sh
    # create Synapse instance
-    - scripts/integration-server-${HOMESERVER_IMPLEMENTATION}.sh
+    - scripts/integration-server-synapse.sh
    # properly set the homeserver IP and create test users
    - scripts/integration-prepare-homeserver.sh
+    # ensure the homeserver works
+    - curl docker:8008/_matrix/static/ 2> /dev/null | grep "It works! Synapse is running"
  script:
-    # start AVD and keep running in background
-    - scripts/integration-start-avd.sh &
    - flutter pub get
-    - scrcpy --no-display --record video.mkv &
-    - flutter test integration_test --dart-define=HOMESERVER=$HOMESERVER --dart-define=USER1_NAME=$USER1_NAME --dart-define=USER2_NAME=$USER2_NAME --dart-define=USER1_PW=$USER1_PW --dart-define=USER2_PW=$USER2_PW || ( sleep 10 && exit 1 )
-  after_script:
-    - ffmpeg -i video.mkv -vf scale=iw/2:-2 -crf 40 -b:v 2000k -preset fast video.mp4 || true
-  timeout: 30m
-  retry: 2
-  rules:
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: always
-  artifacts:
-    when: always
-    paths:
-      - video.mp4
+    - flutter test integration_test
+  allow_failure: true
  tags:
-    - docker
-    - famedly
-
-
-# integration tests for Linux builds
-### disabled because of Linux headless issues
-.integration_test_linux:
-  image: cirrusci/flutter:${FLUTTER_VERSION}
-  extends: integration_test
-  parallel:
-    matrix:
-      - HOMESERVER_IMPLEMENTATION:
-          - conduit
-  script:
-    - apt-get update
-    - apt-get install -y clang cmake ninja-build pkg-config libgtk-3-dev liblzma-dev libsecret-1-dev libjsoncpp-dev
-    - flutter pub get
-    - flutter test integration_test -d linux --dart-define=HOMESERVER=$HOMESERVER --dart-define=USER1_NAME=$USER1_NAME --dart-define=USER2_NAME=$USER2_NAME --dart-define=USER1_PW=$USER1_PW --dart-define=USER2_PW=$USER2_PW || ( sleep 10 && exit 1 )
-  after_script: [ ]
-  artifacts:
+    - android
+  timeout: 20m

 # extending the default tests to test the Google-flavored builds
-integration_test_proprietary:
-  extends: integration_test
-  parallel:
-    matrix:
-      - HOMESERVER_IMPLEMENTATION:
-          - conduit
+.integration_test_google:
+  extends: .integration_test
  script:
-    # start AVD and keep running in background
-    - scripts/integration-start-avd.sh &
    - git apply ./scripts/enable-android-google-services.patch
    - flutter pub get
-    - scrcpy --no-display --record video.mkv &
-    - flutter test integration_test --dart-define=HOMESERVER=$HOMESERVER --dart-define=USER1_NAME=$USER1_NAME --dart-define=USER2_NAME=$USER2_NAME --dart-define=USER1_PW=$USER1_PW --dart-define=USER2_PW=$USER2_PW || ( sleep 10 && exit 1 )
+    - flutter test integration_test
+  allow_failure: true

-release_mode_launches:
-  parallel:
-    matrix:
-      - FLAVOR:
-          - floss
-          - proprietary
+# extending the default tests to use Conduit as local homeserver
+.integration_test_conduit:
+  extends: .integration_test
+  before_script:
+    # start AVD and keep running in background
+    - scripts/integration-start-avd.sh &
+    - scripts/integration-prepare-alpine.sh
+    # create Conduit instance
+    - scripts/integration-server-conduit.sh
+    # properly set the homeserver IP and create test users
+    - scripts/integration-prepare-homeserver.sh
+    # ensure the homeserver works
+    - curl docker:8008/_matrix/static/ 2> /dev/null | grep "M_NOT_FOUND" 1> /dev/null && echo "Conduit is running!"
+  allow_failure: true
+
+# extending the default tests to use Dendrite as local homeserver
+.integration_test_dendrite:
+  extends: .integration_test
+  before_script:
+    # start AVD and keep running in background
+    - scripts/integration-start-avd.sh &
+    - scripts/integration-prepare-alpine.sh
+    # create Dendrite instance
+    - scripts/integration-server-dendrite.sh
+    # properly set the homeserver IP and create test users
+    - scripts/integration-prepare-homeserver.sh
+    # ensure the homeserver works
+    - curl docker:8008/_matrix/static/ 2> /dev/null | grep "404 page not found" 1> /dev/null && echo "Dendrite is running!"
+  allow_failure: true
+
+.release_mode_launches:
  image: registry.gitlab.com/famedly/company/frontend/flutter-dockerimages/integration/stable:${FLUTTER_VERSION}
  stage: test
-  before_script:
-    - |
-      if [ "$FLAVOR" == "proprietary" ]; then
-        git apply ./scripts/enable-android-google-services.patch
-      fi
  script:
    # start AVD and keep running in background
    - scripts/integration-start-avd.sh &
    # generate temporary release build configuration and ensure app launches
    - scripts/integration-check-release-build.sh
-  timeout: 20m
+  allow_failure: true
  tags:
-    - docker
-    - famedly
+    - android
+  timeout: 20m
+
+.release_mode_launches_google:
+  extends: .release_mode_launches
+  before_script:
+    - git apply ./scripts/enable-android-google-services.patch
+  allow_failure: true

 build_web:
  stage: build
  before_script:
-    [ sudo apt update && sudo apt install curl -y, ./scripts/prepare-web.sh ]
-  script: [ ./scripts/build-web.sh ]
+    [sudo apt update && sudo apt install curl -y, ./scripts/prepare-web.sh]
+  script: [./scripts/build-web.sh]
  artifacts:
    paths:
      - build/web/
-  tags:
-    - docker
-    - famedly
-
-# yes, we *do* build a Windows DLL on Linux. More reliable.
-build_olm_windows:
-  image: archlinux:latest
-  stage: test
-  before_script:
-    - pacman-key --init
-    - pacman --noconfirm -Sy mingw-w64 cmake git base-devel
-  script:
-    - ./scripts/build-olm-windows.sh
-    - mv olm/build/libolm.dll .
-  artifacts:
-    paths:
-      - libolm.dll
-  only:
-    - main
-    - tags

 build_windows:
  extends:
    - .shared_windows_runners
-  stage: test
-  before_script:
-    - ./scripts/prepare-windows.ps1
-    # workarounding artifacts download being broken
-    - $response = Invoke-WebRequest -Uri "$CI_API_V4_URL/projects/$CI_PROJECT_ID/pipelines/$CI_PIPELINE_ID/jobs" -UseBasicParsing
-    - $jobs = $response | ConvertFrom-Json
-    - $job = $jobs | where { $_.name -eq "build_olm_windows" }
-    - $jobId = $job.id
-    - Invoke-WebRequest -Uri "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$jobId/artifacts/libolm.dll" -UseBasicParsing -OutFile libolm.dll
-  script:
-    - ./scripts/build-windows.ps1
-    - Copy-Item -Path "libolm.dll" -Destination "build/windows/runner/Release"
-    - ./scripts/package-windows.ps1
+  stage: build
+  before_script: [./scripts/prepare-windows.ps1]
+  script: [./scripts/build-windows.ps1]
  artifacts:
    paths:
      - build/windows/runner/Release
+  allow_failure: true
  only:
    - main
    - tags

 build_android_debug:
  stage: build
-  script: [ ./scripts/build-android-debug.sh ]
+  script: [./scripts/build-android-debug.sh]
+  tags:
+    - android
  artifacts:
    when: on_success
    paths:
@ -203,23 +152,19 @@ build_android_debug:
  except:
    - main
    - tags
-  tags:
-    - docker
-    - famedly

 build_android_apk:
  stage: build
  before_script:
    - git apply ./scripts/enable-android-google-services.patch
    - ./scripts/prepare-android-release.sh
-  script: [ ./scripts/build-android-apk.sh ]
+  script: [./scripts/build-android-apk.sh]
+  tags:
+    - android
  artifacts:
    when: on_success
    paths:
      - build/android/app-release.apk
-  tags:
-    - docker
-    - famedly
  only:
    - main
    - tags
@ -229,15 +174,14 @@ deploy_playstore_internal:
  before_script:
    - git apply ./scripts/enable-android-google-services.patch
    - ./scripts/prepare-android-release.sh
-  script: [ ./scripts/release-playstore-beta.sh ]
+  script: [./scripts/release-playstore-beta.sh]
+  tags:
+    - android
  artifacts:
    when: on_success
    paths:
      - build/android/app-release.aab
  resource_group: playstore_release
-  tags:
-    - docker
-    - famedly
  only:
    - main

@ -256,9 +200,6 @@ fdroid_repo:
  needs:
    - "build_android_apk"
  resource_group: playstore_release
-  tags:
-    - docker
-    - famedly
  allow_failure: true
  only:
    - main
@ -296,10 +237,7 @@ build_linux_x86:
    [
      sudo apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install keyboard-configuration -y && sudo apt-get install curl clang cmake ninja-build pkg-config libgtk-3-dev libblkid-dev liblzma-dev libjsoncpp-dev cmake-data libsecret-1-dev libsecret-1-0 librhash0 -y,
    ]
-  script: [ ./scripts/build-linux.sh ]
-  tags:
-    - docker
-    - famedly
+  script: [./scripts/build-linux.sh]
  artifacts:
    when: on_success
    paths:
@ -307,9 +245,9 @@ build_linux_x86:

 build_linux_arm64:
  stage: build
-  before_script: [ flutter upgrade ]
-  script: [ ./scripts/build-linux.sh ]
-  tags: [ docker_arm64 ]
+  before_script: [flutter upgrade]
+  script: [./scripts/build-linux.sh]
+  tags: [docker_arm64]
  only:
    - main
    - tags
@ -321,7 +259,7 @@ build_linux_arm64:

 update_dependencies:
  stage: build
-  needs: [ ]
+  needs: []
  tags:
    - docker
  only:
@ -348,9 +286,6 @@ update_dependencies:
 .release:
  stage: deploy
  image: curlimages/curl:latest
-  tags:
-    - docker
-    - famedly
  rules:
    - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+$/'
    - if: '$CI_COMMIT_TAG =~ /^rc\d+\.\d+\.\d+-\d+$/'
@ -368,8 +303,7 @@ upload_android:
 upload_web:
  extends: .release
  script:
-    # workaround bug of Flutter engine
-    - tar czf package.tar.gz --ignore-failed-read -C build/web/ .
+    - tar czf package.tar.gz -C build/web/ .
    - |
      curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file package.tar.gz ${PACKAGE_REGISTRY_URL}/fluffychat-web.tar.gz

@ -403,7 +337,7 @@ deploy_playstore:
  before_script:
    - git apply ./scripts/enable-android-google-services.patch
    - ./scripts/prepare-android-release.sh
-  script: [ ./scripts/release-playstore.sh ]
+  script: [./scripts/release-playstore.sh]
  resource_group: playstore_release
  only:
    - tags
--- a/.metadata
+++ b/.metadata
@ -4,7 +4,7 @@
 # This file should be version controlled.

 version:
-  revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+  revision: 85684f9300908116a78138ea4c6036c35c9a1236
  channel: stable

 project_type: app
@ -13,26 +13,11 @@ project_type: app
 migration:
  platforms:
    - platform: root
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: android
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: ios
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: linux
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: macos
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: web
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236
    - platform: windows
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      create_revision: 85684f9300908116a78138ea4c6036c35c9a1236
+      base_revision: 85684f9300908116a78138ea4c6036c35c9a1236

  # User provided section

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,33 +1,4 @@
-## v1.8.0 2022-12-30
- Added translation using Weblate (Yue (yue_HK)) (Raatty)
- Translated using Weblate (Chinese (Simplified)) (Mike Evans)
- Translated using Weblate (Estonian) (Priit Jõerüüt)
- Translated using Weblate (French) (Anne Onyme 017)
- Translated using Weblate (Indonesian) (Linerly)
- Translated using Weblate (Turkish) (Oğuz Ersen)
- Translated using Weblate (Ukrainian) (Ihor Hordiichuk)
- design: New encryption page (Krille Fear)
- feat: Add audio message support to linux (Krille Fear)
- feat: Use Android system accent color (Krille Fear)
- feat: include olm to Windows builds (TheOneWithTheBraid)
- feat: Store drafts (Krille)
- fix: Android push notification follow-up (TheOneWithTheBraid)
- fix: Content banner (Krille Fear)
- fix: Correct redacted by username (Krille Fear)
- fix: Do not setup push on every app resume (Krille Fear)
- fix: Encryption button is orange in public rooms (Krille Fear)
- fix: File event design (Krille Fear)
- fix: Hide google services warning after marked (Krille Fear)
- fix: Improve story page appearance (Reinhart Previano Koentjoro)
- fix: Libhandy windows (Krille Fear)
- fix: Monochromatic icon rendering for Android 13+ (Reinhart Previano Koentjoro)
- fix: homeserver error text not visible in app bar (TheOneWithTheBraid)
- fix: minor issues in room list (TheOneWithTheBraid)
-
-## v1.7.2 2022-12-19
-Update dependencies and translations.
-
-## v1.7.1 2022-11-23
+## v1.7.1 2022 11-23
 Minor bugfix release to retrigger build for FlatPak and Android. Fixes some style bugs and updates some translations

 ## v1.7.0 2022-11-17
--- a/PRIVACY.md
+++ b/PRIVACY.md
@ -2,15 +2,15 @@

 FluffyChat is available on Android, iOS and as a web version. Desktop versions for Windows, Linux and macOS may follow.

-*   [Matrix](#matrix)
-*   Sentry
-*   [Database](#database)
-*   [Encryption](#encryption)
-*   [App Permissions](#app-permissions)
-*   [Push Notifications](#push-notifications)
-*   [Stories](#stories)
+*   [Matrix](#1)
+*   [Sentry](#2)
+*   [Database](#3)
+*   [Encryption](#4)
+*   [App Permissions](#5)
+*   [Push Notifications](#6)
+*   [Stories](#7)

-## Matrix<a id="matrix"/>
+## Matrix<a id="1"/>
 FluffyChat uses the Matrix protocol. This means that FluffyChat is just a client that can be connected to any compatible matrix server. The respective data protection agreement of the server selected by the user then applies.

 For convenience, one or more servers are set as default that the FluffyChat developers consider trustworthy. The developers of FluffyChat do not guarantee their trustworthiness. Before the first communication, users are informed which server they are connecting to.
@ -19,17 +19,17 @@ FluffyChat only communicates with the selected server, with sentry.io if enabled

 More information is available at: [https://matrix.org](https://matrix.org)

-## Database<a id="database"/>
+## Database<a id="3"/>
 FluffyChat caches some data received from the server in a local database on the device of the user.

 More information is available at: [https://pub.dev/packages/hive](https://pub.dev/packages/hive)

-## Encryption<a id="encryption"/>
+## Encryption<a id="4"/>
 All communication of substantive content between Fluffychat and any server is done in secure way, using transport encryption to protect it.

 FluffyChat is able to use End-To-End-Encryption as a tech preview.

-## App Permissions<a id="app-permissions"/>
+## App Permissions<a id="5"/>

 The permissions are the same on Android and iOS but may differ in the name. This are the Android Permissions:

@ -52,7 +52,7 @@ The user is able to send files from the device's file system.
 #### Location
 FluffyChat makes it possible to share the current location via the chat. When the user shares their location, FluffyChat uses the device location service and sends the geo-data via Matrix.

-## Push Notifications<a id="push-notifications"/>
+## Push Notifications<a id="6"/>
 FluffyChat uses the Firebase Cloud Messaging service for push notifications on Android and iOS. This takes place in the following steps:
 1. The matrix server sends the push notification to the FluffyChat Push Gateway
 2. The FluffyChat Push Gateway forwards the message in a different format to Firebase Cloud Messaging
@ -95,7 +95,7 @@ A typical push notification could look like this:

 FluffyChat sets the `event_id_only` flag at the Matrix Server. This server is then responsible to send the correct data.

-## Stories<a id="stories"/>
+## Stories<a id="7"/>

 FluffyChat supports stories which is a feature similar to WhatsApp status or Instagram stories. However it is just a different GUI for the same room-related communication. More information about the feature can be found here:

--- a/android/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ b/android/app/src/main/res/drawable/ic_launcher_monochrome.xml
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -2,5 +2,5 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
--- a/assets/banner_transparent.png
+++ b/assets/banner_transparent.png
--- a/assets/encryption.png
+++ b/assets/encryption.png
--- a/assets/l10n/intl_ar.arb
+++ b/assets/l10n/intl_ar.arb
--- a/assets/l10n/intl_bn.arb
+++ b/assets/l10n/intl_bn.arb
@ -1,25 +1,30 @@
 {
-    "@@last_modified": "2021-08-14 12:41:10.154280",
-    "about": "সম্পর্কে",
-    "@about": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "accept": "স্বীকার করি",
-    "@accept": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "acceptedTheInvitation": "{username} আমন্ত্রণ গ্রহণ করেছে",
-    "@acceptedTheInvitation": {
-        "type": "text",
-        "placeholders": {
-            "username": {}
-        }
-    },
-    "account": "অ্যাকাউন্ট",
-    "@account": {
-        "type": "text",
-        "placeholders": {}
+  "@@last_modified": "2021-08-14 12:41:10.154280",
+  "about": "সম্পর্কে",
+  "@about": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "accept": "স্বীকার করি",
+  "@accept": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "acceptedTheInvitation": "{username} আমন্ত্রণ গ্রহণ করেছে",
+  "@acceptedTheInvitation": {
+    "type": "text",
+    "placeholders": {
+      "username": {}
    }
+  },
+  "account": "অ্যাকাউন্ট",
+  "@account": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "accountInformation": "অ্যাকাউন্ট তথ্য",
+  "@accountInformation": {
+    "type": "text",
+    "placeholders": {}
+  }
 }
--- a/assets/l10n/intl_ca.arb
+++ b/assets/l10n/intl_ca.arb
--- a/assets/l10n/intl_cs.arb
+++ b/assets/l10n/intl_cs.arb
--- a/assets/l10n/intl_de.arb
+++ b/assets/l10n/intl_de.arb
--- a/assets/l10n/intl_en.arb
+++ b/assets/l10n/intl_en.arb
--- a/assets/l10n/intl_eo.arb
+++ b/assets/l10n/intl_eo.arb
--- a/assets/l10n/intl_es.arb
+++ b/assets/l10n/intl_es.arb
--- a/assets/l10n/intl_et.arb
+++ b/assets/l10n/intl_et.arb
--- a/assets/l10n/intl_eu.arb
+++ b/assets/l10n/intl_eu.arb
--- a/assets/l10n/intl_fa.arb
+++ b/assets/l10n/intl_fa.arb
--- a/assets/l10n/intl_fi.arb
+++ b/assets/l10n/intl_fi.arb
--- a/assets/l10n/intl_fr.arb
+++ b/assets/l10n/intl_fr.arb
--- a/assets/l10n/intl_ga.arb
+++ b/assets/l10n/intl_ga.arb
--- a/assets/l10n/intl_gl.arb
+++ b/assets/l10n/intl_gl.arb
--- a/assets/l10n/intl_he.arb
+++ b/assets/l10n/intl_he.arb
--- a/assets/l10n/intl_hi.arb
+++ b/assets/l10n/intl_hi.arb
@ -1 +1 @@
-{}
+{}
--- a/assets/l10n/intl_hr.arb
+++ b/assets/l10n/intl_hr.arb
--- a/assets/l10n/intl_hu.arb
+++ b/assets/l10n/intl_hu.arb
--- a/assets/l10n/intl_hy.arb
+++ b/assets/l10n/intl_hy.arb
--- a/assets/l10n/intl_id.arb
+++ b/assets/l10n/intl_id.arb
--- a/assets/l10n/intl_ie.arb
+++ b/assets/l10n/intl_ie.arb
--- a/assets/l10n/intl_it.arb
+++ b/assets/l10n/intl_it.arb
--- a/assets/l10n/intl_ja.arb
+++ b/assets/l10n/intl_ja.arb
--- a/assets/l10n/intl_ko.arb
+++ b/assets/l10n/intl_ko.arb
--- a/assets/l10n/intl_lt.arb
+++ b/assets/l10n/intl_lt.arb
--- a/assets/l10n/intl_nb.arb
+++ b/assets/l10n/intl_nb.arb
--- a/assets/l10n/intl_nl.arb
+++ b/assets/l10n/intl_nl.arb
--- a/assets/l10n/intl_pl.arb
+++ b/assets/l10n/intl_pl.arb
--- a/assets/l10n/intl_pt.arb
+++ b/assets/l10n/intl_pt.arb
@ -1,155 +1,155 @@
 {
-    "@@last_modified": "2021-08-14 12:41:09.940318",
-    "copiedToClipboard": "Copiada para a área de transferência",
-    "@copiedToClipboard": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "login": "Iniciar sessão",
-    "@login": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "monday": "segunda-feira",
-    "@monday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "saturday": "sábado",
-    "@saturday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "wednesday": "quarta-feira",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "about": "Sobre",
-    "@about": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "admin": "Admin",
-    "@admin": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "areYouSure": "Tens a certeza?",
-    "@areYouSure": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "notifications": "Notificações",
-    "@notifications": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "account": "Conta",
-    "@account": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "cancel": "Cancelar",
-    "@cancel": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "delete": "Eliminar",
-    "@delete": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "dateAndTimeOfDay": "{date}, {timeOfDay}",
-    "@dateAndTimeOfDay": {
-        "type": "text",
-        "placeholders": {
-            "date": {},
-            "timeOfDay": {}
-        }
-    },
-    "dateWithYear": "{day}-{month}-{year}",
-    "@dateWithYear": {
-        "type": "text",
-        "placeholders": {
-            "year": {},
-            "month": {},
-            "day": {}
-        }
-    },
-    "help": "Ajuda",
-    "@help": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "messages": "Mensagens",
-    "@messages": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "reason": "Razão",
-    "@reason": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "privacy": "Privacidade",
-    "@privacy": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "openCamera": "Abrir câmara",
-    "@openCamera": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "settings": "Configurações",
-    "@settings": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "tuesday": "terça-feira",
-    "@tuesday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "logout": "Terminar sessão",
-    "@logout": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "search": "Pesquisar",
-    "@search": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "sunday": "domingo",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "users": "Utilizadores",
-    "@users": {},
-    "close": "Fechar",
-    "@close": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "dateWithoutYear": "{day}-{month}",
-    "@dateWithoutYear": {
-        "type": "text",
-        "placeholders": {
-            "month": {},
-            "day": {}
-        }
-    },
-    "friday": "sexta-feira",
-    "@friday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "thursday": "quinta-feira",
-    "@thursday": {
-        "type": "text",
-        "placeholders": {}
+  "@@last_modified": "2021-08-14 12:41:09.940318",
+  "copiedToClipboard": "Copiada para a área de transferência",
+  "@copiedToClipboard": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "login": "Iniciar sessão",
+  "@login": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "monday": "segunda-feira",
+  "@monday": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "saturday": "sábado",
+  "@saturday": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "wednesday": "quarta-feira",
+  "@wednesday": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "about": "Sobre",
+  "@about": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "admin": "Admin",
+  "@admin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "areYouSure": "Tens a certeza?",
+  "@areYouSure": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "notifications": "Notificações",
+  "@notifications": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "account": "Conta",
+  "@account": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "cancel": "Cancelar",
+  "@cancel": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "delete": "Eliminar",
+  "@delete": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "dateAndTimeOfDay": "{date}, {timeOfDay}",
+  "@dateAndTimeOfDay": {
+    "type": "text",
+    "placeholders": {
+      "date": {},
+      "timeOfDay": {}
    }
-}
+  },
+  "dateWithYear": "{day}-{month}-{year}",
+  "@dateWithYear": {
+    "type": "text",
+    "placeholders": {
+      "year": {},
+      "month": {},
+      "day": {}
+    }
+  },
+  "help": "Ajuda",
+  "@help": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "messages": "Mensagens",
+  "@messages": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "reason": "Razão",
+  "@reason": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "privacy": "Privacidade",
+  "@privacy": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "openCamera": "Abrir câmara",
+  "@openCamera": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "settings": "Configurações",
+  "@settings": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "tuesday": "terça-feira",
+  "@tuesday": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "logout": "Terminar sessão",
+  "@logout": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "search": "Pesquisar",
+  "@search": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "sunday": "domingo",
+  "@sunday": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "users": "Utilizadores",
+  "@users": {},
+  "close": "Fechar",
+  "@close": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "dateWithoutYear": "{day}-{month}",
+  "@dateWithoutYear": {
+    "type": "text",
+    "placeholders": {
+      "month": {},
+      "day": {}
+    }
+  },
+  "friday": "sexta-feira",
+  "@friday": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "thursday": "quinta-feira",
+  "@thursday": {
+    "type": "text",
+    "placeholders": {}
+  }
+}
--- a/assets/l10n/intl_pt_BR.arb
+++ b/assets/l10n/intl_pt_BR.arb
--- a/assets/l10n/intl_pt_PT.arb
+++ b/assets/l10n/intl_pt_PT.arb
--- a/assets/l10n/intl_ro.arb
+++ b/assets/l10n/intl_ro.arb
@ -1,147 +1,182 @@
 {
-    "@@last_modified": "2021-08-14 12:41:09.918296",
-    "about": "Despre",
-    "@about": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "accept": "Accept",
-    "@accept": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "acceptedTheInvitation": "{username} a aceptat invitați",
-    "@acceptedTheInvitation": {
-        "type": "text",
-        "placeholders": {
-            "username": {}
-        }
-    },
-    "account": "Cont",
-    "@account": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "activatedEndToEndEncryption": "{username} a activat criptarea end-to-end",
-    "@activatedEndToEndEncryption": {
-        "type": "text",
-        "placeholders": {
-            "username": {}
-        }
-    },
-    "addGroupDescription": "Adaugă o descriere de",
-    "@addGroupDescription": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "admin": "Administrator",
-    "@admin": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "alias": "poreclă",
-    "@alias": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "answeredTheCall": "{sendername} a acceptat apelul",
-    "@answeredTheCall": {
-        "type": "text",
-        "placeholders": {
-            "senderName": {}
-        }
-    },
-    "anyoneCanJoin": "Oricine se poate alătura",
-    "@anyoneCanJoin": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "archive": "Arhivă",
-    "@archive": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "archivedRoom": "Grup arhivat",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "areGuestsAllowedToJoin": "Vizitatorii \"guest\" se pot alătura",
-    "@areGuestsAllowedToJoin": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "areYouSure": "Ești sigur?",
-    "@areYouSure": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "askSSSSSign": "Pentru a putea conecta cealaltă persoană, te rog introdu parola sau cheia ta de recuperare.",
-    "@askSSSSSign": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "askVerificationRequest": "Accepți cererea de verificare de la {username}?",
-    "@askVerificationRequest": {
-        "type": "text",
-        "placeholders": {
-            "username": {}
-        }
-    },
-    "banFromChat": "Interzis din conversație",
-    "@banFromChat": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "banned": "Interzis",
-    "@banned": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "bannedUser": "{username} a interzis pe {targetName}",
-    "@bannedUser": {
-        "type": "text",
-        "placeholders": {
-            "username": {},
-            "targetName": {}
-        }
-    },
-    "blockDevice": "Blochează dispozitiv",
-    "@blockDevice": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "cancel": "Anulează",
-    "@cancel": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "changeDeviceName": "Schimbă numele dispozitiv",
-    "@changeDeviceName": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "changedTheChatAvatar": "{username} a schimbat poza conversați",
-    "@changedTheChatAvatar": {
-        "type": "text",
-        "placeholders": {
-            "username": {}
-        }
-    },
-    "changedTheChatDescriptionTo": "{username} a schimbat descrierea grupului în '{description}'",
-    "@changedTheChatDescriptionTo": {
-        "type": "text",
-        "placeholders": {
-            "username": {},
-            "description": {}
-        }
-    },
-    "changedTheChatNameTo": "{username} a schimbat porecla în '{chatname}'",
-    "@changedTheChatNameTo": {
-        "type": "text",
-        "placeholders": {
-            "username": {},
-            "chatname": {}
-        }
+  "@@last_modified": "2021-08-14 12:41:09.918296",
+  "about": "Despre",
+  "@about": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "accept": "Accept",
+  "@accept": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "acceptedTheInvitation": "{username} a aceptat invitați",
+  "@acceptedTheInvitation": {
+    "type": "text",
+    "placeholders": {
+      "username": {}
    }
+  },
+  "account": "Cont",
+  "@account": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "accountInformation": "Informații despre cont",
+  "@accountInformation": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "activatedEndToEndEncryption": "{username} a activat criptarea end-to-end",
+  "@activatedEndToEndEncryption": {
+    "type": "text",
+    "placeholders": {
+      "username": {}
+    }
+  },
+  "addGroupDescription": "Adaugă o descriere de",
+  "@addGroupDescription": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "admin": "Administrator",
+  "@admin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "alias": "poreclă",
+  "@alias": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "alreadyHaveAnAccount": "Ai deja un cont?",
+  "@alreadyHaveAnAccount": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "answeredTheCall": "{sendername} a acceptat apelul",
+  "@answeredTheCall": {
+    "type": "text",
+    "placeholders": {
+      "senderName": {}
+    }
+  },
+  "anyoneCanJoin": "Oricine se poate alătura",
+  "@anyoneCanJoin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "archive": "Arhivă",
+  "@archive": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "archivedRoom": "Grup arhivat",
+  "@archivedRoom": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "areGuestsAllowedToJoin": "Vizitatorii \"guest\" se pot alătura",
+  "@areGuestsAllowedToJoin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "areYouSure": "Ești sigur?",
+  "@areYouSure": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "askSSSSCache": "Te rog introdu parola ta sau cheile de recuparare pentru a depozita cheile.",
+  "@askSSSSCache": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "askSSSSSign": "Pentru a putea conecta cealaltă persoană, te rog introdu parola sau cheia ta de recuperare.",
+  "@askSSSSSign": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "askSSSSVerify": "Te rog introdu parola sau cheia ta de recuperare pentru a-ți verifica sesiunea.",
+  "@askSSSSVerify": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "askVerificationRequest": "Accepți cererea de verificare de la {username}?",
+  "@askVerificationRequest": {
+    "type": "text",
+    "placeholders": {
+      "username": {}
+    }
+  },
+  "authentication": "Autentificare",
+  "@authentication": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "avatarHasBeenChanged": "Image de profil schimbată",
+  "@avatarHasBeenChanged": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "banFromChat": "Interzis din conversație",
+  "@banFromChat": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "banned": "Interzis",
+  "@banned": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "bannedUser": "{username} a interzis pe {targetName}",
+  "@bannedUser": {
+    "type": "text",
+    "placeholders": {
+      "username": {},
+      "targetName": {}
+    }
+  },
+  "blockDevice": "Blochează dispozitiv",
+  "@blockDevice": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "cachedKeys": "Chei salvate",
+  "@cachedKeys": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "cancel": "Anulează",
+  "@cancel": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "changeDeviceName": "Schimbă numele dispozitiv",
+  "@changeDeviceName": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "changedTheChatAvatar": "{username} a schimbat poza conversați",
+  "@changedTheChatAvatar": {
+    "type": "text",
+    "placeholders": {
+      "username": {}
+    }
+  },
+  "changedTheChatDescriptionTo": "{username} a schimbat descrierea grupului în '{description}'",
+  "@changedTheChatDescriptionTo": {
+    "type": "text",
+    "placeholders": {
+      "username": {},
+      "description": {}
+    }
+  },
+  "changedTheChatNameTo": "{username} a schimbat porecla în '{chatname}'",
+  "@changedTheChatNameTo": {
+    "type": "text",
+    "placeholders": {
+      "username": {},
+      "chatname": {}
+    }
+  }
 }
--- a/assets/l10n/intl_ru.arb
+++ b/assets/l10n/intl_ru.arb
--- a/assets/l10n/intl_si.arb
+++ b/assets/l10n/intl_si.arb
@ -1,292 +1,374 @@
 {
-    "@@last_modified": "2021-08-14 12:41:09.895217",
-    "about": "පිළිබඳව",
-    "@about": {
-        "type": "text",
-        "placeholders": {}
+  "@@last_modified": "2021-08-14 12:41:09.895217",
+  "about": "පිළිබඳව",
+  "@about": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "accept": "පිළිගන්න",
+  "@accept": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "account": "ගිණුම",
+  "@account": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "accountInformation": "ගිණුමේ තොරතුරු",
+  "@accountInformation": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "addEmail": "වි-තැපෑල එකතු කරන්න",
+  "@addEmail": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "admin": "පරිපාලක",
+  "@admin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "allChats": "සියලුම සංවාද",
+  "@allChats": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "alreadyHaveAnAccount": "දැනටමත් ගිණුමක් තිබේද?",
+  "@alreadyHaveAnAccount": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "anyoneCanJoin": "ඕනෑම කෙනෙකුට එක්විය හැකිය",
+  "@anyoneCanJoin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "archive": "සංරක්ෂිතය",
+  "@archive": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "archivedRoom": "සංරක්ෂිත කාමරය",
+  "@archivedRoom": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "areGuestsAllowedToJoin": "ආගන්තුක පරිශීලකයින්ට එක්වීමට අවසර තිබේද",
+  "@areGuestsAllowedToJoin": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "areYouSure": "ඔබට විශ්වාසද?",
+  "@areYouSure": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "areYouSureYouWantToLogout": "ඔබට නික්මීමට අවශ්‍ය බව විශ්වාසද?",
+  "@areYouSureYouWantToLogout": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "audioPlayerPlay": "ධාවනය",
+  "@audioPlayerPlay": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "blockDevice": "උපාංගය අවහිර කරන්න",
+  "@blockDevice": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "cachedKeys": "යතුරු නිහිතගතයි",
+  "@cachedKeys": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "cancel": "අවලංගු කරන්න",
+  "@cancel": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "changeDeviceName": "උපාංගයේ නම වෙනස් කරන්න",
+  "@changeDeviceName": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "changePassword": "මුරපදය වෙනස් කරන්න",
+  "@changePassword": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "chat": "සංවාදය",
+  "@chat": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "chatBackup": "සංවාද උපස්ථය",
+  "@chatBackup": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "chatDetails": "සංවාදයේ විස්තර",
+  "@chatDetails": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "chats": "සංවාද",
+  "@chats": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "chooseAStrongPassword": "ශක්තිමත් මුරපදයක් තෝරන්න",
+  "@chooseAStrongPassword": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "chooseAUsername": "පරිශීලක නාමයක් තෝරන්න",
+  "@chooseAUsername": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "clearArchive": "සංරක්ෂිතය හිස් කරන්න",
+  "@clearArchive": {},
+  "close": "වසන්න",
+  "@close": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "commandHint_join": "දී ඇති කාමරයට එක්වන්න",
+  "@commandHint_join": {
+    "type": "text",
+    "description": "Usage hint for the command /join"
+  },
+  "commandHint_leave": "මෙම කාමරය හැරයන්න",
+  "@commandHint_leave": {
+    "type": "text",
+    "description": "Usage hint for the command /leave"
+  },
+  "commandInvalid": "විධානය වලංගු නොවේ",
+  "@commandInvalid": {
+    "type": "text"
+  },
+  "commandMissing": "{{command} විධානයක් නොවේ.",
+  "@commandMissing": {
+    "type": "text",
+    "placeholders": {
+      "command": {}
    },
-    "accept": "පිළිගන්න",
-    "@accept": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "account": "ගිණුම",
-    "@account": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "addEmail": "වි-තැපෑල එකතු කරන්න",
-    "@addEmail": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "admin": "පරිපාලක",
-    "@admin": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "allChats": "සියලුම සංවාද",
-    "@allChats": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "anyoneCanJoin": "ඕනෑම කෙනෙකුට එක්විය හැකිය",
-    "@anyoneCanJoin": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "archive": "සංරක්ෂිතය",
-    "@archive": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "archivedRoom": "සංරක්ෂිත කාමරය",
-    "@archivedRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "areGuestsAllowedToJoin": "ආගන්තුක පරිශීලකයින්ට එක්වීමට අවසර තිබේද",
-    "@areGuestsAllowedToJoin": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "areYouSure": "ඔබට විශ්වාසද?",
-    "@areYouSure": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "areYouSureYouWantToLogout": "ඔබට නික්මීමට අවශ්‍ය බව විශ්වාසද?",
-    "@areYouSureYouWantToLogout": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "blockDevice": "උපාංගය අවහිර කරන්න",
-    "@blockDevice": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "cancel": "අවලංගු කරන්න",
-    "@cancel": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "changeDeviceName": "උපාංගයේ නම වෙනස් කරන්න",
-    "@changeDeviceName": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "changePassword": "මුරපදය වෙනස් කරන්න",
-    "@changePassword": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "chat": "සංවාදය",
-    "@chat": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "chatBackup": "සංවාද උපස්ථය",
-    "@chatBackup": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "chatDetails": "සංවාදයේ විස්තර",
-    "@chatDetails": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "chats": "සංවාද",
-    "@chats": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "chooseAStrongPassword": "ශක්තිමත් මුරපදයක් තෝරන්න",
-    "@chooseAStrongPassword": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "chooseAUsername": "පරිශීලක නාමයක් තෝරන්න",
-    "@chooseAUsername": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "clearArchive": "සංරක්ෂිතය හිස් කරන්න",
-    "@clearArchive": {},
-    "close": "වසන්න",
-    "@close": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "commandHint_join": "දී ඇති කාමරයට එක්වන්න",
-    "@commandHint_join": {
-        "type": "text",
-        "description": "Usage hint for the command /join"
-    },
-    "commandHint_leave": "මෙම කාමරය හැරයන්න",
-    "@commandHint_leave": {
-        "type": "text",
-        "description": "Usage hint for the command /leave"
-    },
-    "commandInvalid": "විධානය වලංගු නොවේ",
-    "@commandInvalid": {
-        "type": "text"
-    },
-    "commandMissing": "{{command} විධානයක් නොවේ.",
-    "@commandMissing": {
-        "type": "text",
-        "placeholders": {
-            "command": {}
-        },
-        "description": "State that {command} is not a valid /command."
-    },
-    "compareEmojiMatch": "සසඳා බලා පහත දැක්වෙන ඉමොජි අනෙක් උපාංගයට නිසැකවම ගැලපෙන බවට වග බලා ගන්න:",
-    "@compareEmojiMatch": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "compareNumbersMatch": "සංසන්දනය කර පහත දැක්වෙන අංක අනෙක් උපාංගට නිසැකව ගැලපෙන බවට වග බලා ගන්න:",
-    "@compareNumbersMatch": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "confirm": "තහවුරු කරන්න",
-    "@confirm": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "connect": "සබඳින්න",
-    "@connect": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "contactHasBeenInvitedToTheGroup": "සමූහය වෙත සබඳතාවයකට ආරාධනා කර ඇත",
-    "@contactHasBeenInvitedToTheGroup": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "copy": "පිටපත්",
-    "@copy": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "create": "සාදන්න",
-    "@create": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "createNewGroup": "නව සමූහයක් සාදන්න",
-    "@createNewGroup": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "encryption": "සංකේතාංකනය",
-    "@encryption": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "everythingReady": "සියල්ල සූදානම්!",
-    "@everythingReady": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "fontSize": "මුද්‍රණඅකුරේ ප්‍රමාණය",
-    "@fontSize": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "goToTheNewRoom": "නව කාමරයට යන්න",
-    "@goToTheNewRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "joinRoom": "කාමරයට එක්වන්න",
-    "@joinRoom": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "keysCached": "යතුරු නිහිතගත යි",
-    "@keysCached": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "next": "ඊලඟ",
-    "@next": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "people": "මිනිසුන්",
-    "@people": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "removeDevice": "උපාංගය ඉවත්කරන්න",
-    "@removeDevice": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "roomVersion": "කාමරයේ අනුවාදය",
-    "@roomVersion": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "saveFile": "ගොනුව සුරකින්න",
-    "@saveFile": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "send": "යවන්න",
-    "@send": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "showPassword": "මුරපදය පෙන්වන්න",
-    "@showPassword": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "sunday": "ඉරිදා",
-    "@sunday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "username": "පරිශීලක නාමය",
-    "@username": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "videoCall": "දෘශ්‍ය ඇමතුම",
-    "@videoCall": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "wallpaper": "බිතුපත",
-    "@wallpaper": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "warning": "අවවාදයයි!",
-    "@warning": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "wednesday": "බදාදා",
-    "@wednesday": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "writeAMessage": "පණිවිඩයක් ලියන්න…",
-    "@writeAMessage": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "yes": "ඔව්",
-    "@yes": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "you": "ඔබ",
-    "@you": {
-        "type": "text",
-        "placeholders": {}
+    "description": "State that {command} is not a valid /command."
+  },
+  "compareEmojiMatch": "සසඳා බලා පහත දැක්වෙන ඉමොජි අනෙක් උපාංගයට නිසැකවම ගැලපෙන බවට වග බලා ගන්න:",
+  "@compareEmojiMatch": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "compareNumbersMatch": "සංසන්දනය කර පහත දැක්වෙන අංක අනෙක් උපාංගට නිසැකව ගැලපෙන බවට වග බලා ගන්න:",
+  "@compareNumbersMatch": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "confirm": "තහවුරු කරන්න",
+  "@confirm": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "connect": "සබඳින්න",
+  "@connect": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "connectionAttemptFailed": "සබැඳීමේ උත්සාහය අසාර්ථකයි",
+  "@connectionAttemptFailed": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "contactHasBeenInvitedToTheGroup": "සමූහය වෙත සබඳතාවයකට ආරාධනා කර ඇත",
+  "@contactHasBeenInvitedToTheGroup": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "copy": "පිටපත්",
+  "@copy": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "create": "සාදන්න",
+  "@create": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "createAccountNow": "දැන් ගිණුමක් සාදන්න",
+  "@createAccountNow": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "createNewGroup": "නව සමූහයක් සාදන්න",
+  "@createNewGroup": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "donate": "පරිත්‍යාග",
+  "@donate": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "encryption": "සංකේතාංකනය",
+  "@encryption": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "everythingReady": "සියල්ල සූදානම්!",
+  "@everythingReady": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "fontSize": "මුද්‍රණඅකුරේ ප්‍රමාණය",
+  "@fontSize": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "goToTheNewRoom": "නව කාමරයට යන්න",
+  "@goToTheNewRoom": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "joinRoom": "කාමරයට එක්වන්න",
+  "@joinRoom": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "keysCached": "යතුරු නිහිතගත යි",
+  "@keysCached": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "next": "ඊලඟ",
+  "@next": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "noPublicRoomsFound": "ප්‍රසිද්ධ කාමර හමු නොවිණි…",
+  "@noPublicRoomsFound": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "people": "මිනිසුන්",
+  "@people": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "publicGroups": "ප්‍රසිද්ධ සමූහ",
+  "@publicGroups": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "removeDevice": "උපාංගය ඉවත්කරන්න",
+  "@removeDevice": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "roomVersion": "කාමරයේ අනුවාදය",
+  "@roomVersion": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "savedFileAs": "ලෙස ගොනුව සුරකින්න {filename}",
+  "@savedFileAs": {
+    "type": "text",
+    "placeholders": {
+      "filename": {}
    }
-}
+  },
+  "saveFile": "ගොනුව සුරකින්න",
+  "@saveFile": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "saveFileToFolder": "ගොනුව මෙම බහාලුමට සුරකින්න",
+  "@saveFileToFolder": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "securityKey": "ආරක්ෂක යතුර",
+  "@securityKey": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "securityKeyLost": "ආරක්ෂක යතුර නැතිවුනාද?",
+  "@securityKeyLost": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "send": "යවන්න",
+  "@send": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "showPassword": "මුරපදය පෙන්වන්න",
+  "@showPassword": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "sunday": "ඉරිදා",
+  "@sunday": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "username": "පරිශීලක නාමය",
+  "@username": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "videoCall": "දෘශ්‍ය ඇමතුම",
+  "@videoCall": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "wallpaper": "බිතුපත",
+  "@wallpaper": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "warning": "අවවාදයයි!",
+  "@warning": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "wednesday": "බදාදා",
+  "@wednesday": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "writeAMessage": "පණිවිඩයක් ලියන්න…",
+  "@writeAMessage": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "yes": "ඔව්",
+  "@yes": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "you": "ඔබ",
+  "@you": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "yourOwnUsername": "ඔබට හිමි පරිශීලකනාමය",
+  "@yourOwnUsername": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "zoomIn": "විශාලනය",
+  "@zoomIn": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "zoomOut": "කුඩාලනය",
+  "@zoomOut": {
+    "type": "text",
+    "placeholders": {}
+  }
+}
--- a/assets/l10n/intl_sk.arb
+++ b/assets/l10n/intl_sk.arb
--- a/assets/l10n/intl_sl.arb
+++ b/assets/l10n/intl_sl.arb
--- a/assets/l10n/intl_sr.arb
+++ b/assets/l10n/intl_sr.arb
--- a/assets/l10n/intl_sv.arb
+++ b/assets/l10n/intl_sv.arb
--- a/assets/l10n/intl_ta.arb
+++ b/assets/l10n/intl_ta.arb
@ -1,20 +1,20 @@
 {
-    "@@last_modified": "2021-08-14 12:41:09.826673",
-    "acceptedTheInvitation": "{username} அழைப்பை ஏற்றுக்கொண்டார்",
-    "@acceptedTheInvitation": {
-        "type": "text",
-        "placeholders": {
-            "username": {}
-        }
-    },
-    "accept": "ஏற்றுக்கொள்",
-    "@accept": {
-        "type": "text",
-        "placeholders": {}
-    },
-    "about": "பற்றி",
-    "@about": {
-        "type": "text",
-        "placeholders": {}
+  "@@last_modified": "2021-08-14 12:41:09.826673",
+  "acceptedTheInvitation": "{username} அழைப்பை ஏற்றுக்கொண்டார்",
+  "@acceptedTheInvitation": {
+    "type": "text",
+    "placeholders": {
+      "username": {}
    }
-}
+  },
+  "accept": "ஏற்றுக்கொள்",
+  "@accept": {
+    "type": "text",
+    "placeholders": {}
+  },
+  "about": "பற்றி",
+  "@about": {
+    "type": "text",
+    "placeholders": {}
+  }
+}
--- a/assets/l10n/intl_tr.arb
+++ b/assets/l10n/intl_tr.arb
--- a/assets/l10n/intl_uk.arb
+++ b/assets/l10n/intl_uk.arb
--- a/assets/l10n/intl_vi.arb
+++ b/assets/l10n/intl_vi.arb
--- a/assets/l10n/intl_zh.arb
+++ b/assets/l10n/intl_zh.arb
--- a/assets/l10n/intl_zh_Hant.arb
+++ b/assets/l10n/intl_zh_Hant.arb
--- a/assets/private_chat_wallpaper.png
+++ b/assets/private_chat_wallpaper.png
--- a/assets/start_chat.png
+++ b/assets/start_chat.png
--- a/docs/Kofi_pixel_logo.png
+++ b/docs/Kofi_pixel_logo.png
--- a/docs/index.html
+++ b/docs/index.html
@ -1,119 +1,565 @@
 <!DOCTYPE html>
 <html lang="en">
-<html>

 <head>
-	<meta charset="utf-8">
-	<title>FluffyChat Official Website</title>
-	<meta name="identifier-url" content="https://fluffychat.im" />
-	<meta name="title" content="FluffyChat Official Website" />
-	<meta name="description" content="The cutest messenger in the Matrix network" />
-	<meta name="abstract" content="FluffyChat is the cutest messenger in the Matrix network" />
-	<meta name="keywords" content="FluffyChat, Matrix, Flutter, App" />
-	<meta name="author" content="Krille Fear" />
-	<meta name="revisit-after" content="15" />
-	<meta name="language" content="EN" />
-	<meta name="robots" content="All" />
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="icon" type="image/x-icon" href="favicon.png">
-	<link href="tailwind.css" rel="stylesheet">
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title>FluffyChat - Official Website</title>
+	<meta name="description" content="A cute and secure chatclient for the matrix protocol">
+	<meta name="keywords"
+		content="Fluffychat, Matrix, Web, Android, iOS, Desktop, Chat, Client, Chatclient, Matrix.org, Secure, E2EE, End to End, Encryption, End to End Encryption, F-Droid, Foss, FOSS, OpenSource, Free, Community, Open">
+	<script type="application/ld+json">
+		{
+			"@context": "https://schema.org",
+			"@type": "MobileApplication",
+			"name": "Fluffychat",
+			"applicationCategory": "CommunicationApplication",
+			"countriesNotSupported": "fr",
+			"operatingSystem": "ANDROID",
+			"releaseNotes": "https://gitlab.com/famedly/fluffychat/-/blob/main/CHANGELOG.md",
+			"screenshot": "https://gitlab.com/famedly/fluffychat/-/raw/main/docs/screenshots/mobile.png",
+			"softwareHelp": "https://gitlab.com/famedly/fluffychat/-/wikis/FAQ",
+			"author": {
+				"@type": "Person",
+				"callSign": "KrilleFear"
+			},
+			"license": "https://gitlab.com/famedly/fluffychat/-/blob/main/LICENSE",
+			"offers": {
+				"@type": "Offer",
+				"price": "0",
+				"priceCurrency": "USD"
+			},
+			"aggregateRating": {
+				"@type": "AggregateRating",
+				"ratingValue": "4.5",
+				"ratingCount": "133"
+			},
+			"installUrl": "https://play.google.com/store/apps/details?id=chat.fluffy.fluffychat"
+		}
+	</script>
+	<script type="application/ld+json">
+		{
+			"@context": "https://schema.org",
+			"@type": "MobileApplication",
+			"name": "Fluffychat",
+			"applicationCategory": "CommunicationApplication",
+			"countriesNotSupported": "fr",
+			"operatingSystem": "ANDROID",
+			"releaseNotes": "https://gitlab.com/famedly/fluffychat/-/blob/main/CHANGELOG.md",
+			"screenshot": "https://gitlab.com/famedly/fluffychat/-/raw/main/docs/screenshots/mobile.png",
+			"softwareHelp": "https://gitlab.com/famedly/fluffychat/-/wikis/FAQ",
+			"author": {
+				"@type": "Person",
+				"callSign": "KrilleFear"
+			},
+			"license": "https://gitlab.com/famedly/fluffychat/-/blob/main/LICENSE",
+			"offers": {
+				"@type": "Offer",
+				"price": "0",
+				"priceCurrency": "USD"
+			},
+			"aggregateRating": {
+				"@type": "AggregateRating",
+				"ratingValue": "4.5",
+				"ratingCount": "133"
+			},
+			"installUrl": "https://f-droid.org/de/packages/chat.fluffy.fluffychat/"
+		}
+	</script>
+	<script type="application/ld+json">
+		{
+			"@context": "https://schema.org",
+			"@type": "MobileApplication",
+			"name": "Fluffychat",
+			"applicationCategory": "CommunicationApplication",
+			"countriesNotSupported": "fr",
+			"operatingSystem": "IOS",
+			"releaseNotes": "https://gitlab.com/famedly/fluffychat/-/blob/main/CHANGELOG.md",
+			"screenshot": "https://gitlab.com/famedly/fluffychat/-/raw/main/docs/screenshots/mobile.png",
+			"softwareHelp": "https://gitlab.com/famedly/fluffychat/-/wikis/FAQ",
+			"author": {
+				"@type": "Person",
+				"callSign": "KrilleFear"
+			},
+			"license": "https://gitlab.com/famedly/fluffychat/-/blob/main/LICENSE",
+			"offers": {
+				"@type": "Offer",
+				"price": "0",
+				"priceCurrency": "USD"
+			},
+			"aggregateRating": {
+				"@type": "AggregateRating",
+				"ratingValue": "4.4",
+				"ratingCount": "28"
+			},
+			"installUrl": "https://apps.apple.com/app/fluffychat/id1551469600"
+		}
+	</script>
+	<script type="application/ld+json">
+		{
+			"@context": "https://schema.org",
+			"@type": "WebApplication",
+			"name": "Fluffychat",
+			"applicationCategory": "CommunicationApplication",
+			"countriesNotSupported": "fr",
+			"operatingSystem": "WEB",
+			"releaseNotes": "https://gitlab.com/famedly/fluffychat/-/blob/main/CHANGELOG.md",
+			"screenshot": "https://gitlab.com/famedly/fluffychat/-/raw/main/docs/screenshots/mobile.png",
+			"softwareHelp": "https://gitlab.com/famedly/fluffychat/-/wikis/FAQ",
+			"author": {
+				"@type": "Person",
+				"callSign": "KrilleFear"
+			},
+			"license": "https://gitlab.com/famedly/fluffychat/-/blob/main/LICENSE",
+			"offers": {
+				"@type": "Offer",
+				"price": "0",
+				"priceCurrency": "USD"
+			},
+			"aggregateRating": {
+				"@type": "AggregateRating",
+				"ratingValue": "4.5",
+				"ratingCount": "133"
+			},
+			"url": "https://fluffychat.im/web",
+			"downloadUrl": "https://fluffychat.im/web",
+			"installUrl": "https://fluffychat.im/web"
+		}
+	</script>
+	<script type="application/ld+json">
+		{
+			"@context": "https://schema.org",
+			"@type": "SoftwareApplication",
+			"name": "Fluffychat",
+			"applicationCategory": "CommunicationApplication",
+			"countriesNotSupported": "fr",
+			"operatingSystem": "LINUX",
+			"releaseNotes": "https://gitlab.com/famedly/fluffychat/-/blob/main/CHANGELOG.md",
+			"screenshot": "https://gitlab.com/famedly/fluffychat/-/raw/main/docs/screenshots/mobile.png",
+			"softwareHelp": "https://gitlab.com/famedly/fluffychat/-/wikis/FAQ",
+			"author": {
+				"@type": "Person",
+				"callSign": "KrilleFear"
+			},
+			"license": "https://gitlab.com/famedly/fluffychat/-/blob/main/LICENSE",
+			"offers": {
+				"@type": "Offer",
+				"price": "0",
+				"priceCurrency": "USD"
+			},
+			"aggregateRating": {
+				"@type": "AggregateRating",
+				"ratingValue": "4.5",
+				"ratingCount": "133"
+			},
+			"downloadUrl": "https://snapcraft.io/fluffychat",
+			"installUrl": "https://snapcraft.io/fluffychat"
+		}
+	</script>
+	<script type="application/ld+json">
+		{
+			"@context": "https://schema.org",
+			"@type": "SoftwareApplication",
+			"name": "Fluffychat",
+			"applicationCategory": "CommunicationApplication",
+			"countriesNotSupported": "fr",
+			"operatingSystem": "LINUX",
+			"releaseNotes": "https://gitlab.com/famedly/fluffychat/-/blob/main/CHANGELOG.md",
+			"screenshot": "https://gitlab.com/famedly/fluffychat/-/raw/main/docs/screenshots/mobile.png",
+			"softwareHelp": "https://gitlab.com/famedly/fluffychat/-/wikis/FAQ",
+			"author": {
+				"@type": "Person",
+				"callSign": "KrilleFear"
+			},
+			"license": "https://gitlab.com/famedly/fluffychat/-/blob/main/LICENSE",
+			"offers": {
+				"@type": "Offer",
+				"price": "0",
+				"priceCurrency": "USD"
+			},
+			"aggregateRating": {
+				"@type": "AggregateRating",
+				"ratingValue": "4.5",
+				"ratingCount": "133"
+			},
+			"downloadUrl": "https://flathub.org/apps/details/im.fluffychat.Fluffychat",
+			"installUrl": "https://flathub.org/apps/details/im.fluffychat.Fluffychat"
+		}
+	</script>
+	<script type="application/ld+json">
+	{
+		"@context": "https://schema.org",
+		"@type": "WebSite",
+		"name": "FluffyChat - Official Website",
+		"url": "https://fluffychat.im",
+		"description": "A cute and secure chatclient for the matrix protocol",
+		"thumbnailUrl": "https://fluffychat.im/favicon.png",
+		"inLanguage": "de-de"
+	}
+	</script>
+	<script type="application/ld+json">
+		{
+			"@context": "https://schema.org",
+			"@type": "BreadcrumbList",
+			"description": "Breadcrumbs list",
+			"name": "Breadcrumbs",
+			"itemListElement": [
+				{
+					"@type": "ListItem",
+					"item": {
+						"@id": "https://fluffychat.im",
+						"name": "Homepage"
+					},
+					"position": 1
+				}
+			]
+		}
+	</script>
+	<link rel="icon" type="image/png" href="favicon.png">
+	<link rel="stylesheet" href="tailwind.css">
+	<!-- Animation CSS-->
 	<style>
 		@font-face {
 			font-family: Zen Kurenaido;
 			src: url(ZenKurenaido-Regular.ttf);
 		}
+
+		/* ----------------------------------------------
+		 * Generated by Animista
+		 * w: http://animista.net, t: @cssanimista
+		 * ---------------------------------------------- */
+
+		.slide-in-bottom {
+			-webkit-animation: slide-in-bottom .5s cubic-bezier(.25, .46, .45, .94) both;
+			animation: slide-in-bottom .5s cubic-bezier(.25, .46, .45, .94) both
+		}
+
+		.slide-in-bottom-h1 {
+			-webkit-animation: slide-in-bottom .5s cubic-bezier(.25, .46, .45, .94) .5s both;
+			animation: slide-in-bottom .5s cubic-bezier(.25, .46, .45, .94) .5s both
+		}
+
+		.slide-in-bottom-subtitle {
+			-webkit-animation: slide-in-bottom .5s cubic-bezier(.25, .46, .45, .94) .75s both;
+			animation: slide-in-bottom .5s cubic-bezier(.25, .46, .45, .94) .75s both
+		}
+
+		.fade-in {
+			-webkit-animation: fade-in 1.2s cubic-bezier(.39, .575, .565, 1.000) 1s both;
+			animation: fade-in 1.2s cubic-bezier(.39, .575, .565, 1.000) 1s both
+		}
+
+		.bounce-top-icons {
+			-webkit-animation: bounce-top .9s 1s both;
+			animation: bounce-top .9s 1s both
+		}
+
+		@-webkit-keyframes slide-in-bottom {
+			0% {
+				-webkit-transform: translateY(1000px);
+				transform: translateY(1000px);
+				opacity: 0
+			}
+
+			100% {
+				-webkit-transform: translateY(0);
+				transform: translateY(0);
+				opacity: 1
+			}
+		}
+
+		@keyframes slide-in-bottom {
+			0% {
+				-webkit-transform: translateY(1000px);
+				transform: translateY(1000px);
+				opacity: 0
+			}
+
+			100% {
+				-webkit-transform: translateY(0);
+				transform: translateY(0);
+				opacity: 1
+			}
+		}
+
+		@-webkit-keyframes bounce-top {
+			0% {
+				-webkit-transform: translateY(-45px);
+				transform: translateY(-45px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in;
+				opacity: 1
+			}
+
+			24% {
+				opacity: 1
+			}
+
+			40% {
+				-webkit-transform: translateY(-24px);
+				transform: translateY(-24px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in
+			}
+
+			65% {
+				-webkit-transform: translateY(-12px);
+				transform: translateY(-12px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in
+			}
+
+			82% {
+				-webkit-transform: translateY(-6px);
+				transform: translateY(-6px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in
+			}
+
+			93% {
+				-webkit-transform: translateY(-4px);
+				transform: translateY(-4px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in
+			}
+
+			25%,
+			55%,
+			75%,
+			87% {
+				-webkit-transform: translateY(0);
+				transform: translateY(0);
+				-webkit-animation-timing-function: ease-out;
+				animation-timing-function: ease-out
+			}
+
+			100% {
+				-webkit-transform: translateY(0);
+				transform: translateY(0);
+				-webkit-animation-timing-function: ease-out;
+				animation-timing-function: ease-out;
+				opacity: 1
+			}
+		}
+
+		@keyframes bounce-top {
+			0% {
+				-webkit-transform: translateY(-45px);
+				transform: translateY(-45px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in;
+				opacity: 1
+			}
+
+			24% {
+				opacity: 1
+			}
+
+			40% {
+				-webkit-transform: translateY(-24px);
+				transform: translateY(-24px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in
+			}
+
+			65% {
+				-webkit-transform: translateY(-12px);
+				transform: translateY(-12px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in
+			}
+
+			82% {
+				-webkit-transform: translateY(-6px);
+				transform: translateY(-6px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in
+			}
+
+			93% {
+				-webkit-transform: translateY(-4px);
+				transform: translateY(-4px);
+				-webkit-animation-timing-function: ease-in;
+				animation-timing-function: ease-in
+			}
+
+			25%,
+			55%,
+			75%,
+			87% {
+				-webkit-transform: translateY(0);
+				transform: translateY(0);
+				-webkit-animation-timing-function: ease-out;
+				animation-timing-function: ease-out
+			}
+
+			100% {
+				-webkit-transform: translateY(0);
+				transform: translateY(0);
+				-webkit-animation-timing-function: ease-out;
+				animation-timing-function: ease-out;
+				opacity: 1
+			}
+		}
+
+		@-webkit-keyframes fade-in {
+			0% {
+				opacity: 0
+			}
+
+			100% {
+				opacity: 1
+			}
+		}
+
+		@keyframes fade-in {
+			0% {
+				opacity: 0
+			}
+
+			100% {
+				opacity: 1
+			}
+		}
 	</style>
+
 </head>

-<body
-	class="flex flex-col items-center justify-center min-h-screen w-screen bg-gradient-to-t from-purple-200 to-blue-50 dark:from-gray-800 dark:to-slate-900 p-4"
-	style="font-family: 'Zen Kurenaido', sans-serif;">
-	<img src="favicon.png" class="h-10" />
-	<h1 class="flex text-4xl items-center mb-4">
-		<span style="color: #5625BA">Fluffy</span>
-		<span style="color: #41a2bc">Chat</span>
-	</h1>
-	<img src="screenshots/screenshots.png" class="sm:max-w-lg max-w-screen mb-8" />

-	<div class="max-w-lg mb-8 flex justify-center flex-wrap">
-		<a href="https://apps.apple.com/app/fluffychat/id1551469600"><img src="appstore-badge.png"
-				class="w-36 pr-2 mb-2 inline hover:scale-105 transition-transform"></a>
-		<a href="https://play.google.com/store/apps/details?id=chat.fluffy.fluffychat"><img src="google-play-badge.png"
-				class="w-36 pr-2 mb-2  hover:scale-105 transition-transform inline">
-		</a><a href="https://f-droid.org/de/packages/chat.fluffy.fluffychat/"><img src="fdroid_button.png"
-				class="w-36 pr-2 mb-2  hover:scale-105 transition-transform inline">
-		</a>
-		<a href="https://fluffychat.im/web">
-			<img src="browser-badge.png" class="w-36 pr-2 mb-2  hover:scale-105 transition-transform inline"></a>
-		<a href="https://snapcraft.io/fluffychat"><img
-				src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg"
-				class="w-36 pr-2 mb-2  hover:scale-105 transition-transform inline"></a>
-		<a href="https://flathub.org/apps/details/im.fluffychat.Fluffychat"><img src="flathub-badge-en.png"
-				class="w-36 pr-2 mb-2  hover:scale-105 transition-transform inline"></a>
-	</div>
+<body class="leading-normal tracking-normal text-gray-900" style="font-family: 'Zen Kurenaido', sans-serif;">
+
+
+
+	<div class="h-screen pb-14 bg-right bg-cover" style="background-image:url('bg.svg');">
+		<!--Nav-->
+		<div class="w-full container mx-auto p-6">
+
+			<div class="w-full flex items-center justify-between">
+				<a class="flex items-center no-underline hover:no-underline font-bold text-2xl lg:text-4xl" href="#">
+					<img src="favicon.png" class="h-8 fill-current text-indigo-600 pr-2" /> <span
+						style="color: #5625BA">Fluffy</span><span style="color: #41a2bc">Chat</span>
+				</a>
+
+				<div class="flex w-1/2 justify-end content-center">
+					<a class="inline-block text-blue-300 no-underline hover:text-indigo-800 hover:text-underline text-center h-10 p-2 md:h-auto md:p-4"
+						href="https://matrix.to/#/#fluffychat:matrix.org">
+						<svg class="fill-current h-6" enable-background="new -91 49.217 56.693 56.693" id="Layer_1"
+							version="1.1" viewBox="-91 49.217 56.693 56.693" xml:space="preserve"
+							xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+							<path
+								d="M-38.3289,79.8244c-0.7526-2.2362-3.1756-3.4388-5.4117-2.6861l-4.5351,1.5264l-3.0737-9.1321l4.4169-1.4866  c2.2362-0.7526,3.4388-3.1756,2.6861-5.4117c-0.7526-2.2362-3.1756-3.4388-5.4117-2.6861l-4.4168,1.4866l-1.4877-4.4201  c-0.7527-2.2362-3.1756-3.4388-5.4117-2.6861v0c-2.2362,0.7526-3.4388,3.1756-2.6861,5.4117l1.4877,4.4201l-9.3246,3.1385  l-1.4697-4.3666c-0.7527-2.2362-3.1756-3.4388-5.4117-2.6861c-2.2362,0.7527-3.4388,3.1756-2.6861,5.4117l1.4697,4.3666  l-4.445,1.4961c-2.2362,0.7527-3.4388,3.1756-2.6861,5.4117v0c0.7526,2.2362,3.1756,3.4388,5.4117,2.6861l4.445-1.4961  l3.0737,9.1321l-4.3268,1.4563c-2.2362,0.7527-3.4388,3.1756-2.6861,5.4117c0.7526,2.2362,3.1756,3.4388,5.4117,2.6861  l4.3268-1.4563l1.5778,4.6877c0.7527,2.2362,3.1756,3.4388,5.4117,2.6861c2.2362-0.7527,3.4388-3.1756,2.6861-5.4117l-1.5778-4.6877  l9.3246-3.1385l1.5598,4.6342c0.7527,2.2362,3.1756,3.4388,5.4117,2.6861c2.2362-0.7527,3.4388-3.1756,2.6861-5.4117l-1.5598-4.6342  l4.5351-1.5264C-38.7789,84.4835-37.5762,82.0606-38.3289,79.8244z M-65.6982,84.5288l-3.0737-9.1321l9.3246-3.1385l3.0737,9.1321  L-65.6982,84.5288z" />
+						</svg>
+					</a>
+					<a class="inline-block text-blue-300 no-underline hover:text-indigo-800 hover:text-underline text-center h-10 p-2 md:h-auto md:p-4"
+						href="https://twitter.com/KrilleFear">
+						<svg class="fill-current h-6" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+							<path
+								d="M30.063 7.313c-.813 1.125-1.75 2.125-2.875 2.938v.75c0 1.563-.188 3.125-.688 4.625a15.088 15.088 0 0 1-2.063 4.438c-.875 1.438-2 2.688-3.25 3.813a15.015 15.015 0 0 1-4.625 2.563c-1.813.688-3.75 1-5.75 1-3.25 0-6.188-.875-8.875-2.625.438.063.875.125 1.375.125 2.688 0 5.063-.875 7.188-2.5-1.25 0-2.375-.375-3.375-1.125s-1.688-1.688-2.063-2.875c.438.063.813.125 1.125.125.5 0 1-.063 1.5-.25-1.313-.25-2.438-.938-3.313-1.938a5.673 5.673 0 0 1-1.313-3.688v-.063c.813.438 1.688.688 2.625.688a5.228 5.228 0 0 1-1.875-2c-.5-.875-.688-1.813-.688-2.75 0-1.063.25-2.063.75-2.938 1.438 1.75 3.188 3.188 5.25 4.25s4.313 1.688 6.688 1.813a5.579 5.579 0 0 1 1.5-5.438c1.125-1.125 2.5-1.688 4.125-1.688s3.063.625 4.188 1.813a11.48 11.48 0 0 0 3.688-1.375c-.438 1.375-1.313 2.438-2.563 3.188 1.125-.125 2.188-.438 3.313-.875z">
+							</path>
+						</svg>
+					</a>
+					<a class="inline-block text-blue-300 no-underline hover:text-indigo-800 hover:text-underline text-center h-10 p-2 md:h-auto md:p-4"
+						href="https://metalhead.club/@krille">
+						<svg class="fill-current h-6" viewBox="0 0 1000 1000" version="1.1"
+							xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+							xml:space="preserve"
+							style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
+							<clipPath id="_clip1">
+								<rect x="33.6" y="-0.035" width="932.844" height="1000" />
+							</clipPath>
+							<g clip-path="url(#_clip1)">
+								<path
+									d="M946.586,599.455c-13.713,70.541 -122.816,147.742 -248.121,162.703c-65.341,7.796 -129.674,14.962 -198.275,11.815c-112.191,-5.139 -200.716,-26.776 -200.716,-26.776c0,10.92 0.673,21.319 2.02,31.044c14.586,110.711 109.787,117.344 199.967,120.436c91.021,3.114 172.068,-22.44 172.068,-22.44l3.74,82.281c0,0 -63.666,34.185 -177.079,40.473c-62.539,3.437 -140.192,-1.573 -230.636,-25.511c-196.158,-51.916 -229.893,-260.996 -235.055,-473.143c-1.573,-62.987 -0.603,-122.381 -0.603,-172.056c0,-216.931 142.142,-280.516 142.142,-280.516c71.672,-32.914 194.655,-46.755 322.508,-47.8l3.142,0c127.853,1.045 250.917,14.886 322.583,47.8c0,0 142.138,63.585 142.138,280.516c0,0 1.783,160.053 -19.823,271.174"
+									style="fill-rule:nonzero;" />
+								<path
+									d="M798.748,345.11l0,262.667l-104.07,0l0,-254.946c0,-53.743 -22.614,-81.021 -67.847,-81.021c-50.012,0 -75.077,32.359 -75.077,96.343l0,139.547l-103.457,0l0,-139.547c0,-63.984 -25.07,-96.343 -75.082,-96.343c-45.233,0 -67.847,27.278 -67.847,81.021l0,254.946l-104.07,0l0,-262.667c0,-53.683 13.669,-96.343 41.127,-127.904c28.314,-31.561 65.395,-47.741 111.425,-47.741c53.256,0 93.585,20.468 120.251,61.41l25.922,43.451l25.927,-43.451c26.66,-40.942 66.99,-61.41 120.251,-61.41c46.025,0 83.106,16.18 111.425,47.741c27.453,31.561 41.122,74.221 41.122,127.904"
+									style="fill:#fff;fill-rule:nonzero;" />
+							</g>
+						</svg>
+					</a>
+					<a class="inline-block text-blue-300 no-underline hover:text-indigo-800 hover:text-underline text-center h-10 p-2 md:h-auto md:p-4"
+						href="https://ko-fi.com/krille">
+						<img class="w-10 hover:animate-bounce" src="Kofi_pixel_logo.png"/>
+					</a>
+				</div>
+
+			</div>
+
+		</div>
+
+		<!--Main-->
+		<div class="container pt-8 px-6 mx-auto flex flex-wrap flex-col md:flex-row items-center">
+
+			<!--Left Col-->
+			<div class="flex flex-col w-full xl:w-2/5 justify-center lg:items-start overflow-y-hidden">
+				<h1
+					class="my-4 text-3xl md:text-5xl text-purple-800 font-bold leading-tight text-center md:text-left slide-in-bottom-h1">
+					Open. Nonprofit. Cute.</h1>
+				<p class="leading-normal text-base md:text-2xl mb-8 text-center md:text-left slide-in-bottom-subtitle">
+					Easy to use (<a class="underline hover:text-blue-700 transition-all"
+						href="https://matrix.org">matrix</a>) messenger. Secure and decentralized.</p>
+
+				<p class="text-blue-700 font-bold pb-4 text-center md:text-left fade-in">Mobile app:</p>
+				<div class="w-full flex justify-center md:justify-start pb-24 lg:pb-0 fade-in">
+					<a href="https://apps.apple.com/app/fluffychat/id1551469600"><img src="appstore-badge.png"
+							class="max-h-12 pr-2 mb-2 bounce-top-icons inline"></a>
+					<a href="https://play.google.com/store/apps/details?id=chat.fluffy.fluffychat"><img
+							src="google-play-badge.png" class="max-h-12 pr-2 mb-2 bounce-top-icons inline">
+					</a><a href="https://f-droid.org/de/packages/chat.fluffy.fluffychat/"><img src="fdroid_button.png"
+							class="max-h-12 pr-2 mb-2 bounce-top-icons inline">
+					</a>
+				</div>
+				<p class="text-blue-700 font-bold py-4 text-center md:text-left fade-in">Desktop app:</p>
+				<div class="w-full flex justify-center md:justify-start pb-24 lg:pb-0 fade-in">
+					<a href="https://fluffychat.im/web">
+						<img src="browser-badge.png" class="max-h-12 pr-2 mb-2 bounce-top-icons inline"></a>
+					<a href="https://snapcraft.io/fluffychat"><img
+							src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg"
+							class="max-h-12 pr-2 mb-2 bounce-top-icons inline"></a>
+					<a href="https://flathub.org/apps/details/im.fluffychat.Fluffychat"><img src="flathub-badge-en.png"
+							class="max-h-12 pr-2 mb-2 bounce-top-icons inline"></a>
+				</div>
+
+			</div>
+
+			<!--Right Col-->
+			<div class="w-full xl:w-3/5 py-6 relative">
+				<img class="w-full mx-auto slide-in-bottom" src="screenshots/screenshots.png">
+			</div>
+
+			<!--Footer-->
+			<div class="w-full pt-16 pb-6 text-sm text-center md:text-left fade-in">
+				<a class="text-gray-500 no-underline hover:text-purple-800"
+					href="https://gitlab.com/famedly/fluffychat">Source code</a>
+				-
+				<a class="text-gray-500 no-underline hover:text-purple-800"
+					href="https://gitlab.com/famedly/fluffychat/-/blob/main/PRIVACY.md">Privacy</a>
+				-
+				<a class="text-gray-500 no-underline hover:text-purple-800"
+					href="https://gitlab.com/famedly/fluffychat/-/blob/main/CHANGELOG.md">Changelog</a>
+				-
+				<a class="text-gray-500 no-underline hover:text-purple-800"
+					href="https://hosted.weblate.org/projects/fluffychat/">Translations</a>
+				-
+				<a class="text-gray-500 no-underline hover:text-purple-800"
+					href="https://gitlab.com/famedly/fluffychat/-/blob/main/docs/fdroid_repo.md">FluffyChat F-Droid repository</a>
+				-
+				<a class="text-gray-500 no-underline hover:text-purple-800"
+					href="https://liberapay.com/KrilleChritzelius/donate">Donate</a>
+				-
+				<a class="text-gray-500 no-underline hover:text-purple-800"
+					href="https://keys.mailvelope.com/pks/lookup?op=get&search=christian-pauly%40posteo.de">Contact</a>
+				-
+				<a class="text-gray-500 no-underline hover:text-purple-800" href="https://krillefear.gitlab.io">Created
+					by Krille Fear</a>
+			</div>
+
+		</div>

-	<div class="flex mb-8 justify-center content-center">
-		<a rel="me"
-			class="inline-block text-indigo-500 no-underline hover:text-indigo-900 hover:scale-105 transition-all text-center h-auto p-4"
-			href="https://metalhead.club/@krille">
-			<svg class="fill-current h-6" viewBox="0 0 1000 1000" version="1.1" xmlns="http://www.w3.org/2000/svg"
-				xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve"
-				style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;">
-				<clipPath id="_clip1">
-					<rect x="33.6" y="-0.035" width="932.844" height="1000" />
-				</clipPath>
-				<g clip-path="url(#_clip1)">
-					<path
-						d="M946.586,599.455c-13.713,70.541 -122.816,147.742 -248.121,162.703c-65.341,7.796 -129.674,14.962 -198.275,11.815c-112.191,-5.139 -200.716,-26.776 -200.716,-26.776c0,10.92 0.673,21.319 2.02,31.044c14.586,110.711 109.787,117.344 199.967,120.436c91.021,3.114 172.068,-22.44 172.068,-22.44l3.74,82.281c0,0 -63.666,34.185 -177.079,40.473c-62.539,3.437 -140.192,-1.573 -230.636,-25.511c-196.158,-51.916 -229.893,-260.996 -235.055,-473.143c-1.573,-62.987 -0.603,-122.381 -0.603,-172.056c0,-216.931 142.142,-280.516 142.142,-280.516c71.672,-32.914 194.655,-46.755 322.508,-47.8l3.142,0c127.853,1.045 250.917,14.886 322.583,47.8c0,0 142.138,63.585 142.138,280.516c0,0 1.783,160.053 -19.823,271.174"
-						style="fill-rule:nonzero;" />
-					<path
-						d="M798.748,345.11l0,262.667l-104.07,0l0,-254.946c0,-53.743 -22.614,-81.021 -67.847,-81.021c-50.012,0 -75.077,32.359 -75.077,96.343l0,139.547l-103.457,0l0,-139.547c0,-63.984 -25.07,-96.343 -75.082,-96.343c-45.233,0 -67.847,27.278 -67.847,81.021l0,254.946l-104.07,0l0,-262.667c0,-53.683 13.669,-96.343 41.127,-127.904c28.314,-31.561 65.395,-47.741 111.425,-47.741c53.256,0 93.585,20.468 120.251,61.41l25.922,43.451l25.927,-43.451c26.66,-40.942 66.99,-61.41 120.251,-61.41c46.025,0 83.106,16.18 111.425,47.741c27.453,31.561 41.122,74.221 41.122,127.904"
-						style="fill:#fff;fill-rule:nonzero;" />
-				</g>
-			</svg>
-		</a>
-		<a class="inline-block text-indigo-500 no-underline hover:text-indigo-900 hover:scale-105 transition-all text-center h-auto p-4"
-			href="https://matrix.to/#/#fluffychat:matrix.org">
-			<svg class="fill-current h-6" enable-background="new -91 49.217 56.693 56.693" id="Layer_1" version="1.1"
-				viewBox="-91 49.217 56.693 56.693" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"
-				xmlns:xlink="http://www.w3.org/1999/xlink">
-				<path
-					d="M-38.3289,79.8244c-0.7526-2.2362-3.1756-3.4388-5.4117-2.6861l-4.5351,1.5264l-3.0737-9.1321l4.4169-1.4866  c2.2362-0.7526,3.4388-3.1756,2.6861-5.4117c-0.7526-2.2362-3.1756-3.4388-5.4117-2.6861l-4.4168,1.4866l-1.4877-4.4201  c-0.7527-2.2362-3.1756-3.4388-5.4117-2.6861v0c-2.2362,0.7526-3.4388,3.1756-2.6861,5.4117l1.4877,4.4201l-9.3246,3.1385  l-1.4697-4.3666c-0.7527-2.2362-3.1756-3.4388-5.4117-2.6861c-2.2362,0.7527-3.4388,3.1756-2.6861,5.4117l1.4697,4.3666  l-4.445,1.4961c-2.2362,0.7527-3.4388,3.1756-2.6861,5.4117v0c0.7526,2.2362,3.1756,3.4388,5.4117,2.6861l4.445-1.4961  l3.0737,9.1321l-4.3268,1.4563c-2.2362,0.7527-3.4388,3.1756-2.6861,5.4117c0.7526,2.2362,3.1756,3.4388,5.4117,2.6861  l4.3268-1.4563l1.5778,4.6877c0.7527,2.2362,3.1756,3.4388,5.4117,2.6861c2.2362-0.7527,3.4388-3.1756,2.6861-5.4117l-1.5778-4.6877  l9.3246-3.1385l1.5598,4.6342c0.7527,2.2362,3.1756,3.4388,5.4117,2.6861c2.2362-0.7527,3.4388-3.1756,2.6861-5.4117l-1.5598-4.6342  l4.5351-1.5264C-38.7789,84.4835-37.5762,82.0606-38.3289,79.8244z M-65.6982,84.5288l-3.0737-9.1321l9.3246-3.1385l3.0737,9.1321  L-65.6982,84.5288z" />
-			</svg>
-		</a>
-		<a class="inline-block no-underline hover:scale-105 transition-all text-center h-auto p-4"
-			href="https://ko-fi.com/krille">
-			<img src="kofi_button_dark.png" class="h-6 fill-current" />
-		</a>
-	</div>

-	<!--Footer-->
-	<div class="w-full text-sm text-center max-w-lg">
-		<a class="text-slate-700 dark:text-slate-200 no-underline hover:text-purple-800"
-			href="https://gitlab.com/famedly/fluffychat">Source
-			code</a>
-		-
-		<a class="text-slate-700 dark:text-slate-200 no-underline hover:text-purple-800"
-			href="https://gitlab.com/famedly/fluffychat/-/blob/main/PRIVACY.md">Privacy</a>
-		-
-		<a class="text-slate-700 dark:text-slate-200 no-underline hover:text-purple-800"
-			href="https://gitlab.com/famedly/fluffychat/-/blob/main/CHANGELOG.md">Changelog</a>
-		-
-		<a class="text-slate-700 dark:text-slate-200 no-underline hover:text-purple-800"
-			href="https://hosted.weblate.org/projects/fluffychat/">Translations</a>
-		-
-		<a class="text-slate-700 dark:text-slate-200 no-underline hover:text-purple-800"
-			href="https://gitlab.com/famedly/fluffychat/-/blob/main/docs/fdroid_repo.md">FluffyChat F-Droid
-			repository</a>
-		-
-		<a class="text-slate-700 dark:text-slate-200 no-underline hover:text-purple-800"
-			href="https://keys.mailvelope.com/pks/lookup?op=get&search=christian-pauly%40posteo.de">Contact</a>
-		-
-		<a class="text-slate-700 dark:text-slate-200 no-underline hover:text-purple-800"
-			href="https://krillefear.gitlab.io">Created
-			by Krille Fear</a>
 	</div>

 </body>

-</html>
+</html>
--- a/docs/kofi_button_dark.png
+++ b/docs/kofi_button_dark.png
--- a/fonts/NotoEmoji/NotoColorEmoji.ttf
+++ b/fonts/NotoEmoji/NotoColorEmoji.ttf
--- a/fonts/NotoEmoji/NotoEmoji-Regular.ttf
+++ b/fonts/NotoEmoji/NotoEmoji-Regular.ttf
--- a/integration_test/app_test.dart
+++ b/integration_test/app_test.dart
@ -1,188 +1,49 @@
-import 'package:fluffychat/config/setting_keys.dart';
-import 'package:fluffychat/pages/chat/chat_view.dart';
-import 'package:fluffychat/pages/chat_list/chat_list_body.dart';
-import 'package:fluffychat/pages/chat_list/search_title.dart';
-import 'package:fluffychat/pages/invitation_selection/invitation_selection_view.dart';
+import 'dart:developer';

 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:hive_flutter/hive_flutter.dart';
 import 'package:integration_test/integration_test.dart';

 import 'package:fluffychat/main.dart' as app;
-import 'package:shared_preferences/shared_preferences.dart';

-import 'extensions/default_flows.dart';
-import 'extensions/wait_for.dart';
 import 'users.dart';

 void main() {
  IntegrationTestWidgetsFlutterBinding.ensureInitialized();

-  group(
-    'Integration Test',
-    () {
-      setUpAll(
-        () async {
-          // this random dialog popping up is super hard to cover in tests
-          SharedPreferences.setMockInitialValues({
-            SettingKeys.showNoGoogle: false,
-          });
-          try {
-            Hive.deleteFromDisk();
-            Hive.initFlutter();
-          } catch (_) {}
-        },
-      );
+  group('Integration Test', () {
+    testWidgets('Test if the app starts', (WidgetTester tester) async {
+      app.main();
+      await tester.pumpAndSettle();

-      testWidgets(
-        'Start app, login and logout',
-        (WidgetTester tester) async {
-          app.main();
-          await tester.ensureAppStartedHomescreen();
-          await tester.ensureLoggedOut();
-        },
-      );
+      await Future.delayed(const Duration(seconds: 10));

-      testWidgets(
-        'Login again',
-        (WidgetTester tester) async {
-          app.main();
-          await tester.ensureAppStartedHomescreen();
-        },
-      );
+      await tester.pumpAndSettle();

-      testWidgets(
-        'Start chat and send message',
-        (WidgetTester tester) async {
-          app.main();
-          await tester.ensureAppStartedHomescreen();
-          await tester.waitFor(find.byType(TextField));
-          await tester.enterText(find.byType(TextField), Users.user2.name);
-          await tester.pumpAndSettle();
+      expect(find.text('Connect'), findsOneWidget);

-          await tester.scrollUntilVisible(
-            find.text('Chats').first,
-            500,
-            scrollable: find
-                .descendant(
-                  of: find.byType(ChatListViewBody),
-                  matching: find.byType(Scrollable),
-                )
-                .first,
-          );
-          await tester.pumpAndSettle();
-          await tester.tap(find.text('Chats'));
-          await tester.pumpAndSettle();
-          await tester.waitFor(find.byType(SearchTitle));
-          await tester.pumpAndSettle();
+      final input = find.byType(TextField);

-          await tester.scrollUntilVisible(
-            find.text(Users.user2.name).first,
-            500,
-            scrollable: find
-                .descendant(
-                  of: find.byType(ChatListViewBody),
-                  matching: find.byType(Scrollable),
-                )
-                .first,
-          );
-          await tester.pumpAndSettle();
-          await tester.tap(find.text(Users.user2.name).first);
+      expect(input, findsOneWidget);

-          try {
-            await tester.waitFor(
-              find.byType(ChatView),
-              timeout: const Duration(seconds: 5),
-            );
-          } catch (_) {
-            // in case the homeserver sends the username as search result
-            if (find.byIcon(Icons.send_outlined).evaluate().isNotEmpty) {
-              await tester.tap(find.byIcon(Icons.send_outlined));
-              await tester.pumpAndSettle();
-            }
-          }
+      await tester.enterText(input, homeserver);
+      await tester.testTextInput.receiveAction(TextInputAction.done);
+      await tester.pumpAndSettle();

-          await tester.waitFor(find.byType(ChatView));
-          await tester.enterText(find.byType(TextField).last, 'Test');
-          await tester.pumpAndSettle();
-          try {
-            await tester.waitFor(find.byIcon(Icons.send_outlined));
-            await tester.tap(find.byIcon(Icons.send_outlined));
-          } catch (_) {
-            await tester.testTextInput.receiveAction(TextInputAction.done);
-          }
-          await tester.pumpAndSettle();
-          await tester.waitFor(find.text('Test'));
-          await tester.pumpAndSettle();
-        },
-      );
-
-      testWidgets('Spaces', (tester) async {
-        app.main();
-        await tester.ensureAppStartedHomescreen();
-
-        await tester.waitFor(find.byTooltip('Show menu'));
-        await tester.tap(find.byTooltip('Show menu'));
+      // in case registration is allowed
+      try {
+        await tester.tap(find.text('Login'));
        await tester.pumpAndSettle();
+      } catch (e) {
+        log('Registration is not allowed. Proceeding with login...');
+      }
+      await tester.pumpAndSettle();

-        await tester.waitFor(find.byIcon(Icons.workspaces_outlined));
-        await tester.tap(find.byIcon(Icons.workspaces_outlined));
-        await tester.pumpAndSettle();
+      final inputs = find.byType(TextField);

-        await tester.waitFor(find.byType(TextField));
-        await tester.enterText(find.byType(TextField).last, 'Test Space');
-        await tester.pumpAndSettle();
-
-        await tester.testTextInput.receiveAction(TextInputAction.done);
-        await tester.pumpAndSettle();
-
-        await tester.waitFor(find.text('Invite contact'));
-
-        await tester.tap(find.text('Invite contact'));
-        await tester.pumpAndSettle();
-
-        await tester.waitFor(
-          find.descendant(
-              of: find.byType(InvitationSelectionView),
-              matching: find.byType(TextField)),
-        );
-        await tester.enterText(
-          find.descendant(
-              of: find.byType(InvitationSelectionView),
-              matching: find.byType(TextField)),
-          Users.user2.name,
-        );
-
-        await Future.delayed(const Duration(milliseconds: 250));
-        await tester.testTextInput.receiveAction(TextInputAction.done);
-
-        await Future.delayed(const Duration(milliseconds: 1000));
-        await tester.pumpAndSettle();
-
-        await tester.tap(find
-            .descendant(
-                of: find.descendant(
-                  of: find.byType(InvitationSelectionView),
-                  matching: find.byType(ListTile),
-                ),
-                matching: find.text(Users.user2.name))
-            .last);
-        await tester.pumpAndSettle();
-
-        await tester.waitFor(find.maybeUppercaseText('Yes'));
-        await tester.tap(find.maybeUppercaseText('Yes'));
-        await tester.pumpAndSettle();
-
-        await tester.tap(find.byTooltip('Back'));
-        await tester.pumpAndSettle();
-
-        await tester.waitFor(find.text('Load 2 more participants'));
-        await tester.tap(find.text('Load 2 more participants'));
-        await tester.pumpAndSettle();
-
-        expect(find.text(Users.user2.name), findsOneWidget);
-      });
-    },
-  );
+      await tester.enterText(inputs.first, Users.alice.name);
+      await tester.enterText(inputs.last, Users.alice.password);
+      await tester.testTextInput.receiveAction(TextInputAction.done);
+    });
+  });
 }
--- a/integration_test/extensions/default_flows.dart
+++ b/integration_test/extensions/default_flows.dart
@ -1,182 +0,0 @@
-import 'dart:developer';
-
-import 'package:fluffychat/pages/chat_list/chat_list_body.dart';
-import 'package:fluffychat/pages/homeserver_picker/homeserver_picker.dart';
-import 'package:fluffychat/pages/settings_account/settings_account_view.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-
-import '../users.dart';
-import 'wait_for.dart';
-
-extension DefaultFlowExtensions on WidgetTester {
-  Future<void> login() async {
-    final tester = this;
-
-    await tester.pumpAndSettle();
-
-    await tester.waitFor(find.text('Let\'s start'));
-
-    expect(find.text('Let\'s start'), findsOneWidget);
-
-    final input = find.byType(TextField);
-
-    expect(input, findsOneWidget);
-
-    // getting the placeholder in place
-    await tester.tap(find.byIcon(Icons.search));
-    await tester.pumpAndSettle();
-    await tester.enterText(input, homeserver);
-    await tester.pumpAndSettle();
-    await tester.testTextInput.receiveAction(TextInputAction.done);
-    await tester.pumpAndSettle();
-
-    // in case registration is allowed
-    // try {
-    await Future.delayed(const Duration(milliseconds: 50));
-
-    await tester.scrollUntilVisible(
-      find.text('Login'),
-      500,
-      scrollable: find.descendant(
-        of: find.byKey(const Key('ConnectPageListView')),
-        matching: find.byType(Scrollable).first,
-      ),
-    );
-    await tester.pumpAndSettle();
-
-    await tester.tap(find.text('Login'));
-    await tester.pumpAndSettle();
-    /*} catch (e) {
-      log('Registration is not allowed. Proceeding with login...');
-    }*/
-    await tester.pumpAndSettle();
-
-    await Future.delayed(const Duration(milliseconds: 50));
-
-    final inputs = find.byType(TextField);
-
-    await tester.enterText(inputs.first, Users.user1.name);
-    await tester.enterText(inputs.last, Users.user1.password);
-    await tester.pumpAndSettle();
-    await tester.testTextInput.receiveAction(TextInputAction.done);
-
-    try {
-      // pumpAndSettle does not work in here as setState is called
-      // asynchronously
-      await tester.waitFor(
-        find.byType(LinearProgressIndicator),
-        timeout: const Duration(milliseconds: 1500),
-        skipPumpAndSettle: true,
-      );
-    } catch (_) {
-      // in case the input action does not work on the desired platform
-      if (find.text('Login').evaluate().isNotEmpty) {
-        await tester.tap(find.text('Login'));
-      }
-    }
-
-    try {
-      await tester.pumpAndSettle();
-    } catch (_) {
-      // may fail because of ongoing animation below dialog
-    }
-
-    await tester.waitFor(
-      find.byType(ChatListViewBody),
-      skipPumpAndSettle: true,
-    );
-  }
-
-  /// ensure PushProvider check passes
-  Future<void> acceptPushWarning() async {
-    final tester = this;
-
-    final matcher = find.maybeUppercaseText('Do not show again');
-
-    try {
-      await tester.waitFor(matcher, timeout: const Duration(seconds: 5));
-
-      // the FCM push error dialog to be handled...
-      await tester.tap(matcher);
-      await tester.pumpAndSettle();
-    } catch (_) {}
-  }
-
-  Future<void> ensureLoggedOut() async {
-    final tester = this;
-    await tester.pumpAndSettle();
-    if (find.byType(ChatListViewBody).evaluate().isNotEmpty) {
-      await tester.tap(find.byTooltip('Show menu'));
-      await tester.pumpAndSettle();
-      await tester.tap(find.text('Settings'));
-      await tester.pumpAndSettle();
-      await tester.scrollUntilVisible(
-        find.text('Account'),
-        500,
-        scrollable: find.descendant(
-          of: find.byKey(const Key('SettingsListViewContent')),
-          matching: find.byType(Scrollable),
-        ),
-      );
-      await tester.pumpAndSettle();
-      await tester.tap(find.text('Account'));
-      await tester.pumpAndSettle();
-      await tester.scrollUntilVisible(
-        find.text('Logout'),
-        500,
-        scrollable: find.descendant(
-          of: find.byType(SettingsAccountView),
-          matching: find.byType(Scrollable),
-        ),
-      );
-      await tester.pumpAndSettle();
-      await tester.tap(find.text('Logout'));
-      await tester.pumpAndSettle();
-      await tester.tap(find.maybeUppercaseText('Yes'));
-      await tester.pumpAndSettle();
-    }
-  }
-
-  Future<void> ensureAppStartedHomescreen({
-    Duration timeout = const Duration(seconds: 20),
-  }) async {
-    final tester = this;
-    await tester.pumpAndSettle();
-
-    final homeserverPickerFinder = find.byType(HomeserverPicker);
-    final chatListFinder = find.byType(ChatListViewBody);
-
-    final end = DateTime.now().add(timeout);
-
-    log(
-      'Waiting for HomeserverPicker or ChatListViewBody...',
-      name: 'Test Runner',
-    );
-    do {
-      if (DateTime.now().isAfter(end)) {
-        throw Exception(
-            'Timed out waiting for HomeserverPicker or ChatListViewBody');
-      }
-
-      await pumpAndSettle();
-      await Future.delayed(const Duration(milliseconds: 100));
-    } while (homeserverPickerFinder.evaluate().isEmpty &&
-        chatListFinder.evaluate().isEmpty);
-
-    if (homeserverPickerFinder.evaluate().isNotEmpty) {
-      log(
-        'Found HomeserverPicker, performing login.',
-        name: 'Test Runner',
-      );
-      await tester.login();
-    } else {
-      log(
-        'Found ChatListViewBody, skipping login.',
-        name: 'Test Runner',
-      );
-    }
-
-    await tester.acceptPushWarning();
-  }
-}
--- a/integration_test/extensions/wait_for.dart
+++ b/integration_test/extensions/wait_for.dart
@ -1,49 +0,0 @@
-import 'package:flutter_test/flutter_test.dart';
-
-/// Workaround for https://github.com/flutter/flutter/issues/88765
-extension WaitForExtension on WidgetTester {
-  Future<void> waitFor(
-    Finder finder, {
-    Duration timeout = const Duration(seconds: 20),
-    bool skipPumpAndSettle = false,
-  }) async {
-    final end = DateTime.now().add(timeout);
-
-    do {
-      if (DateTime.now().isAfter(end)) {
-        throw Exception('Timed out waiting for $finder');
-      }
-
-      if (!skipPumpAndSettle) {
-        await pumpAndSettle();
-      }
-      await Future.delayed(const Duration(milliseconds: 100));
-    } while (finder.evaluate().isEmpty);
-  }
-}
-
-extension MaybeUppercaseFinder on CommonFinders {
-  /// On Android some button labels are in uppercase while on iOS they
-  /// are not. This method tries both.
-  Finder maybeUppercaseText(
-    String text, {
-    bool findRichText = false,
-    bool skipOffstage = true,
-  }) {
-    try {
-      final finder = find.text(
-        text.toUpperCase(),
-        findRichText: findRichText,
-        skipOffstage: skipOffstage,
-      );
-      expect(finder, findsOneWidget);
-      return finder;
-    } catch (_) {
-      return find.text(
-        text,
-        findRichText: findRichText,
-        skipOffstage: skipOffstage,
-      );
-    }
-  }
-}
--- a/integration_test/synapse/data/homeserver.yaml
+++ b/integration_test/synapse/data/homeserver.yaml
@ -297,7 +297,7 @@ listeners:
  # If you plan to use a reverse proxy, please see
  # https://matrix-org.github.io/synapse/latest/reverse_proxy.html.
  #
-  - port: 80
+  - port: 8008
    tls: false
    type: http
    x_forwarded: false
--- a/integration_test/users.dart
+++ b/integration_test/users.dart
@ -1,26 +1,8 @@
 abstract class Users {
  const Users._();
-
-  static const user1 = User(
-    String.fromEnvironment(
-      'USER1_NAME',
-      defaultValue: 'alice',
-    ),
-    String.fromEnvironment(
-      'USER1_PW',
-      defaultValue: 'AliceInWonderland',
-    ),
-  );
-  static const user2 = User(
-    String.fromEnvironment(
-      'USER2_NAME',
-      defaultValue: 'bob',
-    ),
-    String.fromEnvironment(
-      'USER2_PW',
-      defaultValue: 'JoWirSchaffenDas',
-    ),
-  );
+  static const alice = User('alice', 'AliceInWonderland');
+  static const bob = User('bob', 'JoWirSchaffenDas');
+  static const trudy = User('trudy', 'HaveIBeenPwned');
 }

 class User {
@ -30,7 +12,5 @@ class User {
  const User(this.name, this.password);
 }

-const homeserver = 'http://${const String.fromEnvironment(
-  'HOMESERVER',
-  defaultValue: 'localhost',
-)}';
+// https://stackoverflow.com/a/33088657
+const homeserver = 'http://10.0.2.2:8008';
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@ -63,8 +63,6 @@
 	<string>Share your location with your contacts in FluffyChat.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
 	<string>Share your location with your contacts in FluffyChat.</string>
-	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
-	<string>Share your location with your contacts in FluffyChat.</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>Record voice message and share them with your contacts on FluffyChat.</string>
 	<key>NSMotionUsageDescription</key>
--- a/lib/config/app_config.dart
+++ b/lib/config/app_config.dart
@ -24,8 +24,6 @@ abstract class AppConfig {
  static String get privacyUrl => _privacyUrl;
  static const String enablePushTutorial =
      'https://gitlab.com/famedly/fluffychat/-/wikis/Push-Notifications-without-Google-Services';
-  static const String encryptionTutorial =
-      'https://gitlab.com/famedly/fluffychat/-/wikis/How-to-use-end-to-end-encryption-in-FluffyChat';
  static const String appId = 'im.fluffychat.FluffyChat';
  static const String appOpenUrlScheme = 'im.fluffychat';
  static String _webBaseUrl = 'https://fluffychat.im/web';
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@ -94,13 +94,6 @@ class AppRoutes {
            VWidget(
              path: '/archive',
              widget: const Archive(),
-              stackedRoutes: [
-                VWidget(
-                  path: ':roomid',
-                  widget: const Chat(),
-                  buildTransition: _dynamicTransition,
-                ),
-              ],
            ),
            VWidget(
              path: '/newprivatechat',
@ -227,25 +220,13 @@ class AppRoutes {
                ),
              ],
            ),
-            VNester(
+            VWidget(
              path: '/archive',
-              widgetBuilder: (child) => TwoColumnLayout(
-                mainView: const Archive(),
-                sideView: child,
+              widget: const TwoColumnLayout(
+                mainView: Archive(),
+                sideView: EmptyPage(),
              ),
              buildTransition: _fadeTransition,
-              nestedRoutes: [
-                VWidget(
-                  path: '',
-                  widget: const EmptyPage(),
-                  buildTransition: _dynamicTransition,
-                ),
-                VWidget(
-                  path: ':roomid',
-                  widget: const Chat(),
-                  buildTransition: _dynamicTransition,
-                ),
-              ],
            ),
          ],
        ),
--- a/lib/config/setting_keys.dart
+++ b/lib/config/setting_keys.dart
@ -8,6 +8,7 @@ abstract class SettingKeys {
  static const String showDirectChatsInSpaces =
      'chat.fluffy.showDirectChatsInSpaces';
  static const String separateChatTypes = 'chat.fluffy.separateChatTypes';
+  static const String chatColor = 'chat.fluffy.chat_color';
  static const String sentry = 'sentry';
  static const String theme = 'theme';
  static const String amoledEnabled = 'amoled_enabled';
--- a/lib/config/themes.dart
+++ b/lib/config/themes.dart
@ -38,15 +38,15 @@ abstract class FluffyThemes {
    subtitle2: fallbackTextStyle,
  );

-  static const Duration animationDuration = Duration(milliseconds: 250);
-  static const Curve animationCurve = Curves.easeInOut;
-
-  static ThemeData buildTheme(Brightness brightness, [Color? seed]) =>
+  static ThemeData buildTheme(Brightness brightness,
+          [ColorScheme? colorScheme]) =>
      ThemeData(
        visualDensity: VisualDensity.standard,
        useMaterial3: true,
        brightness: brightness,
-        colorSchemeSeed: seed ?? AppConfig.colorSchemeSeed,
+        colorSchemeSeed: AppConfig.colorSchemeSeed ??
+            colorScheme?.primary ??
+            AppConfig.chatColor,
        textTheme: PlatformInfos.isDesktop
            ? brightness == Brightness.light
                ? Typography.material2018().black.merge(fallbackTextTheme)
@ -58,11 +58,8 @@ abstract class FluffyThemes {
        dividerColor: brightness == Brightness.light
            ? Colors.blueGrey.shade50
            : Colors.blueGrey.shade900,
-        inputDecorationTheme: InputDecorationTheme(
-          border: UnderlineInputBorder(
-            borderSide: BorderSide.none,
-            borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
-          ),
+        inputDecorationTheme: const InputDecorationTheme(
+          border: InputBorder.none,
          filled: true,
        ),
        appBarTheme: AppBarTheme(
@ -75,20 +72,6 @@ abstract class FluffyThemes {
            statusBarBrightness: brightness,
          ),
        ),
-        textButtonTheme: TextButtonThemeData(
-          style: TextButton.styleFrom(
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
-            ),
-          ),
-        ),
-        outlinedButtonTheme: OutlinedButtonThemeData(
-          style: OutlinedButton.styleFrom(
-            shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
-            ),
-          ),
-        ),
        elevatedButtonTheme: ElevatedButtonThemeData(
          style: ElevatedButton.styleFrom(
            padding: const EdgeInsets.all(16),
--- a/lib/pages/add_story/add_story.dart
+++ b/lib/pages/add_story/add_story.dart
@ -12,12 +12,12 @@ import 'package:vrouter/vrouter.dart';

 import 'package:fluffychat/pages/add_story/add_story_view.dart';
 import 'package:fluffychat/pages/add_story/invite_story_page.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart';
 import 'package:fluffychat/utils/resize_image.dart';
 import 'package:fluffychat/utils/story_theme_data.dart';
 import 'package:fluffychat/utils/string_color.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import '../../utils/matrix_sdk_extensions/client_stories_extension.dart';
+import '../../utils/matrix_sdk_extensions.dart/client_stories_extension.dart';

 class AddStoryPage extends StatefulWidget {
  const AddStoryPage({Key? key}) : super(key: key);
--- a/lib/pages/add_story/invite_story_page.dart
+++ b/lib/pages/add_story/invite_story_page.dart
@ -6,7 +6,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/matrix.dart';

 import 'package:fluffychat/utils/localized_exception_extension.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/client_stories_extension.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/matrix.dart';

--- a/lib/pages/archive/archive.dart
+++ b/lib/pages/archive/archive.dart
@ -21,9 +21,11 @@ class ArchiveController extends State<Archive> {
  Future<List<Room>> getArchive(BuildContext context) async {
    final archive = this.archive;
    if (archive != null) return archive;
-    return this.archive = await Matrix.of(context).client.loadArchive();
+    return await Matrix.of(context).client.loadArchive();
  }

+  void forgetAction(int i) => setState(() => archive?.removeAt(i));
+
  void forgetAllAction() async {
    final archive = this.archive;
    if (archive == null) return;
--- a/lib/pages/archive/archive_view.dart
+++ b/lib/pages/archive/archive_view.dart
@ -21,14 +21,10 @@ class ArchiveView extends StatelessWidget {
          leading: const BackButton(),
          title: Text(L10n.of(context)!.archive),
          actions: [
-            if (snapshot.data?.isNotEmpty ?? false)
-              Padding(
-                padding: const EdgeInsets.all(8.0),
-                child: TextButton.icon(
-                  onPressed: controller.forgetAllAction,
-                  label: Text(L10n.of(context)!.clearArchive),
-                  icon: const Icon(Icons.cleaning_services_outlined),
-                ),
+            if (snapshot.hasData && archive != null && archive!.isNotEmpty)
+              TextButton(
+                onPressed: controller.forgetAllAction,
+                child: Text(L10n.of(context)!.clearArchive),
              )
          ],
        ),
@ -54,6 +50,7 @@ class ArchiveView extends StatelessWidget {
                itemCount: archive!.length,
                itemBuilder: (BuildContext context, int i) => ChatListItem(
                  archive![i],
+                  onForget: controller.forgetAction,
                ),
              );
            }
--- a/lib/pages/bootstrap/bootstrap_dialog.dart
+++ b/lib/pages/bootstrap/bootstrap_dialog.dart
@ -139,7 +139,6 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                  minLines: 4,
                  maxLines: 4,
                  readOnly: true,
-                  style: const TextStyle(fontFamily: 'monospace'),
                  controller: TextEditingController(text: key),
                ),
                const SizedBox(height: 16),
@ -255,22 +254,16 @@ class BootstrapDialogState extends State<BootstrapDialog> {
                    ),
                    const Divider(height: 32),
                    TextField(
-                      minLines: 2,
-                      maxLines: 2,
+                      minLines: 1,
+                      maxLines: 1,
                      autocorrect: false,
                      readOnly: _recoveryKeyInputLoading,
                      autofillHints: _recoveryKeyInputLoading
                          ? null
                          : [AutofillHints.password],
                      controller: _recoveryKeyTextEditingController,
-                      style: const TextStyle(fontFamily: 'monospace'),
                      decoration: InputDecoration(
                        hintText: 'Abc123 Def456',
-                        labelStyle: TextStyle(
-                            fontFamily: Theme.of(context)
-                                .textTheme
-                                .bodyText1
-                                ?.fontFamily),
                        labelText: L10n.of(context)!.recoveryKey,
                        errorText: _recoveryKeyInputError,
                      ),
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@ -16,21 +16,19 @@ import 'package:image_picker/image_picker.dart';
 import 'package:matrix/matrix.dart';
 import 'package:record/record.dart';
 import 'package:scroll_to_index/scroll_to_index.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 import 'package:vrouter/vrouter.dart';

 import 'package:fluffychat/pages/chat/chat_view.dart';
 import 'package:fluffychat/pages/chat/event_info_dialog.dart';
 import 'package:fluffychat/pages/chat/recording_dialog.dart';
-import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/ios_badge_client_extension.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/ios_badge_client_extension.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import '../../utils/account_bundles.dart';
 import '../../utils/localized_exception_extension.dart';
-import '../../utils/matrix_sdk_extensions/matrix_file_extension.dart';
+import '../../utils/matrix_sdk_extensions.dart/matrix_file_extension.dart';
 import 'send_file_dialog.dart';
 import 'send_location_dialog.dart';
 import 'sticker_picker_dialog.dart';
@ -134,51 +132,6 @@ class ChatController extends State<Chat> {

  bool showEmojiPicker = false;

-  bool get isLeftDMRoom {
-    final room = this.room;
-    final userId = room?.directChatMatrixID;
-    if (room == null || userId == null) return false;
-    return room.isDirectChat &&
-        room.unsafeGetUserFromMemoryOrFallback(userId).membership ==
-            Membership.leave;
-  }
-
-  void recreateChat() async {
-    final room = this.room;
-    final userId = room?.directChatMatrixID;
-    if (room == null || userId == null) {
-      throw Exception(
-          'Try to recreate a room with is not a DM room. This should not be possible from the UI!');
-    }
-    final success = await showFutureLoadingDialog(
-        context: context,
-        future: () async {
-          final client = room.client;
-          final waitForSync = client.onSync.stream
-              .firstWhere((s) => s.rooms?.leave?.containsKey(room.id) ?? false);
-          await room.leave();
-          await waitForSync;
-          return await client.startDirectChat(userId);
-        });
-    final roomId = success.result;
-    if (roomId == null) return;
-    VRouter.of(context).toSegments(['rooms', roomId]);
-  }
-
-  void leaveChat() async {
-    final room = this.room;
-    if (room == null) {
-      throw Exception(
-          'Leave room button clicked while room is null. This should not be possible from the UI!');
-    }
-    final success = await showFutureLoadingDialog(
-      context: context,
-      future: room.leave,
-    );
-    if (success.error != null) return;
-    VRouter.of(context).to('/rooms');
-  }
-
  EmojiPickerType emojiPickerType = EmojiPickerType.keyboard;

  void requestHistory() async {
@ -219,20 +172,10 @@ class ChatController extends State<Chat> {
    }
  }

-  void _loadDraft() async {
-    final prefs = await SharedPreferences.getInstance();
-    final draft = prefs.getString('draft_$roomId');
-    if (draft != null && draft.isNotEmpty) {
-      sendController.text = draft;
-      setState(() => inputText = draft);
-    }
-  }
-
  @override
  void initState() {
    scrollController.addListener(_updateScrollController);
    inputFocus.addListener(_inputFocusListener);
-    _loadDraft();
    super.initState();
  }

@ -314,9 +257,6 @@ class ChatController extends State<Chat> {

  Future<void> send() async {
    if (sendController.text.trim().isEmpty) return;
-    _storeInputTimeoutTimer?.cancel();
-    final prefs = await SharedPreferences.getInstance();
-    prefs.remove('draft_$roomId');
    var parseCommands = true;

    final commandMatch = RegExp(r'^\/(\w+)').firstMatch(sendController.text);
@ -437,8 +377,9 @@ class ChatController extends State<Chat> {
  }

  void sendStickerAction() async {
-    final sticker = await showAdaptiveBottomSheet<ImagePackImageContent>(
+    final sticker = await showModalBottomSheet<ImagePackImageContent>(
      context: context,
+      useRootNavigator: false,
      builder: (c) => StickerPickerDialog(room: room!),
    );
    if (sticker == null) return;
@ -472,7 +413,6 @@ class ChatController extends State<Chat> {
    final result = await showDialog<RecordingResult>(
      context: context,
      useRootNavigator: false,
-      barrierDismissible: false,
      builder: (c) => const RecordingDialog(),
    );
    if (result == null) return;
@ -644,7 +584,6 @@ class ChatController extends State<Chat> {
  }

  bool get canRedactSelectedEvents {
-    if (isArchived) return false;
    final clients = matrix!.currentBundle;
    for (final event in selectedEvents) {
      if (event.canRedact == false &&
@ -654,9 +593,7 @@ class ChatController extends State<Chat> {
  }

  bool get canEditSelectedEvents {
-    if (isArchived ||
-        selectedEvents.length != 1 ||
-        !selectedEvents.first.status.isSent) {
+    if (selectedEvents.length != 1 || !selectedEvents.first.status.isSent) {
      return false;
    }
    return currentRoomBundle
@ -774,15 +711,6 @@ class ChatController extends State<Chat> {
    return sendEmojiAction(emoji.emoji);
  }

-  void forgetRoom() async {
-    final result = await showFutureLoadingDialog(
-      context: context,
-      future: room!.forget,
-    );
-    if (result.error != null) return;
-    VRouter.of(context).to('/archive');
-  }
-
  void typeEmoji(Emoji? emoji) {
    if (emoji == null) return;
    final text = sendController.text;
@ -991,15 +919,7 @@ class ChatController extends State<Chat> {
    );
  }

-  Timer? _storeInputTimeoutTimer;
-  static const Duration _storeInputTimeout = Duration(milliseconds: 500);
-
  void onInputBarChanged(String text) {
-    _storeInputTimeoutTimer?.cancel();
-    _storeInputTimeoutTimer = Timer(_storeInputTimeout, () async {
-      final prefs = await SharedPreferences.getInstance();
-      await prefs.setString('draft_$roomId', text);
-    });
    setReadMarker();
    if (text.endsWith(' ') && matrix!.hasComplexBundles) {
      final clients = currentRoomBundle;
@ -1034,9 +954,6 @@ class ChatController extends State<Chat> {
    setState(() => inputText = text);
  }

-  bool get isArchived =>
-      {Membership.leave, Membership.ban}.contains(room?.membership);
-
  void showEventInfo([Event? event]) =>
      (event ?? selectedEvents.single).showInfoDialog(context);

--- a/lib/pages/chat/chat_app_bar_title.dart
+++ b/lib/pages/chat/chat_app_bar_title.dart
@ -5,8 +5,7 @@ import 'package:vrouter/vrouter.dart';

 import 'package:fluffychat/pages/chat/chat.dart';
 import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart';
-import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
 import 'package:fluffychat/widgets/avatar.dart';

 class ChatAppBarTitle extends StatelessWidget {
@ -27,7 +26,7 @@ class ChatAppBarTitle extends StatelessWidget {
      splashColor: Colors.transparent,
      highlightColor: Colors.transparent,
      onTap: directChatMatrixID != null
-          ? () => showAdaptiveBottomSheet(
+          ? () => showModalBottomSheet(
                context: context,
                builder: (c) => UserBottomSheet(
                  user: room
@ -37,10 +36,7 @@ class ChatAppBarTitle extends StatelessWidget {
                      '${room.unsafeGetUserFromMemoryOrFallback(directChatMatrixID).mention} ',
                ),
              )
-          : controller.isArchived
-              ? null
-              : () =>
-                  VRouter.of(context).toSegments(['rooms', room.id, 'details']),
+          : () => VRouter.of(context).toSegments(['rooms', room.id, 'details']),
      child: Row(
        children: [
          Hero(
--- a/lib/pages/chat/chat_emoji_picker.dart
+++ b/lib/pages/chat/chat_emoji_picker.dart
@ -2,7 +2,6 @@ import 'package:flutter/material.dart';

 import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';

-import 'package:fluffychat/config/themes.dart';
 import 'chat.dart';

 class ChatEmojiPicker extends StatelessWidget {
@ -12,8 +11,7 @@ class ChatEmojiPicker extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return AnimatedContainer(
-      duration: FluffyThemes.animationDuration,
-      curve: FluffyThemes.animationCurve,
+      duration: const Duration(milliseconds: 300),
      height: controller.showEmojiPicker
          ? MediaQuery.of(context).size.height / 2
          : 0,
--- a/lib/pages/chat/chat_event_list.dart
+++ b/lib/pages/chat/chat_event_list.dart
@ -10,8 +10,7 @@ import 'package:fluffychat/pages/chat/events/message.dart';
 import 'package:fluffychat/pages/chat/seen_by_row.dart';
 import 'package:fluffychat/pages/chat/typing_indicators.dart';
 import 'package:fluffychat/pages/user_bottom_sheet/user_bottom_sheet.dart';
-import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/filtered_timeline_extension.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';

 class ChatEventList extends StatelessWidget {
@ -90,7 +89,7 @@ class ChatEventList extends StatelessWidget {
                    onSwipe: (direction) =>
                        controller.replyAction(replyTo: event),
                    onInfoTab: controller.showEventInfo,
-                    onAvatarTab: (Event event) => showAdaptiveBottomSheet(
+                    onAvatarTab: (Event event) => showModalBottomSheet(
                          context: context,
                          builder: (c) => UserBottomSheet(
                            user: event.senderFromMemoryOrFallback,
--- a/lib/pages/chat/chat_input_row.dart
+++ b/lib/pages/chat/chat_input_row.dart
@ -10,7 +10,6 @@ import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/matrix.dart';
-import '../../config/themes.dart';
 import '../../widgets/m2_popup_menu_button.dart';
 import 'chat.dart';
 import 'input_bar.dart';
@ -85,8 +84,7 @@ class ChatInputRow extends StatelessWidget {
                    controller.onAddPopupMenuButtonSelected('file'),
                helpLabel: L10n.of(context)!.sendFile,
                child: AnimatedContainer(
-                  duration: FluffyThemes.animationDuration,
-                  curve: FluffyThemes.animationCurve,
+                  duration: const Duration(milliseconds: 200),
                  height: 56,
                  width: controller.inputText.isEmpty ? 56 : 0,
                  alignment: Alignment.center,
--- a/lib/pages/chat/chat_view.dart
+++ b/lib/pages/chat/chat_view.dart
@ -108,20 +108,6 @@ class ChatView extends StatelessWidget {
            ],
          ),
      ];
-    } else if (controller.isArchived) {
-      return [
-        Padding(
-          padding: const EdgeInsets.all(8.0),
-          child: TextButton.icon(
-            onPressed: controller.forgetRoom,
-            style: TextButton.styleFrom(
-              foregroundColor: Theme.of(context).colorScheme.error,
-            ),
-            icon: const Icon(Icons.delete_forever_outlined),
-            label: Text(L10n.of(context)!.delete),
-          ),
-        )
-      ];
    } else {
      return [
        if (Matrix.of(context).voipPlugin != null &&
@ -159,7 +145,6 @@ class ChatView extends StatelessWidget {
          context: context, future: () => controller.room!.join());
    }
    final bottomSheetPadding = FluffyThemes.isColumnMode(context) ? 16.0 : 8.0;
-    final colorScheme = Theme.of(context).colorScheme;

    return VWidgetGuard(
      onSystemPop: (redirector) async {
@ -228,20 +213,6 @@ class ChatView extends StatelessWidget {
                          height: double.infinity,
                          fit: BoxFit.cover,
                          filterQuality: FilterQuality.medium,
-                        )
-                      else
-                        Container(
-                          decoration: BoxDecoration(
-                            gradient: LinearGradient(
-                              begin: Alignment.topCenter,
-                              colors: [
-                                colorScheme.primaryContainer.withAlpha(64),
-                                colorScheme.secondaryContainer.withAlpha(64),
-                                colorScheme.tertiaryContainer.withAlpha(64),
-                                colorScheme.primaryContainer.withAlpha(64),
-                              ],
-                            ),
-                          ),
                        ),
                      SafeArea(
                        child: Column(
@ -291,53 +262,16 @@ class ChatView extends StatelessWidget {
                                          Brightness.light
                                      ? Colors.white
                                      : Colors.black,
-                                  child: controller.isLeftDMRoom
-                                      ? Row(
-                                          mainAxisAlignment:
-                                              MainAxisAlignment.spaceEvenly,
-                                          children: [
-                                            TextButton.icon(
-                                              style: TextButton.styleFrom(
-                                                padding:
-                                                    const EdgeInsets.all(16),
-                                                foregroundColor:
-                                                    Theme.of(context)
-                                                        .colorScheme
-                                                        .error,
-                                              ),
-                                              icon: const Icon(
-                                                Icons.archive_outlined,
-                                              ),
-                                              onPressed: controller.leaveChat,
-                                              label: Text(
-                                                L10n.of(context)!.leave,
-                                              ),
-                                            ),
-                                            TextButton.icon(
-                                              style: TextButton.styleFrom(
-                                                padding:
-                                                    const EdgeInsets.all(16),
-                                              ),
-                                              icon: const Icon(
-                                                Icons.chat_outlined,
-                                              ),
-                                              onPressed:
-                                                  controller.recreateChat,
-                                              label: Text(
-                                                  L10n.of(context)!.reopenChat),
-                                            ),
-                                          ],
-                                        )
-                                      : Column(
-                                          mainAxisSize: MainAxisSize.min,
-                                          children: [
-                                            const ConnectionStatusHeader(),
-                                            ReactionsPicker(controller),
-                                            ReplyDisplay(controller),
-                                            ChatInputRow(controller),
-                                            ChatEmojiPicker(controller),
-                                          ],
-                                        ),
+                                  child: Column(
+                                    mainAxisSize: MainAxisSize.min,
+                                    children: [
+                                      const ConnectionStatusHeader(),
+                                      ReactionsPicker(controller),
+                                      ReplyDisplay(controller),
+                                      ChatInputRow(controller),
+                                      ChatEmojiPicker(controller),
+                                    ],
+                                  ),
                                ),
                              ),
                          ],
--- a/lib/pages/chat/encryption_button.dart
+++ b/lib/pages/chat/encryption_button.dart
@ -1,46 +1,93 @@
+import 'dart:async';
+
 import 'package:flutter/material.dart';

+import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
+import 'package:future_loading_dialog/future_loading_dialog.dart';
 import 'package:matrix/matrix.dart';
 import 'package:vrouter/vrouter.dart';

 import '../../widgets/matrix.dart';

-class EncryptionButton extends StatelessWidget {
+class EncryptionButton extends StatefulWidget {
  final Room room;
  const EncryptionButton(this.room, {Key? key}) : super(key: key);
+  @override
+  EncryptionButtonState createState() => EncryptionButtonState();
+}
+
+class EncryptionButtonState extends State<EncryptionButton> {
+  StreamSubscription? _onSyncSub;
+
+  void _enableEncryptionAction() async {
+    if (widget.room.encrypted) {
+      VRouter.of(context).toSegments(['rooms', widget.room.id, 'encryption']);
+      return;
+    }
+    if (widget.room.joinRules == JoinRules.public) {
+      await showOkAlertDialog(
+        useRootNavigator: false,
+        context: context,
+        okLabel: L10n.of(context)!.ok,
+        message: L10n.of(context)!.noEncryptionForPublicRooms,
+      );
+      return;
+    }
+    if (await showOkCancelAlertDialog(
+          useRootNavigator: false,
+          context: context,
+          title: L10n.of(context)!.enableEncryption,
+          message: widget.room.client.encryptionEnabled
+              ? L10n.of(context)!.enableEncryptionWarning
+              : L10n.of(context)!.needPantalaimonWarning,
+          okLabel: L10n.of(context)!.yes,
+          cancelLabel: L10n.of(context)!.cancel,
+        ) ==
+        OkCancelResult.ok) {
+      await showFutureLoadingDialog(
+        context: context,
+        future: () => widget.room.enableEncryption(),
+      );
+      // we want to enable the lock icon
+      setState(() {});
+    }
+  }
+
+  @override
+  void dispose() {
+    _onSyncSub?.cancel();
+    super.dispose();
+  }

  @override
  Widget build(BuildContext context) {
-    return StreamBuilder<SyncUpdate>(
-        stream: Matrix.of(context)
-            .client
-            .onSync
-            .stream
-            .where((s) => s.deviceLists != null),
-        builder: (context, snapshot) {
-          return FutureBuilder<EncryptionHealthState>(
-              future: room.calcEncryptionHealthState(),
-              builder: (BuildContext context, snapshot) => IconButton(
-                    tooltip: room.encrypted
-                        ? L10n.of(context)!.encrypted
-                        : L10n.of(context)!.encryptionNotEnabled,
-                    icon: Icon(
-                        room.encrypted
-                            ? Icons.lock_outlined
-                            : Icons.lock_open_outlined,
-                        size: 20,
-                        color: room.joinRules != JoinRules.public &&
-                                !room.encrypted
-                            ? Colors.red
-                            : room.joinRules != JoinRules.public &&
-                                    snapshot.data ==
-                                        EncryptionHealthState.unverifiedDevices
-                                ? Colors.orange
-                                : null),
-                    onPressed: () => VRouter.of(context)
-                        .toSegments(['rooms', room.id, 'encryption']),
-                  ));
-        });
+    if (widget.room.encrypted) {
+      _onSyncSub ??= Matrix.of(context)
+          .client
+          .onSync
+          .stream
+          .where((s) => s.deviceLists != null)
+          .listen((s) => setState(() {}));
+    }
+    return FutureBuilder<EncryptionHealthState>(
+        future: widget.room.calcEncryptionHealthState(),
+        builder: (BuildContext context, snapshot) => IconButton(
+              tooltip: widget.room.encrypted
+                  ? L10n.of(context)!.encrypted
+                  : L10n.of(context)!.encryptionNotEnabled,
+              icon: Icon(
+                  widget.room.encrypted
+                      ? Icons.lock_outlined
+                      : Icons.lock_open_outlined,
+                  size: 20,
+                  color: widget.room.joinRules != JoinRules.public &&
+                          !widget.room.encrypted
+                      ? Colors.red
+                      : snapshot.data == EncryptionHealthState.unverifiedDevices
+                          ? Colors.orange
+                          : null),
+              onPressed: _enableEncryptionAction,
+            ));
  }
 }
--- a/lib/pages/chat/event_info_dialog.dart
+++ b/lib/pages/chat/event_info_dialog.dart
@ -6,12 +6,11 @@ import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';

 import 'package:fluffychat/config/app_config.dart';
-import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
 import 'package:fluffychat/utils/date_time_extension.dart';
 import 'package:fluffychat/widgets/avatar.dart';

 extension EventInfoDialogExtension on Event {
-  void showInfoDialog(BuildContext context) => showAdaptiveBottomSheet(
+  void showInfoDialog(BuildContext context) => showModalBottomSheet(
        context: context,
        builder: (context) =>
            EventInfoDialog(l10n: L10n.of(context)!, event: this),
--- a/lib/pages/chat/events/audio_player.dart
+++ b/lib/pages/chat/events/audio_player.dart
@ -8,9 +8,8 @@ import 'package:just_audio/just_audio.dart';
 import 'package:matrix/matrix.dart';
 import 'package:path_provider/path_provider.dart';

-import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
-import '../../../utils/matrix_sdk_extensions/event_extension.dart';
+import '../../../utils/matrix_sdk_extensions.dart/event_extension.dart';

 class AudioPlayerWidget extends StatefulWidget {
  final Color color;
@ -102,7 +101,6 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
    }

    onAudioPositionChanged ??= audioPlayer.positionStream.listen((state) {
-      if (maxPosition <= 0) return;
      setState(() {
        statusText =
            '${state.inMinutes.toString().padLeft(2, '0')}:${(state.inSeconds % 60).toString().padLeft(2, '0')}';
@ -111,10 +109,9 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
            .round();
      });
    });
-    onDurationChanged ??= audioPlayer.durationStream.listen((max) {
-      if (max == null || max == Duration.zero) return;
-      setState(() => maxPosition = max.inMilliseconds.toDouble());
-    });
+    onDurationChanged ??= audioPlayer.durationStream.listen((max) => max == null
+        ? null
+        : setState(() => maxPosition = max.inMilliseconds.toDouble()));
    onPlayerStateChanged ??=
        audioPlayer.playingStream.listen((_) => setState(() {}));
    audioPlayer.setFilePath(audioFile!.path);
@ -172,11 +169,10 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
  Widget build(BuildContext context) {
    final statusText = this.statusText ??= _durationString ?? '00:00';
    return Padding(
-      padding: EdgeInsets.all(16 * AppConfig.bubbleSizeFactor),
+      padding: const EdgeInsets.symmetric(horizontal: 6.0),
      child: Row(
        mainAxisSize: MainAxisSize.min,
        children: <Widget>[
-          const SizedBox(width: 4),
          SizedBox(
            width: buttonSize,
            height: buttonSize,
--- a/lib/pages/chat/events/cute_events.dart
+++ b/lib/pages/chat/events/cute_events.dart
@ -17,11 +17,11 @@ class CuteContent extends StatefulWidget {
 }

 class _CuteContentState extends State<CuteContent> {
-  static bool _isOverlayShown = false;
+  static final List<OverlayEntry> overlays = [];

  @override
  void initState() {
-    if (AppConfig.autoplayImages && !_isOverlayShown) {
+    if (AppConfig.autoplayImages && overlays.isEmpty) {
      addOverlay();
    }
    super.initState();
@ -55,21 +55,52 @@ class _CuteContentState extends State<CuteContent> {
    );
  }

-  Future<void> addOverlay() async {
-    _isOverlayShown = true;
-    await Future.delayed(const Duration(milliseconds: 50));
+  Widget overlayBuilder(BuildContext context) {
+    return LayoutBuilder(builder: (context, constraints) {
+      final position = Size(
+          Random().nextInt(constraints.maxWidth.round() - 64).toDouble(),
+          Random().nextInt(constraints.maxHeight.round() - 64).toDouble());

-    OverlayEntry? overlay;
-    overlay = OverlayEntry(
-      builder: (context) => CuteEventOverlay(
-        emoji: widget.event.text,
-        onAnimationEnd: () {
-          _isOverlayShown = false;
-          overlay?.remove();
-        },
-      ),
-    );
-    Overlay.of(context)?.insert(overlay);
+      return Padding(
+        padding: EdgeInsets.only(
+            top: position.height,
+            left: position.width,
+            bottom: constraints.maxHeight - 64 - position.height,
+            right: constraints.maxWidth - 64 - position.width),
+        child: SizedBox.square(
+          dimension: 64,
+          child: GestureDetector(
+            onTap: removeOverlay,
+            child: Text(
+              widget.event.text,
+              style: const TextStyle(fontSize: 48),
+            ),
+          ),
+        ),
+      );
+    });
+  }
+
+  Future<void> addOverlay() async {
+    await Future.delayed(const Duration(milliseconds: 50));
+    for (int i = 0; i < 5; i++) {
+      final overlay = OverlayEntry(
+        builder: overlayBuilder,
+      );
+      Overlay.of(context)?.insert(overlay);
+
+      Future.delayed(Duration(seconds: Random().nextInt(35))).then((_) {
+        overlay.remove();
+        overlays.remove(overlay);
+      });
+      overlays.add(overlay);
+    }
+  }
+
+  void removeOverlay() {
+    if (overlays.isEmpty) return;
+    final overlay = overlays.removeLast();
+    overlay.remove();
  }

  generateLabel(User? user) {
@ -95,101 +126,3 @@ class _CuteContentState extends State<CuteContent> {
    }
  }
 }
-
-class CuteEventOverlay extends StatefulWidget {
-  final String emoji;
-  final VoidCallback onAnimationEnd;
-
-  const CuteEventOverlay({
-    Key? key,
-    required this.emoji,
-    required this.onAnimationEnd,
-  }) : super(key: key);
-
-  @override
-  State<CuteEventOverlay> createState() => _CuteEventOverlayState();
-}
-
-class _CuteEventOverlayState extends State<CuteEventOverlay>
-    with TickerProviderStateMixin {
-  final List<Size> items = List.generate(
-    50,
-    (index) => Size(
-      Random().nextDouble(),
-      4 + (Random().nextDouble() * 4),
-    ),
-  );
-
-  AnimationController? controller;
-
-  @override
-  void initState() {
-    controller = AnimationController(
-      duration: const Duration(milliseconds: 2500),
-      vsync: this,
-    );
-    controller?.forward();
-    controller?.addStatusListener(_hideOverlay);
-    super.initState();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return AnimatedBuilder(
-      animation: controller!,
-      builder: (context, _) => LayoutBuilder(
-        builder: (context, constraints) {
-          final width = constraints.maxWidth - _CuteOverlayContent.size;
-          final height = constraints.maxHeight + _CuteOverlayContent.size;
-          return SizedBox(
-            height: constraints.maxHeight,
-            width: constraints.maxWidth,
-            child: Stack(
-              alignment: Alignment.bottomLeft,
-              fit: StackFit.expand,
-              children: items
-                  .map(
-                    (position) => Positioned(
-                      left: position.width * width,
-                      bottom: (height *
-                              .25 *
-                              position.height *
-                              (controller?.value ?? 0)) -
-                          _CuteOverlayContent.size,
-                      child: _CuteOverlayContent(
-                        emoji: widget.emoji,
-                      ),
-                    ),
-                  )
-                  .toList(),
-            ),
-          );
-        },
-      ),
-    );
-  }
-
-  void _hideOverlay(AnimationStatus status) {
-    if (status == AnimationStatus.completed) {
-      widget.onAnimationEnd.call();
-    }
-  }
-}
-
-class _CuteOverlayContent extends StatelessWidget {
-  static const double size = 64.0;
-  final String emoji;
-
-  const _CuteOverlayContent({Key? key, required this.emoji}) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return SizedBox.square(
-      dimension: size,
-      child: Text(
-        emoji,
-        style: const TextStyle(fontSize: 48),
-      ),
-    );
-  }
-}
--- a/lib/pages/chat/events/html_message.dart
+++ b/lib/pages/chat/events/html_message.dart
@ -8,7 +8,7 @@ import 'package:fluffychat/widgets/matrix.dart';
 import '../../../config/app_config.dart';
 import '../../../config/setting_keys.dart';
 import '../../../pages/image_viewer/image_viewer.dart';
-import '../../../utils/matrix_sdk_extensions/matrix_locals.dart';
+import '../../../utils/matrix_sdk_extensions.dart/matrix_locals.dart';
 import '../../../utils/url_launcher.dart';

 class HtmlMessage extends StatelessWidget {
--- a/lib/pages/chat/events/image_bubble.dart
+++ b/lib/pages/chat/events/image_bubble.dart
@ -85,7 +85,7 @@ class ImageBubble extends StatelessWidget {
      child: Hero(
        tag: event.eventId,
        child: AnimatedSwitcher(
-          duration: const Duration(seconds: 1),
+          duration: const Duration(milliseconds: 1000),
          child: Container(
            constraints: maxSize
                ? BoxConstraints(
--- a/lib/pages/chat/events/map_bubble.dart
+++ b/lib/pages/chat/events/map_bubble.dart
@ -35,15 +35,15 @@ class MapBubble extends StatelessWidget {
                  center: LatLng(latitude, longitude),
                  zoom: zoom,
                ),
-                children: [
-                  TileLayer(
+                layers: [
+                  TileLayerOptions(
                    maxZoom: 20,
                    minZoom: 0,
                    urlTemplate:
                        'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
-                    subdomains: const ['a', 'b', 'c'],
+                    subdomains: ['a', 'b', 'c'],
                  ),
-                  MarkerLayer(
+                  MarkerLayerOptions(
                    rotate: true,
                    markers: [
                      Marker(
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@ -100,13 +100,9 @@ class Message extends StatelessWidget {
    final noBubble = {
          MessageTypes.Video,
          MessageTypes.Image,
-          MessageTypes.Sticker
+          MessageTypes.Sticker,
        }.contains(event.messageType) &&
        !event.redacted;
-    final noPadding = {
-      MessageTypes.File,
-      MessageTypes.Audio,
-    }.contains(event.messageType);

    if (ownMessage) {
      color = displayEvent.status.isError
@ -191,7 +187,7 @@ class Message extends StatelessWidget {
                      borderRadius:
                          BorderRadius.circular(AppConfig.borderRadius),
                    ),
-                    padding: noBubble || noPadding
+                    padding: noBubble
                        ? EdgeInsets.zero
                        : EdgeInsets.all(16 * AppConfig.bubbleSizeFactor),
                    constraints: const BoxConstraints(
--- a/lib/pages/chat/events/message_content.dart
+++ b/lib/pages/chat/events/message_content.dart
@ -5,9 +5,8 @@ import 'package:matrix/matrix.dart';
 import 'package:matrix_link_text/link_text.dart';

 import 'package:fluffychat/pages/chat/events/video_player.dart';
-import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
 import 'package:fluffychat/utils/date_time_extension.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
 import 'package:fluffychat/widgets/avatar.dart';
 import 'package:fluffychat/widgets/matrix.dart';
 import '../../../config/app_config.dart';
@ -53,7 +52,7 @@ class MessageContent extends StatelessWidget {
    }
    event.requestKey();
    final sender = event.senderFromMemoryOrFallback;
-    await showAdaptiveBottomSheet(
+    await showModalBottomSheet(
      context: context,
      builder: (context) => Scaffold(
        appBar: AppBar(
@ -113,12 +112,7 @@ class MessageContent extends StatelessWidget {
          case CuteEventContent.eventType:
            return CuteContent(event);
          case MessageTypes.Audio:
-            if (PlatformInfos.isMobile || PlatformInfos.isMacOS
-                // || latformInfos.isLinux
-                // disabled until
-                // https://github.com/bleonard252/just_audio_mpv/issues/3 is
-                // fixed
-                ) {
+            if (PlatformInfos.isMobile || PlatformInfos.isMacOS) {
              return AudioPlayerWidget(
                event,
                color: textColor,
@ -211,7 +205,7 @@ class MessageContent extends StatelessWidget {
          default:
            if (event.redacted) {
              return FutureBuilder<User?>(
-                  future: event.redactedBecause?.fetchSenderUser(),
+                  future: event.fetchSenderUser(),
                  builder: (context, snapshot) {
                    return _ButtonContent(
                      label: L10n.of(context)!.redactedAnEvent(snapshot.data
--- a/lib/pages/chat/events/message_download_content.dart
+++ b/lib/pages/chat/events/message_download_content.dart
@ -1,8 +1,10 @@
 import 'package:flutter/material.dart';

+import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';

-import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart';
+import 'package:fluffychat/utils/platform_infos.dart';

 class MessageDownloadContent extends StatelessWidget {
  final Event event;
@ -28,47 +30,45 @@ class MessageDownloadContent extends StatelessWidget {
        crossAxisAlignment: CrossAxisAlignment.start,
        mainAxisSize: MainAxisSize.min,
        children: <Widget>[
-          Padding(
-            padding: const EdgeInsets.all(16.0),
-            child: Row(
-              children: [
-                Icon(
-                  Icons.file_download_outlined,
-                  color: textColor,
-                ),
-                const SizedBox(width: 16),
-                Text(
-                  filename,
-                  maxLines: 1,
-                  style: TextStyle(
-                    color: textColor,
-                    fontWeight: FontWeight.bold,
-                  ),
-                ),
-              ],
+          ListTile(
+            leading: Icon(
+              Icons.file_download_outlined,
+              color: textColor,
            ),
+            title: Text(
+              filename,
+              maxLines: 1,
+              style: TextStyle(
+                color: textColor,
+                fontWeight: FontWeight.bold,
+              ),
+            ),
+            trailing: PlatformInfos.isAndroid
+                ? IconButton(
+                    onPressed: () => event.shareFile(context),
+                    tooltip: L10n.of(context)!.share,
+                    icon: Icon(Icons.adaptive.share_outlined),
+                  )
+                : null,
          ),
-          const Divider(height: 1),
-          Padding(
-            padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
-            child: Row(
-              children: [
+          const Divider(),
+          Row(
+            children: [
+              Text(
+                filetype,
+                style: TextStyle(
+                  color: textColor.withAlpha(150),
+                ),
+              ),
+              const Spacer(),
+              if (sizeString != null)
                Text(
-                  filetype,
+                  sizeString,
                  style: TextStyle(
                    color: textColor.withAlpha(150),
                  ),
                ),
-                const Spacer(),
-                if (sizeString != null)
-                  Text(
-                    sizeString,
-                    style: TextStyle(
-                      color: textColor.withAlpha(150),
-                    ),
-                  ),
-              ],
-            ),
+            ],
          ),
        ],
      ),
--- a/lib/pages/chat/events/reply_content.dart
+++ b/lib/pages/chat/events/reply_content.dart
@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';

-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
 import '../../../config/app_config.dart';
 import 'html_message.dart';

--- a/lib/pages/chat/events/state_message.dart
+++ b/lib/pages/chat/events/state_message.dart
@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';

-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
 import '../../../config/app_config.dart';

 class StateMessage extends StatelessWidget {
--- a/lib/pages/chat/events/video_player.dart
+++ b/lib/pages/chat/events/video_player.dart
@ -13,7 +13,7 @@ import 'package:video_player/video_player.dart';

 import 'package:fluffychat/pages/chat/events/image_bubble.dart';
 import 'package:fluffychat/utils/localized_exception_extension.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart';

 class EventVideoPlayer extends StatefulWidget {
  final Event event;
--- a/lib/pages/chat/pinned_events.dart
+++ b/lib/pages/chat/pinned_events.dart
@ -9,7 +9,7 @@ import 'package:matrix_link_text/link_text.dart';

 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
 import 'package:fluffychat/utils/url_launcher.dart';

 class PinnedEvents extends StatelessWidget {
@ -21,11 +21,10 @@ class PinnedEvents extends StatelessWidget {
      BuildContext context, List<Event?> events) async {
    final eventId = events.length == 1
        ? events.single?.eventId
-        : await showConfirmationDialog<String>(
+        : await showModalActionSheet<String>(
            context: context,
-            title: L10n.of(context)!.pinMessage,
            actions: events
-                .map((event) => AlertDialogAction(
+                .map((event) => SheetAction(
                      key: event?.eventId ?? '',
                      label: event?.calcLocalizedBodyFallback(
                            MatrixLocals(L10n.of(context)!),
--- a/lib/pages/chat/reactions_picker.dart
+++ b/lib/pages/chat/reactions_picker.dart
@ -6,7 +6,6 @@ import 'package:matrix/matrix.dart';
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/app_emojis.dart';
 import 'package:fluffychat/pages/chat/chat.dart';
-import '../../config/themes.dart';

 class ReactionsPicker extends StatelessWidget {
  final ChatController controller;
@ -21,8 +20,7 @@ class ReactionsPicker extends StatelessWidget {
        controller.room!.canSendDefaultMessages &&
        controller.selectedEvents.isNotEmpty;
    return AnimatedContainer(
-      duration: FluffyThemes.animationDuration,
-      curve: FluffyThemes.animationCurve,
+      duration: const Duration(milliseconds: 300),
      height: (display) ? 56 : 0,
      child: Material(
        color: Colors.transparent,
--- a/lib/pages/chat/reply_display.dart
+++ b/lib/pages/chat/reply_display.dart
@ -3,8 +3,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/l10n.dart';
 import 'package:matrix/matrix.dart';

-import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
-import '../../config/themes.dart';
+import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
 import 'chat.dart';
 import 'events/reply_content.dart';

@ -15,8 +14,7 @@ class ReplyDisplay extends StatelessWidget {
  @override
  Widget build(BuildContext context) {
    return AnimatedContainer(
-      duration: FluffyThemes.animationDuration,
-      curve: FluffyThemes.animationCurve,
+      duration: const Duration(milliseconds: 300),
      height: controller.editEvent != null || controller.replyEvent != null
          ? 56
          : 0,
--- a/lib/pages/chat/seen_by_row.dart
+++ b/lib/pages/chat/seen_by_row.dart
@ -22,9 +22,8 @@ class SeenByRow extends StatelessWidget {
            const BoxConstraints(maxWidth: FluffyThemes.columnWidth * 2.5),
        height: seenByUsers.isEmpty ? 0 : 24,
        duration: seenByUsers.isEmpty
-            ? Duration.zero
-            : FluffyThemes.animationDuration,
-        curve: FluffyThemes.animationCurve,
+            ? const Duration(milliseconds: 0)
+            : const Duration(milliseconds: 300),
        alignment: controller.timeline!.events.isNotEmpty &&
                controller.timeline!.events.first.senderId ==
                    Matrix.of(context).client.userID
--- a/Show More
+++ b/Show More