diff --git a/.gitmodules b/.gitmodules
index e69de29..020d20c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,4 @@
+
+[submodule "dependencies"]
+	path = dependencies
+	url = git@github.com:twonlyapp/twonly-app-dependencies.git
diff --git a/dependencies b/dependencies
new file mode 160000
index 0000000..3a25778
--- /dev/null
+++ b/dependencies
@@ -0,0 +1 @@
+Subproject commit 3a2577878242feee5d5a50205498fce1c26f3202
diff --git a/lib/src/views/contact/contact_verify.view.dart b/lib/src/views/contact/contact_verify.view.dart
index de226c4..d0f1f28 100644
--- a/lib/src/views/contact/contact_verify.view.dart
+++ b/lib/src/views/contact/contact_verify.view.dart
@@ -1,10 +1,8 @@
 import 'dart:async';
-import 'dart:convert';
 
 import 'package:drift/drift.dart' hide Column;
 import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
-import 'package:image/image.dart' as imglib;
 import 'package:libsignal_protocol_dart/libsignal_protocol_dart.dart';
 import 'package:lottie/lottie.dart';
 import 'package:twonly/globals.dart';
diff --git a/pubspec.lock b/pubspec.lock
index a591354..0940a3a 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -18,12 +18,11 @@ packages:
     source: hosted
     version: "1.3.64"
   adaptive_number:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: adaptive_number
-      sha256: "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/adaptive_number"
+      relative: true
+    source: path
     version: "1.0.0"
   analyzer:
     dependency: transitive
@@ -275,7 +274,7 @@ packages:
     source: hosted
     version: "2.0.1"
   convert:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: convert
       sha256: b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68
@@ -291,7 +290,7 @@ packages:
     source: hosted
     version: "0.3.5"
   crypto:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: crypto
       sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf
@@ -355,12 +354,11 @@ packages:
     source: hosted
     version: "7.0.3"
   dots_indicator:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: dots_indicator
-      sha256: c070af5058a084ba7b354df4b4c26c719595d70a3531eea6edd8af8716684ba3
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/dots_indicator"
+      relative: true
+    source: path
     version: "4.0.1"
   drift:
     dependency: "direct main"
@@ -387,12 +385,11 @@ packages:
     source: hosted
     version: "0.2.7"
   ed25519_edwards:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: ed25519_edwards
-      sha256: "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/ed25519_edwards"
+      relative: true
+    source: path
     version: "0.3.1"
   emoji_picker_flutter:
     dependency: "direct main"
@@ -853,18 +850,16 @@ packages:
   hashlib:
     dependency: "direct main"
     description:
-      name: hashlib
-      sha256: "408af9bfb16289d433822635f0b6890e4440b74fe7acd40014983abeef6d33f0"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/hashlib"
+      relative: true
+    source: path
     version: "2.2.0"
   hashlib_codecs:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: hashlib_codecs
-      sha256: "0e1a17c47792fd131a9bf49b811c394b22516287746ee14cd0b0c22a34136699"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/hashlib_codecs"
+      relative: true
+    source: path
     version: "3.0.1"
   html:
     dependency: transitive
@@ -981,10 +976,9 @@ packages:
   introduction_screen:
     dependency: "direct main"
     description:
-      name: introduction_screen
-      sha256: "47ad51281f86c3ed47e0c1a0008899ad253ca71e8b626fd862e55993825a271b"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/introduction_screen"
+      relative: true
+    source: path
     version: "4.0.0"
   io:
     dependency: transitive
@@ -1053,10 +1047,9 @@ packages:
   libsignal_protocol_dart:
     dependency: "direct main"
     description:
-      name: libsignal_protocol_dart
-      sha256: "2b18de43016474ab85d21553a88f59d6f4fea8c2eddf35be7e24ab5f8969a81d"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/libsignal_protocol_dart"
+      relative: true
+    source: path
     version: "0.7.4"
   lints:
     dependency: transitive
@@ -1117,10 +1110,9 @@ packages:
   lottie:
     dependency: "direct main"
     description:
-      name: lottie
-      sha256: "8ae0be46dbd9e19641791dc12ee480d34e1fd3f84c749adc05f3ad9342b71b95"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/lottie"
+      relative: true
+    source: path
     version: "3.3.2"
   matcher:
     dependency: transitive
