diff --git a/README.md b/README.md
index 4269b7d..6d58cf3 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,19 @@
-# Shared
+# Splitr
 
 :warning: This is a beta version. Use it at your own risk!
 
-Shared is a free and open-source app that lets you create multiple projects, add and track expenses, split expenses unevenly between members, and settle up balances between group members. It's a great alternative to other expense tracking apps, especially for groups who need to manage expenses together.
+Splitr is a free and open-source app that lets you create multiple projects, add and track expenses, split expenses unevenly between members, and settle up balances between group members. It's a great alternative to other expense tracking apps, especially for groups who need to manage expenses together.
 
 ## Installation
 
-This is currently a beta version. To get the app, you have to build it yourself with flutter or download the latest beta version [here](https://github.com/BhasherBEL/Shared/releases).
+This is currently a beta version. To get the app, you have to build it yourself with flutter or download the latest beta version [here](https://github.com/BhasherBEL/Splitr/releases).
 
 
 ## Screenshots
 
 | | | |
 |:-------------------------:|:-------------------------:|:-------------------------:|
-![Project](https://raw.githubusercontent.com/BhasherBEL/Shared/master/metadata/en-US/images/phoneScreenshots/1.png) | ![Refund](https://raw.githubusercontent.com/BhasherBEL/Shared/master/metadata/en-US/images/phoneScreenshots/2.png) | ![New project](https://raw.githubusercontent.com/BhasherBEL/Shared/master/metadata/en-US/images/phoneScreenshots/3.png) |
+![Project](https://raw.githubusercontent.com/BhasherBEL/Splitr/master/metadata/en-US/images/phoneScreenshots/1.png) | ![Refund](https://raw.githubusercontent.com/BhasherBEL/Splitr/master/metadata/en-US/images/phoneScreenshots/2.png) | ![New project](https://raw.githubusercontent.com/BhasherBEL/Splitr/master/metadata/en-US/images/phoneScreenshots/3.png) |
 
 ## Features
 
@@ -31,4 +31,4 @@ This is currently a beta version. To get the app, you have to build it yourself
 
 ## License
 
-Shared is licensed under the [MIT License](LICENCE.md).
+Splitr is licensed under the [MIT License](LICENCE.md).
diff --git a/android/app/build.gradle b/android/app/build.gradle
index c7230d4..e3f0226 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -44,7 +44,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "be.bhasher.shared"
+        applicationId "be.bhasher.splitr"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
         minSdkVersion flutter.minSdkVersion
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index e6e1ebe..4976f05 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="be.bhasher.shared">
+    package="be.bhasher.splitr">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 07d1805..cb8c124 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="be.bhasher.shared">
+    package="be.bhasher.splitr">
     <uses-permission android:name="android.permission.INTERNET"/>
    <application
-        android:label="Shared"
+        android:label="Splitr"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
@@ -29,10 +29,10 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" android:host="shared.bhasher.com" />
-                <data android:scheme="http" android:host="www.shared.bhasher.com" />
-                <data android:scheme="https" android:host="shared.bhasher.com" />
-                <data android:scheme="https" android:host="www.shared.bhasher.com" />
+                <data android:scheme="http" android:host="splitr.bhasher.com" />
+                <data android:scheme="http" android:host="www.splitr.bhasher.com" />
+                <data android:scheme="https" android:host="splitr.bhasher.com" />
+                <data android:scheme="https" android:host="www.splitr.bhasher.com" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/android/app/src/main/kotlin/be/bhasher/shared/MainActivity.kt b/android/app/src/main/kotlin/be/bhasher/splitr/MainActivity.kt
similarity index 78%
rename from android/app/src/main/kotlin/be/bhasher/shared/MainActivity.kt
rename to android/app/src/main/kotlin/be/bhasher/splitr/MainActivity.kt
index d1fc4dc..bd8ebab 100644
--- a/android/app/src/main/kotlin/be/bhasher/shared/MainActivity.kt
+++ b/android/app/src/main/kotlin/be/bhasher/splitr/MainActivity.kt
@@ -1,4 +1,4 @@
-package be.bhasher.shared
+package be.bhasher.splitr
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index e6e1ebe..4976f05 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="be.bhasher.shared">
+    package="be.bhasher.splitr">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/lib/components/pages/instances/instance_tile.dart b/lib/components/pages/instances/instance_tile.dart
index 20e4fbd..9fea063 100644
--- a/lib/components/pages/instances/instance_tile.dart
+++ b/lib/components/pages/instances/instance_tile.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:shared/model/app_data.dart';
-import 'package:shared/model/instance.dart';
 
+import '../../../model/app_data.dart';
+import '../../../model/instance.dart';
 import '../../../utils/dialogs/confirm_box.dart';
 import '../../../utils/navigator/navigator.dart';
 import '../new_instance/new_instance_page.dart';
diff --git a/lib/components/pages/instances/instances_list_page.dart b/lib/components/pages/instances/instances_list_page.dart
index 1242d46..0d49776 100644
--- a/lib/components/pages/instances/instances_list_page.dart
+++ b/lib/components/pages/instances/instances_list_page.dart
@@ -1,9 +1,10 @@
 import 'package:flutter/material.dart';
-import 'package:shared/components/pages/instances/instance_tile.dart';
-import 'package:shared/components/pages/new_instance/new_instance_page.dart';
-import 'package:shared/model/app_data.dart';
-import 'package:shared/model/instance.dart';
-import 'package:shared/utils/navigator/navigator.dart';
+
+import '../../../model/app_data.dart';
+import '../../../model/instance.dart';
+import '../../../utils/navigator/navigator.dart';
+import '../new_instance/new_instance_page.dart';
+import 'instance_tile.dart';
 
 class InstancesListPage extends StatefulWidget {
   const InstancesListPage({super.key});
diff --git a/lib/components/pages/new_instance/new_instance_page.dart b/lib/components/pages/new_instance/new_instance_page.dart
index 91f4129..bd9379d 100644
--- a/lib/components/pages/new_instance/new_instance_page.dart
+++ b/lib/components/pages/new_instance/new_instance_page.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:pocketbase/pocketbase.dart';
-import 'package:shared/components/pages/new_instance/new_instance_selector.dart';
-import 'package:shared/model/app_data.dart';
-import 'package:shared/model/connectors/provider.dart';
-import 'package:shared/model/instance.dart';
 
+import '../../../model/app_data.dart';
 import '../../../model/connectors/pocketbase/provider.dart';
+import '../../../model/connectors/provider.dart';
+import '../../../model/instance.dart';
+import 'new_instance_selector.dart';
 
 class NewInstancePage extends StatelessWidget {
   NewInstancePage({
diff --git a/lib/components/pages/new_instance/new_instance_pocketbase.dart b/lib/components/pages/new_instance/new_instance_pocketbase.dart
index de0a981..98ae762 100644
--- a/lib/components/pages/new_instance/new_instance_pocketbase.dart
+++ b/lib/components/pages/new_instance/new_instance_pocketbase.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
-import 'package:shared/components/pages/new_instance/new_instance_page.dart';
+
+import 'new_instance_page.dart';
 
 class NewInstancePocketbase extends StatefulWidget {
   const NewInstancePocketbase(this.instanceData, {super.key});
diff --git a/lib/components/pages/new_instance/new_instance_selector.dart b/lib/components/pages/new_instance/new_instance_selector.dart
index 22aaa19..61c7fdd 100644
--- a/lib/components/pages/new_instance/new_instance_selector.dart
+++ b/lib/components/pages/new_instance/new_instance_selector.dart
@@ -1,7 +1,8 @@
 import 'package:flutter/material.dart';
-import 'package:shared/components/pages/new_instance/new_instance_page.dart';
-import 'package:shared/components/pages/new_instance/new_instance_pocketbase.dart';
-import 'package:shared/utils/tiles/header_tile.dart';
+
+import '../../../utils/tiles/header_tile.dart';
+import 'new_instance_page.dart';
+import 'new_instance_pocketbase.dart';
 
 class NewInstanceSelector extends StatefulWidget {
   const NewInstanceSelector(this.instanceData, {super.key});
diff --git a/lib/components/pages/new_project/new_project_page.dart b/lib/components/pages/new_project/new_project_page.dart
index 95576ed..7e43844 100644
--- a/lib/components/pages/new_project/new_project_page.dart
+++ b/lib/components/pages/new_project/new_project_page.dart
@@ -1,16 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:select_form_field/select_form_field.dart';
-import 'package:shared/components/pages/instances/instances_list_page.dart';
-import 'package:shared/model/app_data.dart';
-import 'package:shared/utils/navigator/navigator.dart';
-import 'package:shared/utils/string.dart';
-import 'package:shared/utils/switches/text_switch.dart';
+import 'package:splitr/utils/string.dart';
 
+import '../../../model/app_data.dart';
 import '../../../model/instance.dart';
 import '../../../model/project.dart';
 import '../../../model/project_data.dart';
+import '../../../utils/navigator/navigator.dart';
+import '../../../utils/switches/text_switch.dart';
 import '../../../utils/tiles/header_tile.dart';
 import '../../../utils/tiles/participant_tile.dart';
+import '../instances/instances_list_page.dart';
 
 class NewProjectPage extends StatefulWidget {
   const NewProjectPage({super.key, this.project, required this.projectData});
diff --git a/lib/components/pages/project/balances/balancing_page_part.dart b/lib/components/pages/project/balances/balancing_page_part.dart
index 318dbbb..5d2a725 100644
--- a/lib/components/pages/project/balances/balancing_page_part.dart
+++ b/lib/components/pages/project/balances/balancing_page_part.dart
@@ -1,8 +1,8 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:shared/model/participant.dart';
 
+import '../../../../model/participant.dart';
 import '../../../../model/project.dart';
 import 'refund_page_part.dart';
 
diff --git a/lib/components/pages/project/balances/refund_page_part.dart b/lib/components/pages/project/balances/refund_page_part.dart
index 8255424..ebe57c5 100644
--- a/lib/components/pages/project/balances/refund_page_part.dart
+++ b/lib/components/pages/project/balances/refund_page_part.dart
@@ -1,9 +1,10 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:shared/model/participant.dart';
-import 'package:shared/model/project.dart';
-import 'package:shared/utils/tiles/header_tile.dart';
+
+import '../../../../model/participant.dart';
+import '../../../../model/project.dart';
+import '../../../../utils/tiles/header_tile.dart';
 
 List<Widget> getRefundPageTiles({
   required final Project project,
diff --git a/lib/components/pages/project/item_list.dart b/lib/components/pages/project/expenses/item_list.dart
similarity index 97%
rename from lib/components/pages/project/item_list.dart
rename to lib/components/pages/project/expenses/item_list.dart
index e2444f9..29ae72e 100644
--- a/lib/components/pages/project/item_list.dart
+++ b/lib/components/pages/project/expenses/item_list.dart
@@ -2,14 +2,14 @@ import 'dart:async';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
-import 'package:shared/utils/colors.dart';
-import 'package:shared/utils/string.dart';
 import 'package:tuple/tuple.dart';
 
-import '../../../model/item.dart';
-import '../../../model/project.dart';
-import '../../../utils/time.dart';
-import 'expenses/new_entry.dart';
+import '../../../../utils/string.dart';
+import '../../../../model/item.dart';
+import '../../../../model/project.dart';
+import '../../../../utils/colors.dart';
+import '../../../../utils/time.dart';
+import 'new_entry.dart';
 
 class ItemList extends StatefulWidget {
   const ItemList(this.project, {super.key});
diff --git a/lib/components/pages/project/project_page.dart b/lib/components/pages/project/project_page.dart
index 976d1ae..f2c84a1 100644
--- a/lib/components/pages/project/project_page.dart
+++ b/lib/components/pages/project/project_page.dart
@@ -1,14 +1,13 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 import 'package:share_plus/share_plus.dart';
-import 'package:shared/components/pages/project/balances/balancing_page_part.dart';
-import 'package:shared/components/pages/projects_list/projects_list_page.dart';
-import 'package:shared/screens/new_project_screen.dart';
-import 'package:shared/utils/dialogs/confirm_box.dart';
 
 import '../../../model/project.dart';
+import '../../../screens/new_project_screen.dart';
+import '../projects_list/projects_list_page.dart';
+import 'balances/balancing_page_part.dart';
 import 'expenses/new_entry.dart';
-import 'item_list.dart';
+import 'expenses/item_list.dart';
 
 class ProjectPage extends StatefulWidget {
   const ProjectPage(this.project, {super.key});
@@ -108,13 +107,13 @@ class _ProjectPageState extends State<ProjectPage> {
                 actions: [
                   TextButton(
                     onPressed: () => Share.share(
-                      'Join my shared project!\n\nInstance: ${Uri.encodeComponent(widget.project.provider.instance.name)}\nCode: ${widget.project.code}',
+                      'Join my Splitr project!\n\nInstance: ${Uri.encodeComponent(widget.project.provider.instance.name)}\nCode: ${widget.project.code}',
                     ),
                     child: const Text("Share code"),
                   ),
                   TextButton(
                     onPressed: () => Share.share(
-                      'Join my shared project!\nhttps://shared.bhasher.com/join?instance=${Uri.encodeComponent(widget.project.provider.instance.name)}&code=${widget.project.code}',
+                      'Join my Splitr project!\nhttps://splitr.bhasher.com/join?instance=${Uri.encodeComponent(widget.project.provider.instance.name)}&code=${widget.project.code}',
                     ),
                     child: const Text("Share link"),
                   ),
diff --git a/lib/components/pages/projects_list/projects_list.dart b/lib/components/pages/projects_list/projects_list.dart
index 964924a..079325a 100644
--- a/lib/components/pages/projects_list/projects_list.dart
+++ b/lib/components/pages/projects_list/projects_list.dart
@@ -1,11 +1,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_slidable/flutter_slidable.dart';
-import 'package:shared/components/pages/project/project_page.dart';
-import 'package:shared/screens/new_project_screen.dart';
-import 'package:shared/utils/navigator/navigator.dart';
 
 import '../../../model/app_data.dart';
 import '../../../model/project.dart';
+import '../../../screens/new_project_screen.dart';
+import '../../../utils/navigator/navigator.dart';
+import '../project/project_page.dart';
 
 class ProjectsList extends StatefulWidget {
   const ProjectsList({super.key});
diff --git a/lib/components/pages/projects_list/projects_list_page.dart b/lib/components/pages/projects_list/projects_list_page.dart
index aca7170..40acb33 100644
--- a/lib/components/pages/projects_list/projects_list_page.dart
+++ b/lib/components/pages/projects_list/projects_list_page.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:shared/components/pages/projects_list/projects_list.dart';
-import 'package:shared/screens/new_project_screen.dart';
+
+import '../../../screens/new_project_screen.dart';
+import 'projects_list.dart';
 
 class ProjectsListPage extends StatefulWidget {
   const ProjectsListPage({super.key});
@@ -17,7 +18,7 @@ class _ProjectsListPageState extends State<ProjectsListPage> {
         centerTitle: true,
         elevation: 4,
         title: const Text(
-          "Shared",
+          "Splitr",
           style: TextStyle(
             fontSize: 24,
             fontWeight: FontWeight.bold,
diff --git a/lib/db/shared_database.dart b/lib/db/splitr_database.dart
similarity index 91%
rename from lib/db/shared_database.dart
rename to lib/db/splitr_database.dart
index dcd0bbd..754009b 100644
--- a/lib/db/shared_database.dart
+++ b/lib/db/splitr_database.dart
@@ -2,30 +2,30 @@ import 'dart:async';
 import 'dart:convert';
 
 import 'package:path/path.dart';
-import 'package:shared/model/connectors/local/deleted.dart';
-import 'package:shared/model/connectors/local/instance.dart';
-import 'package:shared/model/instance.dart';
 import 'package:sqflite/sqflite.dart';
 
+import '../model/connectors/local/deleted.dart';
+import '../model/connectors/local/instance.dart';
 import '../model/connectors/local/item.dart';
 import '../model/connectors/local/item_part.dart';
 import '../model/connectors/local/participant.dart';
 import '../model/connectors/local/project.dart';
+import '../model/instance.dart';
 import '../model/item.dart';
 import '../model/item_part.dart';
 import '../model/participant.dart';
 import '../model/project.dart';
 
-class SharedDatabase {
-  static final SharedDatabase instance = SharedDatabase._init();
+class SplitrDatabase {
+  static final SplitrDatabase instance = SplitrDatabase._init();
 
   static Database? _database;
 
-  SharedDatabase._init();
+  SplitrDatabase._init();
 
   Future<Database> get database async {
     if (_database != null) return _database!;
-    _database = await _initDB('shared.db');
+    _database = await _initDB('splitr.db');
 
     return _database!;
   }
diff --git a/lib/main.dart b/lib/main.dart
index 273c5ea..7bea1c5 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
-import 'package:shared/screens/setup_screen.dart';
 import 'model/app_data.dart';
 import 'screens/main_screen.dart';
+import 'screens/setup_screen.dart';
 import 'screens/splash_screen.dart';
 
 void main() async {
diff --git a/lib/model/app_data.dart b/lib/model/app_data.dart
index 7cb8977..7032217 100644
--- a/lib/model/app_data.dart
+++ b/lib/model/app_data.dart
@@ -1,14 +1,13 @@
 import 'package:app_links/app_links.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
-import 'package:shared/model/instance.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:sqflite/sqflite.dart';
 
-import '../db/shared_database.dart';
+import '../db/splitr_database.dart';
 import '../screens/main_screen.dart';
 import '../screens/new_project_screen.dart';
-import 'connectors/local/instance.dart';
+import 'instance.dart';
 import 'project.dart';
 
 class AppData {
@@ -48,7 +47,7 @@ class AppData {
   static init() async {
     hasBeenInit = true;
     sharedPreferences = await SharedPreferences.getInstance();
-    db = await SharedDatabase.instance.database;
+    db = await SplitrDatabase.instance.database;
 
     if (!sharedPreferences.containsKey("firstRun")) {
       firstRun = true;
@@ -95,7 +94,7 @@ class _NewProjectFromLink extends StatelessWidget {
   Widget build(BuildContext context) {
     return DynamicColorBuilder(builder: (lightColorScheme, darkColorScheme) {
       return MaterialApp(
-        title: 'Shared',
+        title: 'Splitr',
         theme: defaultTheme,
         darkTheme: defaultDarkTheme,
         themeMode: ThemeMode.system,
diff --git a/lib/model/bill_data.dart b/lib/model/bill_data.dart
index bf929cb..b223bf1 100644
--- a/lib/model/bill_data.dart
+++ b/lib/model/bill_data.dart
@@ -1,6 +1,6 @@
-import 'package:shared/model/item_part.dart';
-import 'package:shared/model/participant.dart';
-import 'package:shared/model/project.dart';
+import 'item_part.dart';
+import 'participant.dart';
+import 'project.dart';
 
 import 'item.dart';
 
@@ -78,12 +78,17 @@ shares: ${shares.entries.map((e) => "${e.key.pseudo}:${e.value}").join(",")}""";
       }
       item!.itemParts = [];
     }
-    shares.forEach((p, s) {
+    await item!.conn.save();
+    for (var a in shares.entries) {
+      Participant p = a.key;
+      BillPart s = a.value;
       if (s.fixed != null || s.share != null) {
-        item!.itemParts.add(ItemPart(
-            item: item!, participant: p, rate: s.share, amount: s.fixed));
+        ItemPart ip = ItemPart(
+            item: item!, participant: p, rate: s.share, amount: s.fixed);
+        item!.itemParts.add(ip);
+        await ip.conn.save();
       }
-    });
+    }
 
     return item!;
   }
diff --git a/lib/model/connectors/local/instance.dart b/lib/model/connectors/local/instance.dart
index 6cc21a9..aed5778 100644
--- a/lib/model/connectors/local/instance.dart
+++ b/lib/model/connectors/local/instance.dart
@@ -1,6 +1,5 @@
-import 'package:shared/model/instance.dart';
-
 import '../../app_data.dart';
+import '../../instance.dart';
 
 const String tableInstances = 'instances';
 
diff --git a/lib/model/connectors/local/participant.dart b/lib/model/connectors/local/participant.dart
index b9a9b55..9ef239f 100644
--- a/lib/model/connectors/local/participant.dart
+++ b/lib/model/connectors/local/participant.dart
@@ -1,7 +1,6 @@
-import 'package:shared/model/app_data.dart';
-import 'package:shared/model/connectors/local/deleted.dart';
-
+import '../../app_data.dart';
 import '../../participant.dart';
+import 'deleted.dart';
 
 const String tableParticipants = 'participants';
 
diff --git a/lib/model/connectors/local/project.dart b/lib/model/connectors/local/project.dart
index 680a9eb..5c1f97a 100644
--- a/lib/model/connectors/local/project.dart
+++ b/lib/model/connectors/local/project.dart
@@ -1,9 +1,8 @@
-import 'package:shared/model/connectors/local/deleted.dart';
-
 import '../../app_data.dart';
 import '../../item.dart';
 import '../../participant.dart';
 import '../../project.dart';
+import 'deleted.dart';
 import 'item.dart';
 import 'participant.dart';
 
diff --git a/lib/model/connectors/local/provider.dart b/lib/model/connectors/local/provider.dart
index 38d3e09..2b909d5 100644
--- a/lib/model/connectors/local/provider.dart
+++ b/lib/model/connectors/local/provider.dart
@@ -1,6 +1,5 @@
-import 'package:shared/model/project.dart';
-
 import '../../instance.dart';
+import '../../project.dart';
 import '../provider.dart';
 
 class LocalProvider extends Provider {
diff --git a/lib/model/connectors/pocketbase/item.dart b/lib/model/connectors/pocketbase/item.dart
index fc8347b..493165e 100644
--- a/lib/model/connectors/pocketbase/item.dart
+++ b/lib/model/connectors/pocketbase/item.dart
@@ -1,10 +1,10 @@
 import 'package:pocketbase/pocketbase.dart';
-import 'package:shared/model/connectors/external_connector.dart';
-import 'package:shared/model/connectors/pocketbase/deleted.dart';
-import 'package:shared/model/connectors/pocketbase/item_part.dart';
-import 'package:shared/model/project.dart';
 
 import '../../item.dart';
+import '../../project.dart';
+import '../external_connector.dart';
+import 'deleted.dart';
+import 'item_part.dart';
 
 class PocketBaseItemsFields {
   static const String id = "id";
diff --git a/lib/model/connectors/pocketbase/item_part.dart b/lib/model/connectors/pocketbase/item_part.dart
index 12153e5..6fb0c45 100644
--- a/lib/model/connectors/pocketbase/item_part.dart
+++ b/lib/model/connectors/pocketbase/item_part.dart
@@ -1,10 +1,10 @@
 import 'package:pocketbase/pocketbase.dart';
-import 'package:shared/model/connectors/external_connector.dart';
-import 'package:shared/model/connectors/pocketbase/deleted.dart';
-import 'package:shared/model/item_part.dart';
-import 'package:shared/model/project.dart';
 
 import '../../item.dart';
+import '../../item_part.dart';
+import '../../project.dart';
+import '../external_connector.dart';
+import 'deleted.dart';
 
 class PocketBaseItemPartsFields {
   static const String id = "id";
diff --git a/lib/model/connectors/pocketbase/participant.dart b/lib/model/connectors/pocketbase/participant.dart
index 2cae2d9..3fde740 100644
--- a/lib/model/connectors/pocketbase/participant.dart
+++ b/lib/model/connectors/pocketbase/participant.dart
@@ -1,9 +1,9 @@
 import 'package:pocketbase/pocketbase.dart';
-import 'package:shared/model/connectors/external_connector.dart';
-import 'package:shared/model/connectors/pocketbase/deleted.dart';
-import 'package:shared/model/project.dart';
 
 import '../../participant.dart';
+import '../../project.dart';
+import '../external_connector.dart';
+import 'deleted.dart';
 
 class PocketBaseParticipantFields {
   static const String id = "id";
diff --git a/lib/model/connectors/pocketbase/project.dart b/lib/model/connectors/pocketbase/project.dart
index 2a921df..c139ff2 100644
--- a/lib/model/connectors/pocketbase/project.dart
+++ b/lib/model/connectors/pocketbase/project.dart
@@ -1,9 +1,8 @@
 import 'package:pocketbase/pocketbase.dart';
-import 'package:shared/model/connectors/external_connector.dart';
-import 'package:shared/model/connectors/pocketbase/deleted.dart';
-import 'package:shared/screens/new_project_screen.dart';
 
 import '../../project.dart';
+import '../external_connector.dart';
+import 'deleted.dart';
 
 class PocketBaseProjectFields {
   static const String name = "name";
diff --git a/lib/model/connectors/pocketbase/provider.dart b/lib/model/connectors/pocketbase/provider.dart
index 5304da1..258d211 100644
--- a/lib/model/connectors/pocketbase/provider.dart
+++ b/lib/model/connectors/pocketbase/provider.dart
@@ -1,18 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:pocketbase/pocketbase.dart';
-import 'package:shared/model/connectors/local/deleted.dart';
-import 'package:shared/model/connectors/pocketbase/deleted.dart';
-import 'package:shared/model/connectors/pocketbase/item.dart';
-import 'package:shared/model/connectors/pocketbase/item_part.dart';
-import 'package:shared/model/connectors/pocketbase/participant.dart';
-import 'package:shared/model/connectors/pocketbase/project.dart';
-import 'package:shared/model/connectors/provider.dart';
-import 'package:shared/model/item.dart';
-import 'package:shared/model/item_part.dart';
-import 'package:shared/model/participant.dart';
 
 import '../../instance.dart';
+import '../../item.dart';
+import '../../item_part.dart';
+import '../../participant.dart';
 import '../../project.dart';
+import '../local/deleted.dart';
+import '../provider.dart';
+import 'deleted.dart';
+import 'item.dart';
+import 'item_part.dart';
+import 'participant.dart';
+import 'project.dart';
 
 class PocketBaseProvider extends Provider {
   PocketBaseProvider(Project project, Instance instance)
diff --git a/lib/model/connectors/provider.dart b/lib/model/connectors/provider.dart
index afa5a25..efa78f1 100644
--- a/lib/model/connectors/provider.dart
+++ b/lib/model/connectors/provider.dart
@@ -1,7 +1,6 @@
-import 'package:shared/model/connectors/local/provider.dart';
-import 'package:shared/model/instance.dart';
-import 'package:shared/model/project.dart';
-
+import '../instance.dart';
+import '../project.dart';
+import 'local/provider.dart';
 import 'pocketbase/provider.dart';
 
 abstract class Provider {
diff --git a/lib/model/item.dart b/lib/model/item.dart
index 4f0b36b..b527a12 100644
--- a/lib/model/item.dart
+++ b/lib/model/item.dart
@@ -1,6 +1,6 @@
-import 'package:shared/model/item_part.dart';
-import 'package:shared/model/participant.dart';
-import 'package:shared/model/project.dart';
+import 'item_part.dart';
+import 'participant.dart';
+import 'project.dart';
 
 import 'connectors/local/item.dart';
 
diff --git a/lib/model/item_part.dart b/lib/model/item_part.dart
index 416e104..87bf498 100644
--- a/lib/model/item_part.dart
+++ b/lib/model/item_part.dart
@@ -1,5 +1,5 @@
-import 'package:shared/model/participant.dart';
-import 'package:shared/model/item.dart';
+import 'participant.dart';
+import 'item.dart';
 
 import 'connectors/local/item_part.dart';
 
diff --git a/lib/model/participant.dart b/lib/model/participant.dart
index 1e2d6bd..bee2911 100644
--- a/lib/model/participant.dart
+++ b/lib/model/participant.dart
@@ -1,6 +1,5 @@
-import 'package:shared/model/project.dart';
-
 import 'connectors/local/participant.dart';
+import 'project.dart';
 
 class ParticipantFields {
   static const values = [
diff --git a/lib/model/project.dart b/lib/model/project.dart
index fa4e8c2..12a8303 100644
--- a/lib/model/project.dart
+++ b/lib/model/project.dart
@@ -1,12 +1,12 @@
-import 'package:shared/model/connectors/provider.dart';
-import 'package:shared/model/instance.dart';
-import 'package:shared/model/item_part.dart';
-import 'package:shared/screens/new_project_screen.dart';
 import 'package:tuple/tuple.dart';
 
+import '../screens/new_project_screen.dart';
 import 'app_data.dart';
 import 'connectors/local/project.dart';
+import 'connectors/provider.dart';
+import 'instance.dart';
 import 'item.dart';
+import 'item_part.dart';
 import 'participant.dart';
 
 class ProjectFields {
diff --git a/lib/screens/main_screen.dart b/lib/screens/main_screen.dart
index ae66067..8bf92b0 100644
--- a/lib/screens/main_screen.dart
+++ b/lib/screens/main_screen.dart
@@ -1,10 +1,10 @@
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
-import 'package:shared/components/pages/project/project_page.dart';
-import 'package:shared/model/app_data.dart';
-import 'package:shared/utils/colors.dart';
 
+import '../components/pages/project/project_page.dart';
 import '../components/pages/projects_list/projects_list_page.dart';
+import '../model/app_data.dart';
+import '../utils/colors.dart';
 
 final defaultLightColorScheme = ColorScheme.fromSwatch(
   primarySwatch: Colors.red,
@@ -40,7 +40,7 @@ class MainScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return DynamicColorBuilder(builder: (lightColorScheme, darkColorScheme) {
       return MaterialApp(
-        title: 'Shared',
+        title: 'Splitr',
         theme: defaultTheme,
         darkTheme: defaultDarkTheme,
         themeMode: ThemeMode.system,
diff --git a/lib/screens/new_project_screen.dart b/lib/screens/new_project_screen.dart
index 86f3b89..84f711c 100644
--- a/lib/screens/new_project_screen.dart
+++ b/lib/screens/new_project_screen.dart
@@ -2,16 +2,16 @@ import 'dart:math';
 
 import 'package:flutter/material.dart';
 import 'package:pocketbase/pocketbase.dart';
-import 'package:shared/model/connectors/pocketbase/provider.dart';
-import 'package:shared/model/connectors/provider.dart';
-import 'package:shared/model/instance.dart';
-import 'package:shared/model/project_data.dart';
-import 'package:shared/screens/new_screen.dart';
 
 import '../components/pages/new_project/new_project_page.dart';
 import '../model/app_data.dart';
+import '../model/connectors/pocketbase/provider.dart';
+import '../model/connectors/provider.dart';
+import '../model/instance.dart';
 import '../model/project.dart';
+import '../model/project_data.dart';
 import 'main_screen.dart';
+import 'new_screen.dart';
 
 class NewProjectScreen extends StatelessWidget {
   NewProjectScreen({
diff --git a/lib/screens/new_screen.dart b/lib/screens/new_screen.dart
index c7aefed..17c7f3f 100644
--- a/lib/screens/new_screen.dart
+++ b/lib/screens/new_screen.dart
@@ -11,7 +11,8 @@ class NewScreen extends StatelessWidget {
 
   String? title;
   Widget child;
-  void Function(BuildContext context, GlobalKey<FormState> formKey)? onValidate;
+  Future Function(BuildContext context, GlobalKey<FormState> formKey)?
+      onValidate;
   final GlobalKey<FormState> formKey = GlobalKey();
   String? buttonTitle;
 
@@ -48,7 +49,7 @@ class NewScreen extends StatelessWidget {
                       child: ElevatedButton(
                         onPressed: onValidate == null
                             ? null
-                            : () => onValidate!(context, formKey),
+                            : () async => await onValidate!(context, formKey),
                         child: Padding(
                           padding: const EdgeInsets.all(15.0),
                           child: Text(
diff --git a/lib/screens/setup_screen.dart b/lib/screens/setup_screen.dart
index 6e503b5..3e85285 100644
--- a/lib/screens/setup_screen.dart
+++ b/lib/screens/setup_screen.dart
@@ -11,7 +11,7 @@ class SetupScreen extends StatelessWidget {
   Widget build(BuildContext context) {
     return DynamicColorBuilder(builder: (lightColorScheme, darkColorScheme) {
       return MaterialApp(
-        title: 'Shared',
+        title: 'Splitr',
         theme: defaultTheme,
         darkTheme: defaultDarkTheme,
         themeMode: ThemeMode.system,
diff --git a/lib/screens/splash_screen.dart b/lib/screens/splash_screen.dart
index e17c188..f727f5a 100644
--- a/lib/screens/splash_screen.dart
+++ b/lib/screens/splash_screen.dart
@@ -20,7 +20,7 @@ class SplashScreen extends StatelessWidget {
         ),
         home: const Scaffold(
           body: Center(
-            child: Text("Starting up Shared ..."),
+            child: Text("Starting up Splitr ..."),
           ),
         ),
       );
diff --git a/pubspec.yaml b/pubspec.yaml
index a31e64b..c845f1e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
-name: shared
-description: Shared is a free and open-source app that lets you create multiple projects, add and track expenses, split expenses unevenly between members, and settle up balances between group members. It's a great alternative to other expense tracking apps, especially for groups who need to manage expenses together.
+name: splitr
+description: splitr is a free and open-source app that lets you create multiple projects, add and track expenses, split expenses unevenly between members, and settle up balances between group members. It's a great alternative to other expense tracking apps, especially for groups who need to manage expenses together.
 
 publish_to: 'none'