diff --git a/Features/Setting/Notification/NotificationSettingView.swift b/Features/Setting/Notification/NotificationSettingView.swift
index 13f86236..901ddcc6 100644
--- a/Features/Setting/Notification/NotificationSettingView.swift
+++ b/Features/Setting/Notification/NotificationSettingView.swift
@@ -166,6 +166,21 @@ private struct NotificationSettingDetailView: View {
             Text("setting.notification.expedition.header")
         }
 
+        Section {
+            Toggle("setting.notification.daily_training.toggle", isOn: allowDailyTrainingNotification)
+            if let bindingDate = Binding(dailyTrainingNotificationTime) {
+                DatePicker(
+                    "setting.notification.daily_training.date_picker",
+                    selection: bindingDate,
+                    displayedComponents: .hourAndMinute
+                )
+            }
+        } header: {
+            Text("setting.notification.daily_training.header")
+        } footer: {
+            Text("setting.notification.daily_training.footer")
+        }
+
         Section {
             Toggle("setting.notification.simulated_universe.toggle", isOn: allowSimulatedUniverseNotification)
             if let bindingDate = Binding(simulatedUniverseNotificationTime),
diff --git a/HSRPizzaHelperWatch Watch App.entitlements b/HSRPizzaHelper Watch App/HSRPizzaHelperWatch Watch App.entitlements
similarity index 100%
rename from HSRPizzaHelperWatch Watch App.entitlements
rename to HSRPizzaHelper Watch App/HSRPizzaHelperWatch Watch App.entitlements
diff --git a/HSRPizzaHelperWatch-Watch-App-Info.plist b/HSRPizzaHelper Watch App/HSRPizzaHelperWatch-Watch-App-Info.plist
similarity index 100%
rename from HSRPizzaHelperWatch-Watch-App-Info.plist
rename to HSRPizzaHelper Watch App/HSRPizzaHelperWatch-Watch-App-Info.plist
diff --git a/HSRPizzaHelper.xcodeproj/project.pbxproj b/HSRPizzaHelper.xcodeproj/project.pbxproj
index f472f1a4..71f116df 100644
--- a/HSRPizzaHelper.xcodeproj/project.pbxproj
+++ b/HSRPizzaHelper.xcodeproj/project.pbxproj
@@ -295,7 +295,7 @@
 		BF58D23F2A579D5100CC0DC6 /* WatchAssets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = WatchAssets.xcassets; sourceTree = "<group>"; };
 		BF58D2422A579D5100CC0DC6 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
 		BF58D25F2A57A58E00CC0DC6 /* WatchHomeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchHomeView.swift; sourceTree = "<group>"; };
-		BF58D2682A57ABCF00CC0DC6 /* HSRPizzaHelperWatch-Watch-App-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "HSRPizzaHelperWatch-Watch-App-Info.plist"; sourceTree = "<group>"; };
+		BF58D2682A57ABCF00CC0DC6 /* HSRPizzaHelperWatch-Watch-App-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "HSRPizzaHelperWatch-Watch-App-Info.plist"; sourceTree = "<group>"; };
 		BF58D2692A57AD4300CC0DC6 /* WatchConnectivityManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WatchConnectivityManager.swift; sourceTree = "<group>"; };
 		BF58D26C2A57F19B00CC0DC6 /* HSRPizzaHelperWatch Watch App.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "HSRPizzaHelperWatch Watch App.entitlements"; sourceTree = "<group>"; };
 		BFA4A84A2A0BD0AA00239BB0 /* ImageCroper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageCroper.swift; sourceTree = "<group>"; };
@@ -500,6 +500,8 @@
 		BF58D23A2A579D5000CC0DC6 /* HSRPizzaHelper Watch App */ = {
 			isa = PBXGroup;
 			children = (
+				BF58D26C2A57F19B00CC0DC6 /* HSRPizzaHelperWatch Watch App.entitlements */,
+				BF58D2682A57ABCF00CC0DC6 /* HSRPizzaHelperWatch-Watch-App-Info.plist */,
 				BF58D23B2A579D5000CC0DC6 /* HSRPizzaHelperWatchApp.swift */,
 				BF58D23D2A579D5000CC0DC6 /* WatchContentView.swift */,
 				BF58D23F2A579D5100CC0DC6 /* WatchAssets.xcassets */,
@@ -850,8 +852,6 @@
 		EAE519732A01738600EF23B7 = {
 			isa = PBXGroup;
 			children = (
-				BF58D26C2A57F19B00CC0DC6 /* HSRPizzaHelperWatch Watch App.entitlements */,
-				BF58D2682A57ABCF00CC0DC6 /* HSRPizzaHelperWatch-Watch-App-Info.plist */,
 				BFCACD112A04922E009B0B85 /* README.md */,
 				BFCACD0F2A0491E9009B0B85 /* LICENSE */,
 				EAE519C82A0178AD00EF23B7 /* Common */,
@@ -1526,14 +1526,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_ENTITLEMENTS = "HSRPizzaHelperWatch Watch App.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "HSRPizzaHelper Watch App/HSRPizzaHelperWatch Watch App.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 148;
 				DEVELOPMENT_ASSET_PATHS = "\"HSRPizzaHelper Watch App/Preview Content\"";
 				DEVELOPMENT_TEAM = 45Z6V4YD5U;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "HSRPizzaHelperWatch-Watch-App-Info.plist";
+				INFOPLIST_FILE = "HSRPizzaHelper Watch App/HSRPizzaHelperWatch-Watch-App-Info.plist";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = Canglong.HSRPizzaHelper;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1557,14 +1557,14 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
-				CODE_SIGN_ENTITLEMENTS = "HSRPizzaHelperWatch Watch App.entitlements";
+				CODE_SIGN_ENTITLEMENTS = "HSRPizzaHelper Watch App/HSRPizzaHelperWatch Watch App.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 148;
 				DEVELOPMENT_ASSET_PATHS = "\"HSRPizzaHelper Watch App/Preview Content\"";
 				DEVELOPMENT_TEAM = 45Z6V4YD5U;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
-				INFOPLIST_FILE = "HSRPizzaHelperWatch-Watch-App-Info.plist";
+				INFOPLIST_FILE = "HSRPizzaHelper Watch App/HSRPizzaHelperWatch-Watch-App-Info.plist";
 				INFOPLIST_KEY_UISupportedInterfaceOrientations = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
 				INFOPLIST_KEY_WKCompanionAppBundleIdentifier = Canglong.HSRPizzaHelper;
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/HSRPizzaHelper.xcodeproj/xcshareddata/xcschemes/Widget Debug.xcscheme b/HSRPizzaHelper.xcodeproj/xcshareddata/xcschemes/Widget Debug.xcscheme
index 0f4f03fd..2ff0d5f9 100644
--- a/HSRPizzaHelper.xcodeproj/xcshareddata/xcschemes/Widget Debug.xcscheme	
+++ b/HSRPizzaHelper.xcodeproj/xcshareddata/xcschemes/Widget Debug.xcscheme	
@@ -2,7 +2,7 @@
 <Scheme
    LastUpgradeVersion = "1430"
    wasCreatedForAppExtension = "YES"
-   version = "2.0">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -49,24 +49,11 @@
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
-      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.springboard">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EA1673EE2A063AF300436487"
-            BuildableName = "HSRPizzaHelperWidgetExtension.appex"
-            BlueprintName = "HSRPizzaHelperWidgetExtension"
-            ReferencedContainer = "container:HSRPizzaHelper.xcodeproj">
-         </BuildableReference>
-      </RemoteRunnable>
+      allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -100,6 +87,7 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/HSRPizzaHelper.xcodeproj/xcshareddata/xcschemes/Widget Release.xcscheme b/HSRPizzaHelper.xcodeproj/xcshareddata/xcschemes/Widget Release.xcscheme
index 24257956..1ecac0e2 100644
--- a/HSRPizzaHelper.xcodeproj/xcshareddata/xcschemes/Widget Release.xcscheme	
+++ b/HSRPizzaHelper.xcodeproj/xcshareddata/xcschemes/Widget Release.xcscheme	
@@ -2,7 +2,7 @@
 <Scheme
    LastUpgradeVersion = "1430"
    wasCreatedForAppExtension = "YES"
-   version = "2.0">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
@@ -49,24 +49,11 @@
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"
-      askForAppToLaunch = "Yes"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      launchAutomaticallySubstyle = "2">
-      <RemoteRunnable
-         runnableDebuggingMode = "2"
-         BundleIdentifier = "com.apple.springboard">
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "EA1673EE2A063AF300436487"
-            BuildableName = "HSRPizzaHelperWidgetExtension.appex"
-            BlueprintName = "HSRPizzaHelperWidgetExtension"
-            ReferencedContainer = "container:HSRPizzaHelper.xcodeproj">
-         </BuildableReference>
-      </RemoteRunnable>
+      allowLocationSimulation = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -100,6 +87,7 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/Packages/HBMihoyoAPI/Package.swift b/Packages/HBMihoyoAPI/Package.swift
index f06ada8e..5aa33b46 100644
--- a/Packages/HBMihoyoAPI/Package.swift
+++ b/Packages/HBMihoyoAPI/Package.swift
@@ -7,6 +7,7 @@ let package = Package(
     name: "HBMihoyoAPI",
     platforms: [
         .iOS(.v15),
+        .watchOS(.v9),
     ],
     products: [
         .library(
diff --git a/Packages/HBPizzaHelperAPI/Package.swift b/Packages/HBPizzaHelperAPI/Package.swift
index f336c38b..55b7090a 100644
--- a/Packages/HBPizzaHelperAPI/Package.swift
+++ b/Packages/HBPizzaHelperAPI/Package.swift
@@ -7,6 +7,7 @@ let package = Package(
     name: "HBPizzaHelperAPI",
     platforms: [
         .iOS(.v15),
+        .watchOS(.v9),
     ],
     products: [
         // Products define the executables and libraries a package produces, and make them visible to other packages.