diff --git a/.beta-base b/.beta-base
index 669ca49f..d878b321 100644
--- a/.beta-base
+++ b/.beta-base
@@ -1 +1 @@
-1087
+1100
diff --git a/.beta-build b/.beta-build
index 9870e4a2..4d47be63 100644
--- a/.beta-build
+++ b/.beta-build
@@ -1 +1 @@
-2984
+3012
diff --git a/Passepartout.xcodeproj/project.pbxproj b/Passepartout.xcodeproj/project.pbxproj
index 45cab536..5655995b 100644
--- a/Passepartout.xcodeproj/project.pbxproj
+++ b/Passepartout.xcodeproj/project.pbxproj
@@ -1177,7 +1177,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CURRENT_PROJECT_VERSION = 3001;
+				CURRENT_PROJECT_VERSION = 3012;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_BITCODE = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -1243,7 +1243,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				CURRENT_PROJECT_VERSION = 3001;
+				CURRENT_PROJECT_VERSION = 3012;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_BITCODE = NO;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -1274,7 +1274,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Passepartout/App/Shared/App.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3000;
+				CURRENT_PROJECT_VERSION = 3012;
 				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = Passepartout/App/Shared/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -1300,7 +1300,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Passepartout/App/Shared/App.entitlements;
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3000;
+				CURRENT_PROJECT_VERSION = 3012;
 				DEVELOPMENT_TEAM = DTDYD63ZX9;
 				INFOPLIST_FILE = Passepartout/App/Shared/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
diff --git a/Passepartout/App/Shared/Info.plist b/Passepartout/App/Shared/Info.plist
index 8ffaffc8..ea8fc8ce 100644
--- a/Passepartout/App/Shared/Info.plist
+++ b/Passepartout/App/Shared/Info.plist
@@ -34,7 +34,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>3000</string>
+	<string>3012</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>
diff --git a/Passepartout/App/iOS/fastlane/metadata/de-DE/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/de-DE/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/de-DE/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/de-DE/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/el/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/el/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/el/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/el/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/en-US/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/es-MX/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/es-MX/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/es-MX/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/es-MX/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/fr-FR/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/fr-FR/release_notes.txt
index 5feb29d9..d38fec53 100755
--- a/Passepartout/App/iOS/fastlane/metadata/fr-FR/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/fr-FR/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/it/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/it/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/it/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/it/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/nl-NL/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/nl-NL/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/nl-NL/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/nl-NL/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/pl/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/pl/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/pl/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/pl/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/pt-BR/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/pt-BR/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/pt-BR/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/pt-BR/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/ru/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/ru/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/ru/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/ru/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/iOS/fastlane/metadata/sv/release_notes.txt b/Passepartout/App/iOS/fastlane/metadata/sv/release_notes.txt
index 5feb29d9..d38fec53 100644
--- a/Passepartout/App/iOS/fastlane/metadata/sv/release_notes.txt
+++ b/Passepartout/App/iOS/fastlane/metadata/sv/release_notes.txt
@@ -1,12 +1,13 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
+- App completely rewritten in SwiftUI.
 
 ### Fixed
 
-- Trim whitespaces in text fields.
+- Files occasionally not selectable in browser.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/de-DE/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/de-DE/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/de-DE/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/de-DE/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/el/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/el/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/el/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/el/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/en-US/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/es-MX/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/es-MX/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/es-MX/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/es-MX/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/fr-FR/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/fr-FR/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/fr-FR/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/fr-FR/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/it/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/it/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/it/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/it/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/nl-NL/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/nl-NL/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/nl-NL/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/nl-NL/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/pl/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/pl/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/pl/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/pl/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/pt-BR/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/pt-BR/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/pt-BR/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/pt-BR/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/ru/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/ru/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/ru/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/ru/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/App/macOS/fastlane/metadata/sv/release_notes.txt b/Passepartout/App/macOS/fastlane/metadata/sv/release_notes.txt
index cc4f9ce2..76e77af5 100644
--- a/Passepartout/App/macOS/fastlane/metadata/sv/release_notes.txt
+++ b/Passepartout/App/macOS/fastlane/metadata/sv/release_notes.txt
@@ -1,13 +1,9 @@
 ### Added
 
-- Handle `--keepalive` option.
+- WireGuard support.
+- iCloud support.
 
 ### Changed
 
-- Release app in the open via GitHub Actions.
-
-### Fixed
-
-- Last update was not refreshed on "Refresh infrastructure".
-- Trim whitespaces in text fields.
+- App completely rewritten in SwiftUI.
 
diff --git a/Passepartout/Tunnel/Info.plist b/Passepartout/Tunnel/Info.plist
index ac5d1de2..4442e09f 100644
--- a/Passepartout/Tunnel/Info.plist
+++ b/Passepartout/Tunnel/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>2.0.0</string>
 	<key>CFBundleVersion</key>
-	<string>3000</string>
+	<string>3012</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
 	<key>NSExtension</key>
diff --git a/scripts/commit-beta.sh b/scripts/commit-beta.sh
index 9c3bbf01..bca8f213 100755
--- a/scripts/commit-beta.sh
+++ b/scripts/commit-beta.sh
@@ -19,8 +19,9 @@ ci/update-release-notes.sh ios &&
     ci/copy-release-notes.sh mac
 
 # pull latest API
-git -C PassepartoutCore/Sources/PassepartoutCore/API pull origin master
-git add */PassepartoutCore/API
+API_PATH="PassepartoutCore/Sources/PassepartoutServices/API"
+git -C $API_PATH pull origin master
+git add $API_PATH
 
 # add build number
 git add $BUILD_FILE