diff --git a/Haltestellenmonitor1-DD.xcodeproj/project.pbxproj b/Haltestellenmonitor1-DD.xcodeproj/project.pbxproj
index d673b7a..c4f3016 100644
--- a/Haltestellenmonitor1-DD.xcodeproj/project.pbxproj
+++ b/Haltestellenmonitor1-DD.xcodeproj/project.pbxproj
@@ -190,6 +190,7 @@
 		D0D1998229F40C4B00946D87 /* StopRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D1998129F40C4B00946D87 /* StopRow.swift */; };
 		D0D1998929F412DF00946D87 /* DepartureView.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D1998829F412DF00946D87 /* DepartureView.swift */; };
 		D0D1998B29F414BD00946D87 /* DepartureRow.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0D1998A29F414BD00946D87 /* DepartureRow.swift */; };
+		F1520EE32AE96E5A001E3E05 /* widgetLocationManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1520EE12AE96E5A001E3E05 /* widgetLocationManager.swift */; };
 		F19FC6EE2AE9974C00F65316 /* ColorManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F19FC6ED2AE9974C00F65316 /* ColorManager.swift */; };
 		F1A7E7CB2AEA988C00E1910F /* TripSectionViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A7E7CA2AEA988C00E1910F /* TripSectionViewModel.swift */; };
 		F1BC367D2BC3E16100629780 /* MotColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1BC367C2BC3E16100629780 /* MotColors.swift */; };
