diff --git a/android/app/build.gradle b/android/app/build.gradle
index 802810e..41bca0b 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -63,5 +63,5 @@ flutter {
 }
 
 dependencies {
-  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.2'
+  coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.1.4'
 }
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index c6c3c3a..2011490 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -11,6 +11,7 @@
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as
                  the Android process has started. This theme is visible to the user
diff --git a/generate_proto.sh b/generate_proto.sh
index a5cd387..ec563ed 100755
--- a/generate_proto.sh
+++ b/generate_proto.sh
@@ -4,7 +4,7 @@
 
 SRC_DIR="../twonly-server/twonly/src/"
 
-DST_DIR="$(pwd)/lib/src/proto/"
+DST_DIR="$(pwd)/lib/src/model/protobuf/"
 
 mkdir $DST_DIR
 
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 0aee694..130b615 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -5,54 +5,54 @@ PODS:
     - Flutter
   - cryptography_flutter_plus (0.2.0):
     - Flutter
-  - Firebase (11.8.0):
-    - Firebase/Core (= 11.8.0)
-  - Firebase/Core (11.8.0):
+  - Firebase (11.10.0):
+    - Firebase/Core (= 11.10.0)
+  - Firebase/Core (11.10.0):
     - Firebase/CoreOnly
-    - FirebaseAnalytics (~> 11.8.0)
-  - Firebase/CoreOnly (11.8.0):
-    - FirebaseCore (~> 11.8.0)
-  - Firebase/Messaging (11.8.0):
+    - FirebaseAnalytics (~> 11.10.0)
+  - Firebase/CoreOnly (11.10.0):
+    - FirebaseCore (~> 11.10.0)
+  - Firebase/Messaging (11.10.0):
     - Firebase/CoreOnly
-    - FirebaseMessaging (~> 11.8.0)
-  - firebase_core (3.12.1):
-    - Firebase/CoreOnly (= 11.8.0)
+    - FirebaseMessaging (~> 11.10.0)
+  - firebase_core (3.13.0):
+    - Firebase/CoreOnly (= 11.10.0)
     - Flutter
-  - firebase_messaging (15.2.4):
-    - Firebase/Messaging (= 11.8.0)
+  - firebase_messaging (15.2.5):
+    - Firebase/Messaging (= 11.10.0)
     - firebase_core
     - Flutter
