diff --git a/README.md b/README.md
index ebf3b1421a2607fc273f62218e45465cb46b8c27..c69748c2c88ffb3fffab2f693cf27ef2b19fdc4e 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,3 @@
-# better_untis
+# ontime
 
-A new Flutter project.
-
-## Getting Started
-
-This project is a starting point for a Flutter application.
-
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+It's time to ditch Untis.
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 245b62fff6d0b2ceb0dbfb157a8e17b314d71c27..3fee80da468827070474ea37482cae348e13baea 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -23,7 +23,7 @@ if (flutterVersionName == null) {
 }
 
 android {
-    namespace "com.doodlezucc.better_untis"
+    namespace "com.ontime.app"
     compileSdkVersion flutter.compileSdkVersion
     ndkVersion flutter.ndkVersion
 
@@ -42,7 +42,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.doodlezucc.better_untis"
+        applicationId "com.ontime.app"
         // You can update the following values to match your application needs.
         // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
         minSdkVersion flutter.minSdkVersion
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index a620bb0034e2ac35fbcbdc41c54d07776785a280..01377415806aff353dd5b2e0a602564b27034416 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
     <application
-        android:label="Better Untis"
+        android:label="onTime"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/android/app/src/main/kotlin/com/doodlezucc/better_untis/MainActivity.kt b/android/app/src/main/kotlin/com/ontime/app/MainActivity.kt
similarity index 72%
rename from android/app/src/main/kotlin/com/doodlezucc/better_untis/MainActivity.kt
rename to android/app/src/main/kotlin/com/ontime/app/MainActivity.kt
index 880c148d58e14ddb963bbbcb4199512daa0cd19b..bea7767f696efb7d49304b87a5d0000ee17734a7 100644
--- a/android/app/src/main/kotlin/com/doodlezucc/better_untis/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/ontime/app/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.doodlezucc.better_untis
+package com.ontime.app
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index 509be75e60c7a5a3fc6f7bbf2bef6646c1576010..049b09eecebd52021535e7b7138e539e9c9ac03d 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -367,7 +367,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -384,7 +384,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -402,7 +402,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -418,7 +418,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -545,7 +545,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -567,7 +567,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index c8afdbad160a4a3aa2e94ca3ed455091e01790f4..6ad4fa99433bc7f309e232cadc8cea714cabb259 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -5,7 +5,7 @@
 		<key>CFBundleDevelopmentRegion</key>
 		<string>$(DEVELOPMENT_LANGUAGE)</string>
 		<key>CFBundleDisplayName</key>
-		<string>Better Untis</string>
+		<string>onTime</string>
 		<key>CFBundleExecutable</key>
 		<string>$(EXECUTABLE_NAME)</string>
 		<key>CFBundleIdentifier</key>
@@ -13,7 +13,7 @@
 		<key>CFBundleInfoDictionaryVersion</key>
 		<string>6.0</string>
 		<key>CFBundleName</key>
-		<string>Better Untis</string>
+		<string>onTime</string>
 		<key>CFBundlePackageType</key>
 		<string>APPL</string>
 		<key>CFBundleShortVersionString</key>
diff --git a/lib/branding.dart b/lib/branding.dart
index cfdb250ecb7114490bf29a63358448687b70c636..a7cb6a78ecbf83bf8fdb66cb088f0535377fedda 100644
--- a/lib/branding.dart
+++ b/lib/branding.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 
-const appName = 'Better Untis';
+const appName = 'onTime';
 // final scheme = ColorScheme.fromSwatch(primarySwatch: Colors.blue);
 final scheme = ColorScheme.fromSeed(seedColor: Colors.pink);
 const passedTimeOverlayColor = Colors.black26;
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index f9cb06bab9ebbec3d4f8ccc1ef26e6a6050ce9ed..cb26e818a612c0995f6b28f5754c8328919536d9 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -4,10 +4,10 @@ project(runner LANGUAGES CXX)
 
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
-set(BINARY_NAME "Better Untis")
+set(BINARY_NAME "onTime")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "com.doodlezucc.better_untis")
+set(APPLICATION_ID "com.ontime.app")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.
diff --git a/linux/my_application.cc b/linux/my_application.cc
index 2b0f666e7d6e256251bbbef242d239184cc70059..40a1a327e0762c3483c27f480d0194fb3aaa9ffc 100644
--- a/linux/my_application.cc
+++ b/linux/my_application.cc
@@ -45,13 +45,13 @@ static void my_application_activate(GApplication *application)
   {
     GtkHeaderBar *header_bar = GTK_HEADER_BAR(gtk_header_bar_new());
     gtk_widget_show(GTK_WIDGET(header_bar));
-    gtk_header_bar_set_title(header_bar, "Better Untis");
+    gtk_header_bar_set_title(header_bar, "onTime");
     gtk_header_bar_set_show_close_button(header_bar, TRUE);
     gtk_window_set_titlebar(window, GTK_WIDGET(header_bar));
   }
   else
   {
-    gtk_window_set_title(window, "Better Untis");
+    gtk_window_set_title(window, "onTime");
   }
 
   gtk_window_set_default_size(window, 1280, 720);