@@ -347,6 +348,7 @@
 		D0D1998129F40C4B00946D87 /* StopRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StopRow.swift; sourceTree = "<group>"; };
 		D0D1998829F412DF00946D87 /* DepartureView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DepartureView.swift; sourceTree = "<group>"; };
 		D0D1998A29F414BD00946D87 /* DepartureRow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DepartureRow.swift; sourceTree = "<group>"; };
+		F1520EE12AE96E5A001E3E05 /* widgetLocationManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = widgetLocationManager.swift; sourceTree = "<group>"; };
 		F19FC6ED2AE9974C00F65316 /* ColorManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorManager.swift; sourceTree = "<group>"; };
 		F1A7E7CA2AEA988C00E1910F /* TripSectionViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TripSectionViewModel.swift; sourceTree = "<group>"; };
 		F1BC367C2BC3E16100629780 /* MotColors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MotColors.swift; sourceTree = "<group>"; };
@@ -572,6 +574,7 @@
 		D0BD668629EFE0AA004E574C /* MonitorWidget */ = {
 			isa = PBXGroup;
 			children = (
+				F1520EE02AE96E2C001E3E05 /* Managers */,
 				D0BD66C629EFF621004E574C /* Models */,
 				D0BD669929EFE169004E574C /* Views */,
 				D0BD668729EFE0AA004E574C /* MonitorWidgetBundle.swift */,
@@ -662,6 +665,14 @@
 			path = Rows;
 			sourceTree = "<group>";
 		};
+		F1520EE02AE96E2C001E3E05 /* Managers */ = {
+			isa = PBXGroup;
+			children = (
+				F1520EE12AE96E5A001E3E05 /* widgetLocationManager.swift */,
+			);
+			path = Managers;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -764,7 +775,7 @@
 			attributes = {
 				BuildIndependentTargetsInParallel = 1;
 				LastSwiftUpdateCheck = 1430;
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1540;
 				TargetAttributes = {
 					D00059C12A52F3800007468A = {
 						CreatedOnToolsVersion = 14.3.1;
@@ -943,6 +954,7 @@
 				D0C1ECC929F28C2F001D214D /* TripAttributes.swift in Sources */,
 				D0142C3B2A0F90AA00646C94 /* DepartureBinding.swift in Sources */,
 				D0BD66EF29F03C0D004E574C /* PartialRoute.swift in Sources */,
+				F1520EE32AE96E5A001E3E05 /* widgetLocationManager.swift in Sources */,
 				D0BD66A129EFEA0D004E574C /* DepartureStatus.swift in Sources */,
 				D0BD669E29EFEA03004E574C /* Stop.swift in Sources */,
 				D0BD66C229EFEF0F004E574C /* DateParser.swift in Sources */,
@@ -1105,10 +1117,10 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.hanashi.Haltestellenmonitor1-DDTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -1123,10 +1135,10 @@
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				GENERATE_INFOPLIST_FILE = YES;
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "dev.hanashi.Haltestellenmonitor1-DDTests";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
@@ -1140,6 +1152,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -1172,6 +1185,7 @@
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -1200,6 +1214,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
@@ -1232,6 +1247,8 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				ENABLE_USER_SCRIPT_SANDBOXING = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				GCC_NO_COMMON_BLOCKS = YES;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -1258,7 +1275,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "Haltestellenmonitor1-DD/Haltestellenmonitor1-DD.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "\"Haltestellenmonitor1-DD/Preview Content\"";
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				ENABLE_PREVIEWS = YES;
@@ -1274,11 +1291,12 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "eu.Hanashi.Haltestellenmonitor1-DD";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1295,7 +1313,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_ENTITLEMENTS = "Haltestellenmonitor1-DD/Haltestellenmonitor1-DD.entitlements";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "\"Haltestellenmonitor1-DD/Preview Content\"";
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				ENABLE_PREVIEWS = YES;
@@ -1311,11 +1329,12 @@
 				INFOPLIST_KEY_UILaunchScreen_Generation = YES;
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "eu.Hanashi.Haltestellenmonitor1-DD";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1331,19 +1350,20 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = MonitorWidgetExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = MonitorWidget/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = MonitorWidget;
 				INFOPLIST_KEY_NSHumanReadableCopyright = "";
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Der Standort wird verwendet um den Abstand zur nächsten Haltestelle zu berechnen.";
+				IPHONEOS_DEPLOYMENT_TARGET = 16.4;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "eu.Hanashi.Haltestellenmonitor1-DD.MonitorWidget";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1361,7 +1381,7 @@
 				ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
 				CODE_SIGN_ENTITLEMENTS = MonitorWidgetExtension.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = MonitorWidget/Info.plist;
@@ -1373,7 +1393,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "eu.Hanashi.Haltestellenmonitor1-DD.MonitorWidget";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1389,7 +1409,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = MonitorIntents/MonitorIntents.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = MonitorIntents/Info.plist;
@@ -1401,7 +1421,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "eu.Hanashi.Haltestellenmonitor1-DD.MonitorIntents";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1417,7 +1437,7 @@
 			buildSettings = {
 				CODE_SIGN_ENTITLEMENTS = MonitorIntents/MonitorIntents.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = MonitorIntents/Info.plist;
@@ -1429,7 +1449,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "eu.Hanashi.Haltestellenmonitor1-DD.MonitorIntents";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -1446,7 +1466,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "\"WatchMonitor Watch App/Preview Content\"";
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				ENABLE_PREVIEWS = YES;
@@ -1454,11 +1474,12 @@
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Der Standort wird verwendet um den Abstand zur nächsten Haltestelle zu berechnen.";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "eu.Hanashi.Haltestellenmonitor1-DD";
+				INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "eu.Hanashi.Haltestellenmonitor1-DD.watchkitapp";
 				PRODUCT_NAME = "Haltestellenmonitor Dresden";
 				SDKROOT = watchos;
@@ -1476,7 +1497,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_ASSET_PATHS = "\"WatchMonitor Watch App/Preview Content\"";
 				DEVELOPMENT_TEAM = WGL37RNHJ6;
 				ENABLE_PREVIEWS = YES;
@@ -1484,11 +1505,12 @@
 				INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Der Standort wird verwendet um den Abstand zur nächsten Haltestelle zu berechnen.";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = "eu.Hanashi.Haltestellenmonitor1-DD";
+				INFOPLIST_KEY_WKRunsIndependentlyOfCompanionApp = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.1;
+				MARKETING_VERSION = 2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = "eu.Hanashi.Haltestellenmonitor1-DD.watchkitapp";
 				PRODUCT_NAME = "Haltestellenmonitor Dresden";
 				SDKROOT = watchos;
diff --git a/Haltestellenmonitor1-DD.xcodeproj/xcshareddata/xcschemes/MonitorWidgetExtension.xcscheme b/Haltestellenmonitor1-DD.xcodeproj/xcshareddata/xcschemes/MonitorWidgetExtension.xcscheme
new file mode 100644
index 0000000..86aaf0e
--- /dev/null
+++ b/Haltestellenmonitor1-DD.xcodeproj/xcshareddata/xcschemes/MonitorWidgetExtension.xcscheme
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   wasCreatedForAppExtension = "YES"
+   version = "2.0">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "NO"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D0BD668229EFE0AA004E574C"
+               BuildableName = "MonitorWidgetExtension.appex"
+               BlueprintName = "MonitorWidgetExtension"
+               ReferencedContainer = "container:Haltestellenmonitor1-DD.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D03A267E29EEB6C9005B0600"
+               BuildableName = "Haltestellenmonitor1-DD.app"
+               BlueprintName = "Haltestellenmonitor1-DD"
+               ReferencedContainer = "container:Haltestellenmonitor1-DD.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = ""
+      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      launchStyle = "0"
+      askForAppToLaunch = "Yes"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES"
+      launchAutomaticallySubstyle = "2"
+      consoleMode = "0"
+      structuredConsoleMode = "1">
+      <RemoteRunnable
+         runnableDebuggingMode = "2"
+         BundleIdentifier = "com.apple.springboard">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D0BD668229EFE0AA004E574C"
+            BuildableName = "MonitorWidgetExtension.appex"
+            BlueprintName = "MonitorWidgetExtension"
+            ReferencedContainer = "container:Haltestellenmonitor1-DD.xcodeproj">
+         </BuildableReference>
+      </RemoteRunnable>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D03A267E29EEB6C9005B0600"
+            BuildableName = "Haltestellenmonitor1-DD.app"
+            BlueprintName = "Haltestellenmonitor1-DD"
+            ReferencedContainer = "container:Haltestellenmonitor1-DD.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <EnvironmentVariables>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = ""
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetDefaultView"
+            value = "timeline"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetFamily"
+            value = "systemMedium"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+         <EnvironmentVariable
+            key = "_XCWidgetKind"
+            value = "MonitorWidget"
+            isEnabled = "YES">
+         </EnvironmentVariable>
+      </EnvironmentVariables>
+      <LocationScenarioReference
+         identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
+         referenceType = "1">
+      </LocationScenarioReference>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
+      launchAutomaticallySubstyle = "2">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D03A267E29EEB6C9005B0600"
+            BuildableName = "Haltestellenmonitor1-DD.app"
+            BlueprintName = "Haltestellenmonitor1-DD"
+            ReferencedContainer = "container:Haltestellenmonitor1-DD.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/Haltestellenmonitor1-DD.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist b/Haltestellenmonitor1-DD.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
index 4873383..7233ad1 100644
--- a/Haltestellenmonitor1-DD.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Haltestellenmonitor1-DD.xcodeproj/xcuserdata/peter.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -12,12 +12,12 @@
 		<key>MonitorIntents.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>2</integer>
+			<integer>1</integer>
 		</dict>
 		<key>MonitorWidgetExtension.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>WatchMonitor Watch App.xcscheme_^#shared#^_</key>
 		<dict>
diff --git a/Haltestellenmonitor1-DD/Models/FavoriteStop.swift b/Haltestellenmonitor1-DD/Models/FavoriteStop.swift
index 9ea36cb..8e48372 100644
--- a/Haltestellenmonitor1-DD/Models/FavoriteStop.swift
+++ b/Haltestellenmonitor1-DD/Models/FavoriteStop.swift
@@ -11,7 +11,7 @@ import Foundation
     @Published var favorites: [Int]
     
     init() {
-        if let data = UserDefaults(suiteName: "group.dev.hanashi.Haltestellenmonitor")?.data(forKey: "FavoriteStops") {
+        if let data = UserDefaults(suiteName: "group.eu.hanashi.Haltestellenmonitor")?.data(forKey: "FavoriteStops") {
             if let decoded = try? JSONDecoder().decode([Int].self, from: data) {
                 favorites = decoded
                 return
@@ -48,7 +48,12 @@ import Foundation
     
     func save() {
         if let encoded = try? JSONEncoder().encode(favorites) {
-            UserDefaults(suiteName: "group.dev.hanashi.Haltestellenmonitor")?.set(encoded, forKey: "FavoriteStops")
+            UserDefaults(suiteName: "group.eu.hanashi.Haltestellenmonitor")?.set(encoded, forKey: "FavoriteStops")
         }
+        // fürs Widget
+        
+        let sharedUserDefaults = UserDefaults(suiteName: "group.eu.hanashi.Haltestellenmonitor")
+        sharedUserDefaults?.set(favorites, forKey: "WidgetFavs")
+
     }
 }
diff --git a/Haltestellenmonitor1-DD/Views/ConnectionView.swift b/Haltestellenmonitor1-DD/Views/ConnectionView.swift
index edd5fd3..c77fbb2 100644
--- a/Haltestellenmonitor1-DD/Views/ConnectionView.swift
+++ b/Haltestellenmonitor1-DD/Views/ConnectionView.swift
@@ -253,6 +253,7 @@ struct ConnectionView: View {
         request.httpMethod = "POST"
         request.httpBody = try? JSONEncoder().encode(requestData)
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Haltestellenmonitor Dresden v2", forHTTPHeaderField: "User-Agent")
 
         do {
             let (content, _) = try await URLSession.shared.data(for: request)
diff --git a/Haltestellenmonitor1-DD/Views/DepartureView.swift b/Haltestellenmonitor1-DD/Views/DepartureView.swift
index f0f4a24..bbe8bc9 100644
--- a/Haltestellenmonitor1-DD/Views/DepartureView.swift
+++ b/Haltestellenmonitor1-DD/Views/DepartureView.swift
@@ -147,6 +147,7 @@ struct DepartureView: View {
         request.httpMethod = "POST"
         request.httpBody = try? JSONEncoder().encode(DepartureRequest(stopid: String(stop.stopId), time: dateTime.ISO8601Format()))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Haltestellenmonitor Dresden v2", forHTTPHeaderField: "User-Agent")
         
         do {
             let (content, _) = try await URLSession.shared.data(for: request)
@@ -210,6 +211,7 @@ struct DepartureView: View {
         request.httpMethod = "POST"
         request.httpBody = try? JSONEncoder().encode(ActivityRequest(token: token, stopID: String(stop.stopId), tripID: departure.Id, time: departure.getDateTime().ISO8601Format(), scheduledTime: departure.ScheduledTime, realTime: departure.RealTime))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Haltestellenmonitor Dresden v2", forHTTPHeaderField: "User-Agent")
 
         let task = URLSession.shared.dataTask(with: request) {(data, response, error) in
             guard error == nil else {
diff --git a/Haltestellenmonitor1-DD/Views/SingleTripView.swift b/Haltestellenmonitor1-DD/Views/SingleTripView.swift
index e035d18..b3b7195 100644
--- a/Haltestellenmonitor1-DD/Views/SingleTripView.swift
+++ b/Haltestellenmonitor1-DD/Views/SingleTripView.swift
@@ -87,6 +87,7 @@ struct SingleTripView: View {
         request.httpMethod = "POST"
         request.httpBody = try? JSONEncoder().encode(SingleTripRequest(stopID: String(stop.stopId), tripID: departure.Id, time: departure.getDateTime().ISO8601Format()))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Haltestellenmonitor Dresden v2", forHTTPHeaderField: "User-Agent")
         
         do {
             let (content, _) = try await URLSession.shared.data(for: request)
@@ -141,6 +142,7 @@ struct SingleTripView: View {
         request.httpMethod = "POST"
         request.httpBody = try? JSONEncoder().encode(ActivityRequest(token: token, stopID: String(stop.stopId), tripID: departure.Id, time: departure.getDateTime().ISO8601Format(), scheduledTime: departure.ScheduledTime, realTime: departure.RealTime))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Haltestellenmonitor Dresden v2", forHTTPHeaderField: "User-Agent")
 
         let task = URLSession.shared.dataTask(with: request) {(data, response, error) in
             guard error == nil else {
diff --git a/MonitorWidget/Info.plist b/MonitorWidget/Info.plist
index 0f118fb..eed247e 100644
--- a/MonitorWidget/Info.plist
+++ b/MonitorWidget/Info.plist
@@ -2,6 +2,16 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>NSLocationUsageDescription</key>
+	<string>Um Dir stets die nächste favorisierte Haltestelle anzuzeigen, benötigen wir Zugriff auf Standortdaten.</string>
+	<key>CFBundleIdentifier</key>
+	<string></string>
+	<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
+	<string>Um Dir stets die nächste favorisierte Haltestelle anzuzeigen, benötigen wir Zugriff auf Standortdaten.</string>
+	<key>NSLocationWhenInUseUsageDescription</key>
+	<string>Um Dir stets die nächste favorisierte Haltestelle anzuzeigen, benötigen wir Zugriff auf Standortdaten.</string>
+	<key>NSWidgetWantsLocation</key>
+	<true/>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>
diff --git a/MonitorWidget/Managers/widgetLocationManager.swift b/MonitorWidget/Managers/widgetLocationManager.swift
new file mode 100644
index 0000000..de68ae7
--- /dev/null
+++ b/MonitorWidget/Managers/widgetLocationManager.swift
@@ -0,0 +1,49 @@
+//
+//  widgetLocationManager.swift
+//  Haltestellenmonitor1-DD
+//
+//  Created by Tom Braune on 03.11.23
+//  Credit to https://github.com/AKORA-Studios for helping with the LocationManager
+//
+
+import Foundation
+import CoreLocation
+
+class WidgetLocationManager: NSObject, CLLocationManagerDelegate {
+    var locationManager = CLLocationManager()
+    
+    private var handler: ((CLLocation) -> Void)?
+    private var completion: ((CLLocation) -> Void)? = nil
+
+    @Published var llocation: CLLocation?
+
+    override init() {
+        super.init()
+        self.locationManager.delegate = self
+        DispatchQueue.main.async {
+            if self.locationManager.authorizationStatus == .notDetermined {
+                self.locationManager.requestWhenInUseAuthorization()
+            }
+        }
+    }
+
+    func fetchLocation(completion: @escaping (CLLocation) -> Void) async {
+        self.completion = completion
+        locationManager.requestLocation()
+    }
+
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        guard let location = locations.first else { return }
+
+        self.llocation = location
+                
+        if (completion != nil) {
+            completion!(location)
+            completion = nil
+        }
+    }
+
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+            print("MonitorWidgetLocationManagerError ", error)
+    }
+}
diff --git a/MonitorWidget/Models/MonitorEntry.swift b/MonitorWidget/Models/MonitorEntry.swift
index cef5439..dce1b38 100644
--- a/MonitorWidget/Models/MonitorEntry.swift
+++ b/MonitorWidget/Models/MonitorEntry.swift
@@ -3,27 +3,36 @@
 //  MonitorWidgetExtension
 //
 //  Created by Peter Lohse on 19.04.23.
+//  Modified by Tom Braune on 03.11.23.
 //
 
 import WidgetKit
 import SwiftUI
 import Intents
+import CoreLocation
+import MapKit
 
 struct MonitorEntry: TimelineEntry {
     let date: Date
     let configuration: ConfigurationIntent
     let departureMonitor: DepartureMonitor?
+    let widgetLocationManager = WidgetLocationManager()
     
-    func getStopID() -> String {
+    func getStopID(Name : String) -> String {
+        if Name == "_" {
+            return configuration.stopType?.identifier ?? "33000028"
+        }
+        
+        // Retriving the stopID by the Stops' name
+        let stop = stops.first(where: { String($0.name) == Name })
+        
+        if stop != nil {
+            return String(stop!.stopId)
+        }
+        
         return configuration.stopType?.identifier ?? "33000028"
     }
     
-    func getStopName() -> String {
-        let stopID = self.getStopID()
-        let stop = stops.first(where: { String($0.stopId) == stopID })
-        return stop?.name ?? "Unbekannt"
-    }
-    
     func getLineFilters() -> [String]? {
         if (configuration.lineFilter == nil || configuration.lineFilter?.isEmpty == true) {
             return nil
diff --git a/MonitorWidget/MonitorWidget.swift b/MonitorWidget/MonitorWidget.swift
index 16c2857..9212615 100644
--- a/MonitorWidget/MonitorWidget.swift
+++ b/MonitorWidget/MonitorWidget.swift
@@ -3,14 +3,23 @@
 //  MonitorWidget
 //
 //  Created by Peter Lohse on 19.04.23.
+//  Modiefied by Tom Braune on 03.11.23.
+//  Credit to https://github.com/AKORA-Studios for helping with the LocationManager
 //
 
 import WidgetKit
 import SwiftUI
 import Intents
+import CoreLocation
+import MapKit
 
-struct Provider: IntentTimelineProvider {
+class Provider: IntentTimelineProvider {
+    
+    
     typealias Entry = MonitorEntry
+    
+    let widgetLocationManager = WidgetLocationManager()
+
 
     func placeholder(in context: Context) -> MonitorEntry {
         MonitorEntry(date: Date(), configuration: ConfigurationIntent(), departureMonitor: nil)
@@ -20,28 +29,72 @@ struct Provider: IntentTimelineProvider {
         let entry = MonitorEntry(date: Date(), configuration: configuration, departureMonitor: departureM)
         completion(entry)
     }
-
+    
+    
     func getTimeline(for configuration: ConfigurationIntent, in context: Context, completion: @escaping (Timeline<Entry>) -> ()) {
-        let stopID = configuration.stopType?.identifier ?? "33000028"
+        
+        var stopID: String = "33000028"
+        var favoriteStops: [Int] = []
+        
+        if configuration.favoriteFilter == FavoriteFilter.true {
+            if let data = UserDefaults(suiteName: "group.eu.hanashi.Haltestellenmonitor")?.data(forKey: "FavoriteStops") {
+                if let decoded = try? JSONDecoder().decode([Int].self, from: data) {
+                    favoriteStops = decoded
+                }
+            }
+            
+            // Retrieving stop data for marked favorites
+            var favStops : [Stop] = stops.filter{favorite in
+                return favoriteStops.contains(favorite.stopId)
+            }
+            
+            if favStops.isEmpty {
+                print("No favorites found.")
+                stopID = "33000028"
+                
+            } else {
+                var favStopsLoc : [Stop] = []
+                // Retrieving location data
+                Task() {
+                    await widgetLocationManager.fetchLocation { llocation in
+                        print(">>>", llocation.coordinate)}
+                }
+                // Dresden town hall GPS coordinates as default
+                let location = widgetLocationManager.llocation ?? CLLocation(latitude: +51.04750, longitude: +13.74035)
+               
+                // sorting by distance
+                favStops.forEach {stop in
+                    var newStop = stop
+                    newStop.distance = location.distance(from: CLLocation(latitude: stop.coordinates.latitude, longitude: stop.coordinates.longitude))
+                    favStopsLoc.append(newStop)
+                }
+                favStops = favStopsLoc.sorted{$0.getDistance() < $1.getDistance()}
+                
+                stopID = String(favStops[0].stopId)
+            }
+        } else {
+            stopID = configuration.stopType?.identifier ?? "33000028"
+        }
         
         let url = URL(string: "https://webapi.vvo-online.de/dm")!
         var request = URLRequest(url: url, timeoutInterval: 20)
         request.httpMethod = "POST"
         request.httpBody = try? JSONEncoder().encode(DepartureRequest(stopid: stopID))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Haltestellenmonitor Dresden v2", forHTTPHeaderField: "User-Agent")
 
         let task = URLSession.shared.dataTask(with: request) {(data, response, error) in
             var entries: [MonitorEntry] = []
             var departureMonitor: DepartureMonitor? = nil
             guard error == nil else {
                 print ("error: \(error!)")
-                getTimeline(for: configuration, in: context, completion: completion)
+                self.getTimeline(for: configuration, in: context, completion: completion)
                 return
             }
 
             guard let content = data else {
                 print("No data")
-                getTimeline(for: configuration, in: context, completion: completion)
+                self.getTimeline(for: configuration, in: context, completion: completion)
                 return
             }
 
@@ -52,9 +105,10 @@ struct Provider: IntentTimelineProvider {
                 do {
                     let decoder = JSONDecoder()
                     departureMonitor = try decoder.decode(DepartureMonitor.self, from: content)
+                    print(content)
                 } catch {
                     print(error)
-                    getTimeline(for: configuration, in: context, completion: completion)
+                    self.getTimeline(for: configuration, in: context, completion: completion)
                     return
                 }
                 
@@ -76,12 +130,28 @@ struct Provider: IntentTimelineProvider {
 
 struct MonitorWidget: Widget {
     let kind: String = "MonitorWidget"
-
+    
     var body: some WidgetConfiguration {
         IntentConfiguration(kind: kind, intent: ConfigurationIntent.self, provider: Provider()) { entry in
             MonitorWidgetEntryView(entry: entry)
         }
         .configurationDisplayName("Haltestellenmonitor")
         .description("Widget zur Anzeige der Abfahrten an einer Haltestelle.")
+        .contentMarginsDisabledIfAvailable()
+    }
+}
+
+extension WidgetConfiguration
+{
+    func contentMarginsDisabledIfAvailable() -> some WidgetConfiguration
+    {
+        if #available(iOSApplicationExtension 17.0, *)
+        {
+            return self.contentMarginsDisabled()
+        }
+        else
+        {
+            return self
+        }
     }
 }
diff --git a/MonitorWidget/Views/MonitorWidgetEntryView.swift b/MonitorWidget/Views/MonitorWidgetEntryView.swift
index c9417dd..3e32ff0 100644
--- a/MonitorWidget/Views/MonitorWidgetEntryView.swift
+++ b/MonitorWidget/Views/MonitorWidgetEntryView.swift
@@ -3,23 +3,25 @@
 //  MonitorWidgetExtension
 //
 //  Created by Peter Lohse on 19.04.23.
+//  Modified by Tom Braune on 03.11.23.
 //
 
 import WidgetKit
 import SwiftUI
 import Intents
+import CoreLocation
 
 struct MonitorWidgetEntryView : View {
     @Environment(\.colorScheme) var colorScheme
     @Environment(\.widgetFamily) var widgetFamily
     var entry: Provider.Entry
-
+    
     var body: some View {
         let prefix = (widgetFamily == .systemLarge || widgetFamily == .systemExtraLarge) ? 16 : 5
         
         HStack(alignment: .top) {
             VStack(alignment: .leading) {
-                Text(entry.getStopName())
+                Text(entry.departureMonitor?.Name ?? "")
                     .font(.headline)
                     .padding(.bottom, 1.0)
                 if (entry.filterDepartures(departures:  entry.departureMonitor?.Departures ?? []).isEmpty) {
@@ -36,12 +38,24 @@ struct MonitorWidgetEntryView : View {
         }
         .padding([.top, .leading, .bottom])
         .padding(.trailing, 5.0)
-        .background(colorScheme == .dark ? Color.black : Color.yellow)
-        .widgetURL(URL(string: "widget://stop/\(entry.getStopID().addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)!)"))
+        .widgetBackground(colorScheme == .dark ? Color.black : Color.yellow)
+        .widgetURL(URL(string: "widget://stop/\(entry.getStopID(Name: entry.departureMonitor?.Name ?? "-").addingPercentEncoding(withAllowedCharacters: .urlHostAllowed)!)"))
         .dynamicTypeSize(.medium ... .large)
     }
 }
 
+extension View {
+    func widgetBackground(_ backgroundView: some View) -> some View {
+        if #available(iOSApplicationExtension 17.0, *) {
+            return containerBackground(for: .widget) {
+                backgroundView
+            }
+        } else {
+            return background(backgroundView)
+        }
+    }
+}
+
 struct MonitorWidget_Previews: PreviewProvider {
     static var previews: some View {
         MonitorWidgetEntryView(entry: MonitorEntry(date: Date(), configuration: ConfigurationIntent(), departureMonitor: departureM))
diff --git a/MonitorWidget/de.lproj/MonitorWidget.intentdefinition b/MonitorWidget/de.lproj/MonitorWidget.intentdefinition
index 54480d1..5860e0d 100644
--- a/MonitorWidget/de.lproj/MonitorWidget.intentdefinition
+++ b/MonitorWidget/de.lproj/MonitorWidget.intentdefinition
@@ -47,17 +47,60 @@
 				</dict>
 			</array>
 		</dict>
+		<dict>
+			<key>INEnumDisplayName</key>
+			<string>Favorite Filter</string>
+			<key>INEnumDisplayNameID</key>
+			<string>CaHjqO</string>
+			<key>INEnumGeneratesHeader</key>
+			<true/>
+			<key>INEnumName</key>
+			<string>FavoriteFilter</string>
+			<key>INEnumType</key>
+			<string>Regular</string>
+			<key>INEnumValues</key>
+			<array>
+				<dict>
+					<key>INEnumValueDisplayName</key>
+					<string>unknown</string>
+					<key>INEnumValueDisplayNameID</key>
+					<string>OrxHxJ</string>
+					<key>INEnumValueName</key>
+					<string>unknown</string>
+				</dict>
+				<dict>
+					<key>INEnumValueDisplayName</key>
+					<string>Ein</string>
+					<key>INEnumValueDisplayNameID</key>
+					<string>KK7Dbe</string>
+					<key>INEnumValueIndex</key>
+					<integer>1</integer>
+					<key>INEnumValueName</key>
+					<string>true</string>
+				</dict>
+				<dict>
+					<key>INEnumValueDisplayName</key>
+					<string>Gewählte Haltestelle beibehalten</string>
+					<key>INEnumValueDisplayNameID</key>
+					<string>Hl1d2S</string>
+					<key>INEnumValueIndex</key>
+					<integer>2</integer>
+					<key>INEnumValueName</key>
+					<string>false</string>
+				</dict>
+			</array>
+		</dict>
 	</array>
 	<key>INIntentDefinitionModelVersion</key>
 	<string>1.2</string>
 	<key>INIntentDefinitionNamespace</key>
 	<string>88xZPY</string>
 	<key>INIntentDefinitionSystemVersion</key>
-	<string>22E261</string>
+	<string>23A344</string>
 	<key>INIntentDefinitionToolsBuildVersion</key>
-	<string>14E222b</string>
+	<string>15A240d</string>
 	<key>INIntentDefinitionToolsVersion</key>
-	<string>14.3</string>
+	<string>15.0</string>
 	<key>INIntents</key>
 	<array>
 		<dict>
@@ -70,7 +113,7 @@
 			<key>INIntentIneligibleForSuggestions</key>
 			<true/>
 			<key>INIntentLastParameterTag</key>
-			<integer>11</integer>
+			<integer>14</integer>
 			<key>INIntentName</key>
 			<string>Configuration</string>
 			<key>INIntentParameters</key>
@@ -104,26 +147,6 @@
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Primary</string>
 						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>There are ${count} options matching ‘${stopType}’.</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>mpAhY8</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>DisambiguationIntroduction</string>
-						</dict>
-						<dict>
-							<key>INIntentParameterPromptDialogCustom</key>
-							<true/>
-							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>Just to confirm, you wanted ‘${stopType}’?</string>
-							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>uf7Ra2</string>
-							<key>INIntentParameterPromptDialogType</key>
-							<string>Confirmation</string>
-						</dict>
 					</array>
 					<key>INIntentParameterSupportsDynamicEnumeration</key>
 					<true/>
@@ -208,6 +231,50 @@
 					<key>INIntentParameterObjectTypeNamespace</key>
 					<string>88xZPY</string>
 					<key>INIntentParameterPromptDialogs</key>
+					<array>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Configuration</string>
+						</dict>
+						<dict>
+							<key>INIntentParameterPromptDialogCustom</key>
+							<true/>
+							<key>INIntentParameterPromptDialogType</key>
+							<string>Primary</string>
+						</dict>
+					</array>
+					<key>INIntentParameterSupportsDynamicEnumeration</key>
+					<true/>
+					<key>INIntentParameterSupportsMultipleValues</key>
+					<true/>
+					<key>INIntentParameterTag</key>
+					<integer>11</integer>
+					<key>INIntentParameterType</key>
+					<string>Object</string>
+				</dict>
+				<dict>
+					<key>INIntentParameterConfigurable</key>
+					<true/>
+					<key>INIntentParameterDisplayName</key>
+					<string>Automatisch nächsten Favoriten anzeigen</string>
+					<key>INIntentParameterDisplayNameID</key>
+					<string>cKrlgy</string>
+					<key>INIntentParameterDisplayPriority</key>
+					<integer>4</integer>
+					<key>INIntentParameterEnumType</key>
+					<string>FavoriteFilter</string>
+					<key>INIntentParameterEnumTypeNamespace</key>
+					<string>88xZPY</string>
+					<key>INIntentParameterMetadata</key>
+					<dict>
+						<key>INIntentParameterMetadataDefaultValue</key>
+						<string>false</string>
+					</dict>
+					<key>INIntentParameterName</key>
+					<string>favoriteFilter</string>
+					<key>INIntentParameterPromptDialogs</key>
 					<array>
 						<dict>
 							<key>INIntentParameterPromptDialogCustom</key>
@@ -225,9 +292,9 @@
 							<key>INIntentParameterPromptDialogCustom</key>
 							<true/>
 							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>There are ${count} options matching ‘${lineFilter}’.</string>
+							<string>There are 2 options matching ‘${favoriteFilter}’.</string>
 							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>78h9NL</string>
+							<string>o6SqGz</string>
 							<key>INIntentParameterPromptDialogType</key>
 							<string>DisambiguationIntroduction</string>
 						</dict>
@@ -235,21 +302,17 @@
 							<key>INIntentParameterPromptDialogCustom</key>
 							<true/>
 							<key>INIntentParameterPromptDialogFormatString</key>
-							<string>Just to confirm, you wanted ‘${lineFilter}’?</string>
+							<string>Just to confirm, you wanted ‘${favoriteFilter}’?</string>
 							<key>INIntentParameterPromptDialogFormatStringID</key>
-							<string>OjLOW6</string>
+							<string>If7lVM</string>
 							<key>INIntentParameterPromptDialogType</key>
 							<string>Confirmation</string>
 						</dict>
 					</array>
-					<key>INIntentParameterSupportsDynamicEnumeration</key>
-					<true/>
-					<key>INIntentParameterSupportsMultipleValues</key>
-					<true/>
 					<key>INIntentParameterTag</key>
-					<integer>11</integer>
+					<integer>14</integer>
 					<key>INIntentParameterType</key>
-					<string>Object</string>
+					<string>Integer</string>
 				</dict>
 			</array>
 			<key>INIntentResponse</key>
diff --git a/MonitorWidgetExtension.entitlements b/MonitorWidgetExtension.entitlements
index fc07546..46ca08d 100644
--- a/MonitorWidgetExtension.entitlements
+++ b/MonitorWidgetExtension.entitlements
@@ -2,8 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>aps-environment</key>
+	<string>development</string>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+	<key>com.apple.security.application-groups</key>
+	<array>
+		<string>group.eu.hanashi.Haltestellenmonitor</string>
+	</array>
 	<key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.personal-information.location</key>
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..4b14767
--- /dev/null
+++ b/README.md
@@ -0,0 +1,43 @@
+# Haltestellenmonitor-v3
+Haltestellen Navigator für Dresden
+
+[<img src="images/appstoreImage.svg" height="50">](https://apps.apple.com/de/app/haltestellenmonitor-dresden/id1266844674)
+
+### Showcase
+<p align="center">
+  <img src="images/example1.PNG" width="350">
+  <img src="images/example2.PNG" width="350">
+  <img src="images/example3.PNG" width="350">
+</p>
+
+## Anforderungen
+* iOS: 16.4
+* Xcode 14.3*
+
+Für mehr Infos siehe: https://developer.apple.com/support/xcode/
+
+## How to contribute
+0. Erstell ein Issue mit deinem Vorsachlag
+1. Fork das Projekt
+2. Setzte deinen Vorschlag um
+3. Erstelle eine Pullrequest
+4. Warte bis ein Maintainer diese annimmt oder Feedback gibt
+
+Bitte achte darauf das neuer Code zum Codestyle des bisher vorhandenen Codes ähnlich ist und verständlich geschrieben ist. 
+
+### Allgemeine Anmerkungen dazu 
+* Keine Binary Files (wie z.B. .DS_Store) Datein oder so pushen
+* Keine Identifier vom z.B. dem Development Team des projektes in der Pullrequest ändern
+* Bei Fragen zum Codestyle: [siehe hier](https://google.github.io/swift/)
+
+## How to Install and Run the Project
+```
+git clone https://github.com/HanashiDev/Haltestellenmonitor-v3
+```
+
+1. Öffne die workspace Datei in Xcode
+2. Nutze CMD + R um das App Shema (Haltestellenmonitor1-DD) auszuführen c:
+
+
+## License
+Das Projekt läuft unter der GNU GENERAL PUBLIC LICENSE. [Für mehr Info siehe hier](/LICENCES.md)
\ No newline at end of file
diff --git a/WatchMonitor Watch App/DepartureView.swift b/WatchMonitor Watch App/DepartureView.swift
index 38a31e8..c52f133 100644
--- a/WatchMonitor Watch App/DepartureView.swift	
+++ b/WatchMonitor Watch App/DepartureView.swift	
@@ -54,6 +54,7 @@ struct DepartureView: View {
         request.httpMethod = "POST"
         request.httpBody = try? JSONEncoder().encode(DepartureRequest(stopid: String(stop.stopId)))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Haltestellenmonitor Dresden v2", forHTTPHeaderField: "User-Agent")
         
         do {
             let (content, _) = try await URLSession.shared.data(for: request)
diff --git a/WatchMonitor Watch App/SingleTripView.swift b/WatchMonitor Watch App/SingleTripView.swift
index 06b3552..f363820 100644
--- a/WatchMonitor Watch App/SingleTripView.swift	
+++ b/WatchMonitor Watch App/SingleTripView.swift	
@@ -51,6 +51,7 @@ struct SingleTripView: View {
         request.httpMethod = "POST"
         request.httpBody = try? JSONEncoder().encode(SingleTripRequest(stopID: String(stop.stopId), tripID: departure.Id, time: departure.getDateTime().ISO8601Format()))
         request.setValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.setValue("Haltestellenmonitor Dresden v2", forHTTPHeaderField: "User-Agent")
         
         do {
             let (content, _) = try await URLSession.shared.data(for: request)
diff --git a/images/appstoreImage.svg b/images/appstoreImage.svg
new file mode 100644
index 0000000..536f370
--- /dev/null
+++ b/images/appstoreImage.svg
@@ -0,0 +1,40 @@
+<svg id="livetype" xmlns="http://www.w3.org/2000/svg" width="119.66407" height="40" viewBox="0 0 119.66407 40">
+  <title>Download_on_the_App_Store_Badge_DE_RGB_blk_092917</title>
+  <g>
+    <g>
+      <g>
+        <path d="M110.13477,0H9.53468c-.3667,0-.729,0-1.09473.002-.30615.002-.60986.00781-.91895.0127A13.21476,13.21476,0,0,0,5.5171.19141a6.66509,6.66509,0,0,0-1.90088.627A6.43779,6.43779,0,0,0,1.99757,1.99707,6.25844,6.25844,0,0,0,.81935,3.61816a6.60119,6.60119,0,0,0-.625,1.90332,12.993,12.993,0,0,0-.1792,2.002C.00587,7.83008.00489,8.1377,0,8.44434V31.5586c.00489.3105.00587.6113.01515.9219a12.99232,12.99232,0,0,0,.1792,2.0019,6.58756,6.58756,0,0,0,.625,1.9043A6.20778,6.20778,0,0,0,1.99757,38.001a6.27445,6.27445,0,0,0,1.61865,1.1787,6.70082,6.70082,0,0,0,1.90088.6308,13.45514,13.45514,0,0,0,2.0039.1768c.30909.0068.6128.0107.91895.0107C8.80567,40,9.168,40,9.53468,40H110.13477c.3594,0,.7246,0,1.084-.002.3047,0,.6172-.0039.9219-.0107a13.279,13.279,0,0,0,2-.1768,6.80432,6.80432,0,0,0,1.9082-.6308,6.27742,6.27742,0,0,0,1.6172-1.1787,6.39482,6.39482,0,0,0,1.1816-1.6143,6.60413,6.60413,0,0,0,.6191-1.9043,13.50643,13.50643,0,0,0,.1856-2.0019c.0039-.3106.0039-.6114.0039-.9219.0078-.3633.0078-.7246.0078-1.0938V9.53613c0-.36621,0-.72949-.0078-1.09179,0-.30664,0-.61426-.0039-.9209a13.5071,13.5071,0,0,0-.1856-2.002,6.6177,6.6177,0,0,0-.6191-1.90332,6.46619,6.46619,0,0,0-2.7988-2.7998,6.76754,6.76754,0,0,0-1.9082-.627,13.04394,13.04394,0,0,0-2-.17676c-.3047-.00488-.6172-.01074-.9219-.01269-.3594-.002-.7246-.002-1.084-.002Z" style="fill: #a6a6a6"/>
+        <path d="M8.44483,39.125c-.30468,0-.602-.0039-.90429-.0107a12.68714,12.68714,0,0,1-1.86914-.1631,5.88381,5.88381,0,0,1-1.65674-.5479,5.40573,5.40573,0,0,1-1.397-1.0166,5.32082,5.32082,0,0,1-1.02051-1.3965,5.72186,5.72186,0,0,1-.543-1.6572,12.41351,12.41351,0,0,1-.1665-1.875c-.00634-.2109-.01464-.9131-.01464-.9131V8.44434S.88185,7.75293.8877,7.5498a12.37039,12.37039,0,0,1,.16553-1.87207,5.7555,5.7555,0,0,1,.54346-1.6621A5.37349,5.37349,0,0,1,2.61183,2.61768,5.56543,5.56543,0,0,1,4.01417,1.59521a5.82309,5.82309,0,0,1,1.65332-.54394A12.58589,12.58589,0,0,1,7.543.88721L8.44532.875H111.21387l.9131.0127a12.38493,12.38493,0,0,1,1.8584.16259,5.93833,5.93833,0,0,1,1.6709.54785,5.59374,5.59374,0,0,1,2.415,2.41993,5.76267,5.76267,0,0,1,.5352,1.64892,12.995,12.995,0,0,1,.1738,1.88721c.0029.2832.0029.5874.0029.89014.0079.375.0079.73193.0079,1.09179V30.4648c0,.3633,0,.7178-.0079,1.0752,0,.3252,0,.6231-.0039.9297a12.73126,12.73126,0,0,1-.1709,1.8535,5.739,5.739,0,0,1-.54,1.67,5.48029,5.48029,0,0,1-1.0156,1.3857,5.4129,5.4129,0,0,1-1.3994,1.0225,5.86168,5.86168,0,0,1-1.668.5498,12.54218,12.54218,0,0,1-1.8692.1631c-.2929.0068-.5996.0107-.8974.0107l-1.084.002Z"/>
+      </g>
+      <g id="_Group_" data-name="&lt;Group&gt;">
+        <g id="_Group_2" data-name="&lt;Group&gt;">
+          <g id="_Group_3" data-name="&lt;Group&gt;">
+            <path id="_Path_" data-name="&lt;Path&gt;" d="M24.76888,20.30068a4.94881,4.94881,0,0,1,2.35656-4.15206,5.06566,5.06566,0,0,0-3.99116-2.15768c-1.67924-.17626-3.30719,1.00483-4.1629,1.00483-.87227,0-2.18977-.98733-3.6085-.95814a5.31529,5.31529,0,0,0-4.47292,2.72787c-1.934,3.34842-.49141,8.26947,1.3612,10.97608.9269,1.32535,2.01018,2.8058,3.42763,2.7533,1.38706-.05753,1.9051-.88448,3.5794-.88448,1.65876,0,2.14479.88448,3.591.8511,1.48838-.02416,2.42613-1.33124,3.32051-2.66914a10.962,10.962,0,0,0,1.51842-3.09251A4.78205,4.78205,0,0,1,24.76888,20.30068Z" style="fill: #fff"/>
+            <path id="_Path_2" data-name="&lt;Path&gt;" d="M22.03725,12.21089a4.87248,4.87248,0,0,0,1.11452-3.49062,4.95746,4.95746,0,0,0-3.20758,1.65961,4.63634,4.63634,0,0,0-1.14371,3.36139A4.09905,4.09905,0,0,0,22.03725,12.21089Z" style="fill: #fff"/>
+          </g>
+        </g>
+        <g>
+          <path d="M42.30227,27.13965h-4.7334l-1.13672,3.35645H34.42727l4.4834-12.418h2.083l4.4834,12.418H43.438ZM38.0591,25.59082h3.752l-1.84961-5.44727h-.05176Z" style="fill: #fff"/>
+          <path d="M55.15969,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H48.4302v1.50586h.03418a3.21162,3.21162,0,0,1,2.88281-1.60059C53.645,21.34766,55.15969,23.16406,55.15969,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C52.30227,29.01563,53.24953,27.81934,53.24953,25.96973Z" style="fill: #fff"/>
+          <path d="M65.12453,25.96973c0,2.81348-1.50586,4.62109-3.77832,4.62109a3.0693,3.0693,0,0,1-2.84863-1.584h-.043v4.48438h-1.8584V21.44238H58.395v1.50586h.03418A3.21162,3.21162,0,0,1,61.312,21.34766C63.60988,21.34766,65.12453,23.16406,65.12453,25.96973Zm-1.91016,0c0-1.833-.94727-3.03809-2.39258-3.03809-1.41992,0-2.375,1.23047-2.375,3.03809,0,1.82422.95508,3.0459,2.375,3.0459C62.26711,29.01563,63.21438,27.81934,63.21438,25.96973Z" style="fill: #fff"/>
+          <path d="M71.71047,27.03613c.1377,1.23145,1.334,2.04,2.96875,2.04,1.56641,0,2.69336-.80859,2.69336-1.91895,0-.96387-.67969-1.541-2.28906-1.93652l-1.60937-.3877c-2.28027-.55078-3.33887-1.61719-3.33887-3.34766,0-2.14258,1.86719-3.61426,4.51855-3.61426,2.624,0,4.42285,1.47168,4.4834,3.61426h-1.876c-.1123-1.23926-1.13672-1.9873-2.63379-1.9873s-2.52148.75684-2.52148,1.8584c0,.87793.6543,1.39453,2.25488,1.79l1.36816.33594c2.54785.60254,3.60645,1.626,3.60645,3.44238,0,2.32324-1.85059,3.77832-4.79395,3.77832-2.75391,0-4.61328-1.4209-4.7334-3.667Z" style="fill: #fff"/>
+          <path d="M83.34621,19.2998v2.14258h1.72168v1.47168H83.34621v4.99121c0,.77539.34473,1.13672,1.10156,1.13672a5.80752,5.80752,0,0,0,.61133-.043v1.46289a5.10351,5.10351,0,0,1-1.03223.08594c-1.833,0-2.54785-.68848-2.54785-2.44434V22.91406H80.16262V21.44238H81.479V19.2998Z" style="fill: #fff"/>
+          <path d="M86.065,25.96973c0-2.84863,1.67773-4.63867,4.29395-4.63867,2.625,0,4.29492,1.79,4.29492,4.63867,0,2.85645-1.66113,4.63867-4.29492,4.63867C87.72609,30.6084,86.065,28.82617,86.065,25.96973Zm6.69531,0c0-1.9541-.89551-3.10742-2.40137-3.10742s-2.40039,1.16211-2.40039,3.10742c0,1.96191.89453,3.10645,2.40039,3.10645S92.76027,27.93164,92.76027,25.96973Z" style="fill: #fff"/>
+          <path d="M96.18606,21.44238h1.77246v1.541h.043a2.1594,2.1594,0,0,1,2.17773-1.63574,2.86616,2.86616,0,0,1,.63672.06934v1.73828a2.59794,2.59794,0,0,0-.835-.1123,1.87264,1.87264,0,0,0-1.93652,2.083v5.37012h-1.8584Z" style="fill: #fff"/>
+          <path d="M109.3843,27.83691c-.25,1.64355-1.85059,2.77148-3.89844,2.77148-2.63379,0-4.26855-1.76465-4.26855-4.5957,0-2.83984,1.64355-4.68164,4.19043-4.68164,2.50488,0,4.08008,1.7207,4.08008,4.46582v.63672h-6.39453v.1123a2.358,2.358,0,0,0,2.43555,2.56445,2.04834,2.04834,0,0,0,2.09082-1.27344Zm-6.28223-2.70215h4.52637a2.1773,2.1773,0,0,0-2.2207-2.29785A2.292,2.292,0,0,0,103.10207,25.13477Z" style="fill: #fff"/>
+        </g>
+      </g>
+    </g>
+    <g id="_Group_4" data-name="&lt;Group&gt;">
+      <g>
+        <path d="M39.3926,14.69775H35.67092V8.731h.92676V13.8457H39.3926Z" style="fill: #fff"/>
+        <path d="M40.32912,13.42432c0-.81055.60352-1.27783,1.6748-1.34424l1.21973-.07031v-.38867c0-.47559-.31445-.74414-.92187-.74414-.49609,0-.83984.18213-.93848.50049h-.86035c.09082-.77344.81836-1.26953,1.83984-1.26953,1.12891,0,1.76563.562,1.76563,1.51318v3.07666h-.85547v-.63281h-.07031a1.515,1.515,0,0,1-1.35254.707A1.36026,1.36026,0,0,1,40.32912,13.42432Zm2.89453-.38477v-.37646L42.124,12.7334c-.62012.0415-.90137.25244-.90137.64941,0,.40527.35156.64111.835.64111A1.0615,1.0615,0,0,0,43.22365,13.03955Z" style="fill: #fff"/>
+        <path d="M45.27639,12.44434c0-1.42285.73145-2.32422,1.86914-2.32422a1.484,1.484,0,0,1,1.38086.79h.06641V8.437h.88867v6.26074H48.6299v-.71143h-.07031a1.56284,1.56284,0,0,1-1.41406.78564C46,14.772,45.27639,13.87061,45.27639,12.44434Zm.918,0c0,.95508.4502,1.52979,1.20313,1.52979.749,0,1.21191-.583,1.21191-1.52588,0-.93848-.46777-1.52979-1.21191-1.52979C46.64943,10.91846,46.19436,11.49707,46.19436,12.44434Z" style="fill: #fff"/>
+        <path d="M54.74709,13.48193a1.828,1.828,0,0,1-1.95117,1.30273,2.04531,2.04531,0,0,1-2.08008-2.32422A2.07685,2.07685,0,0,1,52.792,10.10791c1.25293,0,2.00879.856,2.00879,2.27V12.688H51.62111v.0498a1.1902,1.1902,0,0,0,1.19922,1.29,1.07934,1.07934,0,0,0,1.07129-.5459Zm-3.126-1.45117h2.27441a1.08647,1.08647,0,0,0-1.1084-1.1665A1.15162,1.15162,0,0,0,51.62111,12.03076Z" style="fill: #fff"/>
+        <path d="M55.99416,10.19482h.85547v.71533H56.916a1.348,1.348,0,0,1,1.34375-.80225,1.46456,1.46456,0,0,1,1.55859,1.6748v2.915h-.88867V12.00586c0-.72363-.31445-1.0835-.97168-1.0835a1.03294,1.03294,0,0,0-1.0752,1.14111v2.63428h-.88867Z" style="fill: #fff"/>
+        <path d="M63.51955,8.86328a.57572.57572,0,1,1,.5752.5415A.54735.54735,0,0,1,63.51955,8.86328Zm.13281,1.33154h.88477v4.50293h-.88477Z" style="fill: #fff"/>
+        <path d="M65.97121,10.19482h.85547v.72363h.06641a1.36385,1.36385,0,0,1,2.49316,0h.07031a1.46325,1.46325,0,0,1,1.36914-.81055,1.33821,1.33821,0,0,1,1.43848,1.48828v3.10156h-.88867V11.82813c0-.60791-.29-.90576-.873-.90576a.91167.91167,0,0,0-.9502.94287v2.83252h-.873V11.74121a.78468.78468,0,0,0-.86816-.81885.96854.96854,0,0,0-.95117,1.02148v2.75391h-.88867Z" style="fill: #fff"/>
+      </g>
+    </g>
+  </g>
+</svg>
diff --git a/images/example1.PNG b/images/example1.PNG
new file mode 100644
index 0000000..c38298b
Binary files /dev/null and b/images/example1.PNG differ
diff --git a/images/example2.PNG b/images/example2.PNG
new file mode 100644
index 0000000..6931c65
Binary files /dev/null and b/images/example2.PNG differ
diff --git a/images/example3.PNG b/images/example3.PNG
new file mode 100644
index 0000000..6608979
Binary files /dev/null and b/images/example3.PNG differ