@@ -1139,7 +1131,7 @@ packages:
     source: hosted
     version: "0.11.1"
   meta:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: meta
       sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
@@ -1157,10 +1149,9 @@ packages:
   mutex:
     dependency: "direct main"
     description:
-      name: mutex
-      sha256: "8827da25de792088eb33e572115a5eb0d61d61a3c01acbc8bcbe76ed78f1a1f2"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/mutex"
+      relative: true
+    source: path
     version: "3.1.0"
   nested:
     dependency: transitive
@@ -1203,12 +1194,11 @@ packages:
     source: hosted
     version: "2.1.0"
   optional:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: optional
-      sha256: f80327d7a3335a0be68418072668043c7ab291df575c21aa42e0c5633641da39
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/optional"
+      relative: true
+    source: path
     version: "6.1.0+1"
   package_config:
     dependency: transitive
@@ -1357,10 +1347,9 @@ packages:
   photo_view:
     dependency: "direct main"
     description:
-      name: photo_view
-      sha256: "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/photo_view"
+      relative: true
+    source: path
     version: "0.15.0"
   platform:
     dependency: transitive
@@ -1379,12 +1368,11 @@ packages:
     source: hosted
     version: "2.1.8"
   pointycastle:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: pointycastle
-      sha256: "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5"
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/pointycastle"
+      relative: true
+    source: path
     version: "4.0.0"
   pool:
     dependency: transitive
@@ -1434,6 +1422,13 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.5.0"
+  qr:
+    dependency: "direct main"
+    description:
+      path: "dependencies/qr"
+      relative: true
+    source: path
+    version: "3.1.0-wip"
   recase:
     dependency: transitive
     description:
@@ -1735,14 +1730,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.10.1"
-  tutorial_coach_mark:
-    dependency: "direct main"
-    description:
-      name: tutorial_coach_mark
-      sha256: "5a325d53bcf16ce7a969e2ab8d4dc9610f39ee3eab2b3cc57d5c98936129b891"
-      url: "https://pub.dev"
-    source: hosted
-    version: "1.3.3"
   typed_data:
     dependency: transitive
     description:
@@ -1960,12 +1947,11 @@ packages:
     source: hosted
     version: "2.1.0"
   x25519:
-    dependency: transitive
+    dependency: "direct overridden"
     description:
-      name: x25519
-      sha256: cec3c125f0d934dccba6c4cab48f3fbf866dc78895dcc5a1584d35b0a845005b
-      url: "https://pub.dev"
-    source: hosted
+      path: "dependencies/x25519"
+      relative: true
+    source: path
     version: "0.1.1"
   xdg_directories:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index 827233f..0110c95 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -9,76 +9,125 @@ environment:
   sdk: ^3.6.0
 
 dependencies:
+  flutter:
+    sdk: flutter
+  flutter_localizations:
+    sdk: flutter
+  
+  # Trusted published dart.dev or tools.dart.dev
+  collection: ^1.18.0
+  fixnum: ^1.1.1
+  meta: ^1.17.0
+  http: ^1.3.0
+  intl: ^0.20.2
+  path: ^1.9.0
+  logging: ^1.3.0
+  web_socket_channel: ^3.0.1
+  convert: ^3.1.2
+  crypto: ^3.0.7
+
+  
+  # Trusted publisher flutter.dev 
+  camera: ^0.11.2
+  flutter_svg: ^2.0.17
+  image_picker: ^1.1.2
+  local_auth: ^3.0.0
+  path_provider: ^2.1.5
+  url_launcher: ^6.3.2
+  vector_graphics: ^1.1.19
+  video_player: ^2.10.1
+
+
+  # Trusted publisher fluttercommunity.dev
+  connectivity_plus: ^7.0.0
+  device_info_plus: ^12.1.0
+  font_awesome_flutter: ^10.10.0
+  share_plus: ^12.0.0
+  package_info_plus: ^9.0.0
+
+
+  # Trustworthy publishers
+  firebase_core: ^4.2.0 # firebase.google.com
+  firebase_messaging: ^16.0.3  # firebase.google.com
+  json_annotation: ^4.9.0 # google.dev
+  protobuf: ^4.0.0 # google.dev
+  scrollable_positioned_list: ^0.3.8 # google.dev
+
+
+  # Not yet checked 
   archive: ^4.0.7
   audio_waveforms: ^2.0.0
   avatar_maker: ^0.4.0
   background_downloader: ^9.4.0
   cached_network_image: ^3.4.1