diff --git a/macos/Runner.xcodeproj/project.pbxproj b/macos/Runner.xcodeproj/project.pbxproj
index c62f8a23bae7275c198d1fd26f1f7fd57f546d5b..ddaa1acb45044d2fd05366954aa462a8f968e4de 100644
--- a/macos/Runner.xcodeproj/project.pbxproj
+++ b/macos/Runner.xcodeproj/project.pbxproj
@@ -64,7 +64,7 @@
 		331C80D7294CF71000263BE5 /* RunnerTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RunnerTests.swift; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* better_untis.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "better_untis.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* ontime.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ontime.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -131,7 +131,7 @@
 		33CC10EE2044A3C60003C045 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				33CC10ED2044A3C60003C045 /* better_untis.app */,
+				33CC10ED2044A3C60003C045 /* ontime.app */,
 				331C80D5294CF71000263BE5 /* RunnerTests.xctest */,
 			);
 			name = Products;
@@ -217,7 +217,7 @@
 			);
 			name = Runner;
 			productName = Runner;
-			productReference = 33CC10ED2044A3C60003C045 /* better_untis.app */;
+			productReference = 33CC10ED2044A3C60003C045 /* ontime.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -384,10 +384,10 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/better_untis.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/better_untis";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ontime.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ontime";
 			};
 			name = Debug;
 		};
@@ -398,10 +398,10 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/better_untis.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/better_untis";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ontime.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ontime";
 			};
 			name = Release;
 		};
@@ -412,10 +412,10 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/better_untis.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/better_untis";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/ontime.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/ontime";
 			};
 			name = Profile;
 		};
diff --git a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
index 94c1c65b83d705011bcff12e5085fcfde3388fba..fe61c30ad61b1f72ed58715fb62282f2a7dbe93f 100644
--- a/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
+++ b/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-               BuildableName = "better_untis.app"
+               BuildableName = "ontime.app"
                BlueprintName = "Runner"
                ReferencedContainer = "container:Runner.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "better_untis.app"
+            BuildableName = "ontime.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -65,7 +65,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "better_untis.app"
+            BuildableName = "ontime.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
@@ -82,7 +82,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "33CC10EC2044A3C60003C045"
-            BuildableName = "better_untis.app"
+            BuildableName = "ontime.app"
             BlueprintName = "Runner"
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
diff --git a/macos/Runner/Configs/AppInfo.xcconfig b/macos/Runner/Configs/AppInfo.xcconfig
index 4b8398be4d32de9908bf6e76b5691fb47c799327..dca45cb249f3a7a5afaea0d3a8a296b39536416d 100644
--- a/macos/Runner/Configs/AppInfo.xcconfig
+++ b/macos/Runner/Configs/AppInfo.xcconfig
@@ -5,10 +5,10 @@
 // 'flutter create' template.
 
 // The application's name. By default this is also the title of the Flutter window.
-PRODUCT_NAME = Better Untis
+PRODUCT_NAME = onTime
 
 // The application's bundle identifier
-PRODUCT_BUNDLE_IDENTIFIER = com.doodlezucc.betterUntis
+PRODUCT_BUNDLE_IDENTIFIER = com.ontime.app
 
 // The copyright displayed in application information
 PRODUCT_COPYRIGHT = Copyright © 2023 doodlezucc. All rights reserved.
diff --git a/pubspec.lock b/pubspec.lock
index 96d9efb5495e74370e0967b0e14f68244d2029de..6e20477e7a2f05451343ec57b94f83ddedff0f1e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -5,50 +5,50 @@ packages:
     dependency: transitive
     description:
       name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
       url: "https://pub.dev"
     source: hosted
-    version: "2.11.0"
+    version: "2.13.0"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   characters:
     dependency: transitive
     description:
       name: characters
-      sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
+      sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.0"
+    version: "1.4.0"
   clock:
     dependency: transitive
     description:
       name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
       url: "https://pub.dev"
     source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
   collection:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "1.19.1"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
       url: "https://pub.dev"
     source: hosted
-    version: "1.3.1"
+    version: "1.3.3"
   ffi:
     dependency: transitive
     description:
@@ -75,6 +75,30 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  leak_tracker:
+    dependency: transitive
+    description:
+      name: leak_tracker
+      sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
+      url: "https://pub.dev"
+    source: hosted
+    version: "10.0.9"
+  leak_tracker_flutter_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_flutter_testing
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.9"
+  leak_tracker_testing:
+    dependency: transitive
+    description:
+      name: leak_tracker_testing
+      sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.0.1"
   lints:
     dependency: transitive
     description:
@@ -87,34 +111,34 @@ packages:
     dependency: transitive
     description:
       name: matcher
-      sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
+      sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
       url: "https://pub.dev"
     source: hosted
-    version: "0.12.16"
+    version: "0.12.17"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
+      sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.0"
+    version: "0.11.1"
   meta:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.16.0"
   path:
     dependency: "direct main"
     description:
       name: path
-      sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
       url: "https://pub.dev"
     source: hosted
-    version: "1.8.3"
+    version: "1.9.1"
   path_provider:
     dependency: "direct main"
     description:
@@ -183,55 +207,55 @@ packages:
     dependency: transitive
     description: flutter
     source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
+      sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
       url: "https://pub.dev"
     source: hosted
-    version: "1.10.0"
+    version: "1.10.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.12.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.4"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.0"
+    version: "1.4.1"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
+      sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.1"
+    version: "1.2.2"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "0.7.4"
   text_search:
     dependency: "direct main"
     description:
@@ -256,14 +280,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.4"
-  web:
+  vm_service:
     dependency: transitive
     description:
-      name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      name: vm_service
+      sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "15.0.0"
   win32:
     dependency: transitive
     description:
@@ -281,5 +305,5 @@ packages:
     source: hosted
     version: "1.0.3"
 sdks:
-  dart: ">=3.1.0 <4.0.0"
-  flutter: ">=3.7.0"
+  dart: ">=3.7.0-0 <4.0.0"
+  flutter: ">=3.18.0-18.0.pre.54"
diff --git a/pubspec.yaml b/pubspec.yaml
index 306585b37809446a13c48421a6b3f1e3aa079e3d..3cc5a5f4bd640c62a545dfee4888199c45981e69 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,4 +1,4 @@
-name: better_untis
+name: ontime
 description: A new Flutter project.
 publish_to: none
 
diff --git a/test/simultaneous_test.dart b/test/simultaneous_test.dart
index 2774266c501209d997553d29948a6f7388afe67f..414370c68f1e8a8ff198a0b62f6832535ecb7d1a 100644
--- a/test/simultaneous_test.dart
+++ b/test/simultaneous_test.dart
@@ -1,5 +1,5 @@
-import 'package:better_untis/util/simultaneous.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:ontime/util/simultaneous.dart';
 
 void main() {
   test('No overlap', () {
diff --git a/test/start_of_datetime_test.dart b/test/start_of_datetime_test.dart
index 5fee05919dfc9ecc6bb0d0b45cd3d72827bf49bf..1494d4cc52b2d60c88f41a5e47f92113ba01e539 100644
--- a/test/start_of_datetime_test.dart
+++ b/test/start_of_datetime_test.dart
@@ -1,5 +1,5 @@
-import 'package:better_untis/util/date_extension.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:ontime/util/date_extension.dart';
 
 void main() {
   final startOfMonday = DateTime(2023, 3, 20, 0, 0);
diff --git a/test/untis_test.dart b/test/untis_test.dart
index 7458576f2fefa22feaf70875203a448d82fc24df..919a1b1b38632d4b91ab5347ea59d66760f16665 100644
--- a/test/untis_test.dart
+++ b/test/untis_test.dart
@@ -1,6 +1,6 @@
-import 'package:better_untis/untis/element_type.dart';
-import 'package:better_untis/untis/fetch.dart';
 import 'package:flutter_test/flutter_test.dart';
+import 'package:ontime/untis/element_type.dart';
+import 'package:ontime/untis/fetch.dart';
 
 void main() {
   test('Basic Untis call', () async {
diff --git a/web/index.html b/web/index.html
index f0dd9c21a8296c0d92be40507c7e3eb73fa50499..d386dc039f41828a4b882300a43193ce5105d785 100644
--- a/web/index.html
+++ b/web/index.html
@@ -23,13 +23,13 @@
   <!-- iOS meta tags & icons -->
   <meta name="apple-mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="Better Untis">
+  <meta name="apple-mobile-web-app-title" content="onTime">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
 
   <!-- Favicon -->
   <link rel="icon" type="image/png" href="favicon.png"/>
 
-  <title>Better Untis</title>
+  <title>onTime</title>
   <link rel="manifest" href="manifest.json">
 
   <script>
diff --git a/web/manifest.json b/web/manifest.json
index b7c5ca211e1e851eb3f04973b6ee89ce6c0e0b7c..d79fa47f59f1bf05ed2a0de30cc2fc66cf41a86e 100644
--- a/web/manifest.json
+++ b/web/manifest.json
@@ -1,35 +1,35 @@
 {
-    "name": "Better Untis",
-    "short_name": "Better Untis",
-    "start_url": ".",
-    "display": "standalone",
-    "background_color": "#0175C2",
-    "theme_color": "#0175C2",
-    "description": "A new Flutter project.",
-    "orientation": "portrait-primary",
-    "prefer_related_applications": false,
-    "icons": [
-        {
-            "src": "icons/Icon-192.png",
-            "sizes": "192x192",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-512.png",
-            "sizes": "512x512",
-            "type": "image/png"
-        },
-        {
-            "src": "icons/Icon-maskable-192.png",
-            "sizes": "192x192",
-            "type": "image/png",
-            "purpose": "maskable"
-        },
-        {
-            "src": "icons/Icon-maskable-512.png",
-            "sizes": "512x512",
-            "type": "image/png",
-            "purpose": "maskable"
-        }
-    ]
+  "name": "onTime",
+  "short_name": "onTime",
+  "start_url": ".",
+  "display": "standalone",
+  "background_color": "#0175C2",
+  "theme_color": "#0175C2",
+  "description": "A new Flutter project.",
+  "orientation": "portrait-primary",
+  "prefer_related_applications": false,
+  "icons": [
+    {
+      "src": "icons/Icon-192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "icons/Icon-512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    },
+    {
+      "src": "icons/Icon-maskable-192.png",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "maskable"
+    },
+    {
+      "src": "icons/Icon-maskable-512.png",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
+    }
+  ]
 }
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
index c8e8073b7bd1f12edf4bdffc4f458ddcdf906c64..f7d9f65fc925592e5f91a80bfe622369ce48a7a5 100644
--- a/windows/CMakeLists.txt
+++ b/windows/CMakeLists.txt
@@ -1,10 +1,10 @@
 # Project-level configuration.
 cmake_minimum_required(VERSION 3.14)
-project(better_untis LANGUAGES CXX)
+project(ontime LANGUAGES CXX)
 
 # The name of the executable created for the application. Change this to change
 # the on-disk name of your application.
-set(BINARY_NAME "BetterUntis")
+set(BINARY_NAME "onTime")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.
diff --git a/windows/runner/Runner.rc b/windows/runner/Runner.rc
index 99f0efb7bf99edbc048865f0b8bd6f8d6778f426..9745257249d81082defa1839df3489cfd9ef165a 100644
--- a/windows/runner/Runner.rc
+++ b/windows/runner/Runner.rc
@@ -90,12 +90,12 @@ BEGIN
         BLOCK "040904e4"
         BEGIN
             VALUE "CompanyName", "com.doodlezucc" "\0"
-            VALUE "FileDescription", "Better Untis" "\0"
+            VALUE "FileDescription", "onTime" "\0"
             VALUE "FileVersion", VERSION_AS_STRING "\0"
-            VALUE "InternalName", "better_untis" "\0"
+            VALUE "InternalName", "ontime" "\0"
             VALUE "LegalCopyright", "Copyright (C) 2023 com.doodlezucc. All rights reserved." "\0"
-            VALUE "OriginalFilename", "BetterUntis.exe" "\0"
-            VALUE "ProductName", "Better Untis" "\0"
+            VALUE "OriginalFilename", "onTime.exe" "\0"
+            VALUE "ProductName", "onTime" "\0"
             VALUE "ProductVersion", VERSION_AS_STRING "\0"
         END
     END
diff --git a/windows/runner/main.cpp b/windows/runner/main.cpp
index 3d5125acdd169ecdabf7b630ff10e93cccdb4d89..b3cc93afa0126f7286335f01ece958759497eea0 100644
--- a/windows/runner/main.cpp
+++ b/windows/runner/main.cpp
@@ -29,7 +29,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev,
   FlutterWindow window(project);
   Win32Window::Point origin(10, 10);
   Win32Window::Size size(1280, 720);
-  if (!window.Create(L"Better Untis", origin, size))
+  if (!window.Create(L"onTime", origin, size))
   {
     return EXIT_FAILURE;
   }