-  - FirebaseAnalytics (11.8.0):
-    - FirebaseAnalytics/AdIdSupport (= 11.8.0)
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseAnalytics (11.10.0):
+    - FirebaseAnalytics/AdIdSupport (= 11.10.0)
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - FirebaseAnalytics/AdIdSupport (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseAnalytics/AdIdSupport (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
-    - GoogleAppMeasurement (= 11.8.0)
+    - GoogleAppMeasurement (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - FirebaseCore (11.8.1):
-    - FirebaseCoreInternal (~> 11.8.0)
+  - FirebaseCore (11.10.0):
+    - FirebaseCoreInternal (~> 11.10.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/Logger (~> 8.0)
-  - FirebaseCoreInternal (11.8.0):
+  - FirebaseCoreInternal (11.10.0):
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
-  - FirebaseInstallations (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseInstallations (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - GoogleUtilities/Environment (~> 8.0)
     - GoogleUtilities/UserDefaults (~> 8.0)
     - PromisesObjC (~> 2.4)
-  - FirebaseMessaging (11.8.0):
-    - FirebaseCore (~> 11.8.0)
+  - FirebaseMessaging (11.10.0):
+    - FirebaseCore (~> 11.10.0)
     - FirebaseInstallations (~> 11.0)
     - GoogleDataTransport (~> 10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
@@ -78,21 +78,21 @@ PODS:
   - gal (1.0.0):
     - Flutter
     - FlutterMacOS
-  - GoogleAppMeasurement (11.8.0):
-    - GoogleAppMeasurement/AdIdSupport (= 11.8.0)
+  - GoogleAppMeasurement (11.10.0):
+    - GoogleAppMeasurement/AdIdSupport (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/AdIdSupport (11.8.0):
-    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.8.0)
+  - GoogleAppMeasurement/AdIdSupport (11.10.0):
+    - GoogleAppMeasurement/WithoutAdIdSupport (= 11.10.0)
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
     - "GoogleUtilities/NSData+zlib (~> 8.0)"
     - nanopb (~> 3.30910.0)
-  - GoogleAppMeasurement/WithoutAdIdSupport (11.8.0):
+  - GoogleAppMeasurement/WithoutAdIdSupport (11.10.0):
     - GoogleUtilities/AppDelegateSwizzler (~> 8.0)
     - GoogleUtilities/MethodSwizzler (~> 8.0)
     - GoogleUtilities/Network (~> 8.0)
@@ -317,25 +317,25 @@ EXTERNAL SOURCES:
     :path: ".symlinks/plugins/url_launcher_ios/ios"
 
 SPEC CHECKSUMS:
-  camera_avfoundation: 04b44aeb14070126c6529e5ab82cc7c9fca107cf
+  camera_avfoundation: be3be85408cd4126f250386828e9b1dfa40ab436
   connectivity_plus: cb623214f4e1f6ef8fe7403d580fdad517d2f7dd
   cryptography_flutter_plus: 44f4e9e4079395fcbb3e7809c0ac2c6ae2d9576f
-  Firebase: d80354ed7f6df5f9aca55e9eb47cc4b634735eaf
-  firebase_core: 8d552814f6c01ccde5d88939fced4ec26f2f5510
-  firebase_messaging: 8b96a4f09841c15a16b96973ef5c3dcfc1a064e4
-  FirebaseAnalytics: 4fd42def128146e24e480e89f310e3d8534ea42b
-  FirebaseCore: 99fe0c4b44a39f37d99e6404e02009d2db5d718d
-  FirebaseCoreInternal: df24ce5af28864660ecbd13596fc8dd3a8c34629
-  FirebaseInstallations: 6c963bd2a86aca0481eef4f48f5a4df783ae5917
-  FirebaseMessaging: 487b634ccdf6f7b7ff180fdcb2a9935490f764e8
+  Firebase: 1fe1c0a7d9aaea32efe01fbea5f0ebd8d70e53a2
+  firebase_core: 2d4534e7b489907dcede540c835b48981d890943
+  firebase_messaging: 75bc93a4df25faccad67f6662ae872ac9ae69b64
+  FirebaseAnalytics: 4e42333f02cf78ed93703a5c36f36dd518aebdef
+  FirebaseCore: 8344daef5e2661eb004b177488d6f9f0f24251b7
+  FirebaseCoreInternal: ef4505d2afb1d0ebbc33162cb3795382904b5679
+  FirebaseInstallations: 9980995bdd06ec8081dfb6ab364162bdd64245c3
+  FirebaseMessaging: 2b9f56aa4ed286e1f0ce2ee1d413aabb8f9f5cb9
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_image_compress_common: 1697a328fd72bfb335507c6bca1a65fa5ad87df1
   flutter_keyboard_visibility: 4625131e43015dbbe759d9b20daaf77e0e3f6619
-  flutter_local_notifications: 395056b3175ba4f08480a7c5de30cd36d69827e4
+  flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
   flutter_secure_storage_darwin: ce237a8775b39723566dc72571190a3769d70468
   flutter_volume_controller: c2be490cb0487e8b88d0d9fc2b7e1c139a4ebccb
   gal: baecd024ebfd13c441269ca7404792a7152fde89
-  GoogleAppMeasurement: fc0817122bd4d4189164f85374e06773b9561896
+  GoogleAppMeasurement: 36684bfb3ee034e2b42b4321eb19da3a1b81e65d
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleUtilities: 26a3abef001b6533cf678d3eb38fd3f614b7872d
   image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 03c16dd..2188287 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -24,6 +24,10 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>$(FLUTTER_BUILD_NUMBER)</string>
+	<key>FIREBASE_ANALYTICS_COLLECTION_ENABLED</key>
+	<false/>
+	<key>FirebaseAutomaticScreenReportingEnabled</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>
@@ -45,20 +49,9 @@
 	<string>LaunchScreen</string>
 	<key>UIMainStoryboardFile</key>
 	<string>Main</string>
-	<key>FIREBASE_ANALYTICS_COLLECTION_ENABLED</key><false/>
-	<key>FirebaseAutomaticScreenReportingEnabled</key> <false/>
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 </dict>
 </plist>
diff --git a/l10n.yaml b/l10n.yaml
index 5852ac9..7dafe6f 100644
--- a/l10n.yaml
+++ b/l10n.yaml
@@ -1,4 +1,6 @@
+synthetic-package: false
 arb-dir: lib/src/localization
 template-arb-file: app_en.arb
 output-localization-file: app_localizations.dart
 untranslated-messages-file: build/l10n.log
+output-dir: lib/src/localization/generated
diff --git a/lib/src/app.dart b/lib/app.dart
similarity index 65%
rename from lib/src/app.dart
rename to lib/app.dart
index cd372bb..c4e1a6c 100644
--- a/lib/src/app.dart
+++ b/lib/app.dart
@@ -1,5 +1,6 @@
 import 'package:provider/provider.dart';
 import 'package:twonly/globals.dart';
+import 'package:twonly/src/localization/generated/app_localizations.dart';
 import 'package:twonly/src/providers/connection_provider.dart';
 import 'package:twonly/src/providers/settings_change_provider.dart';
 import 'package:twonly/src/services/notification_service.dart';
@@ -8,13 +9,12 @@ import 'package:twonly/src/views/onboarding/onboarding_view.dart';
 import 'package:twonly/src/views/home_view.dart';
 import 'package:twonly/src/views/onboarding/register_view.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'dart:async';
 
 // these global function can be called from anywhere to update
 // the ui when something changed. The callbacks will be set by
-// MyApp widget.
+// App widget.
 
 // this callback is called by the apiProvider
 Function(bool) globalCallbackConnectionState = (a) {};
@@ -23,14 +23,13 @@ bool globalIsAppInBackground = true;
 // these two callbacks are called on updated to the corresponding database
 
 /// The Widget that configures your application.
-class MyApp extends StatefulWidget {
-  const MyApp({super.key});
-
+class App extends StatefulWidget {
+  const App({super.key});
   @override
-  State<MyApp> createState() => _MyAppState();
+  State<App> createState() => _AppState();
 }
 
-class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
+class _AppState extends State<App> with WidgetsBindingObserver {
   bool wasPaused = false;
 
   @override
@@ -60,7 +59,6 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
         globalIsAppInBackground = false;
         twonlyDatabase.markUpdated();
         apiProvider.connect();
-        // _stopService();
       }
     } else if (state == AppLifecycleState.paused) {
       wasPaused = true;
@@ -70,20 +68,13 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
 
   @override
   void dispose() {
-    // apiProvider.close(() {});
     WidgetsBinding.instance.removeObserver(this);
-    // disable globalCallbacks to the flutter tree
     globalCallbackConnectionState = (a) {};
     super.dispose();
   }
 
   @override
   Widget build(BuildContext context) {
-    // var isConnected = context.watch<ApiProvider>().isConnected;
-    // Glue the SettingsController to the MaterialApp.
-    //
-    // The ListenableBuilder Widget listens to the SettingsController for changes.
-    // Whenever the user updates their settings, the MaterialApp is rebuilt.
     return ListenableBuilder(
       listenable: context.watch<SettingsChangeProvider>(),
       builder: (BuildContext context, Widget? child) {
@@ -107,7 +98,7 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
                   const InputDecorationTheme(border: OutlineInputBorder())),
           darkTheme: ThemeData.dark().copyWith(
             colorScheme: ColorScheme.fromSeed(
-              brightness: Brightness.dark, // <-- the only line added
+              brightness: Brightness.dark,
               seedColor: const Color(0xFF57CC99),
             ),
             inputDecorationTheme: const InputDecorationTheme(
@@ -117,9 +108,8 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
           themeMode: context.watch<SettingsChangeProvider>().themeMode,
           initialRoute: '/',
           routes: {
-            "/": (context) => MyAppMainWidget(initialPage: 0),
-            "/chats": (context) => MyAppMainWidget(initialPage: 1)
-            // home: MyAppMainWidget(isConnected: isConnected, initialPage: 0),
+            "/": (context) => AppMainWidget(initialPage: 0),
+            "/chats": (context) => AppMainWidget(initialPage: 1)
           },
         );
       },
@@ -127,53 +117,49 @@ class _MyAppState extends State<MyApp> with WidgetsBindingObserver {
   }
 }
 
-class MyAppMainWidget extends StatefulWidget {
-  const MyAppMainWidget({super.key, required this.initialPage});
-
+class AppMainWidget extends StatefulWidget {
+  const AppMainWidget({super.key, required this.initialPage});
   final int initialPage;
-
   @override
-  State<MyAppMainWidget> createState() => _MyAppMainWidgetState();
+  State<AppMainWidget> createState() => _AppMainWidgetState();
 }
 
-class _MyAppMainWidgetState extends State<MyAppMainWidget> {
-  Future<bool> _isUserCreated = isUserCreated();
-  bool _showOnboarding = true;
+class _AppMainWidgetState extends State<AppMainWidget> {
+  Future<bool> userCreated = isUserCreated();
+  bool showOnboarding = true;
 
   @override
   Widget build(BuildContext context) {
     return Stack(
       children: [
         FutureBuilder<bool>(
-          future: _isUserCreated,
+          future: userCreated,
           builder: (context, snapshot) {
-            if (snapshot.hasData) {
-              if (snapshot.data!) {
-                return HomeView(
-                  initialPage: widget.initialPage,
-                );
-              }
-
-              if (_showOnboarding) {
-                return OnboardingView(
-                  callbackOnSuccess: () {
-                    setState(() {
-                      _showOnboarding = false;
-                    });
-                  },
-                );
-              }
-
-              return RegisterView(
-                callbackOnSuccess: () {
-                  setState(() {
-                    _isUserCreated = isUserCreated();
-                  });
-                },
-              );
-            } else {
+            if (!snapshot.hasData) {
               return Center(child: Container());
             }
+
+            if (snapshot.data!) {
+              return HomeView(
+                initialPage: widget.initialPage,
+              );
+            }
+
+            return showOnboarding
+                ? OnboardingView(
+                    callbackOnSuccess: () {
+                      setState(() {
+                        showOnboarding = false;
+                      });
+                    },
+                  )
+                : RegisterView(
+                    callbackOnSuccess: () {
+                      setState(() {
+                        userCreated = isUserCreated();
+                      });
+                    },
+                  );
           },
         ),
       ],
diff --git a/lib/main.dart b/lib/main.dart
index e4020e1..08f2dd7 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:camera/camera.dart';
+import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/src/database/twonly_database.dart';
@@ -10,7 +11,7 @@ import 'package:twonly/src/providers/settings_change_provider.dart';
 import 'package:twonly/src/services/fcm_service.dart';
 import 'package:twonly/src/services/notification_service.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'src/app.dart';
+import 'app.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -32,13 +33,15 @@ void main() async {
   twonlyDatabase = TwonlyDatabase();
   await twonlyDatabase.messagesDao.appRestarted();
 
+  await SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+
   runApp(
     MultiProvider(
       providers: [
         ChangeNotifierProvider(create: (_) => settingsController),
         ChangeNotifierProvider(create: (_) => ConnectionChangeProvider()),
       ],
-      child: MyApp(),
+      child: App(),
     ),
   );
 }
diff --git a/lib/src/database/daos/messages_dao.dart b/lib/src/database/daos/messages_dao.dart
index c446954..ce48e51 100644
--- a/lib/src/database/daos/messages_dao.dart
+++ b/lib/src/database/daos/messages_dao.dart
@@ -11,7 +11,7 @@ class MessagesDao extends DatabaseAccessor<TwonlyDatabase>
     with _$MessagesDaoMixin {
   // this constructor is required so that the main database can create an instance
   // of this object.
-  MessagesDao(TwonlyDatabase db) : super(db);
+  MessagesDao(super.db);
 
   Stream<List<Message>> watchMessageNotOpened(int contactId) {
     return (select(messages)
diff --git a/lib/src/localization/generated/app_localizations.dart b/lib/src/localization/generated/app_localizations.dart
new file mode 100644
index 0000000..86cffcc
--- /dev/null
+++ b/lib/src/localization/generated/app_localizations.dart
@@ -0,0 +1,933 @@
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
+import 'package:intl/intl.dart' as intl;
+
+import 'app_localizations_de.dart';
+import 'app_localizations_en.dart';
+
+// ignore_for_file: type=lint
+
+/// Callers can lookup localized strings with an instance of AppLocalizations
+/// returned by `AppLocalizations.of(context)`.
+///
+/// Applications need to include `AppLocalizations.delegate()` in their app's
+/// `localizationDelegates` list, and the locales they support in the app's
+/// `supportedLocales` list. For example:
+///
+/// ```dart
+/// import 'generated/app_localizations.dart';
+///
+/// return MaterialApp(
+///   localizationsDelegates: AppLocalizations.localizationsDelegates,
+///   supportedLocales: AppLocalizations.supportedLocales,
+///   home: MyApplicationHome(),
+/// );
+/// ```
+///
+/// ## Update pubspec.yaml
+///
+/// Please make sure to update your pubspec.yaml to include the following
+/// packages:
+///
+/// ```yaml
+/// dependencies:
+///   # Internationalization support.
+///   flutter_localizations:
+///     sdk: flutter
+///   intl: any # Use the pinned version from flutter_localizations
+///
+///   # Rest of dependencies
+/// ```
+///
+/// ## iOS Applications
+///
+/// iOS applications define key application metadata, including supported
+/// locales, in an Info.plist file that is built into the application bundle.
+/// To configure the locales supported by your app, you’ll need to edit this
+/// file.
+///
+/// First, open your project’s ios/Runner.xcworkspace Xcode workspace file.
+/// Then, in the Project Navigator, open the Info.plist file under the Runner
+/// project’s Runner folder.
+///
+/// Next, select the Information Property List item, select Add Item from the
+/// Editor menu, then select Localizations from the pop-up menu.
+///
+/// Select and expand the newly-created Localizations item then, for each
+/// locale your application supports, add a new item and select the locale
+/// you wish to add from the pop-up menu in the Value field. This list should
+/// be consistent with the languages listed in the AppLocalizations.supportedLocales
+/// property.
+abstract class AppLocalizations {
+  AppLocalizations(String locale) : localeName = intl.Intl.canonicalizedLocale(locale.toString());
+
+  final String localeName;
+
+  static AppLocalizations? of(BuildContext context) {
+    return Localizations.of<AppLocalizations>(context, AppLocalizations);
+  }
+
+  static const LocalizationsDelegate<AppLocalizations> delegate = _AppLocalizationsDelegate();
+
+  /// A list of this localizations delegate along with the default localizations
+  /// delegates.
+  ///
+  /// Returns a list of localizations delegates containing this delegate along with
+  /// GlobalMaterialLocalizations.delegate, GlobalCupertinoLocalizations.delegate,
+  /// and GlobalWidgetsLocalizations.delegate.
+  ///
+  /// Additional delegates can be added by appending to this list in
+  /// MaterialApp. This list does not have to be used at all if a custom list
+  /// of delegates is preferred or required.
+  static const List<LocalizationsDelegate<dynamic>> localizationsDelegates = <LocalizationsDelegate<dynamic>>[
+    delegate,
+    GlobalMaterialLocalizations.delegate,
+    GlobalCupertinoLocalizations.delegate,
+    GlobalWidgetsLocalizations.delegate,
+  ];
+
+  /// A list of this localizations delegate's supported locales.
+  static const List<Locale> supportedLocales = <Locale>[
+    Locale('de'),
+    Locale('en')
+  ];
+
+  /// No description provided for @registerTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Welcome to twonly!'**
+  String get registerTitle;
+
+  /// No description provided for @registerSlogan.
+  ///
+  /// In en, this message translates to:
+  /// **'twonly, a privacy friendly way to connect with friends through secure, spontaneous image sharing'**
+  String get registerSlogan;
+
+  /// No description provided for @onboardingWelcomeTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Welcome to twonly!'**
+  String get onboardingWelcomeTitle;
+
+  /// No description provided for @onboardingWelcomeBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Experience a private and secure way to stay in touch with friends by sharing instant pictures.'**
+  String get onboardingWelcomeBody;
+
+  /// No description provided for @onboardingE2eTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Carefree sharing'**
+  String get onboardingE2eTitle;
+
+  /// No description provided for @onboardingE2eBody.
+  ///
+  /// In en, this message translates to:
+  /// **'With end-to-end encryption, enjoy the peace of mind that only you and your friends can see the moments you share.'**
+  String get onboardingE2eBody;
+
+  /// No description provided for @onboardingFocusTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Focus on sharing moments'**
+  String get onboardingFocusTitle;
+
+  /// No description provided for @onboardingFocusBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Say goodbye to addictive features! twonly was created for sharing moments, free from useless distractions or ads.'**
+  String get onboardingFocusBody;
+
+  /// No description provided for @onboardingSendTwonliesTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Send twonlies'**
+  String get onboardingSendTwonliesTitle;
+
+  /// No description provided for @onboardingSendTwonliesBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Share moments securely with your partner. twonly ensures that only your partner can open it, keeping your moments with your partner a two(o)nly thing!'**
+  String get onboardingSendTwonliesBody;
+
+  /// No description provided for @onboardingNotProductTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'You are not the product!'**
+  String get onboardingNotProductTitle;
+
+  /// No description provided for @onboardingNotProductBody.
+  ///
+  /// In en, this message translates to:
+  /// **'twonly is financed by a small monthly fee and not by selling your data.'**
+  String get onboardingNotProductBody;
+
+  /// No description provided for @onboardingBuyOneGetTwoTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Buy one get two'**
+  String get onboardingBuyOneGetTwoTitle;
+
+  /// No description provided for @onboardingBuyOneGetTwoBody.
+  ///
+  /// In en, this message translates to:
+  /// **'twonly always requires at least two people, which is why you receive a second free license for your twonly partner with your purchase.'**
+  String get onboardingBuyOneGetTwoBody;
+
+  /// No description provided for @onboardingGetStartedTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Let\'s go!'**
+  String get onboardingGetStartedTitle;
+
+  /// No description provided for @onboardingGetStartedBody.
+  ///
+  /// In en, this message translates to:
+  /// **'You can test twonly free of charge for 14 days, after that it costs either 1€/month or 9€/year.'**
+  String get onboardingGetStartedBody;
+
+  /// No description provided for @onboardingTryForFree.
+  ///
+  /// In en, this message translates to:
+  /// **'Try for free'**
+  String get onboardingTryForFree;
+
+  /// No description provided for @registerUsernameSlogan.
+  ///
+  /// In en, this message translates to:
+  /// **'Please select a username so others can find you!'**
+  String get registerUsernameSlogan;
+
+  /// No description provided for @registerUsernameDecoration.
+  ///
+  /// In en, this message translates to:
+  /// **'Username'**
+  String get registerUsernameDecoration;
+
+  /// No description provided for @registerUsernameLimits.
+  ///
+  /// In en, this message translates to:
+  /// **'Username must be 3 to 12 characters long, consisting only of letters (a-z) and numbers (0-9).'**
+  String get registerUsernameLimits;
+
+  /// No description provided for @registerSubmitButton.
+  ///
+  /// In en, this message translates to:
+  /// **'Register now!'**
+  String get registerSubmitButton;
+
+  /// No description provided for @newMessageTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'New message'**
+  String get newMessageTitle;
+
+  /// No description provided for @chatsTapToSend.
+  ///
+  /// In en, this message translates to:
+  /// **'Click to send your first image'**
+  String get chatsTapToSend;
+
+  /// No description provided for @cameraPreviewSendTo.
+  ///
+  /// In en, this message translates to:
+  /// **'Send to'**
+  String get cameraPreviewSendTo;
+
+  /// No description provided for @shareImageTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Share with'**
+  String get shareImageTitle;
+
+  /// No description provided for @shareImageBestFriends.
+  ///
+  /// In en, this message translates to:
+  /// **'Best friends'**
+  String get shareImageBestFriends;
+
+  /// No description provided for @shareImagedEditorSendImage.
+  ///
+  /// In en, this message translates to:
+  /// **'Send'**
+  String get shareImagedEditorSendImage;
+
+  /// No description provided for @shareImagedEditorShareWith.
+  ///
+  /// In en, this message translates to:
+  /// **'Share with'**
+  String get shareImagedEditorShareWith;
+
+  /// No description provided for @shareImagedEditorSaveImage.
+  ///
+  /// In en, this message translates to:
+  /// **'Save'**
+  String get shareImagedEditorSaveImage;
+
+  /// No description provided for @shareImagedEditorSavedImage.
+  ///
+  /// In en, this message translates to:
+  /// **'Saved'**
+  String get shareImagedEditorSavedImage;
+
+  /// No description provided for @shareImageSearchAllContacts.
+  ///
+  /// In en, this message translates to:
+  /// **'Search all contacts'**
+  String get shareImageSearchAllContacts;
+
+  /// No description provided for @startNewChatTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Select Contact'**
+  String get startNewChatTitle;
+
+  /// No description provided for @startNewChatNewContact.
+  ///
+  /// In en, this message translates to:
+  /// **'New Contact'**
+  String get startNewChatNewContact;
+
+  /// No description provided for @startNewChatYourContacts.
+  ///
+  /// In en, this message translates to:
+  /// **'Your Contacts'**
+  String get startNewChatYourContacts;
+
+  /// No description provided for @shareImageAllUsers.
+  ///
+  /// In en, this message translates to:
+  /// **'All contacts'**
+  String get shareImageAllUsers;
+
+  /// No description provided for @shareImageAllTwonlyWarning.
+  ///
+  /// In en, this message translates to:
+  /// **'twonlies can only be send to verified contacts!'**
+  String get shareImageAllTwonlyWarning;
+
+  /// No description provided for @searchUsernameInput.
+  ///
+  /// In en, this message translates to:
+  /// **'Username'**
+  String get searchUsernameInput;
+
+  /// No description provided for @searchUsernameTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Search username'**
+  String get searchUsernameTitle;
+
+  /// No description provided for @searchUserNamePending.
+  ///
+  /// In en, this message translates to:
+  /// **'Pending'**
+  String get searchUserNamePending;
+
+  /// No description provided for @searchUserNameBlockUserTooltip.
+  ///
+  /// In en, this message translates to:
+  /// **'Block the user without informing.'**
+  String get searchUserNameBlockUserTooltip;
+
+  /// No description provided for @searchUserNameRejectUserTooltip.
+  ///
+  /// In en, this message translates to:
+  /// **'Reject the request and let the requester know.'**
+  String get searchUserNameRejectUserTooltip;
+
+  /// No description provided for @searchUserNameArchiveUserTooltip.
+  ///
+  /// In en, this message translates to:
+  /// **'Archive the user. He will appear again as soon as he accepts your request.'**
+  String get searchUserNameArchiveUserTooltip;
+
+  /// No description provided for @searchUsernameNotFound.
+  ///
+  /// In en, this message translates to:
+  /// **'Username not found'**
+  String get searchUsernameNotFound;
+
+  /// No description provided for @searchUsernameNotFoundBody.
+  ///
+  /// In en, this message translates to:
+  /// **'There is no user with the username \"{username}\" registered'**
+  String searchUsernameNotFoundBody(Object username);
+
+  /// No description provided for @searchUsernameNewFollowerTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Follow requests'**
+  String get searchUsernameNewFollowerTitle;
+
+  /// No description provided for @searchUsernameQrCodeBtn.
+  ///
+  /// In en, this message translates to:
+  /// **'Scan QR code'**
+  String get searchUsernameQrCodeBtn;
+
+  /// No description provided for @chatListViewSearchUserNameBtn.
+  ///
+  /// In en, this message translates to:
+  /// **'Add your first twonly contact!'**
+  String get chatListViewSearchUserNameBtn;
+
+  /// No description provided for @chatListViewSendFirstTwonly.
+  ///
+  /// In en, this message translates to:
+  /// **'Send your first twonly!'**
+  String get chatListViewSendFirstTwonly;
+
+  /// No description provided for @chatListDetailInput.
+  ///
+  /// In en, this message translates to:
+  /// **'Type a message'**
+  String get chatListDetailInput;
+
+  /// No description provided for @contextMenuVerifyUser.
+  ///
+  /// In en, this message translates to:
+  /// **'Verify'**
+  String get contextMenuVerifyUser;
+
+  /// No description provided for @contextMenuArchiveUser.
+  ///
+  /// In en, this message translates to:
+  /// **'Archive'**
+  String get contextMenuArchiveUser;
+
+  /// No description provided for @contextMenuUndoArchiveUser.
+  ///
+  /// In en, this message translates to:
+  /// **'Undo archiving'**
+  String get contextMenuUndoArchiveUser;
+
+  /// No description provided for @contextMenuOpenChat.
+  ///
+  /// In en, this message translates to:
+  /// **'Open chat'**
+  String get contextMenuOpenChat;
+
+  /// No description provided for @contextMenuSendImage.
+  ///
+  /// In en, this message translates to:
+  /// **'Send image'**
+  String get contextMenuSendImage;
+
+  /// No description provided for @mediaViewerAuthReason.
+  ///
+  /// In en, this message translates to:
+  /// **'Please authenticate to see this twonly!'**
+  String get mediaViewerAuthReason;
+
+  /// No description provided for @messageSendState_Received.
+  ///
+  /// In en, this message translates to:
+  /// **'Received'**
+  String get messageSendState_Received;
+
+  /// No description provided for @messageSendState_Opened.
+  ///
+  /// In en, this message translates to:
+  /// **'Opened'**
+  String get messageSendState_Opened;
+
+  /// No description provided for @messageSendState_Send.
+  ///
+  /// In en, this message translates to:
+  /// **'Sent'**
+  String get messageSendState_Send;
+
+  /// No description provided for @messageSendState_Sending.
+  ///
+  /// In en, this message translates to:
+  /// **'Sending'**
+  String get messageSendState_Sending;
+
+  /// No description provided for @messageSendState_TapToLoad.
+  ///
+  /// In en, this message translates to:
+  /// **'Tap to load'**
+  String get messageSendState_TapToLoad;
+
+  /// No description provided for @messageSendState_Loading.
+  ///
+  /// In en, this message translates to:
+  /// **'Downloading'**
+  String get messageSendState_Loading;
+
+  /// No description provided for @messageStoredInGalery.
+  ///
+  /// In en, this message translates to:
+  /// **'Stored in gallery'**
+  String get messageStoredInGalery;
+
+  /// No description provided for @imageEditorDrawOk.
+  ///
+  /// In en, this message translates to:
+  /// **'Take drawing'**
+  String get imageEditorDrawOk;
+
+  /// No description provided for @settingsTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Settings'**
+  String get settingsTitle;
+
+  /// No description provided for @settingsChats.
+  ///
+  /// In en, this message translates to:
+  /// **'Chats'**
+  String get settingsChats;
+
+  /// No description provided for @settingsPreSelectedReactions.
+  ///
+  /// In en, this message translates to:
+  /// **'Preselected reaction emojis'**
+  String get settingsPreSelectedReactions;
+
+  /// No description provided for @settingsPreSelectedReactionsError.
+  ///
+  /// In en, this message translates to:
+  /// **'A maximum of 12 reactions can be selected.'**
+  String get settingsPreSelectedReactionsError;
+
+  /// No description provided for @settingsProfile.
+  ///
+  /// In en, this message translates to:
+  /// **'Profile'**
+  String get settingsProfile;
+
+  /// No description provided for @settingsProfileCustomizeAvatar.
+  ///
+  /// In en, this message translates to:
+  /// **'Customize your avatar'**
+  String get settingsProfileCustomizeAvatar;
+
+  /// No description provided for @settingsProfileEditDisplayName.
+  ///
+  /// In en, this message translates to:
+  /// **'Displayname'**
+  String get settingsProfileEditDisplayName;
+
+  /// No description provided for @settingsProfileEditDisplayNameNew.
+  ///
+  /// In en, this message translates to:
+  /// **'New Displayname'**
+  String get settingsProfileEditDisplayNameNew;
+
+  /// No description provided for @settingsAccount.
+  ///
+  /// In en, this message translates to:
+  /// **'Konto'**
+  String get settingsAccount;
+
+  /// No description provided for @settingsSubscription.
+  ///
+  /// In en, this message translates to:
+  /// **'Subscription'**
+  String get settingsSubscription;
+
+  /// No description provided for @settingsAppearance.
+  ///
+  /// In en, this message translates to:
+  /// **'Appearance'**
+  String get settingsAppearance;
+
+  /// No description provided for @settingsPrivacy.
+  ///
+  /// In en, this message translates to:
+  /// **'Privacy'**
+  String get settingsPrivacy;
+
+  /// No description provided for @settingsPrivacyBlockUsers.
+  ///
+  /// In en, this message translates to:
+  /// **'Block users'**
+  String get settingsPrivacyBlockUsers;
+
+  /// No description provided for @settingsPrivacyBlockUsersDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Blocked users will not be able to communicate with you. You can unblock a blocked user at any time.'**
+  String get settingsPrivacyBlockUsersDesc;
+
+  /// No description provided for @settingsPrivacyBlockUsersCount.
+  ///
+  /// In en, this message translates to:
+  /// **'{len} contact(s)'**
+  String settingsPrivacyBlockUsersCount(Object len);
+
+  /// No description provided for @settingsNotification.
+  ///
+  /// In en, this message translates to:
+  /// **'Notification'**
+  String get settingsNotification;
+
+  /// No description provided for @settingsNotifyTroubleshooting.
+  ///
+  /// In en, this message translates to:
+  /// **'Troubleshooting'**
+  String get settingsNotifyTroubleshooting;
+
+  /// No description provided for @settingsNotifyTroubleshootingDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Click here if you have problems receiving push notifications.'**
+  String get settingsNotifyTroubleshootingDesc;
+
+  /// No description provided for @settingsNotifyTroubleshootingNoProblem.
+  ///
+  /// In en, this message translates to:
+  /// **'No problem detected'**
+  String get settingsNotifyTroubleshootingNoProblem;
+
+  /// No description provided for @settingsNotifyTroubleshootingNoProblemDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'Press OK to receive a test notification. When you receive no message even after waiting for 10 minutes, please send us your debug log in Settings > Help > Debug log, so we can look at that issue.'**
+  String get settingsNotifyTroubleshootingNoProblemDesc;
+
+  /// No description provided for @settingsHelp.
+  ///
+  /// In en, this message translates to:
+  /// **'Help'**
+  String get settingsHelp;
+
+  /// No description provided for @settingsHelpDiagnostics.
+  ///
+  /// In en, this message translates to:
+  /// **'Diagnostic protocol'**
+  String get settingsHelpDiagnostics;
+
+  /// No description provided for @settingsHelpSupport.
+  ///
+  /// In en, this message translates to:
+  /// **'Support Center'**
+  String get settingsHelpSupport;
+
+  /// No description provided for @settingsHelpVersion.
+  ///
+  /// In en, this message translates to:
+  /// **'Version'**
+  String get settingsHelpVersion;
+
+  /// No description provided for @settingsHelpLicenses.
+  ///
+  /// In en, this message translates to:
+  /// **'Licenses (Source-Code)'**
+  String get settingsHelpLicenses;
+
+  /// No description provided for @settingsHelpCredits.
+  ///
+  /// In en, this message translates to:
+  /// **'Licenses (Images)'**
+  String get settingsHelpCredits;
+
+  /// No description provided for @settingsHelpLegal.
+  ///
+  /// In en, this message translates to:
+  /// **'Imprint, Terms & Privacy Policy'**
+  String get settingsHelpLegal;
+
+  /// No description provided for @settingsAppearanceTheme.
+  ///
+  /// In en, this message translates to:
+  /// **'Theme'**
+  String get settingsAppearanceTheme;
+
+  /// No description provided for @settingsAccountDeleteAccount.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete account'**
+  String get settingsAccountDeleteAccount;
+
+  /// No description provided for @settingsAccountDeleteModalTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Are you sure?'**
+  String get settingsAccountDeleteModalTitle;
+
+  /// No description provided for @settingsAccountDeleteModalBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Your account will be deleted. There is no change to restore it.'**
+  String get settingsAccountDeleteModalBody;
+
+  /// No description provided for @contactVerifyNumberTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Verify safety number'**
+  String get contactVerifyNumberTitle;
+
+  /// No description provided for @contactVerifyNumberMarkAsVerified.
+  ///
+  /// In en, this message translates to:
+  /// **'Mark as verified'**
+  String get contactVerifyNumberMarkAsVerified;
+
+  /// No description provided for @contactVerifyNumberClearVerification.
+  ///
+  /// In en, this message translates to:
+  /// **'Clear verification'**
+  String get contactVerifyNumberClearVerification;
+
+  /// No description provided for @contactVerifyNumberLongDesc.
+  ///
+  /// In en, this message translates to:
+  /// **'To verify the end-to-end encryption with {username}, compare the numbers with their device. The person can also scan your code with their device.'**
+  String contactVerifyNumberLongDesc(Object username);
+
+  /// No description provided for @contactNickname.
+  ///
+  /// In en, this message translates to:
+  /// **'Nickname'**
+  String get contactNickname;
+
+  /// No description provided for @contactNicknameNew.
+  ///
+  /// In en, this message translates to:
+  /// **'New nickname'**
+  String get contactNicknameNew;
+
+  /// No description provided for @deleteAllContactMessages.
+  ///
+  /// In en, this message translates to:
+  /// **'Delete all messages'**
+  String get deleteAllContactMessages;
+
+  /// No description provided for @deleteAllContactMessagesBody.
+  ///
+  /// In en, this message translates to:
+  /// **'This will remove all messages in your chat with {username}. This will NOT delete the messages stored at {username}s device!'**
+  String deleteAllContactMessagesBody(Object username);
+
+  /// No description provided for @contactBlock.
+  ///
+  /// In en, this message translates to:
+  /// **'Block'**
+  String get contactBlock;
+
+  /// No description provided for @contactBlockTitle.
+  ///
+  /// In en, this message translates to:
+  /// **'Block {username}'**
+  String contactBlockTitle(Object username);
+
+  /// No description provided for @contactBlockBody.
+  ///
+  /// In en, this message translates to:
+  /// **'A blocked user will no longer be able to send you messages and their profile will be hidden from view. To unblock a user, simply navigate to Settings > Privacy > Blocked Users.'**
+  String get contactBlockBody;
+
+  /// No description provided for @undo.
+  ///
+  /// In en, this message translates to:
+  /// **'Undo'**
+  String get undo;
+
+  /// No description provided for @redo.
+  ///
+  /// In en, this message translates to:
+  /// **'Redo'**
+  String get redo;
+
+  /// No description provided for @next.
+  ///
+  /// In en, this message translates to:
+  /// **'Next'**
+  String get next;
+
+  /// No description provided for @close.
+  ///
+  /// In en, this message translates to:
+  /// **'Close'**
+  String get close;
+
+  /// No description provided for @cancel.
+  ///
+  /// In en, this message translates to:
+  /// **'Cancel'**
+  String get cancel;
+
+  /// No description provided for @ok.
+  ///
+  /// In en, this message translates to:
+  /// **'Ok'**
+  String get ok;
+
+  /// No description provided for @switchFrontAndBackCamera.
+  ///
+  /// In en, this message translates to:
+  /// **'Switch between front and back camera.'**
+  String get switchFrontAndBackCamera;
+
+  /// No description provided for @addTextItem.
+  ///
+  /// In en, this message translates to:
+  /// **'Text'**
+  String get addTextItem;
+
+  /// No description provided for @protectAsARealTwonly.
+  ///
+  /// In en, this message translates to:
+  /// **'Send as real twonly!'**
+  String get protectAsARealTwonly;
+
+  /// No description provided for @addDrawing.
+  ///
+  /// In en, this message translates to:
+  /// **'Drawing'**
+  String get addDrawing;
+
+  /// No description provided for @addEmoji.
+  ///
+  /// In en, this message translates to:
+  /// **'Emoji'**
+  String get addEmoji;
+
+  /// No description provided for @toggleFlashLight.
+  ///
+  /// In en, this message translates to:
+  /// **'Toggle the flash light'**
+  String get toggleFlashLight;
+
+  /// No description provided for @toggleHighQuality.
+  ///
+  /// In en, this message translates to:
+  /// **'Toggle better resolution'**
+  String get toggleHighQuality;
+
+  /// No description provided for @userFound.
+  ///
+  /// In en, this message translates to:
+  /// **'User found'**
+  String get userFound;
+
+  /// No description provided for @userFoundBody.
+  ///
+  /// In en, this message translates to:
+  /// **'Do you want to create a follow request?'**
+  String get userFoundBody;
+
+  /// No description provided for @searchUsernameNotFoundLong.
+  ///
+  /// In en, this message translates to:
+  /// **'\"{username}\" is not a twonly user. Please check the username and try again.'**
+  String searchUsernameNotFoundLong(Object username);
+
+  /// No description provided for @errorUnknown.
+  ///
+  /// In en, this message translates to:
+  /// **'An unexpected error has occurred. Please try again later.'**
+  String get errorUnknown;
+
+  /// No description provided for @errorBadRequest.
+  ///
+  /// In en, this message translates to:
+  /// **'The request could not be understood by the server due to malformed syntax. Please check your input and try again.'**
+  String get errorBadRequest;
+
+  /// No description provided for @errorTooManyRequests.
+  ///
+  /// In en, this message translates to:
+  /// **'You have made too many requests in a short period. Please wait a moment before trying again.'**
+  String get errorTooManyRequests;
+
+  /// No description provided for @errorInternalError.
+  ///
+  /// In en, this message translates to:
+  /// **'The server is currently not available. Please try again later.'**
+  String get errorInternalError;
+
+  /// No description provided for @errorInvalidInvitationCode.
+  ///
+  /// In en, this message translates to:
+  /// **'The invitation code you provided is invalid. Please check the code and try again.'**
+  String get errorInvalidInvitationCode;
+
+  /// No description provided for @errorUsernameAlreadyTaken.
+  ///
+  /// In en, this message translates to:
+  /// **'The username you want to use is already taken. Please choose a different username.'**
+  String get errorUsernameAlreadyTaken;
+
+  /// No description provided for @errorSignatureNotValid.
+  ///
+  /// In en, this message translates to:
+  /// **'The provided signature is not valid. Please check your credentials and try again.'**
+  String get errorSignatureNotValid;
+
+  /// No description provided for @errorUsernameNotFound.
+  ///
+  /// In en, this message translates to:
+  /// **'The username you entered does not exist. Please check the spelling or create a new account.'**
+  String get errorUsernameNotFound;
+
+  /// No description provided for @errorUsernameNotValid.
+  ///
+  /// In en, this message translates to:
+  /// **'The username you provided does not meet the required criteria. Please choose a valid username.'**
+  String get errorUsernameNotValid;
+
+  /// No description provided for @errorInvalidPublicKey.
+  ///
+  /// In en, this message translates to:
+  /// **'The public key you provided is invalid. Please check the key and try again.'**
+  String get errorInvalidPublicKey;
+
+  /// No description provided for @errorSessionAlreadyAuthenticated.
+  ///
+  /// In en, this message translates to:
+  /// **'You are already logged in. Please log out if you want to log in with a different account.'**
+  String get errorSessionAlreadyAuthenticated;
+
+  /// No description provided for @errorSessionNotAuthenticated.
+  ///
+  /// In en, this message translates to:
+  /// **'Your session is not authenticated. Please log in to continue.'**
+  String get errorSessionNotAuthenticated;
+
+  /// No description provided for @errorOnlyOneSessionAllowed.
+  ///
+  /// In en, this message translates to:
+  /// **'Only one active session is allowed per user. Please log out from other devices to continue.'**
+  String get errorOnlyOneSessionAllowed;
+}
+
+class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
+  const _AppLocalizationsDelegate();
+
+  @override
+  Future<AppLocalizations> load(Locale locale) {
+    return SynchronousFuture<AppLocalizations>(lookupAppLocalizations(locale));
+  }
+
+  @override
+  bool isSupported(Locale locale) => <String>['de', 'en'].contains(locale.languageCode);
+
+  @override
+  bool shouldReload(_AppLocalizationsDelegate old) => false;
+}
+
+AppLocalizations lookupAppLocalizations(Locale locale) {
+
+
+  // Lookup logic when only language code is specified.
+  switch (locale.languageCode) {
+    case 'de': return AppLocalizationsDe();
+    case 'en': return AppLocalizationsEn();
+  }
+
+  throw FlutterError(
+    'AppLocalizations.delegate failed to load unsupported locale "$locale". This is likely '
+    'an issue with the localizations generation tool. Please file an issue '
+    'on GitHub with a reproducible sample app and the gen-l10n configuration '
+    'that was used.'
+  );
+}
diff --git a/lib/src/localization/generated/app_localizations_de.dart b/lib/src/localization/generated/app_localizations_de.dart
new file mode 100644
index 0000000..91561ea
--- /dev/null
+++ b/lib/src/localization/generated/app_localizations_de.dart
@@ -0,0 +1,424 @@
+// ignore: unused_import
+import 'package:intl/intl.dart' as intl;
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for German (`de`).
+class AppLocalizationsDe extends AppLocalizations {
+  AppLocalizationsDe([String locale = 'de']) : super(locale);
+
+  @override
+  String get registerTitle => 'Willkommen bei twonly!';
+
+  @override
+  String get registerSlogan => 'twonly, eine private und sichere Möglichkeit um mit Freunden in Kontakt zu bleiben.';
+
+  @override
+  String get onboardingWelcomeTitle => 'Willkommen bei twonly!';
+
+  @override
+  String get onboardingWelcomeBody => 'Erlebe eine private und sichere Möglichkeit mit Freunden in Kontakt zu bleiben, indem du spontane Bilder teilst.';
+
+  @override
+  String get onboardingE2eTitle => 'Unbekümmert teilen';
+
+  @override
+  String get onboardingE2eBody => 'Genieße durch die Ende-zu-Ende-Verschlüsselung die Gewissheit, dass nur du und deine Freunde die geteilten Momente sehen können.';
+
+  @override
+  String get onboardingFocusTitle => 'Fokussiere dich auf das Teilen von Momenten';
+
+  @override
+  String get onboardingFocusBody => 'Verabschiede dich von süchtig machenden Funktionen! twonly wurde für das Teilen von Momenten ohne nutzlose Ablenkungen oder Werbung entwickelt.';
+
+  @override
+  String get onboardingSendTwonliesTitle => 'Twonlies senden';
+
+  @override
+  String get onboardingSendTwonliesBody => 'Teile Momente sicher mit deinem Partner. twonly stellt sicher, dass nur dein Partner sie öffnen kann, sodass deine Momente mit deinem Partner eine two(o)nly Sache bleiben!';
+
+  @override
+  String get onboardingNotProductTitle => 'Du bist nicht das Produkt!';
+
+  @override
+  String get onboardingNotProductBody => 'twonly finanziert sich durch eine geringe monatliche Gebühr und nicht durch den Verkauf deiner Daten.';
+
+  @override
+  String get onboardingBuyOneGetTwoTitle => 'Kaufe eins, bekomme zwei';
+
+  @override
+  String get onboardingBuyOneGetTwoBody => 'twonly benötigt immer mindestens zwei Personen, daher erhältst du beim Kauf eine zweite kostenlose Lizenz für deinen twonly-Partner.';
+
+  @override
+  String get onboardingGetStartedTitle => 'Auf geht\'s';
+
+  @override
+  String get onboardingGetStartedBody => 'Du kannst twonly 14 Tage lang kostenlos testen, danach kostet es entweder 1€/Monat oder 9€/Jahr.';
+
+  @override
+  String get onboardingTryForFree => 'Kostenlos testen';
+
+  @override
+  String get registerUsernameSlogan => 'Bitte wähle einen Benutzernamen, damit dich andere finden können!';
+
+  @override
+  String get registerUsernameDecoration => 'Benutzername';
+
+  @override
+  String get registerUsernameLimits => 'Der Benutzername muss 3 bis 12 Zeichen lang sein und darf nur aus Buchstaben (a-z) und Zahlen (0-9) bestehen.';
+
+  @override
+  String get registerSubmitButton => 'Jetzt registrieren!';
+
+  @override
+  String get newMessageTitle => 'Neue Nachricht';
+
+  @override
+  String get chatsTapToSend => 'Klicke, um dein erstes Bild zu teilen.';
+
+  @override
+  String get cameraPreviewSendTo => 'Senden an';
+
+  @override
+  String get shareImageTitle => 'Teilen mit';
+
+  @override
+  String get shareImageBestFriends => 'Beste Freunde';
+
+  @override
+  String get shareImagedEditorSendImage => 'Senden';
+
+  @override
+  String get shareImagedEditorShareWith => 'Teilen mit';
+
+  @override
+  String get shareImagedEditorSaveImage => 'Speichern';
+
+  @override
+  String get shareImagedEditorSavedImage => 'Gespeichert';
+
+  @override
+  String get shareImageSearchAllContacts => 'Alle Kontakte durchsuchen';
+
+  @override
+  String get startNewChatTitle => 'Kontakt wählen';
+
+  @override
+  String get startNewChatNewContact => 'Neuer Kontakt';
+
+  @override
+  String get startNewChatYourContacts => 'Deine Kontakte';
+
+  @override
+  String get shareImageAllUsers => 'Alle Kontakte';
+
+  @override
+  String get shareImageAllTwonlyWarning => 'Twonlies können nur an verifizierte Kontakte gesendet werden!';
+
+  @override
+  String get searchUsernameInput => 'Benutzername';
+
+  @override
+  String get searchUsernameTitle => 'Benutzernamen suchen';
+
+  @override
+  String get searchUserNamePending => 'Ausstehend';
+
+  @override
+  String get searchUserNameBlockUserTooltip => 'Benutzer ohne Benachrichtigung blockieren.';
+
+  @override
+  String get searchUserNameRejectUserTooltip => 'Die Anfrage ablehnen und den Anfragenden informieren.';
+
+  @override
+  String get searchUserNameArchiveUserTooltip => 'Benutzer archivieren. Du wirst informiert sobald er deine Anfrage akzeptiert.';
+
+  @override
+  String get searchUsernameNotFound => 'Benutzername nicht gefunden';
+
+  @override
+  String searchUsernameNotFoundBody(Object username) {
+    return 'Es wurde kein Benutzer mit dem Benutzernamen \"$username\" gefunden.';
+  }
+
+  @override
+  String get searchUsernameNewFollowerTitle => 'Folgeanfragen';
+
+  @override
+  String get searchUsernameQrCodeBtn => 'QR-Code scannen';
+
+  @override
+  String get chatListViewSearchUserNameBtn => 'Füge deinen ersten twonly-Kontakt hinzu!';
+
+  @override
+  String get chatListViewSendFirstTwonly => 'Sende dein erstes twonly!';
+
+  @override
+  String get chatListDetailInput => 'Nachricht eingeben';
+
+  @override
+  String get contextMenuVerifyUser => 'Verifizieren';
+
+  @override
+  String get contextMenuArchiveUser => 'Archivieren';
+
+  @override
+  String get contextMenuUndoArchiveUser => 'Archivierung aufheben';
+
+  @override
+  String get contextMenuOpenChat => 'Chat';
+
+  @override
+  String get contextMenuSendImage => 'Bild senden';
+
+  @override
+  String get mediaViewerAuthReason => 'Bitte authentifiziere dich, um diesen twonly zu sehen!';
+
+  @override
+  String get messageSendState_Received => 'Empfangen';
+
+  @override
+  String get messageSendState_Opened => 'Geöffnet';
+
+  @override
+  String get messageSendState_Send => 'Gesendet';
+
+  @override
+  String get messageSendState_Sending => 'Wird gesendet';
+
+  @override
+  String get messageSendState_TapToLoad => 'Tippe zum Laden';
+
+  @override
+  String get messageSendState_Loading => 'Herunterladen';
+
+  @override
+  String get messageStoredInGalery => 'In Gallerie gespeichert';
+
+  @override
+  String get imageEditorDrawOk => 'Zeichnung machen';
+
+  @override
+  String get settingsTitle => 'Einstellungen';
+
+  @override
+  String get settingsChats => 'Chats';
+
+  @override
+  String get settingsPreSelectedReactions => 'Vorgewählte Reaktions-Emojis';
+
+  @override
+  String get settingsPreSelectedReactionsError => 'Es können maximal 12 Reaktionen ausgewählt werden.';
+
+  @override
+  String get settingsProfile => 'Profil';
+
+  @override
+  String get settingsProfileCustomizeAvatar => 'Avatar anpassen';
+
+  @override
+  String get settingsProfileEditDisplayName => 'Anzeigename';
+
+  @override
+  String get settingsProfileEditDisplayNameNew => 'Neuer Anzeigename';
+
+  @override
+  String get settingsAccount => 'Konto';
+
+  @override
+  String get settingsSubscription => 'Abonnement';
+
+  @override
+  String get settingsAppearance => 'Erscheinungsbild';
+
+  @override
+  String get settingsPrivacy => 'Datenschutz';
+
+  @override
+  String get settingsPrivacyBlockUsers => 'Benutzer blockieren';
+
+  @override
+  String get settingsPrivacyBlockUsersDesc => 'Blockierte Benutzer können nicht mit dir kommunizieren. Du kannst einen blockierten Benutzer jederzeit wieder entsperren.';
+
+  @override
+  String settingsPrivacyBlockUsersCount(Object len) {
+    return '$len Kontakt(e)';
+  }
+
+  @override
+  String get settingsNotification => 'Benachrichtigung';
+
+  @override
+  String get settingsNotifyTroubleshooting => 'Fehlersuche';
+
+  @override
+  String get settingsNotifyTroubleshootingDesc => 'Hier klicken, wenn Probleme beim Empfang von Push-Benachrichtigungen auftreten.';
+
+  @override
+  String get settingsNotifyTroubleshootingNoProblem => 'Kein Problem festgestellt';
+
+  @override
+  String get settingsNotifyTroubleshootingNoProblemDesc => 'Klicke auf OK, um eine Testbenachrichtigung zu erhalten. Wenn du auch nach 10 Minuten warten keine Nachricht erhältst, sende uns bitte dein Diagnoseprotokoll unter Einstellungen > Hilfe > Diagnoseprotokoll, damit wir uns das Problem ansehen können.';
+
+  @override
+  String get settingsHelp => 'Hilfe';
+
+  @override
+  String get settingsHelpDiagnostics => 'Diagnoseprotokoll';
+
+  @override
+  String get settingsHelpSupport => 'Support-Center';
+
+  @override
+  String get settingsHelpVersion => 'Version';
+
+  @override
+  String get settingsHelpLicenses => 'Lizenzen (Source-Code)';
+
+  @override
+  String get settingsHelpCredits => 'Lizenzen (Bilder)';
+
+  @override
+  String get settingsHelpLegal => 'Impressum, Nutzungsbedingungen & Datenschutzrichtlinie';
+
+  @override
+  String get settingsAppearanceTheme => 'Theme';
+
+  @override
+  String get settingsAccountDeleteAccount => 'Konto löschen';
+
+  @override
+  String get settingsAccountDeleteModalTitle => 'Bist du sicher?';
+
+  @override
+  String get settingsAccountDeleteModalBody => 'Dein Konto wird gelöscht. Es gibt keine Möglichkeit, es wiederherzustellen.';
+
+  @override
+  String get contactVerifyNumberTitle => 'Sicherheitsnummer verifizieren';
+
+  @override
+  String get contactVerifyNumberMarkAsVerified => 'Als verifiziert markieren';
+
+  @override
+  String get contactVerifyNumberClearVerification => 'Verifizierung aufheben';
+
+  @override
+  String contactVerifyNumberLongDesc(Object username) {
+    return 'Um die Ende-zu-Ende-Verschlüsselung mit $username zu verifizieren, vergleiche die Zahlen mit ihrem Gerät. Die Person kann auch deinen Code mit ihrem Gerät scannen.';
+  }
+
+  @override
+  String get contactNickname => 'Spitzname';
+
+  @override
+  String get contactNicknameNew => 'Neuer Spitzname';
+
+  @override
+  String get deleteAllContactMessages => 'Alle Nachrichten löschen';
+
+  @override
+  String deleteAllContactMessagesBody(Object username) {
+    return 'Dadurch werden alle Nachrichten in deinem Chat mit $username gelöscht. Dies löscht NICHT die auf dem Gerät von $username gespeicherten Nachrichten!';
+  }
+
+  @override
+  String get contactBlock => 'Blockieren';
+
+  @override
+  String contactBlockTitle(Object username) {
+    return 'Blockiere $username';
+  }
+
+  @override
+  String get contactBlockBody => 'Ein blockierter Benutzer kann dir keine Nachrichten mehr senden, und sein Profil ist nicht mehr sichtbar. Um die Blockierung eines Benutzers aufzuheben, navigiere einfach zu Einstellungen > Datenschutz > Blockierte Benutzer.';
+
+  @override
+  String get undo => 'Rückgängig';
+
+  @override
+  String get redo => 'Wiederholen';
+
+  @override
+  String get next => 'Weiter';
+
+  @override
+  String get close => 'Schließen';
+
+  @override
+  String get cancel => 'Abbrechen';
+
+  @override
+  String get ok => 'Ok';
+
+  @override
+  String get switchFrontAndBackCamera => 'Zwischen Front- und Rückkamera wechseln.';
+
+  @override
+  String get addTextItem => 'Text';
+
+  @override
+  String get protectAsARealTwonly => 'Als echtes twonly senden!';
+
+  @override
+  String get addDrawing => 'Zeichnung';
+
+  @override
+  String get addEmoji => 'Emoji';
+
+  @override
+  String get toggleFlashLight => 'Taschenlampe umschalten';
+
+  @override
+  String get toggleHighQuality => 'Bessere Auflösung umschalten';
+
+  @override
+  String get userFound => 'Benutzer gefunden';
+
+  @override
+  String get userFoundBody => 'Möchtest du eine Folgeanfrage stellen?';
+
+  @override
+  String searchUsernameNotFoundLong(Object username) {
+    return '\"$username\" ist kein twonly-Benutzer. Bitte überprüfe den Benutzernamen und versuche es erneut.';
+  }
+
+  @override
+  String get errorUnknown => 'Ein unerwarteter Fehler ist aufgetreten. Bitte versuche es später erneut.';
+
+  @override
+  String get errorBadRequest => 'Die Anfrage konnte vom Server aufgrund einer fehlerhaften Syntax nicht verstanden werden. Bitte überprüfe deine Eingabe und versuche es erneut.';
+
+  @override
+  String get errorTooManyRequests => 'Du hast in kurzer Zeit zu viele Anfragen gestellt. Bitte warte einen Moment, bevor du es erneut versuchst.';
+
+  @override
+  String get errorInternalError => 'Der Server ist derzeit nicht verfügbar. Bitte versuche es später erneut.';
+
+  @override
+  String get errorInvalidInvitationCode => 'Der von dir angegebene Einladungscode ist ungültig. Bitte überprüfe den Code und versuche es erneut.';
+
+  @override
+  String get errorUsernameAlreadyTaken => 'Der Benutzername, den du verwenden möchtest, ist bereits vergeben. Bitte wähle einen anderen Benutzernamen.';
+
+  @override
+  String get errorSignatureNotValid => 'Die bereitgestellte Signatur ist nicht gültig. Bitte überprüfe deine Anmeldeinformationen und versuche es erneut.';
+
+  @override
+  String get errorUsernameNotFound => 'Der eingegebene Benutzername existiert nicht. Bitte überprüfe die Schreibweise oder erstelle ein neues Konto.';
+
+  @override
+  String get errorUsernameNotValid => 'Der von dir angegebene Benutzername entspricht nicht den erforderlichen Kriterien. Bitte wähle einen gültigen Benutzernamen.';
+
+  @override
+  String get errorInvalidPublicKey => 'Der von dir angegebene öffentliche Schlüssel ist ungültig. Bitte überprüfe den Schlüssel und versuche es erneut.';
+
+  @override
+  String get errorSessionAlreadyAuthenticated => 'Du bist bereits angemeldet. Bitte melde dich ab, wenn du dich mit einem anderen Konto anmelden möchtest.';
+
+  @override
+  String get errorSessionNotAuthenticated => 'Deine Sitzung ist nicht authentifiziert. Bitte melde dich an, um fortzufahren.';
+
+  @override
+  String get errorOnlyOneSessionAllowed => 'Es ist nur eine aktive Sitzung pro Benutzer erlaubt. Bitte melde dich von anderen Geräten ab, um fortzufahren.';
+}
diff --git a/lib/src/localization/generated/app_localizations_en.dart b/lib/src/localization/generated/app_localizations_en.dart
new file mode 100644
index 0000000..5ceb4c0
--- /dev/null
+++ b/lib/src/localization/generated/app_localizations_en.dart
@@ -0,0 +1,424 @@
+// ignore: unused_import
+import 'package:intl/intl.dart' as intl;
+import 'app_localizations.dart';
+
+// ignore_for_file: type=lint
+
+/// The translations for English (`en`).
+class AppLocalizationsEn extends AppLocalizations {
+  AppLocalizationsEn([String locale = 'en']) : super(locale);
+
+  @override
+  String get registerTitle => 'Welcome to twonly!';
+
+  @override
+  String get registerSlogan => 'twonly, a privacy friendly way to connect with friends through secure, spontaneous image sharing';
+
+  @override
+  String get onboardingWelcomeTitle => 'Welcome to twonly!';
+
+  @override
+  String get onboardingWelcomeBody => 'Experience a private and secure way to stay in touch with friends by sharing instant pictures.';
+
+  @override
+  String get onboardingE2eTitle => 'Carefree sharing';
+
+  @override
+  String get onboardingE2eBody => 'With end-to-end encryption, enjoy the peace of mind that only you and your friends can see the moments you share.';
+
+  @override
+  String get onboardingFocusTitle => 'Focus on sharing moments';
+
+  @override
+  String get onboardingFocusBody => 'Say goodbye to addictive features! twonly was created for sharing moments, free from useless distractions or ads.';
+
+  @override
+  String get onboardingSendTwonliesTitle => 'Send twonlies';
+
+  @override
+  String get onboardingSendTwonliesBody => 'Share moments securely with your partner. twonly ensures that only your partner can open it, keeping your moments with your partner a two(o)nly thing!';
+
+  @override
+  String get onboardingNotProductTitle => 'You are not the product!';
+
+  @override
+  String get onboardingNotProductBody => 'twonly is financed by a small monthly fee and not by selling your data.';
+
+  @override
+  String get onboardingBuyOneGetTwoTitle => 'Buy one get two';
+
+  @override
+  String get onboardingBuyOneGetTwoBody => 'twonly always requires at least two people, which is why you receive a second free license for your twonly partner with your purchase.';
+
+  @override
+  String get onboardingGetStartedTitle => 'Let\'s go!';
+
+  @override
+  String get onboardingGetStartedBody => 'You can test twonly free of charge for 14 days, after that it costs either 1€/month or 9€/year.';
+
+  @override
+  String get onboardingTryForFree => 'Try for free';
+
+  @override
+  String get registerUsernameSlogan => 'Please select a username so others can find you!';
+
+  @override
+  String get registerUsernameDecoration => 'Username';
+
+  @override
+  String get registerUsernameLimits => 'Username must be 3 to 12 characters long, consisting only of letters (a-z) and numbers (0-9).';
+
+  @override
+  String get registerSubmitButton => 'Register now!';
+
+  @override
+  String get newMessageTitle => 'New message';
+
+  @override
+  String get chatsTapToSend => 'Click to send your first image';
+
+  @override
+  String get cameraPreviewSendTo => 'Send to';
+
+  @override
+  String get shareImageTitle => 'Share with';
+
+  @override
+  String get shareImageBestFriends => 'Best friends';
+
+  @override
+  String get shareImagedEditorSendImage => 'Send';
+
+  @override
+  String get shareImagedEditorShareWith => 'Share with';
+
+  @override
+  String get shareImagedEditorSaveImage => 'Save';
+
+  @override
+  String get shareImagedEditorSavedImage => 'Saved';
+
+  @override
+  String get shareImageSearchAllContacts => 'Search all contacts';
+
+  @override
+  String get startNewChatTitle => 'Select Contact';
+
+  @override
+  String get startNewChatNewContact => 'New Contact';
+
+  @override
+  String get startNewChatYourContacts => 'Your Contacts';
+
+  @override
+  String get shareImageAllUsers => 'All contacts';
+
+  @override
+  String get shareImageAllTwonlyWarning => 'twonlies can only be send to verified contacts!';
+
+  @override
+  String get searchUsernameInput => 'Username';
+
+  @override
+  String get searchUsernameTitle => 'Search username';
+
+  @override
+  String get searchUserNamePending => 'Pending';
+
+  @override
+  String get searchUserNameBlockUserTooltip => 'Block the user without informing.';
+
+  @override
+  String get searchUserNameRejectUserTooltip => 'Reject the request and let the requester know.';
+
+  @override
+  String get searchUserNameArchiveUserTooltip => 'Archive the user. He will appear again as soon as he accepts your request.';
+
+  @override
+  String get searchUsernameNotFound => 'Username not found';
+
+  @override
+  String searchUsernameNotFoundBody(Object username) {
+    return 'There is no user with the username \"$username\" registered';
+  }
+
+  @override
+  String get searchUsernameNewFollowerTitle => 'Follow requests';
+
+  @override
+  String get searchUsernameQrCodeBtn => 'Scan QR code';
+
+  @override
+  String get chatListViewSearchUserNameBtn => 'Add your first twonly contact!';
+
+  @override
+  String get chatListViewSendFirstTwonly => 'Send your first twonly!';
+
+  @override
+  String get chatListDetailInput => 'Type a message';
+
+  @override
+  String get contextMenuVerifyUser => 'Verify';
+
+  @override
+  String get contextMenuArchiveUser => 'Archive';
+
+  @override
+  String get contextMenuUndoArchiveUser => 'Undo archiving';
+
+  @override
+  String get contextMenuOpenChat => 'Open chat';
+
+  @override
+  String get contextMenuSendImage => 'Send image';
+
+  @override
+  String get mediaViewerAuthReason => 'Please authenticate to see this twonly!';
+
+  @override
+  String get messageSendState_Received => 'Received';
+
+  @override
+  String get messageSendState_Opened => 'Opened';
+
+  @override
+  String get messageSendState_Send => 'Sent';
+
+  @override
+  String get messageSendState_Sending => 'Sending';
+
+  @override
+  String get messageSendState_TapToLoad => 'Tap to load';
+
+  @override
+  String get messageSendState_Loading => 'Downloading';
+
+  @override
+  String get messageStoredInGalery => 'Stored in gallery';
+
+  @override
+  String get imageEditorDrawOk => 'Take drawing';
+
+  @override
+  String get settingsTitle => 'Settings';
+
+  @override
+  String get settingsChats => 'Chats';
+
+  @override
+  String get settingsPreSelectedReactions => 'Preselected reaction emojis';
+
+  @override
+  String get settingsPreSelectedReactionsError => 'A maximum of 12 reactions can be selected.';
+
+  @override
+  String get settingsProfile => 'Profile';
+
+  @override
+  String get settingsProfileCustomizeAvatar => 'Customize your avatar';
+
+  @override
+  String get settingsProfileEditDisplayName => 'Displayname';
+
+  @override
+  String get settingsProfileEditDisplayNameNew => 'New Displayname';
+
+  @override
+  String get settingsAccount => 'Konto';
+
+  @override
+  String get settingsSubscription => 'Subscription';
+
+  @override
+  String get settingsAppearance => 'Appearance';
+
+  @override
+  String get settingsPrivacy => 'Privacy';
+
+  @override
+  String get settingsPrivacyBlockUsers => 'Block users';
+
+  @override
+  String get settingsPrivacyBlockUsersDesc => 'Blocked users will not be able to communicate with you. You can unblock a blocked user at any time.';
+
+  @override
+  String settingsPrivacyBlockUsersCount(Object len) {
+    return '$len contact(s)';
+  }
+
+  @override
+  String get settingsNotification => 'Notification';
+
+  @override
+  String get settingsNotifyTroubleshooting => 'Troubleshooting';
+
+  @override
+  String get settingsNotifyTroubleshootingDesc => 'Click here if you have problems receiving push notifications.';
+
+  @override
+  String get settingsNotifyTroubleshootingNoProblem => 'No problem detected';
+
+  @override
+  String get settingsNotifyTroubleshootingNoProblemDesc => 'Press OK to receive a test notification. When you receive no message even after waiting for 10 minutes, please send us your debug log in Settings > Help > Debug log, so we can look at that issue.';
+
+  @override
+  String get settingsHelp => 'Help';
+
+  @override
+  String get settingsHelpDiagnostics => 'Diagnostic protocol';
+
+  @override
+  String get settingsHelpSupport => 'Support Center';
+
+  @override
+  String get settingsHelpVersion => 'Version';
+
+  @override
+  String get settingsHelpLicenses => 'Licenses (Source-Code)';
+
+  @override
+  String get settingsHelpCredits => 'Licenses (Images)';
+
+  @override
+  String get settingsHelpLegal => 'Imprint, Terms & Privacy Policy';
+
+  @override
+  String get settingsAppearanceTheme => 'Theme';
+
+  @override
+  String get settingsAccountDeleteAccount => 'Delete account';
+
+  @override
+  String get settingsAccountDeleteModalTitle => 'Are you sure?';
+
+  @override
+  String get settingsAccountDeleteModalBody => 'Your account will be deleted. There is no change to restore it.';
+
+  @override
+  String get contactVerifyNumberTitle => 'Verify safety number';
+
+  @override
+  String get contactVerifyNumberMarkAsVerified => 'Mark as verified';
+
+  @override
+  String get contactVerifyNumberClearVerification => 'Clear verification';
+
+  @override
+  String contactVerifyNumberLongDesc(Object username) {
+    return 'To verify the end-to-end encryption with $username, compare the numbers with their device. The person can also scan your code with their device.';
+  }
+
+  @override
+  String get contactNickname => 'Nickname';
+
+  @override
+  String get contactNicknameNew => 'New nickname';
+
+  @override
+  String get deleteAllContactMessages => 'Delete all messages';
+
+  @override
+  String deleteAllContactMessagesBody(Object username) {
+    return 'This will remove all messages in your chat with $username. This will NOT delete the messages stored at ${username}s device!';
+  }
+
+  @override
+  String get contactBlock => 'Block';
+
+  @override
+  String contactBlockTitle(Object username) {
+    return 'Block $username';
+  }
+
+  @override
+  String get contactBlockBody => 'A blocked user will no longer be able to send you messages and their profile will be hidden from view. To unblock a user, simply navigate to Settings > Privacy > Blocked Users.';
+
+  @override
+  String get undo => 'Undo';
+
+  @override
+  String get redo => 'Redo';
+
+  @override
+  String get next => 'Next';
+
+  @override
+  String get close => 'Close';
+
+  @override
+  String get cancel => 'Cancel';
+
+  @override
+  String get ok => 'Ok';
+
+  @override
+  String get switchFrontAndBackCamera => 'Switch between front and back camera.';
+
+  @override
+  String get addTextItem => 'Text';
+
+  @override
+  String get protectAsARealTwonly => 'Send as real twonly!';
+
+  @override
+  String get addDrawing => 'Drawing';
+
+  @override
+  String get addEmoji => 'Emoji';
+
+  @override
+  String get toggleFlashLight => 'Toggle the flash light';
+
+  @override
+  String get toggleHighQuality => 'Toggle better resolution';
+
+  @override
+  String get userFound => 'User found';
+
+  @override
+  String get userFoundBody => 'Do you want to create a follow request?';
+
+  @override
+  String searchUsernameNotFoundLong(Object username) {
+    return '\"$username\" is not a twonly user. Please check the username and try again.';
+  }
+
+  @override
+  String get errorUnknown => 'An unexpected error has occurred. Please try again later.';
+
+  @override
+  String get errorBadRequest => 'The request could not be understood by the server due to malformed syntax. Please check your input and try again.';
+
+  @override
+  String get errorTooManyRequests => 'You have made too many requests in a short period. Please wait a moment before trying again.';
+
+  @override
+  String get errorInternalError => 'The server is currently not available. Please try again later.';
+
+  @override
+  String get errorInvalidInvitationCode => 'The invitation code you provided is invalid. Please check the code and try again.';
+
+  @override
+  String get errorUsernameAlreadyTaken => 'The username you want to use is already taken. Please choose a different username.';
+
+  @override
+  String get errorSignatureNotValid => 'The provided signature is not valid. Please check your credentials and try again.';
+
+  @override
+  String get errorUsernameNotFound => 'The username you entered does not exist. Please check the spelling or create a new account.';
+
+  @override
+  String get errorUsernameNotValid => 'The username you provided does not meet the required criteria. Please choose a valid username.';
+
+  @override
+  String get errorInvalidPublicKey => 'The public key you provided is invalid. Please check the key and try again.';
+
+  @override
+  String get errorSessionAlreadyAuthenticated => 'You are already logged in. Please log out if you want to log in with a different account.';
+
+  @override
+  String get errorSessionNotAuthenticated => 'Your session is not authenticated. Please log in to continue.';
+
+  @override
+  String get errorOnlyOneSessionAllowed => 'Only one active session is allowed per user. Please log out from other devices to continue.';
+}
diff --git a/lib/src/json_models/message.dart b/lib/src/model/json/message.dart
similarity index 100%
rename from lib/src/json_models/message.dart
rename to lib/src/model/json/message.dart
diff --git a/lib/src/json_models/signal_identity.dart b/lib/src/model/json/signal_identity.dart
similarity index 63%
rename from lib/src/json_models/signal_identity.dart
rename to lib/src/model/json/signal_identity.dart
index c3e4966..f2f7400 100644
--- a/lib/src/json_models/signal_identity.dart
+++ b/lib/src/model/json/signal_identity.dart
@@ -1,6 +1,6 @@
 import 'dart:typed_data';
 import 'package:json_annotation/json_annotation.dart';
-import 'package:twonly/src/utils/json.dart';
+import 'dart:convert';
 part 'signal_identity.g.dart';
 
 @JsonSerializable()
@@ -16,3 +16,16 @@ class SignalIdentity {
       _$SignalIdentityFromJson(json);
   Map<String, dynamic> toJson() => _$SignalIdentityToJson(this);
 }
+
+class Uint8ListConverter implements JsonConverter<Uint8List, String> {
+  const Uint8ListConverter();
+  @override
+  Uint8List fromJson(String json) {
+    return base64Decode(json);
+  }
+
+  @override
+  String toJson(Uint8List object) {
+    return base64Encode(object);
+  }
+}
diff --git a/lib/src/json_models/signal_identity.g.dart b/lib/src/model/json/signal_identity.g.dart
similarity index 100%
rename from lib/src/json_models/signal_identity.g.dart
rename to lib/src/model/json/signal_identity.g.dart
diff --git a/lib/src/json_models/userdata.dart b/lib/src/model/json/userdata.dart
similarity index 88%
rename from lib/src/json_models/userdata.dart
rename to lib/src/model/json/userdata.dart
index 4b26962..1ea28c5 100644
--- a/lib/src/json_models/userdata.dart
+++ b/lib/src/model/json/userdata.dart
@@ -1,3 +1,4 @@
+import 'package:flutter/material.dart';
 import 'package:json_annotation/json_annotation.dart';
 part 'userdata.g.dart';
 
@@ -15,9 +16,12 @@ class UserData {
   String? avatarSvg;
   String? avatarJson;
   int? avatarCounter;
+
+  // settings
   int? defaultShowTime;
   bool? useHighQuality;
   List<String>? preSelectedEmojies;
+  ThemeMode? themeMode;
 
   final int userId;
 
diff --git a/lib/src/json_models/userdata.g.dart b/lib/src/model/json/userdata.g.dart
similarity index 83%
rename from lib/src/json_models/userdata.g.dart
rename to lib/src/model/json/userdata.g.dart
index 17e40a1..b3cfc71 100644
--- a/lib/src/json_models/userdata.g.dart
+++ b/lib/src/model/json/userdata.g.dart
@@ -18,7 +18,8 @@ UserData _$UserDataFromJson(Map<String, dynamic> json) => UserData(
       ..useHighQuality = json['useHighQuality'] as bool?
       ..preSelectedEmojies = (json['preSelectedEmojies'] as List<dynamic>?)
           ?.map((e) => e as String)
-          .toList();
+          .toList()
+      ..themeMode = $enumDecodeNullable(_$ThemeModeEnumMap, json['themeMode']);
 
 Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
       'username': instance.username,
@@ -29,5 +30,12 @@ Map<String, dynamic> _$UserDataToJson(UserData instance) => <String, dynamic>{
       'defaultShowTime': instance.defaultShowTime,
       'useHighQuality': instance.useHighQuality,
       'preSelectedEmojies': instance.preSelectedEmojies,
+      'themeMode': _$ThemeModeEnumMap[instance.themeMode],
       'userId': instance.userId,
     };
+
+const _$ThemeModeEnumMap = {
+  ThemeMode.system: 'system',
+  ThemeMode.light: 'light',
+  ThemeMode.dark: 'dark',
+};
diff --git a/lib/src/proto/api/client_to_server.pb.dart b/lib/src/model/protobuf/api/client_to_server.pb.dart
similarity index 100%
rename from lib/src/proto/api/client_to_server.pb.dart
rename to lib/src/model/protobuf/api/client_to_server.pb.dart
diff --git a/lib/src/proto/api/client_to_server.pbenum.dart b/lib/src/model/protobuf/api/client_to_server.pbenum.dart
similarity index 100%
rename from lib/src/proto/api/client_to_server.pbenum.dart
rename to lib/src/model/protobuf/api/client_to_server.pbenum.dart
diff --git a/lib/src/proto/api/client_to_server.pbjson.dart b/lib/src/model/protobuf/api/client_to_server.pbjson.dart
similarity index 100%
rename from lib/src/proto/api/client_to_server.pbjson.dart
rename to lib/src/model/protobuf/api/client_to_server.pbjson.dart
diff --git a/lib/src/proto/api/client_to_server.pbserver.dart b/lib/src/model/protobuf/api/client_to_server.pbserver.dart
similarity index 100%
rename from lib/src/proto/api/client_to_server.pbserver.dart
rename to lib/src/model/protobuf/api/client_to_server.pbserver.dart
diff --git a/lib/src/proto/api/error.pb.dart b/lib/src/model/protobuf/api/error.pb.dart
similarity index 100%
rename from lib/src/proto/api/error.pb.dart
rename to lib/src/model/protobuf/api/error.pb.dart
diff --git a/lib/src/proto/api/error.pbenum.dart b/lib/src/model/protobuf/api/error.pbenum.dart
similarity index 100%
rename from lib/src/proto/api/error.pbenum.dart
rename to lib/src/model/protobuf/api/error.pbenum.dart
diff --git a/lib/src/proto/api/error.pbjson.dart b/lib/src/model/protobuf/api/error.pbjson.dart
similarity index 100%
rename from lib/src/proto/api/error.pbjson.dart
rename to lib/src/model/protobuf/api/error.pbjson.dart
diff --git a/lib/src/proto/api/error.pbserver.dart b/lib/src/model/protobuf/api/error.pbserver.dart
similarity index 100%
rename from lib/src/proto/api/error.pbserver.dart
rename to lib/src/model/protobuf/api/error.pbserver.dart
diff --git a/lib/src/proto/api/server_to_client.pb.dart b/lib/src/model/protobuf/api/server_to_client.pb.dart
similarity index 100%
rename from lib/src/proto/api/server_to_client.pb.dart
rename to lib/src/model/protobuf/api/server_to_client.pb.dart
diff --git a/lib/src/proto/api/server_to_client.pbenum.dart b/lib/src/model/protobuf/api/server_to_client.pbenum.dart
similarity index 100%
rename from lib/src/proto/api/server_to_client.pbenum.dart
rename to lib/src/model/protobuf/api/server_to_client.pbenum.dart
diff --git a/lib/src/proto/api/server_to_client.pbjson.dart b/lib/src/model/protobuf/api/server_to_client.pbjson.dart
similarity index 100%
rename from lib/src/proto/api/server_to_client.pbjson.dart
rename to lib/src/model/protobuf/api/server_to_client.pbjson.dart
diff --git a/lib/src/proto/api/server_to_client.pbserver.dart b/lib/src/model/protobuf/api/server_to_client.pbserver.dart
similarity index 100%
rename from lib/src/proto/api/server_to_client.pbserver.dart
rename to lib/src/model/protobuf/api/server_to_client.pbserver.dart
diff --git a/lib/src/providers/api/api.dart b/lib/src/providers/api/api.dart
index ea32000..d80077b 100644
--- a/lib/src/providers/api/api.dart
+++ b/lib/src/providers/api/api.dart
@@ -7,9 +7,9 @@ import 'package:mutex/mutex.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
-import 'package:twonly/src/json_models/message.dart';
-import 'package:twonly/src/json_models/userdata.dart';
-import 'package:twonly/src/proto/api/error.pb.dart';
+import 'package:twonly/src/model/json/message.dart';
+import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/src/model/protobuf/api/error.pb.dart';
 import 'package:twonly/src/providers/api/api_utils.dart';
 import 'package:twonly/src/providers/hive.dart';
 import 'package:twonly/src/services/notification_service.dart';
diff --git a/lib/src/providers/api/api_utils.dart b/lib/src/providers/api/api_utils.dart
index 49b9ead..97749a0 100644
--- a/lib/src/providers/api/api_utils.dart
+++ b/lib/src/providers/api/api_utils.dart
@@ -1,8 +1,10 @@
 import 'package:fixnum/fixnum.dart';
-import 'package:twonly/src/proto/api/client_to_server.pb.dart' as client;
-import 'package:twonly/src/proto/api/client_to_server.pbserver.dart';
-import 'package:twonly/src/proto/api/error.pb.dart';
-import 'package:twonly/src/proto/api/server_to_client.pb.dart' as server;
+import 'package:twonly/src/model/protobuf/api/client_to_server.pb.dart'
+    as client;
+import 'package:twonly/src/model/protobuf/api/client_to_server.pbserver.dart';
+import 'package:twonly/src/model/protobuf/api/error.pb.dart';
+import 'package:twonly/src/model/protobuf/api/server_to_client.pb.dart'
+    as server;
 
 class Result<T, E> {
   final T? value;
diff --git a/lib/src/providers/api/media.dart b/lib/src/providers/api/media.dart
index 55bd571..3c3abf0 100644
--- a/lib/src/providers/api/media.dart
+++ b/lib/src/providers/api/media.dart
@@ -4,11 +4,11 @@ import 'package:drift/drift.dart';
 import 'package:hive/hive.dart';
 import 'package:logging/logging.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/app.dart';
+import 'package:twonly/app.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
-import 'package:twonly/src/json_models/message.dart';
-import 'package:twonly/src/proto/api/server_to_client.pb.dart';
+import 'package:twonly/src/model/json/message.dart';
+import 'package:twonly/src/model/protobuf/api/server_to_client.pb.dart';
 import 'package:twonly/src/providers/api/api.dart';
 import 'package:twonly/src/providers/api/api_utils.dart';
 import 'package:twonly/src/providers/hive.dart';
diff --git a/lib/src/providers/api/server_messages.dart b/lib/src/providers/api/server_messages.dart
index 539cdd7..dab0b67 100644
--- a/lib/src/providers/api/server_messages.dart
+++ b/lib/src/providers/api/server_messages.dart
@@ -7,15 +7,17 @@ import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 import 'package:logging/logging.dart';
 import 'package:mutex/mutex.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/app.dart';
+import 'package:twonly/app.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
-import 'package:twonly/src/json_models/message.dart';
-import 'package:twonly/src/proto/api/client_to_server.pb.dart' as client;
-import 'package:twonly/src/proto/api/client_to_server.pbserver.dart';
-import 'package:twonly/src/proto/api/error.pb.dart';
-import 'package:twonly/src/proto/api/server_to_client.pb.dart' as server;
-import 'package:twonly/src/proto/api/server_to_client.pbserver.dart';
+import 'package:twonly/src/model/json/message.dart';
+import 'package:twonly/src/model/protobuf/api/client_to_server.pb.dart'
+    as client;
+import 'package:twonly/src/model/protobuf/api/client_to_server.pbserver.dart';
+import 'package:twonly/src/model/protobuf/api/error.pb.dart';
+import 'package:twonly/src/model/protobuf/api/server_to_client.pb.dart'
+    as server;
+import 'package:twonly/src/model/protobuf/api/server_to_client.pbserver.dart';
 import 'package:twonly/src/providers/api/api.dart';
 import 'package:twonly/src/providers/api/api_utils.dart';
 import 'package:twonly/src/providers/api/media.dart';
@@ -115,9 +117,6 @@ Future<client.Response> handleDownloadData(DownloadData data) async {
     return client.Response()..ok = ok;
   }
 
-  // Uint8List? rawBytes =
-  //     await SignalHelper.decryptBytes(downloadedBytes, fromUserId);
-
   Message? msg = await twonlyDatabase.messagesDao
       .getMessageByMessageId(messageId)
       .getSingleOrNull();
diff --git a/lib/src/providers/api_provider.dart b/lib/src/providers/api_provider.dart
index dc401ea..b002166 100644
--- a/lib/src/providers/api_provider.dart
+++ b/lib/src/providers/api_provider.dart
@@ -5,14 +5,16 @@ import 'dart:io';
 import 'dart:math';
 import 'package:fixnum/fixnum.dart';
 import 'package:flutter/foundation.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:logging/logging.dart';
 import 'package:mutex/mutex.dart';
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/app.dart';
-import 'package:twonly/src/proto/api/client_to_server.pbserver.dart';
-import 'package:twonly/src/proto/api/error.pb.dart';
-import 'package:twonly/src/proto/api/server_to_client.pb.dart' as server;
+import 'package:twonly/app.dart';
+import 'package:twonly/src/model/protobuf/api/client_to_server.pbserver.dart';
+import 'package:twonly/src/model/protobuf/api/error.pb.dart';
+import 'package:twonly/src/model/protobuf/api/server_to_client.pb.dart'
+    as server;
 import 'package:twonly/src/providers/api/api.dart';
 import 'package:twonly/src/providers/api/api_utils.dart';
 import 'package:twonly/src/providers/api/media.dart';
@@ -220,7 +222,7 @@ class ApiProvider {
   }
 
   Future<bool> tryAuthenticateWithToken(int userId) async {
-    final storage = getSecureStorage();
+    final storage = FlutterSecureStorage();
     String? apiAuthToken = await storage.read(key: "api_auth_token");
 
     if (apiAuthToken != null) {
@@ -296,7 +298,7 @@ class ApiProvider {
     Uint8List apiAuthToken = result2.value.authtoken;
     String apiAuthTokenB64 = base64Encode(apiAuthToken);
 
-    final storage = getSecureStorage();
+    final storage = FlutterSecureStorage();
     await storage.write(key: "api_auth_token", value: apiAuthTokenB64);
 
     await tryAuthenticateWithToken(userData.userId);
diff --git a/lib/src/providers/hive.dart b/lib/src/providers/hive.dart
index 306f007..e8f463e 100644
--- a/lib/src/providers/hive.dart
+++ b/lib/src/providers/hive.dart
@@ -1,12 +1,12 @@
 import 'dart:convert';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:hive/hive.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:twonly/src/services/notification_service.dart';
-import 'package:twonly/src/utils/misc.dart';
 
 Future initMediaStorage() async {
-  final storage = getSecureStorage();
+  final storage = FlutterSecureStorage();
   var containsEncryptionKey =
       await storage.containsKey(key: 'hive_encryption_key');
   if (!containsEncryptionKey) {
@@ -23,7 +23,7 @@ Future initMediaStorage() async {
 Future<Box> getMediaStorage() async {
   try {
     await initMediaStorage();
-    final storage = getSecureStorage();
+    final storage = FlutterSecureStorage();
 
     var encryptionKey =
         base64Url.decode((await storage.read(key: 'hive_encryption_key'))!);
diff --git a/lib/src/providers/settings_change_provider.dart b/lib/src/providers/settings_change_provider.dart
index abbb613..9181965 100644
--- a/lib/src/providers/settings_change_provider.dart
+++ b/lib/src/providers/settings_change_provider.dart
@@ -1,43 +1,30 @@
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:twonly/src/services/settings_service.dart';
+import 'package:twonly/src/utils/storage.dart';
 
 class SettingsChangeProvider with ChangeNotifier, DiagnosticableTreeMixin {
-  // Make SettingsService a private variable so it is not used directly.
-  final SettingsService _settingsService = SettingsService();
-
-  // Make ThemeMode a private variable so it is not updated directly without
-  // also persisting the changes with the SettingsService.
   late ThemeMode _themeMode;
 
-  // Allow Widgets to read the user's preferred ThemeMode.
   ThemeMode get themeMode => _themeMode;
 
-  /// Load the user's settings from the SettingsService. It may load from a
-  /// local database or the internet. The controller only knows it can load the
-  /// settings from the service.
   Future<void> loadSettings() async {
-    _themeMode = await _settingsService.themeMode();
-
-    // Important! Inform listeners a change has occurred.
+    _themeMode = (await getUser())?.themeMode ?? ThemeMode.system;
     notifyListeners();
   }
 
-  /// Update and persist the ThemeMode based on the user's selection.
   Future<void> updateThemeMode(ThemeMode? newThemeMode) async {
     if (newThemeMode == null) return;
 
-    // Do not perform any work if new and old ThemeMode are identical
     if (newThemeMode == _themeMode) return;
 
-    // Otherwise, store the new ThemeMode in memory
     _themeMode = newThemeMode;
 
-    // Important! Inform listeners a change has occurred.
     notifyListeners();
 
-    // Persist the changes to a local database or the internet using the
-    // SettingService.
-    await _settingsService.updateThemeMode(newThemeMode);
+    var user = await getUser();
+    if (user != null) {
+      user.themeMode = newThemeMode;
+      await updateUser(user);
+    }
   }
 }
diff --git a/lib/src/signal/connect_identitiy_key_store.dart b/lib/src/providers/signal/connect_identitiy_key_store.dart
similarity index 100%
rename from lib/src/signal/connect_identitiy_key_store.dart
rename to lib/src/providers/signal/connect_identitiy_key_store.dart
diff --git a/lib/src/signal/connect_pre_key_store.dart b/lib/src/providers/signal/connect_pre_key_store.dart
similarity index 100%
rename from lib/src/signal/connect_pre_key_store.dart
rename to lib/src/providers/signal/connect_pre_key_store.dart
diff --git a/lib/src/signal/connect_sender_key_store.dart b/lib/src/providers/signal/connect_sender_key_store.dart
similarity index 100%
rename from lib/src/signal/connect_sender_key_store.dart
rename to lib/src/providers/signal/connect_sender_key_store.dart
diff --git a/lib/src/signal/connect_session_store.dart b/lib/src/providers/signal/connect_session_store.dart
similarity index 100%
rename from lib/src/signal/connect_session_store.dart
rename to lib/src/providers/signal/connect_session_store.dart
diff --git a/lib/src/signal/connect_signal_protocol_store.dart b/lib/src/providers/signal/connect_signal_protocol_store.dart
similarity index 91%
rename from lib/src/signal/connect_signal_protocol_store.dart
rename to lib/src/providers/signal/connect_signal_protocol_store.dart
index b186930..db2c5a3 100644
--- a/lib/src/signal/connect_signal_protocol_store.dart
+++ b/lib/src/providers/signal/connect_signal_protocol_store.dart
@@ -1,7 +1,7 @@
-import 'package:twonly/src/signal/connect_identitiy_key_store.dart';
-import 'package:twonly/src/signal/connect_pre_key_store.dart';
-import 'package:twonly/src/signal/connect_session_store.dart';
-import 'package:twonly/src/signal/connect_signed_pre_key_store.dart';
+import 'package:twonly/src/providers/signal/connect_identitiy_key_store.dart';
+import 'package:twonly/src/providers/signal/connect_pre_key_store.dart';
+import 'package:twonly/src/providers/signal/connect_session_store.dart';
+import 'package:twonly/src/providers/signal/connect_signed_pre_key_store.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 
 class ConnectSignalProtocolStore implements SignalProtocolStore {
diff --git a/lib/src/signal/connect_signed_pre_key_store.dart b/lib/src/providers/signal/connect_signed_pre_key_store.dart
similarity index 93%
rename from lib/src/signal/connect_signed_pre_key_store.dart
rename to lib/src/providers/signal/connect_signed_pre_key_store.dart
index 945af2f..7f7b63b 100644
--- a/lib/src/signal/connect_signed_pre_key_store.dart
+++ b/lib/src/providers/signal/connect_signed_pre_key_store.dart
@@ -1,14 +1,14 @@
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:typed_data';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
-import 'package:twonly/src/utils/misc.dart';
 
 class ConnectSignedPreKeyStore extends SignedPreKeyStore {
   // final store = HashMap<int, Uint8List>();
 
   Future<HashMap<int, Uint8List>> getStore() async {
-    final storage = getSecureStorage();
+    final storage = FlutterSecureStorage();
     final storeSerialized = await storage.read(key: "signed_pre_key_store");
     var store = HashMap<int, Uint8List>();
     if (storeSerialized == null) {
@@ -22,7 +22,7 @@ class ConnectSignedPreKeyStore extends SignedPreKeyStore {
   }
 
   Future safeStore(HashMap<int, Uint8List> store) async {
-    final storage = getSecureStorage();
+    final storage = FlutterSecureStorage();
     var storeHashMap = [];
     for (final item in store.entries) {
       storeHashMap.add([item.key, base64Encode(item.value)]);
diff --git a/lib/src/services/fcm_service.dart b/lib/src/services/fcm_service.dart
index 55b431d..2f8d1d2 100644
--- a/lib/src/services/fcm_service.dart
+++ b/lib/src/services/fcm_service.dart
@@ -1,8 +1,9 @@
 import 'package:firebase_core/firebase_core.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:logging/logging.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/app.dart';
+import 'package:twonly/app.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/services/notification_service.dart';
 import 'package:twonly/src/utils/misc.dart';
@@ -14,7 +15,7 @@ import '../../firebase_options.dart';
 Future initFCMAfterAuthenticated() async {
   if (globalIsAppInBackground) return;
 
-  final storage = getSecureStorage();
+  final storage = FlutterSecureStorage();
 
   String? storedToken = await storage.read(key: "google_fcm");
 
diff --git a/lib/src/services/notification_service.dart b/lib/src/services/notification_service.dart
index d54743c..2f2df2b 100644
--- a/lib/src/services/notification_service.dart
+++ b/lib/src/services/notification_service.dart
@@ -14,9 +14,8 @@ import 'package:twonly/globals.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
 import 'package:twonly/src/database/twonly_database.dart';
-import 'package:twonly/src/json_models/message.dart' as my;
+import 'package:twonly/src/model/json/message.dart' as my;
 import 'package:twonly/src/providers/api/api.dart';
-import 'package:twonly/src/utils/misc.dart';
 
 class PushUser {
   String displayName;
@@ -324,7 +323,7 @@ Future handlePushData(String pushDataJson) async {
 }
 
 Future<Map<int, PushUser>> getPushKeys(String storageKey) async {
-  var storage = getSecureStorage();
+  var storage = FlutterSecureStorage();
   String? pushKeysJson = await storage.read(
     key: storageKey,
     iOptions: IOSOptions(
@@ -344,7 +343,7 @@ Future<Map<int, PushUser>> getPushKeys(String storageKey) async {
 }
 
 Future setPushKeys(String storageKey, Map<int, PushUser> pushKeys) async {
-  var storage = getSecureStorage();
+  var storage = FlutterSecureStorage();
   Map<String, dynamic> jsonToSend = {};
   pushKeys.forEach((key, value) {
     jsonToSend[key.toString()] = value.toJson();
diff --git a/lib/src/services/settings_service.dart b/lib/src/services/settings_service.dart
deleted file mode 100644
index 6f94dc3..0000000
--- a/lib/src/services/settings_service.dart
+++ /dev/null
@@ -1,17 +0,0 @@
-import 'package:flutter/material.dart';
-
-/// A service that stores and retrieves user settings.
-///
-/// By default, this class does not persist user settings. If you'd like to
-/// persist the user settings locally, use the shared_preferences package. If
-/// you'd like to store settings on a web server, use the http package.
-class SettingsService {
-  /// Loads the User's preferred ThemeMode from local or remote storage.
-  Future<ThemeMode> themeMode() async => ThemeMode.system;
-
-  /// Persists the user's preferred ThemeMode to local or remote storage.
-  Future<void> updateThemeMode(ThemeMode theme) async {
-    // Use the shared_preferences package to persist settings locally or the
-    // http package to persist settings over the network.
-  }
-}
diff --git a/lib/src/utils/json.dart b/lib/src/utils/json.dart
deleted file mode 100644
index 9296d57..0000000
--- a/lib/src/utils/json.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import 'package:json_annotation/json_annotation.dart';
-import 'dart:convert';
-import 'dart:typed_data';
-
-class Uint8ListConverter implements JsonConverter<Uint8List, String> {
-  const Uint8ListConverter();
-  @override
-  Uint8List fromJson(String json) {
-    return base64Decode(json);
-  }
-
-  @override
-  String toJson(Uint8List object) {
-    return base64Encode(object);
-  }
-}
diff --git a/lib/src/utils/misc.dart b/lib/src/utils/misc.dart
index 28290c9..21d7e82 100644
--- a/lib/src/utils/misc.dart
+++ b/lib/src/utils/misc.dart
@@ -9,12 +9,10 @@ import 'package:gal/gal.dart';
 import 'package:local_auth/local_auth.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:flutter_secure_storage/flutter_secure_storage.dart';
-import 'package:pie_menu/pie_menu.dart';
 import 'package:provider/provider.dart';
 import 'package:twonly/src/database/twonly_database.dart';
-import 'package:twonly/src/proto/api/error.pb.dart';
-import 'package:flutter_gen/gen_l10n/app_localizations.dart';
+import 'package:twonly/src/model/protobuf/api/error.pb.dart';
+import 'package:twonly/src/localization/generated/app_localizations.dart';
 
 extension ShortCutsExtension on BuildContext {
   AppLocalizations get lang => AppLocalizations.of(this)!;
@@ -45,15 +43,6 @@ Future<bool> deleteLogFile() async {
   return false;
 }
 
-// Just a helper function to get the secure storage
-FlutterSecureStorage getSecureStorage() {
-  // ignore: no_leading_underscores_for_local_identifiers
-  AndroidOptions _getAndroidOptions() => const AndroidOptions(
-        encryptedSharedPreferences: true,
-      );
-  return FlutterSecureStorage(aOptions: _getAndroidOptions());
-}
-
 Future<String?> saveImageToGallery(Uint8List imageBytes) async {
   final hasAccess = await Gal.hasAccess();
   if (!hasAccess) {
@@ -181,30 +170,6 @@ Future<bool> isAllowedToDownload() async {
   return true;
 }
 
-PieTheme getPieCanvasTheme(BuildContext context) {
-  return PieTheme(
-    brightness: Theme.of(context).brightness,
-    rightClickShowsMenu: true,
-    radius: 70,
-    buttonTheme: PieButtonTheme(
-      backgroundColor: Theme.of(context).colorScheme.tertiary,
-      iconColor: Theme.of(context).colorScheme.surfaceBright,
-    ),
-    buttonThemeHovered: PieButtonTheme(
-      backgroundColor: Theme.of(context).colorScheme.primary,
-      iconColor: Theme.of(context).colorScheme.surfaceBright,
-    ),
-    tooltipPadding: EdgeInsets.all(20),
-    overlayColor: const Color.fromARGB(41, 0, 0, 0),
-
-    // spacing: 0,
-    tooltipTextStyle: TextStyle(
-      fontSize: 32,
-      fontWeight: FontWeight.w600,
-    ),
-  );
-}
-
 void setupLogger() {
   Logger.root.level = kReleaseMode ? Level.INFO : Level.ALL;
   Logger.root.onRecord.listen((record) async {
@@ -215,3 +180,25 @@ void setupLogger() {
     }
   });
 }
+
+Uint8List intToBytes(int value) {
+  final byteData = ByteData(4);
+  byteData.setInt32(0, value, Endian.big);
+  return byteData.buffer.asUint8List();
+}
+
+int bytesToInt(Uint8List bytes) {
+  final byteData = ByteData.sublistView(bytes);
+  return byteData.getInt32(0, Endian.big);
+}
+
+List<Uint8List>? removeLastXBytes(Uint8List original, int count) {
+  if (original.length < count) {
+    return null;
+  }
+  final newList = Uint8List(original.length - count);
+  newList.setAll(0, original.sublist(0, original.length - count));
+
+  final lastXBytes = original.sublist(original.length - count);
+  return [newList, lastXBytes];
+}
diff --git a/lib/src/utils/signal.dart b/lib/src/utils/signal.dart
index 44745ff..cbbf921 100644
--- a/lib/src/utils/signal.dart
+++ b/lib/src/utils/signal.dart
@@ -1,13 +1,14 @@
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 import 'package:logging/logging.dart';
-import 'package:twonly/src/json_models/message.dart';
-import 'package:twonly/src/json_models/signal_identity.dart';
-import 'package:twonly/src/json_models/userdata.dart';
-import 'package:twonly/src/proto/api/server_to_client.pb.dart';
-import 'package:twonly/src/signal/connect_signal_protocol_store.dart';
+import 'package:twonly/src/model/json/message.dart';
+import 'package:twonly/src/model/json/signal_identity.dart';
+import 'package:twonly/src/model/json/userdata.dart';
+import 'package:twonly/src/model/protobuf/api/server_to_client.pb.dart';
+import 'package:twonly/src/providers/signal/connect_signal_protocol_store.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/storage.dart';
 
@@ -88,7 +89,7 @@ Future<ConnectSignalProtocolStore?> getSignalStore() async {
 
 Future<SignalIdentity?> getSignalIdentity() async {
   try {
-    final storage = getSecureStorage();
+    final storage = FlutterSecureStorage();
     final signalIdentityJson = await storage.read(key: "signal_identity");
     if (signalIdentityJson == null) {
       return null;
@@ -120,7 +121,7 @@ Future<List<PreKeyRecord>> getPreKeys() async {
 }
 
 Future createIfNotExistsSignalIdentity() async {
-  final storage = getSecureStorage();
+  final storage = FlutterSecureStorage();
 
   final signalIdentity = await storage.read(key: "signal_identity");
   if (signalIdentity != null) {
@@ -172,81 +173,6 @@ Future<Fingerprint?> generateSessionFingerPrint(int target) async {
   }
 }
 
-Uint8List intToBytes(int value) {
-  final byteData = ByteData(4);
-  byteData.setInt32(0, value, Endian.big);
-  return byteData.buffer.asUint8List();
-}
-
-int bytesToInt(Uint8List bytes) {
-  final byteData = ByteData.sublistView(bytes);
-  return byteData.getInt32(0, Endian.big);
-}
-
-List<Uint8List>? removeLastFourBytes(Uint8List original) {
-  if (original.length < 4) {
-    return null;
-  }
-  final newList = Uint8List(original.length - 4);
-  newList.setAll(0, original.sublist(0, original.length - 4));
-
-  final lastFourBytes = original.sublist(original.length - 4);
-  return [newList, lastFourBytes];
-}
-
-Future<Uint8List?> encryptBytes(Uint8List bytes, int target) async {
-  try {
-    ConnectSignalProtocolStore signalStore = (await getSignalStore())!;
-
-    SessionCipher session = SessionCipher.fromStore(
-        signalStore, SignalProtocolAddress(target.toString(), defaultDeviceId));
-
-    final ciphertext =
-        await session.encrypt(Uint8List.fromList(gzip.encode(bytes)));
-
-    var b = BytesBuilder();
-    b.add(ciphertext.serialize());
-    b.add(intToBytes(ciphertext.getType()));
-
-    return b.takeBytes();
-  } catch (e) {
-    Logger("utils/signal").shout(e.toString());
-    return null;
-  }
-}
-
-Future<Uint8List?> decryptBytes(Uint8List bytes, int target) async {
-  try {
-    ConnectSignalProtocolStore signalStore = (await getSignalStore())!;
-
-    SessionCipher session = SessionCipher.fromStore(
-        signalStore, SignalProtocolAddress(target.toString(), defaultDeviceId));
-
-    List<Uint8List>? msgs = removeLastFourBytes(bytes);
-    if (msgs == null) return null;
-    Uint8List body = msgs[0];
-    int type = bytesToInt(msgs[1]);
-
-    Uint8List plaintext;
-    Logger("utils/signal").info("got signal type: $type!");
-    if (type == CiphertextMessage.prekeyType) {
-      PreKeySignalMessage pre = PreKeySignalMessage(body);
-      plaintext = await session.decrypt(pre);
-    } else if (type == CiphertextMessage.whisperType) {
-      SignalMessage signalMsg = SignalMessage.fromSerialized(body);
-      plaintext = await session.decryptFromSignal(signalMsg);
-    } else {
-      Logger("utils/signal").shout("signal type is not known: $type!");
-      return null;
-    }
-    List<int>? plainBytes = gzip.decode(Uint8List.fromList(plaintext));
-    return Uint8List.fromList(plainBytes);
-  } catch (e) {
-    Logger("utils/signal").shout(e.toString());
-    return null;
-  }
-}
-
 Future<Uint8List?> encryptMessage(MessageJson msg, int target) async {
   try {
     ConnectSignalProtocolStore signalStore = (await getSignalStore())!;
@@ -275,7 +201,7 @@ Future<MessageJson?> getDecryptedText(int source, Uint8List msg) async {
     SessionCipher session = SessionCipher.fromStore(
         signalStore, SignalProtocolAddress(source.toString(), defaultDeviceId));
 
-    List<Uint8List>? msgs = removeLastFourBytes(msg);
+    List<Uint8List>? msgs = removeLastXBytes(msg, 4);
     if (msgs == null) return null;
     Uint8List body = msgs[0];
     int type = bytesToInt(msgs[1]);
diff --git a/lib/src/utils/storage.dart b/lib/src/utils/storage.dart
index 5cee117..1cc2e8f 100644
--- a/lib/src/utils/storage.dart
+++ b/lib/src/utils/storage.dart
@@ -1,8 +1,8 @@
 import 'dart:convert';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:logging/logging.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:twonly/src/json_models/userdata.dart';
-import 'package:twonly/src/utils/misc.dart';
+import 'package:twonly/src/model/json/userdata.dart';
 
 Future<bool> isUserCreated() async {
   UserData? user = await getUser();
@@ -13,7 +13,7 @@ Future<bool> isUserCreated() async {
 }
 
 Future<UserData?> getUser() async {
-  final storage = getSecureStorage();
+  final storage = FlutterSecureStorage();
   String? userJson = await storage.read(key: "userData");
   if (userJson == null) {
     return null;
@@ -29,7 +29,7 @@ Future<UserData?> getUser() async {
 }
 
 Future updateUser(UserData userData) async {
-  final storage = getSecureStorage();
+  final storage = FlutterSecureStorage();
   storage.write(key: "userData", value: jsonEncode(userData));
 }
 
@@ -38,7 +38,7 @@ Future<bool> deleteLocalUserData() async {
   if (appDir.existsSync()) {
     appDir.deleteSync(recursive: true);
   }
-  final storage = getSecureStorage();
+  final storage = FlutterSecureStorage();
   await storage.deleteAll();
   return true;
 }
diff --git a/lib/src/views/camera_to_share/camera_preview_view.dart b/lib/src/views/camera/camera_preview_view.dart
similarity index 94%
rename from lib/src/views/camera_to_share/camera_preview_view.dart
rename to lib/src/views/camera/camera_preview_view.dart
index a038b47..a0e09a7 100644
--- a/lib/src/views/camera_to_share/camera_preview_view.dart
+++ b/lib/src/views/camera/camera_preview_view.dart
@@ -1,21 +1,21 @@
 import 'dart:io';
-import 'dart:typed_data';
 import 'package:camera/camera.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_volume_controller/flutter_volume_controller.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:screenshot/screenshot.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/zoom_selector.dart';
+import 'package:twonly/src/views/camera/components/zoom_selector.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/components/image_editor/action_button.dart';
-import 'package:twonly/src/components/media_view_sizing.dart';
-import 'package:twonly/src/components/permissions_view.dart';
+import 'package:twonly/src/views/camera/image_editor/action_button.dart';
+import 'package:twonly/src/views/components/media_view_sizing.dart';
+import 'package:twonly/src/views/components/permissions_view.dart';
 import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/camera_to_share/share_image_editor_view.dart';
+import 'package:twonly/src/views/camera/share_image_editor_view.dart';
 
 class CameraPreviewView extends StatefulWidget {
   const CameraPreviewView({super.key, this.sendTo});
@@ -91,12 +91,16 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
     setState(() {
       isZoomAble = false;
     });
-    controller = CameraController(gCameras[sCameraId], ResolutionPreset.high,
-        enableAudio: false);
+    controller = CameraController(
+      gCameras[sCameraId],
+      ResolutionPreset.high,
+      enableAudio: false,
+    );
     controller.initialize().then((_) async {
       if (!mounted) {
         return;
       }
+      await controller.lockCaptureOrientation(DeviceOrientation.portraitUp);
       controller.setFlashMode(isFlashOn ? FlashMode.always : FlashMode.off);
 
       isZoomAble = await controller.getMinZoomLevel() !=
@@ -146,12 +150,15 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
       await File(picture.path).delete();
       return imageBytes;
     } catch (e) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(
-          content: Text('Error loading picture: $e'),
-          duration: Duration(seconds: 3),
-        ),
-      );
+      if (context.mounted) {
+        // ignore: use_build_context_synchronously
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(
+            content: Text('Error loading picture: $e'),
+            duration: Duration(seconds: 3),
+          ),
+        );
+      }
       return null;
     }
   }
@@ -174,12 +181,18 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
         final XFile picture = await controller.takePicture();
         imageBytes = loadAndDeletePictureFromFile(picture);
       } catch (e) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text('Error taking picture: $e'),
-            duration: Duration(seconds: 3),
-          ),
-        );
+        try {
+          if (context.mounted) {
+            // ignore: use_build_context_synchronously
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text('Error taking picture: $e'),
+                duration: Duration(seconds: 3),
+              ),
+            );
+          }
+          // ignore: empty_catches
+        } catch (e) {}
         return;
       }
     } else {
@@ -237,6 +250,7 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
     if (!context.mounted) return true;
     if (shoudReturn != null && shoudReturn) {
       if (!context.mounted) return true;
+      // ignore: use_build_context_synchronously
       Navigator.pop(context);
       return true;
     }
@@ -409,8 +423,6 @@ class _CameraPreviewViewState extends State<CameraPreviewView> {
                                         imageFile.readAsBytes())) {
                                       return;
                                     }
-                                  } else {
-                                    print('No image selected.');
                                   }
                                   setState(() {
                                     galleryLoadedImageIsShown = false;
diff --git a/lib/src/views/camera_to_share/camera_send_to_view.dart b/lib/src/views/camera/camera_send_to_view.dart
similarity index 87%
rename from lib/src/views/camera_to_share/camera_send_to_view.dart
rename to lib/src/views/camera/camera_send_to_view.dart
index ce292a2..00a3d4f 100644
--- a/lib/src/views/camera_to_share/camera_send_to_view.dart
+++ b/lib/src/views/camera/camera_send_to_view.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:twonly/src/database/twonly_database.dart';
-import 'package:twonly/src/views/camera_to_share/camera_preview_view.dart';
+import 'package:twonly/src/views/camera/camera_preview_view.dart';
 
 class CameraSendToView extends StatefulWidget {
   const CameraSendToView(this.sendTo, {super.key});
diff --git a/lib/src/components/best_friends_selector.dart b/lib/src/views/camera/components/best_friends_selector.dart
similarity index 96%
rename from lib/src/components/best_friends_selector.dart
rename to lib/src/views/camera/components/best_friends_selector.dart
index e134a17..3b94cab 100644
--- a/lib/src/components/best_friends_selector.dart
+++ b/lib/src/views/camera/components/best_friends_selector.dart
@@ -1,13 +1,13 @@
 import 'dart:collection';
 import 'package:flutter/material.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/verified_shield.dart';
+import 'package:twonly/src/views/components/verified_shield.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/components/flame.dart';
-import 'package:twonly/src/components/headline.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
+import 'package:twonly/src/views/components/flame.dart';
+import 'package:twonly/src/views/components/headline.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
 
 class BestFriendsSelector extends StatelessWidget {
   final List<Contact> users;
diff --git a/lib/src/components/zoom_selector.dart b/lib/src/views/camera/components/zoom_selector.dart
similarity index 100%
rename from lib/src/components/zoom_selector.dart
rename to lib/src/views/camera/components/zoom_selector.dart
diff --git a/lib/src/components/image_editor/action_button.dart b/lib/src/views/camera/image_editor/action_button.dart
similarity index 100%
rename from lib/src/components/image_editor/action_button.dart
rename to lib/src/views/camera/image_editor/action_button.dart
diff --git a/lib/src/components/image_editor/data/data.dart b/lib/src/views/camera/image_editor/data/data.dart
similarity index 100%
rename from lib/src/components/image_editor/data/data.dart
rename to lib/src/views/camera/image_editor/data/data.dart
diff --git a/lib/src/components/image_editor/data/image_item.dart b/lib/src/views/camera/image_editor/data/image_item.dart
similarity index 100%
rename from lib/src/components/image_editor/data/image_item.dart
rename to lib/src/views/camera/image_editor/data/image_item.dart
diff --git a/lib/src/components/image_editor/data/layer.dart b/lib/src/views/camera/image_editor/data/layer.dart
similarity index 95%
rename from lib/src/components/image_editor/data/layer.dart
rename to lib/src/views/camera/image_editor/data/layer.dart
index 8b04978..cffa374 100755
--- a/lib/src/components/image_editor/data/layer.dart
+++ b/lib/src/views/camera/image_editor/data/layer.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:hand_signature/signature.dart';
-import 'package:twonly/src/components/image_editor/data/image_item.dart';
+import 'package:twonly/src/views/camera/image_editor/data/image_item.dart';
 
 /// Layer class with some common properties
 class Layer {
diff --git a/lib/src/components/image_editor/layers/background_layer.dart b/lib/src/views/camera/image_editor/layers/background_layer.dart
similarity index 91%
rename from lib/src/components/image_editor/layers/background_layer.dart
rename to lib/src/views/camera/image_editor/layers/background_layer.dart
index db65cd1..bfea351 100755
--- a/lib/src/components/image_editor/layers/background_layer.dart
+++ b/lib/src/views/camera/image_editor/layers/background_layer.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/components/image_editor/data/layer.dart';
+import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
 
 /// Main layer
 class BackgroundLayer extends StatefulWidget {
diff --git a/lib/src/components/image_editor/layers/draw_layer.dart b/lib/src/views/camera/image_editor/layers/draw_layer.dart
similarity index 98%
rename from lib/src/components/image_editor/layers/draw_layer.dart
rename to lib/src/views/camera/image_editor/layers/draw_layer.dart
index 0409b70..0130ccb 100644
--- a/lib/src/components/image_editor/layers/draw_layer.dart
+++ b/lib/src/views/camera/image_editor/layers/draw_layer.dart
@@ -2,8 +2,8 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:hand_signature/signature.dart';
 import 'package:screenshot/screenshot.dart';
-import 'package:twonly/src/components/image_editor/action_button.dart';
-import 'package:twonly/src/components/image_editor/data/layer.dart';
+import 'package:twonly/src/views/camera/image_editor/action_button.dart';
+import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
 import 'package:twonly/src/utils/misc.dart';
 
 class DrawLayer extends StatefulWidget {
diff --git a/lib/src/components/image_editor/layers/emoji_layer.dart b/lib/src/views/camera/image_editor/layers/emoji_layer.dart
similarity index 97%
rename from lib/src/components/image_editor/layers/emoji_layer.dart
rename to lib/src/views/camera/image_editor/layers/emoji_layer.dart
index aabf64a..ea53250 100755
--- a/lib/src/components/image_editor/layers/emoji_layer.dart
+++ b/lib/src/views/camera/image_editor/layers/emoji_layer.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/src/components/image_editor/action_button.dart';
-import 'package:twonly/src/components/image_editor/data/layer.dart';
+import 'package:twonly/src/views/camera/image_editor/action_button.dart';
+import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
 
 /// Emoji layer
 class EmojiLayer extends StatefulWidget {
diff --git a/lib/src/components/image_editor/layers/filter_layer.dart b/lib/src/views/camera/image_editor/layers/filter_layer.dart
similarity index 89%
rename from lib/src/components/image_editor/layers/filter_layer.dart
rename to lib/src/views/camera/image_editor/layers/filter_layer.dart
index 8bc5965..949ab04 100644
--- a/lib/src/components/image_editor/layers/filter_layer.dart
+++ b/lib/src/views/camera/image_editor/layers/filter_layer.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/components/image_editor/data/layer.dart';
-import 'package:twonly/src/components/image_editor/layers/filters/datetime_filter.dart';
-import 'package:twonly/src/components/image_editor/layers/filters/image_filter.dart';
-import 'package:twonly/src/components/image_editor/layers/filters/location_filter.dart';
+import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/filters/datetime_filter.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/filters/image_filter.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/filters/location_filter.dart';
 
 /// Main layer
 class FilterLayer extends StatefulWidget {
diff --git a/lib/src/components/image_editor/layers/filters/datetime_filter.dart b/lib/src/views/camera/image_editor/layers/filters/datetime_filter.dart
similarity index 90%
rename from lib/src/components/image_editor/layers/filters/datetime_filter.dart
rename to lib/src/views/camera/image_editor/layers/filters/datetime_filter.dart
index 7a937ac..9924f7f 100644
--- a/lib/src/components/image_editor/layers/filters/datetime_filter.dart
+++ b/lib/src/views/camera/image_editor/layers/filters/datetime_filter.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:twonly/src/components/image_editor/layers/filter_layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/filter_layer.dart';
 
 class DateTimeFilter extends StatelessWidget {
   const DateTimeFilter({super.key, this.color = Colors.white});
diff --git a/lib/src/components/image_editor/layers/filters/image_filter.dart b/lib/src/views/camera/image_editor/layers/filters/image_filter.dart
similarity index 86%
rename from lib/src/components/image_editor/layers/filters/image_filter.dart
rename to lib/src/views/camera/image_editor/layers/filters/image_filter.dart
index 19901af..8ea6309 100644
--- a/lib/src/components/image_editor/layers/filters/image_filter.dart
+++ b/lib/src/views/camera/image_editor/layers/filters/image_filter.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/components/image_editor/layers/filter_layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/filter_layer.dart';
 
 class ImageFilter extends StatelessWidget {
   const ImageFilter({super.key, required this.imagePath});
diff --git a/lib/src/components/image_editor/layers/filters/location_filter.dart b/lib/src/views/camera/image_editor/layers/filters/location_filter.dart
similarity index 93%
rename from lib/src/components/image_editor/layers/filters/location_filter.dart
rename to lib/src/views/camera/image_editor/layers/filters/location_filter.dart
index a690332..83da2dc 100644
--- a/lib/src/components/image_editor/layers/filters/location_filter.dart
+++ b/lib/src/views/camera/image_editor/layers/filters/location_filter.dart
@@ -1,8 +1,8 @@
 import 'package:flutter/material.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/image_editor/layers/filter_layer.dart';
-import 'package:twonly/src/components/image_editor/layers/filters/datetime_filter.dart';
-import 'package:twonly/src/proto/api/server_to_client.pb.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/filter_layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/filters/datetime_filter.dart';
+import 'package:twonly/src/model/protobuf/api/server_to_client.pb.dart';
 import 'dart:convert';
 import 'package:http/http.dart' as http;
 import 'package:path_provider/path_provider.dart';
diff --git a/lib/src/components/image_editor/layers/text_layer.dart b/lib/src/views/camera/image_editor/layers/text_layer.dart
similarity index 97%
rename from lib/src/components/image_editor/layers/text_layer.dart
rename to lib/src/views/camera/image_editor/layers/text_layer.dart
index 3f7f8c1..1889b82 100755
--- a/lib/src/components/image_editor/layers/text_layer.dart
+++ b/lib/src/views/camera/image_editor/layers/text_layer.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/src/components/image_editor/action_button.dart';
-import 'package:twonly/src/components/image_editor/data/layer.dart';
+import 'package:twonly/src/views/camera/image_editor/action_button.dart';
+import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
 
 /// Text layer
 class TextLayer extends StatefulWidget {
diff --git a/lib/src/components/image_editor/layers_viewer.dart b/lib/src/views/camera/image_editor/layers_viewer.dart
similarity index 76%
rename from lib/src/components/image_editor/layers_viewer.dart
rename to lib/src/views/camera/image_editor/layers_viewer.dart
index 854a6e5..2640eed 100644
--- a/lib/src/components/image_editor/layers_viewer.dart
+++ b/lib/src/views/camera/image_editor/layers_viewer.dart
@@ -1,10 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/components/image_editor/data/layer.dart';
-import 'package:twonly/src/components/image_editor/layers/background_layer.dart';
-import 'package:twonly/src/components/image_editor/layers/draw_layer.dart';
-import 'package:twonly/src/components/image_editor/layers/emoji_layer.dart';
-import 'package:twonly/src/components/image_editor/layers/filter_layer.dart';
-import 'package:twonly/src/components/image_editor/layers/text_layer.dart';
+import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/background_layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/draw_layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/emoji_layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/filter_layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers/text_layer.dart';
 
 /// View stacked layers (unbounded height, width)
 class LayersViewer extends StatelessWidget {
diff --git a/lib/src/components/image_editor/modules/all_emojis.dart b/lib/src/views/camera/image_editor/modules/all_emojis.dart
similarity index 93%
rename from lib/src/components/image_editor/modules/all_emojis.dart
rename to lib/src/views/camera/image_editor/modules/all_emojis.dart
index 020eed3..263427a 100755
--- a/lib/src/components/image_editor/modules/all_emojis.dart
+++ b/lib/src/views/camera/image_editor/modules/all_emojis.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/components/image_editor/data/data.dart';
-import 'package:twonly/src/components/image_editor/data/layer.dart';
+import 'package:twonly/src/views/camera/image_editor/data/data.dart';
+import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
 
 class Emojis extends StatefulWidget {
   const Emojis({super.key});
diff --git a/lib/src/views/camera_to_share/share_image_editor_view.dart b/lib/src/views/camera/share_image_editor_view.dart
similarity index 95%
rename from lib/src/views/camera_to_share/share_image_editor_view.dart
rename to lib/src/views/camera/share_image_editor_view.dart
index f73e392..0046f95 100644
--- a/lib/src/views/camera_to_share/share_image_editor_view.dart
+++ b/lib/src/views/camera/share_image_editor_view.dart
@@ -1,21 +1,21 @@
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/image_editor/action_button.dart';
-import 'package:twonly/src/components/media_view_sizing.dart';
-import 'package:twonly/src/components/notification_badge.dart';
+import 'package:twonly/src/views/camera/image_editor/action_button.dart';
+import 'package:twonly/src/views/components/media_view_sizing.dart';
+import 'package:twonly/src/views/components/notification_badge.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/providers/api/media.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/camera_to_share/share_image_view.dart';
+import 'package:twonly/src/views/camera/share_image_view.dart';
 import 'dart:async';
 import 'package:flutter/services.dart';
-import 'package:twonly/src/components/image_editor/data/image_item.dart';
-import 'package:twonly/src/components/image_editor/data/layer.dart';
-import 'package:twonly/src/components/image_editor/layers_viewer.dart';
-import 'package:twonly/src/components/image_editor/modules/all_emojis.dart';
+import 'package:twonly/src/views/camera/image_editor/data/image_item.dart';
+import 'package:twonly/src/views/camera/image_editor/data/layer.dart';
+import 'package:twonly/src/views/camera/image_editor/layers_viewer.dart';
+import 'package:twonly/src/views/camera/image_editor/modules/all_emojis.dart';
 import 'package:screenshot/screenshot.dart';
 
 List<Layer> layers = [];
@@ -32,6 +32,7 @@ class ShareImageEditorView extends StatefulWidget {
 }
 
 class _ShareImageEditorView extends State<ShareImageEditorView> {
+  bool imageLoadedReady = false;
   bool _imageSaved = false;
   bool _imageSaving = false;
   bool _isRealTwonly = false;
@@ -246,6 +247,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
   Future<void> loadImage(Future<Uint8List?> imageFile) async {
     Uint8List? imageBytes = await imageFile;
     await currentImage.load(imageBytes);
+
     if (!context.mounted) return;
 
     layers.clear();
@@ -256,7 +258,9 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
 
     layers.add(FilterLayerData());
 
-    setState(() {});
+    setState(() {
+      imageLoadedReady = true;
+    });
   }
 
   @override
@@ -268,7 +272,7 @@ class _ShareImageEditorView extends State<ShareImageEditorView> {
     }
 
     return Scaffold(
-      backgroundColor: Colors.white.withAlpha(0),
+      backgroundColor: imageLoadedReady ? null : Colors.white.withAlpha(0),
       resizeToAvoidBottomInset: false,
       body: Stack(
         fit: StackFit.expand,
diff --git a/lib/src/views/camera_to_share/share_image_view.dart b/lib/src/views/camera/share_image_view.dart
similarity index 97%
rename from lib/src/views/camera_to_share/share_image_view.dart
rename to lib/src/views/camera/share_image_view.dart
index 481759f..ac4c5c3 100644
--- a/lib/src/views/camera_to_share/share_image_view.dart
+++ b/lib/src/views/camera/share_image_view.dart
@@ -4,11 +4,11 @@ import 'dart:typed_data';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/best_friends_selector.dart';
-import 'package:twonly/src/components/flame.dart';
-import 'package:twonly/src/components/headline.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
-import 'package:twonly/src/components/verified_shield.dart';
+import 'package:twonly/src/views/camera/components/best_friends_selector.dart';
+import 'package:twonly/src/views/components/flame.dart';
+import 'package:twonly/src/views/components/headline.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
+import 'package:twonly/src/views/components/verified_shield.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/providers/api/media.dart';
diff --git a/lib/src/views/chats/chat_item_details_view.dart b/lib/src/views/chats/chat_item_details_view.dart
index 44a4656..b1455ad 100644
--- a/lib/src/views/chats/chat_item_details_view.dart
+++ b/lib/src/views/chats/chat_item_details_view.dart
@@ -5,19 +5,19 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/animate_icon.dart';
-import 'package:twonly/src/components/better_text.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
-import 'package:twonly/src/components/message_send_state_icon.dart';
-import 'package:twonly/src/components/verified_shield.dart';
+import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/views/components/better_text.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
+import 'package:twonly/src/views/components/message_send_state_icon.dart';
+import 'package:twonly/src/views/components/verified_shield.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
-import 'package:twonly/src/json_models/message.dart';
+import 'package:twonly/src/model/json/message.dart';
 import 'package:twonly/src/providers/api/api.dart';
 import 'package:twonly/src/providers/api/media.dart';
 import 'package:twonly/src/services/notification_service.dart';
-import 'package:twonly/src/views/camera_to_share/camera_send_to_view.dart';
+import 'package:twonly/src/views/camera/camera_send_to_view.dart';
 import 'package:twonly/src/views/chats/media_viewer_view.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/views/contact/contact_view.dart';
diff --git a/lib/src/views/chats/chat_list_view.dart b/lib/src/views/chats/chat_list_view.dart
index 0e13f13..3bb4e08 100644
--- a/lib/src/views/chats/chat_list_view.dart
+++ b/lib/src/views/chats/chat_list_view.dart
@@ -3,20 +3,20 @@ import 'dart:convert';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/connection_state.dart';
-import 'package:twonly/src/components/flame.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
-import 'package:twonly/src/components/message_send_state_icon.dart';
-import 'package:twonly/src/components/notification_badge.dart';
-import 'package:twonly/src/components/user_context_menu.dart';
+import 'package:twonly/src/views/components/connection_state.dart';
+import 'package:twonly/src/views/components/flame.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
+import 'package:twonly/src/views/components/message_send_state_icon.dart';
+import 'package:twonly/src/views/components/notification_badge.dart';
+import 'package:twonly/src/views/components/user_context_menu.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
-import 'package:twonly/src/json_models/message.dart';
+import 'package:twonly/src/model/json/message.dart';
 import 'package:twonly/src/providers/api/media.dart';
 import 'package:twonly/src/providers/connection_provider.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera_to_share/camera_send_to_view.dart';
+import 'package:twonly/src/views/camera/camera_send_to_view.dart';
 import 'package:twonly/src/views/chats/chat_item_details_view.dart';
 import 'package:twonly/src/views/chats/media_viewer_view.dart';
 import 'package:twonly/src/views/chats/start_new_chat.dart';
diff --git a/lib/src/views/chats/media_viewer_view.dart b/lib/src/views/chats/media_viewer_view.dart
index 1359690..6369973 100644
--- a/lib/src/views/chats/media_viewer_view.dart
+++ b/lib/src/views/chats/media_viewer_view.dart
@@ -6,17 +6,17 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:lottie/lottie.dart';
 import 'package:no_screenshot/no_screenshot.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/animate_icon.dart';
-import 'package:twonly/src/components/media_view_sizing.dart';
+import 'package:twonly/src/views/components/animate_icon.dart';
+import 'package:twonly/src/views/components/media_view_sizing.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
-import 'package:twonly/src/json_models/message.dart';
+import 'package:twonly/src/model/json/message.dart';
 import 'package:twonly/src/providers/api/api.dart';
 import 'package:twonly/src/providers/api/media.dart';
 import 'package:twonly/src/services/notification_service.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/storage.dart';
-import 'package:twonly/src/views/camera_to_share/camera_send_to_view.dart';
+import 'package:twonly/src/views/camera/camera_send_to_view.dart';
 import 'package:twonly/src/views/chats/chat_item_details_view.dart';
 
 final _noScreenshot = NoScreenshot.instance;
@@ -131,6 +131,7 @@ class _MediaViewerViewState extends State<MediaViewerView> {
 
       if (isRealTwonly) {
         if (!context.mounted) return;
+        // ignore: use_build_context_synchronously
         bool isAuth = await authenticateUser(context.lang.mediaViewerAuthReason,
             force: false);
         if (!isAuth) {
@@ -464,18 +465,16 @@ class _MediaViewerViewState extends State<MediaViewerView> {
                         },
                       ),
                       Expanded(
-                        child: Container(
-                          child: TextField(
-                            autofocus: true,
-                            controller: textMessageController,
-                            onEditingComplete: () {
-                              setState(() {
-                                showSendTextMessageInput = false;
-                                showShortReactions = false;
-                              });
-                            },
-                            decoration: inputTextMessageDeco(context),
-                          ),
+                        child: TextField(
+                          autofocus: true,
+                          controller: textMessageController,
+                          onEditingComplete: () {
+                            setState(() {
+                              showSendTextMessageInput = false;
+                              showShortReactions = false;
+                            });
+                          },
+                          decoration: inputTextMessageDeco(context),
                         ),
                       ),
                       IconButton(
@@ -628,7 +627,7 @@ class EmojiReactionWidget extends StatefulWidget {
   });
 
   @override
-  _EmojiReactionWidgetState createState() => _EmojiReactionWidgetState();
+  State<EmojiReactionWidget> createState() => _EmojiReactionWidgetState();
 }
 
 class _EmojiReactionWidgetState extends State<EmojiReactionWidget> {
diff --git a/lib/src/views/chats/search_username_view.dart b/lib/src/views/chats/search_username_view.dart
index 7820af1..73e6a43 100644
--- a/lib/src/views/chats/search_username_view.dart
+++ b/lib/src/views/chats/search_username_view.dart
@@ -3,16 +3,16 @@ import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/src/components/alert_dialog.dart';
+import 'package:twonly/src/views/components/alert_dialog.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/services/notification_service.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/headline.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
-import 'package:twonly/src/json_models/message.dart';
+import 'package:twonly/src/views/components/headline.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
+import 'package:twonly/src/model/json/message.dart';
 import 'package:twonly/src/providers/api/api.dart';
 // ignore: library_prefixes
 import 'package:twonly/src/utils/signal.dart' as SignalHelper;
diff --git a/lib/src/views/chats/start_new_chat.dart b/lib/src/views/chats/start_new_chat.dart
index e55e912..53f94b2 100644
--- a/lib/src/views/chats/start_new_chat.dart
+++ b/lib/src/views/chats/start_new_chat.dart
@@ -4,9 +4,9 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:pie_menu/pie_menu.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/flame.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
-import 'package:twonly/src/components/user_context_menu.dart';
+import 'package:twonly/src/views/components/flame.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
+import 'package:twonly/src/views/components/user_context_menu.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/utils/misc.dart';
diff --git a/lib/src/components/alert_dialog.dart b/lib/src/views/components/alert_dialog.dart
similarity index 100%
rename from lib/src/components/alert_dialog.dart
rename to lib/src/views/components/alert_dialog.dart
diff --git a/lib/src/components/animate_icon.dart b/lib/src/views/components/animate_icon.dart
similarity index 100%
rename from lib/src/components/animate_icon.dart
rename to lib/src/views/components/animate_icon.dart
diff --git a/lib/src/components/better_list_title.dart b/lib/src/views/components/better_list_title.dart
similarity index 100%
rename from lib/src/components/better_list_title.dart
rename to lib/src/views/components/better_list_title.dart
diff --git a/lib/src/components/better_text.dart b/lib/src/views/components/better_text.dart
similarity index 100%
rename from lib/src/components/better_text.dart
rename to lib/src/views/components/better_text.dart
diff --git a/lib/src/components/connection_state.dart b/lib/src/views/components/connection_state.dart
similarity index 100%
rename from lib/src/components/connection_state.dart
rename to lib/src/views/components/connection_state.dart
diff --git a/lib/src/components/flame.dart b/lib/src/views/components/flame.dart
similarity index 93%
rename from lib/src/components/flame.dart
rename to lib/src/views/components/flame.dart
index 23cde6d..d4aab96 100644
--- a/lib/src/components/flame.dart
+++ b/lib/src/views/components/flame.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/components/animate_icon.dart';
+import 'package:twonly/src/views/components/animate_icon.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 
 class FlameCounterWidget extends StatelessWidget {
diff --git a/lib/src/components/format_long_string.dart b/lib/src/views/components/format_long_string.dart
similarity index 100%
rename from lib/src/components/format_long_string.dart
rename to lib/src/views/components/format_long_string.dart
diff --git a/lib/src/components/headline.dart b/lib/src/views/components/headline.dart
similarity index 100%
rename from lib/src/components/headline.dart
rename to lib/src/views/components/headline.dart
diff --git a/lib/src/components/initialsavatar.dart b/lib/src/views/components/initialsavatar.dart
similarity index 97%
rename from lib/src/components/initialsavatar.dart
rename to lib/src/views/components/initialsavatar.dart
index 7200c9e..400830d 100644
--- a/lib/src/components/initialsavatar.dart
+++ b/lib/src/views/components/initialsavatar.dart
@@ -1,8 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
+import 'package:logging/logging.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
-import 'package:twonly/src/json_models/userdata.dart';
+import 'package:twonly/src/model/json/userdata.dart';
 
 class ContactAvatar extends StatelessWidget {
   final Contact? contact;
@@ -47,7 +48,7 @@ class ContactAvatar extends StatelessWidget {
                 child: SvgPicture.string(
                   avatarSvg,
                   errorBuilder: (context, error, stackTrace) {
-                    print("Error: $error");
+                    Logger("ui.avater").shout("$error");
                     return Container();
                   },
                 ),
diff --git a/lib/src/components/media_view_sizing.dart b/lib/src/views/components/media_view_sizing.dart
similarity index 100%
rename from lib/src/components/media_view_sizing.dart
rename to lib/src/views/components/media_view_sizing.dart
diff --git a/lib/src/components/message_send_state_icon.dart b/lib/src/views/components/message_send_state_icon.dart
similarity index 99%
rename from lib/src/components/message_send_state_icon.dart
rename to lib/src/views/components/message_send_state_icon.dart
index f1a1e62..1ca7655 100644
--- a/lib/src/components/message_send_state_icon.dart
+++ b/lib/src/views/components/message_send_state_icon.dart
@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/database/tables/messages_table.dart';
-import 'package:twonly/src/json_models/message.dart';
+import 'package:twonly/src/model/json/message.dart';
 import 'package:twonly/src/utils/misc.dart';
 
 enum MessageSendState {
diff --git a/lib/src/components/notification_badge.dart b/lib/src/views/components/notification_badge.dart
similarity index 100%
rename from lib/src/components/notification_badge.dart
rename to lib/src/views/components/notification_badge.dart
diff --git a/lib/src/components/permissions_view.dart b/lib/src/views/components/permissions_view.dart
similarity index 100%
rename from lib/src/components/permissions_view.dart
rename to lib/src/views/components/permissions_view.dart
diff --git a/lib/src/components/radio_button.dart b/lib/src/views/components/radio_button.dart
similarity index 100%
rename from lib/src/components/radio_button.dart
rename to lib/src/views/components/radio_button.dart
diff --git a/lib/src/components/user_context_menu.dart b/lib/src/views/components/user_context_menu.dart
similarity index 79%
rename from lib/src/components/user_context_menu.dart
rename to lib/src/views/components/user_context_menu.dart
index 490a9a1..d8ef4a9 100644
--- a/lib/src/components/user_context_menu.dart
+++ b/lib/src/views/components/user_context_menu.dart
@@ -5,7 +5,7 @@ import 'package:pie_menu/pie_menu.dart';
 import 'package:twonly/globals.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/utils/misc.dart';
-import 'package:twonly/src/views/camera_to_share/camera_send_to_view.dart';
+import 'package:twonly/src/views/camera/camera_send_to_view.dart';
 import 'package:twonly/src/views/chats/chat_item_details_view.dart';
 import 'package:twonly/src/views/contact/contact_verify_view.dart';
 
@@ -89,3 +89,27 @@ class _UserContextMenuState extends State<UserContextMenu> {
     );
   }
 }
+
+PieTheme getPieCanvasTheme(BuildContext context) {
+  return PieTheme(
+    brightness: Theme.of(context).brightness,
+    rightClickShowsMenu: true,
+    radius: 70,
+    buttonTheme: PieButtonTheme(
+      backgroundColor: Theme.of(context).colorScheme.tertiary,
+      iconColor: Theme.of(context).colorScheme.surfaceBright,
+    ),
+    buttonThemeHovered: PieButtonTheme(
+      backgroundColor: Theme.of(context).colorScheme.primary,
+      iconColor: Theme.of(context).colorScheme.surfaceBright,
+    ),
+    tooltipPadding: EdgeInsets.all(20),
+    overlayColor: const Color.fromARGB(41, 0, 0, 0),
+
+    // spacing: 0,
+    tooltipTextStyle: TextStyle(
+      fontSize: 32,
+      fontWeight: FontWeight.w600,
+    ),
+  );
+}
diff --git a/lib/src/components/verified_shield.dart b/lib/src/views/components/verified_shield.dart
similarity index 100%
rename from lib/src/components/verified_shield.dart
rename to lib/src/views/components/verified_shield.dart
diff --git a/lib/src/views/contact/contact_verify_view.dart b/lib/src/views/contact/contact_verify_view.dart
index eae7660..7d4e938 100644
--- a/lib/src/views/contact/contact_verify_view.dart
+++ b/lib/src/views/contact/contact_verify_view.dart
@@ -4,7 +4,7 @@ import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/format_long_string.dart';
+import 'package:twonly/src/views/components/format_long_string.dart';
 import 'package:flutter/material.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
diff --git a/lib/src/views/contact/contact_view.dart b/lib/src/views/contact/contact_view.dart
index 8870aa3..19805e6 100644
--- a/lib/src/views/contact/contact_view.dart
+++ b/lib/src/views/contact/contact_view.dart
@@ -1,11 +1,11 @@
 import 'package:drift/drift.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/alert_dialog.dart';
-import 'package:twonly/src/components/better_list_title.dart';
-import 'package:twonly/src/components/flame.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
-import 'package:twonly/src/components/verified_shield.dart';
+import 'package:twonly/src/views/components/alert_dialog.dart';
+import 'package:twonly/src/views/components/better_list_title.dart';
+import 'package:twonly/src/views/components/flame.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
+import 'package:twonly/src/views/components/verified_shield.dart';
 import 'package:flutter/material.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/utils/misc.dart';
diff --git a/lib/src/views/home_view.dart b/lib/src/views/home_view.dart
index dd0a26e..fe6b66e 100644
--- a/lib/src/views/home_view.dart
+++ b/lib/src/views/home_view.dart
@@ -1,9 +1,9 @@
 import 'package:flutter_local_notifications/flutter_local_notifications.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:pie_menu/pie_menu.dart';
+import 'package:twonly/src/views/components/user_context_menu.dart';
 import 'package:twonly/src/services/notification_service.dart';
-import 'package:twonly/src/utils/misc.dart';
-import 'camera_to_share/camera_preview_view.dart';
+import 'camera/camera_preview_view.dart';
 import 'chats/chat_list_view.dart';
 import 'package:flutter/material.dart';
 
diff --git a/lib/src/views/onboarding/register_view.dart b/lib/src/views/onboarding/register_view.dart
index 8ac596d..eafacf0 100644
--- a/lib/src/views/onboarding/register_view.dart
+++ b/lib/src/views/onboarding/register_view.dart
@@ -1,11 +1,12 @@
 import 'dart:async';
 import 'dart:convert';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:logging/logging.dart';
 import 'package:twonly/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:twonly/src/components/alert_dialog.dart';
-import 'package:twonly/src/json_models/userdata.dart';
+import 'package:twonly/src/views/components/alert_dialog.dart';
+import 'package:twonly/src/model/json/userdata.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/signal.dart';
 
@@ -30,7 +31,7 @@ class _RegisterViewState extends State<RegisterView> {
       _isTryingToRegister = true;
     });
 
-    final storage = getSecureStorage();
+    final storage = FlutterSecureStorage();
 
     await createIfNotExistsSignalIdentity();
 
@@ -57,6 +58,7 @@ class _RegisterViewState extends State<RegisterView> {
     }
 
     if (context.mounted) {
+      // ignore: use_build_context_synchronously
       showAlertDialog(context, "Oh no!", errorCodeToText(context, res.error));
     }
   }
diff --git a/lib/src/views/settings/account_view.dart b/lib/src/views/settings/account_view.dart
index 1675acd..a021b77 100644
--- a/lib/src/views/settings/account_view.dart
+++ b/lib/src/views/settings/account_view.dart
@@ -1,6 +1,6 @@
 import 'package:restart_app/restart_app.dart';
 import 'package:flutter/material.dart';
-import 'package:twonly/src/components/alert_dialog.dart';
+import 'package:twonly/src/views/components/alert_dialog.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/storage.dart';
 
diff --git a/lib/src/views/settings/appearance_view.dart b/lib/src/views/settings/appearance_view.dart
index 48b0657..34d5137 100644
--- a/lib/src/views/settings/appearance_view.dart
+++ b/lib/src/views/settings/appearance_view.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-import 'package:twonly/src/components/radio_button.dart';
+import 'package:twonly/src/views/components/radio_button.dart';
 import 'package:twonly/src/providers/settings_change_provider.dart';
 import 'package:twonly/src/utils/misc.dart';
 
diff --git a/lib/src/views/settings/chat/chat_reactions_view.dart b/lib/src/views/settings/chat/chat_reactions_view.dart
index 5352fed..c8a4ae6 100644
--- a/lib/src/views/settings/chat/chat_reactions_view.dart
+++ b/lib/src/views/settings/chat/chat_reactions_view.dart
@@ -1,5 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:twonly/src/components/animate_icon.dart';
+import 'package:twonly/src/views/components/animate_icon.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/storage.dart';
 
diff --git a/lib/src/views/settings/notification_view.dart b/lib/src/views/settings/notification_view.dart
index f1ac6bb..3f73dd0 100644
--- a/lib/src/views/settings/notification_view.dart
+++ b/lib/src/views/settings/notification_view.dart
@@ -2,8 +2,9 @@ import 'dart:io';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_secure_storage/flutter_secure_storage.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/alert_dialog.dart';
+import 'package:twonly/src/views/components/alert_dialog.dart';
 import 'package:twonly/src/services/fcm_service.dart';
 import 'package:twonly/src/services/notification_service.dart';
 import 'package:twonly/src/utils/misc.dart';
@@ -25,7 +26,7 @@ class NotificationView extends StatelessWidget {
             subtitle: Text(context.lang.settingsNotifyTroubleshootingDesc),
             onTap: () async {
               await initFCMAfterAuthenticated();
-              final storage = getSecureStorage();
+              final storage = FlutterSecureStorage();
               String? storedToken = await storage.read(key: "google_fcm");
               await setupNotificationWithUsers(force: true);
               if (!context.mounted) return;
diff --git a/lib/src/views/settings/privacy_view_block_users.dart b/lib/src/views/settings/privacy_view_block_users.dart
index cda8d6f..1b18ba7 100644
--- a/lib/src/views/settings/privacy_view_block_users.dart
+++ b/lib/src/views/settings/privacy_view_block_users.dart
@@ -1,7 +1,7 @@
 import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
 import 'package:twonly/globals.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
 import 'package:twonly/src/database/daos/contacts_dao.dart';
 import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/utils/misc.dart';
diff --git a/lib/src/views/settings/profile/modify_avatar_view.dart b/lib/src/views/settings/profile/modify_avatar_view.dart
index 68befde..a784e57 100644
--- a/lib/src/views/settings/profile/modify_avatar_view.dart
+++ b/lib/src/views/settings/profile/modify_avatar_view.dart
@@ -3,7 +3,7 @@ import 'package:avatar_maker/avatar_maker.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'package:provider/provider.dart';
-import 'package:twonly/src/json_models/userdata.dart';
+import 'package:twonly/src/model/json/userdata.dart';
 import 'package:twonly/src/providers/api/api.dart';
 import 'package:twonly/src/providers/settings_change_provider.dart';
 import 'package:twonly/src/utils/misc.dart';
diff --git a/lib/src/views/settings/profile/profile_view.dart b/lib/src/views/settings/profile/profile_view.dart
index 11056f0..cfd9ab5 100644
--- a/lib/src/views/settings/profile/profile_view.dart
+++ b/lib/src/views/settings/profile/profile_view.dart
@@ -1,8 +1,8 @@
 import 'package:avatar_maker/avatar_maker.dart';
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/src/components/better_list_title.dart';
-import 'package:twonly/src/json_models/userdata.dart';
+import 'package:twonly/src/views/components/better_list_title.dart';
+import 'package:twonly/src/model/json/userdata.dart';
 import 'package:twonly/src/providers/api/api.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/storage.dart';
diff --git a/lib/src/views/settings/settings_main_view.dart b/lib/src/views/settings/settings_main_view.dart
index b7678b9..6daab5b 100644
--- a/lib/src/views/settings/settings_main_view.dart
+++ b/lib/src/views/settings/settings_main_view.dart
@@ -1,7 +1,7 @@
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:twonly/src/components/better_list_title.dart';
-import 'package:twonly/src/components/initialsavatar.dart';
-import 'package:twonly/src/json_models/userdata.dart';
+import 'package:twonly/src/views/components/better_list_title.dart';
+import 'package:twonly/src/views/components/initialsavatar.dart';
+import 'package:twonly/src/model/json/userdata.dart';
 import 'package:flutter/material.dart';
 import 'package:twonly/src/utils/misc.dart';
 import 'package:twonly/src/utils/storage.dart';
diff --git a/pubspec.lock b/pubspec.lock
index 1f318e7..b47f78b 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,18 +5,18 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      sha256: dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57
+      sha256: e55636ed79578b9abca5fecf9437947798f5ef7456308b5cb85720b793eac92f
       url: "https://pub.dev"
     source: hosted
-    version: "80.0.0"
+    version: "82.0.0"
   _flutterfire_internals:
     dependency: transitive
     description:
       name: _flutterfire_internals
-      sha256: "7fd72d77a7487c26faab1d274af23fb008763ddc10800261abbfb2c067f183d5"
+      sha256: de9ecbb3ddafd446095f7e833c853aff2fa1682b017921fe63a833f9d6f0e422
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.53"
+    version: "1.3.54"
   adaptive_number:
     dependency: transitive
     description:
@@ -29,18 +29,18 @@ packages:
     dependency: transitive
     description:
       name: analyzer
-      sha256: "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e"
+      sha256: "97536280ed2b09e659b8916be70ec1fb83f2317b653847e2b5efb581add506bf"
       url: "https://pub.dev"
     source: hosted
-    version: "7.3.0"
+    version: "7.4.2"
   archive:
     dependency: transitive
     description:
       name: archive
-      sha256: "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742"
+      sha256: a7f37ff061d7abc2fcf213554b9dcaca713c5853afa5c065c44888bc9ccaf813
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.4"
+    version: "4.0.6"
   args:
     dependency: transitive
     description:
@@ -173,26 +173,26 @@ packages:
     dependency: transitive
     description:
       name: camera_android_camerax
-      sha256: "13784f539c7f104766bff84e4479a70f03b29d78b208278be45c939250d9d7f5"
+      sha256: "26673643ed8f4a468a81ebd7ca760bc1d8c4c741df6d731cc958585ac1983126"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.14+1"
+    version: "0.6.15"
   camera_avfoundation:
     dependency: transitive
     description:
       name: camera_avfoundation
-      sha256: ba48b65a3a97004276ede882e6b838d9667642ff462c95a8bb57ca8a82b6bd25
+      sha256: a33cd9a250296271cdf556891b7c0986a93772426f286595eccd5f45b185933c
       url: "https://pub.dev"
     source: hosted
-    version: "0.9.18+11"
+    version: "0.9.18+14"
   camera_platform_interface:
     dependency: transitive
     description:
       name: camera_platform_interface
-      sha256: "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31"
+      sha256: "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2"
       url: "https://pub.dev"
     source: hosted
-    version: "2.9.0"
+    version: "2.10.0"
   camera_web:
     dependency: transitive
     description:
@@ -437,10 +437,10 @@ packages:
     dependency: "direct main"
     description:
       name: firebase_core
-      sha256: f4d8f49574a4e396f34567f3eec4d38ab9c3910818dec22ca42b2a467c685d8b
+      sha256: "017d17d9915670e6117497e640b2859e0b868026ea36bf3a57feb28c3b97debe"
       url: "https://pub.dev"
     source: hosted
-    version: "3.12.1"
+    version: "3.13.0"
   firebase_core_platform_interface:
     dependency: transitive
     description:
@@ -453,34 +453,34 @@ packages:
     dependency: transitive
     description:
       name: firebase_core_web
-      sha256: faa5a76f6380a9b90b53bc3bdcb85bc7926a382e0709b9b5edac9f7746651493
+      sha256: "129a34d1e0fb62e2b488d988a1fc26cc15636357e50944ffee2862efe8929b23"
       url: "https://pub.dev"
     source: hosted
-    version: "2.21.1"
+    version: "2.22.0"
   firebase_messaging:
     dependency: "direct main"
     description:
       name: firebase_messaging
-      sha256: "5fc345c6341f9dc69fd0ffcbf508c784fd6d1b9e9f249587f30434dd8b6aa281"
+      sha256: "5f8918848ee0c8eb172fc7698619b2bcd7dda9ade8b93522c6297dd8f9178356"
       url: "https://pub.dev"
     source: hosted
-    version: "15.2.4"
+    version: "15.2.5"
   firebase_messaging_platform_interface:
     dependency: transitive
     description:
       name: firebase_messaging_platform_interface
-      sha256: a935924cf40925985c8049df4968b1dde5c704f570f3ce380b31d3de6990dd94
+      sha256: "0bbea00680249595fc896e7313a2bd90bd55be6e0abbe8b9a39d81b6b306acb6"
       url: "https://pub.dev"
     source: hosted
-    version: "4.6.4"
+    version: "4.6.5"
   firebase_messaging_web:
     dependency: transitive
     description:
       name: firebase_messaging_web
-      sha256: fafebf6a1921931334f3f10edb5037a5712288efdd022881e2d093e5654a2fd4
+      sha256: ffb392ce2a7e8439cd0a9a80e3c702194e73c927e5c7b4f0adf6faa00b245b17
       url: "https://pub.dev"
     source: hosted
-    version: "3.10.4"
+    version: "3.10.5"
   fixnum:
     dependency: "direct main"
     description:
@@ -618,26 +618,34 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_local_notifications
-      sha256: ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610
+      sha256: "33b3e0269ae9d51669957a923f2376bee96299b09915d856395af8c4238aebfa"
       url: "https://pub.dev"
     source: hosted
-    version: "18.0.1"
+    version: "19.1.0"
   flutter_local_notifications_linux:
     dependency: transitive
     description:
       name: flutter_local_notifications_linux
-      sha256: "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01"
+      sha256: e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5
       url: "https://pub.dev"
     source: hosted
-    version: "5.0.0"
+    version: "6.0.0"
   flutter_local_notifications_platform_interface:
     dependency: transitive
     description:
       name: flutter_local_notifications_platform_interface
-      sha256: "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52"
+      sha256: "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c"
       url: "https://pub.dev"
     source: hosted
-    version: "8.0.0"
+    version: "9.0.0"
+  flutter_local_notifications_windows:
+    dependency: transitive
+    description:
+      name: flutter_local_notifications_windows
+      sha256: f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   flutter_localizations:
     dependency: "direct main"
     description: flutter
@@ -647,10 +655,10 @@ packages:
     dependency: transitive
     description:
       name: flutter_plugin_android_lifecycle
-      sha256: "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3"
+      sha256: f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.27"
+    version: "2.0.28"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -702,10 +710,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_svg
-      sha256: c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b
+      sha256: d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.17"
+    version: "2.1.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -749,7 +757,7 @@ packages:
     source: hosted
     version: "2.3.1"
   get:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: get
       sha256: c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425
@@ -789,7 +797,7 @@ packages:
     source: hosted
     version: "2.2.3"
   http:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: http
       sha256: fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f
@@ -816,10 +824,10 @@ packages:
     dependency: "direct main"
     description:
       name: image
-      sha256: "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3"
+      sha256: "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928"
       url: "https://pub.dev"
     source: hosted
-    version: "4.5.3"
+    version: "4.5.4"
   image_picker:
     dependency: "direct main"
     description:
@@ -832,10 +840,10 @@ packages:
     dependency: transitive
     description:
       name: image_picker_android
-      sha256: "8bd392ba8b0c8957a157ae0dc9fcf48c58e6c20908d5880aea1d79734df090e9"
+      sha256: "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb"
       url: "https://pub.dev"
     source: hosted
-    version: "0.8.12+22"
+    version: "0.8.12+23"
   image_picker_for_web:
     dependency: transitive
     description:
@@ -928,10 +936,10 @@ packages:
     dependency: "direct dev"
     description:
       name: json_serializable
-      sha256: "81f04dee10969f89f604e1249382d46b97a1ccad53872875369622b5bfc9e58a"
+      sha256: c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c
       url: "https://pub.dev"
     source: hosted
-    version: "6.9.4"
+    version: "6.9.5"
   leak_tracker:
     dependency: transitive
     description:
@@ -960,10 +968,10 @@ packages:
     dependency: "direct main"
     description:
       name: libsignal_protocol_dart
-      sha256: "2a8d54cddb89eab0301d333c4346d7edc920da0a0c0daa5e324878de2841dce6"
+      sha256: "385c0d499d70063739ab6963455a4e889aea16d6a4c9e769371d7ed2d1427ef6"
       url: "https://pub.dev"
     source: hosted
-    version: "0.7.1"
+    version: "0.7.3"
   lints:
     dependency: transitive
     description:
@@ -984,10 +992,10 @@ packages:
     dependency: transitive
     description:
       name: local_auth_android
-      sha256: "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74"
+      sha256: "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.0.48"
+    version: "1.0.49"
   local_auth_darwin:
     dependency: transitive
     description:
@@ -1160,10 +1168,10 @@ packages:
     dependency: transitive
     description:
       name: path_provider_android
-      sha256: "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12"
+      sha256: d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9
       url: "https://pub.dev"
     source: hosted
-    version: "2.2.16"
+    version: "2.2.17"
   path_provider_foundation:
     dependency: transitive
     description:
@@ -1200,26 +1208,26 @@ packages:
     dependency: "direct main"
     description:
       name: permission_handler
-      sha256: "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849"
+      sha256: "2d070d8684b68efb580a5997eb62f675e8a885ef0be6e754fb9ef489c177470f"
       url: "https://pub.dev"
     source: hosted
-    version: "11.4.0"
+    version: "12.0.0+1"
   permission_handler_android:
     dependency: transitive
     description:
       name: permission_handler_android
-      sha256: d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc
+      sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6"
       url: "https://pub.dev"
     source: hosted
-    version: "12.1.0"
+    version: "13.0.1"
   permission_handler_apple:
     dependency: transitive
     description:
       name: permission_handler_apple
-      sha256: f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98
+      sha256: f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023
       url: "https://pub.dev"
     source: hosted
-    version: "9.4.6"
+    version: "9.4.7"
   permission_handler_html:
     dependency: transitive
     description:
@@ -1256,10 +1264,10 @@ packages:
     dependency: "direct main"
     description:
       name: pie_menu
-      sha256: "011ccddc6f71c51a766cd3daba445f9e0cba9a6003e8528340c3064a241a5a30"
+      sha256: d6511a64319c500e2263656020105fbce41dcc6234cb8c16f5f5cdac47ab64c1
       url: "https://pub.dev"
     source: hosted
-    version: "3.2.7"
+    version: "3.2.10"
   platform:
     dependency: transitive
     description:
@@ -1280,10 +1288,10 @@ packages:
     dependency: transitive
     description:
       name: pointycastle
-      sha256: "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe"
+      sha256: "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5"
       url: "https://pub.dev"
     source: hosted
-    version: "3.9.1"
+    version: "4.0.0"
   pool:
     dependency: transitive
     description:
@@ -1296,26 +1304,26 @@ packages:
     dependency: transitive
     description:
       name: posix
-      sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a
+      sha256: f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62
       url: "https://pub.dev"
     source: hosted
-    version: "6.0.1"
+    version: "6.0.2"
   protobuf:
     dependency: "direct main"
     description:
       name: protobuf
-      sha256: "01dd9bd0fa02548bf2ceee13545d4a0ec6046459d847b6b061d8a27237108a08"
+      sha256: fbb0c37d435641d0b84813c1dad41e6fa61ddc880a320bce16b3063ecec35aa6
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.0"
+    version: "4.0.0"
   provider:
     dependency: "direct main"
     description:
       name: provider
-      sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c
+      sha256: "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310"
       url: "https://pub.dev"
     source: hosted
-    version: "6.1.2"
+    version: "6.1.4"
   pub_semver:
     dependency: transitive
     description:
@@ -1384,18 +1392,18 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences
-      sha256: "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a"
+      sha256: "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5"
       url: "https://pub.dev"
     source: hosted
-    version: "2.5.2"
+    version: "2.5.3"
   shared_preferences_android:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad"
+      sha256: "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac"
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.8"
+    version: "2.4.10"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1645,18 +1653,18 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_android
-      sha256: "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4"
+      sha256: "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.15"
+    version: "6.3.16"
   url_launcher_ios:
     dependency: transitive
     description:
       name: url_launcher_ios
-      sha256: "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626"
+      sha256: "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb"
       url: "https://pub.dev"
     source: hosted
-    version: "6.3.2"
+    version: "6.3.3"
   url_launcher_linux:
     dependency: transitive
     description:
@@ -1741,10 +1749,10 @@ packages:
     dependency: transitive
     description:
       name: very_good_analysis
-      sha256: "9ae7f3a3bd5764fb021b335ca28a34f040cd0ab6eec00a1b213b445dae58a4b8"
+      sha256: "62d2b86d183fb81b2edc22913d9f155d26eb5cf3855173adb1f59fac85035c63"
       url: "https://pub.dev"
     source: hosted
-    version: "5.1.0"
+    version: "7.0.0"
   vm_service:
     dependency: transitive
     description:
@@ -1773,18 +1781,18 @@ packages:
     dependency: transitive
     description:
       name: web_socket
-      sha256: "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83"
+      sha256: bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.6"
+    version: "1.0.0"
   web_socket_channel:
     dependency: "direct main"
     description:
       name: web_socket_channel
-      sha256: "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5"
+      sha256: d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8
       url: "https://pub.dev"
     source: hosted
-    version: "3.0.2"
+    version: "3.0.3"
   win32:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index aae9783..29c4a2f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -20,7 +20,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_image_compress: ^2.4.0
-  flutter_local_notifications: ^18.0.1
+  flutter_local_notifications: ^19.1.0
   flutter_localizations:
     sdk: flutter
   # flutter_secure_storage: ^10.0.0-beta.4
@@ -45,9 +45,9 @@ dependencies:
   package_info_plus: ^8.2.1
   path: ^1.9.0
   path_provider: ^2.1.5
-  permission_handler: ^11.3.1
+  permission_handler: ^12.0.0+1
   pie_menu: ^3.2.7
-  protobuf: ^2.1.0
+  protobuf: ^4.0.0
   cryptography_plus: ^2.7.0
   cryptography_flutter_plus: ^2.3.2
   provider: ^6.1.2
@@ -64,6 +64,8 @@ dependencies:
   mutex: ^3.1.0
   cached_network_image: ^3.4.1
   image_picker: ^1.1.2
+  http: ^1.3.0
+  get: ^4.7.2
   # avatar_maker
   # avatar_maker: 
   #   path: ./dependencies/avatar_maker/
diff --git a/test/drift/twonly_database/migration_test.dart b/test/drift/twonly_database/migration_test.dart
index 98e54db..ee37ec9 100644
--- a/test/drift/twonly_database/migration_test.dart
+++ b/test/drift/twonly_database/migration_test.dart
@@ -42,12 +42,9 @@ void main() {
   // (e.g. by alterating their type or constraints). Migrations that only add
   // tables or columns typically don't need these advanced tests. For more
   // information, see https://drift.simonbinder.eu/migrations/tests/#verifying-data-integrity
-  // TODO: This generated template shows how these tests could be written. Adopt
-  // it to your own needs when testing migrations with data integrity.
   test('migration from v1 to v2 does not corrupt data', () async {
     // Add data to insert into the old database, and the expected rows after the
     // migration.
-    // TODO: Fill these lists
     final oldContactsData = <v1.ContactsData>[];
     final expectedNewContactsData = <v2.ContactsData>[];
 
diff --git a/test/unit_test.dart b/test/unit_test.dart
index 0c6c648..a635eee 100644
--- a/test/unit_test.dart
+++ b/test/unit_test.dart
@@ -1,5 +1,5 @@
 import 'package:flutter_test/flutter_test.dart';
-import 'package:twonly/src/components/animate_icon.dart';
+import 'package:twonly/src/views/components/animate_icon.dart';
 
 void main() {
   group('isEmoji', () {