-  camera: ^0.11.2
-  collection: ^1.18.0
-  connectivity_plus: ^7.0.0
   cryptography_flutter_plus: ^2.3.4
   cryptography_plus: ^2.7.0
-  device_info_plus: ^12.1.0
   drift: ^2.25.1
   drift_flutter: ^0.2.4
-  emoji_picker_flutter: ^4.3.0
   ffmpeg_kit_flutter_new: ^4.1.0
   file_picker: ^10.3.6
-  firebase_core: ^4.2.0
-  firebase_messaging: ^16.0.3
-  fixnum: ^1.1.1
-  flutter:
-    sdk: flutter
   flutter_android_volume_keydown: ^1.0.1
   flutter_image_compress: ^2.4.0
   flutter_local_notifications: ^19.1.0
-  flutter_localizations:
-    sdk: flutter
   flutter_secure_storage:
     git:
       url: https://github.com/juliansteenbakker/flutter_secure_storage.git
       ref: a06ead81809c900e7fc421a30db0adf3b5919139 # from develop
       path: flutter_secure_storage/
-  flutter_svg: ^2.0.17
   flutter_volume_controller: ^1.3.4
-  font_awesome_flutter: ^10.10.0
   gal: ^2.3.1
   get: ^4.7.2
   google_mlkit_barcode_scanning: ^0.14.1
   hand_signature: ^3.0.3
-  hashlib: ^2.0.0
-  http: ^1.3.0
   image: ^4.3.0
-  image_picker: ^1.1.2
-  intl: ^0.20.2
-  introduction_screen: ^4.0.0
-  json_annotation: ^4.9.0
-  libsignal_protocol_dart: ^0.7.4
-  local_auth: ^3.0.0
-  logging: ^1.3.0
-  lottie: ^3.3.1
-  mutex: ^3.1.0
   no_screenshot: ^0.3.1
-  package_info_plus: ^9.0.0
-  path: ^1.9.0
-  path_provider: ^2.1.5
   permission_handler: ^12.0.0+1
-  photo_view: ^0.15.0
-  protobuf: ^4.0.0
   provider: ^6.1.2
   restart_app: ^1.3.2
   screenshot: ^3.0.0
-  scrollable_positioned_list: ^0.3.8
   sentry_flutter: ^9.8.0
-  share_plus: ^12.0.0
-  tutorial_coach_mark: ^1.3.0
-  url_launcher: ^6.3.2
-  vector_graphics: ^1.1.19
-  video_player: ^2.10.1
-  web_socket_channel: ^3.0.1
 
-dependency_overrides: 
+  # Overwritten by self-controlled repository
+  emoji_picker_flutter: ^4.3.0
+
+  # Packages which got overwritten using the twonly-app-dependencies repository
+  photo_view: ^0.15.0
+  hashlib: ^2.0.0
+  libsignal_protocol_dart: ^0.7.4
+  lottie: ^3.3.1
+  mutex: ^3.1.0
+  introduction_screen: ^4.0.0
+  qr: ^3.0.2
+
+dependency_overrides:
+  dots_indicator:
+    path: ./dependencies/dots_indicator
+  hashlib:
+    path: ./dependencies/hashlib
+  introduction_screen:
+    path: ./dependencies/introduction_screen
+  libsignal_protocol_dart:
+    path: ./dependencies/libsignal_protocol_dart
+  lottie:
+    path: ./dependencies/lottie
+  mutex:
+    path: ./dependencies/mutex
+  photo_view:
+    path: ./dependencies/photo_view
+  qr:
+    path: ./dependencies/qr
+  adaptive_number:
+    path: ./dependencies/adaptive_number
+  ed25519_edwards:
+    path: ./dependencies/ed25519_edwards
+  hashlib_codecs:
+    path: ./dependencies/hashlib_codecs
+  optional:
+    path: ./dependencies/optional
+  pointycastle:
+    path: ./dependencies/pointycastle
+  x25519:
+    path: ./dependencies/x25519
   camera_android_camerax: 
     # path: ../flutter-packages/packages/camera/camera_android_camerax
     git: