diff --git a/OpenHaystack/OpenHaystack.xcodeproj/project.pbxproj b/OpenHaystack/OpenHaystack.xcodeproj/project.pbxproj
index 584ab1a..ade62b8 100644
--- a/OpenHaystack/OpenHaystack.xcodeproj/project.pbxproj
+++ b/OpenHaystack/OpenHaystack.xcodeproj/project.pbxproj
@@ -796,7 +796,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				ENABLE_PREVIEWS = YES;
-				EXCLUDED_ARCHS = "arm64e arm64";
+				EXCLUDED_ARCHS = "";
 				INFOPLIST_FILE = OpenHaystack/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -823,7 +823,7 @@
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				ENABLE_PREVIEWS = YES;
-				EXCLUDED_ARCHS = "arm64e arm64";
+				EXCLUDED_ARCHS = "";
 				INFOPLIST_FILE = OpenHaystack/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
diff --git a/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift b/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift
index a76815e..47456f1 100644
--- a/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift
+++ b/OpenHaystack/OpenHaystack/HaystackApp/Model/PreviewData.swift
@@ -9,6 +9,7 @@
 
 import Foundation
 import SwiftUI
+import CoreLocation
 
 // swiftlint:disable force_try
 struct PreviewData {
diff --git a/OpenHaystack/OpenHaystackMail/Info.plist b/OpenHaystack/OpenHaystackMail/Info.plist
index 8e74f28..5e7fde3 100644
--- a/OpenHaystack/OpenHaystackMail/Info.plist
+++ b/OpenHaystack/OpenHaystackMail/Info.plist
@@ -22,90 +22,127 @@
 	<string>Copyright © 2021 SEEMOO – TU Darmstadt</string>
 	<key>NSPrincipalClass</key>
 	<string>OpenHaystackPluginService</string>
-    <key>Supported10.14PluginCompatibilityUUIDs</key>
-        <array>
-            <string># UUIDs for versions from 10.12 to 99.99.99</string>
-            <string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
-            <string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
-            <string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
-            <string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
-            <string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
-            <string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
-            <string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
-            <string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
-            <string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
-            <string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
-            <string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
-            <string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
-            <string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
-            <string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
-        </array>
-        <key>Supported10.15PluginCompatibilityUUIDs</key>
-        <array>
-            <string># UUIDs for versions from 10.12 to 99.99.99</string>
-            <string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
-            <string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
-            <string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
-            <string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
-            <string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
-            <string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
-            <string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
-            <string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
-            <string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
-            <string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
-            <string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
-            <string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
-            <string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
-            <string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
-        </array>
-        <key>Supported11.0PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.10PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.1PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.2PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.3PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.4PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.5PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.6PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.7PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.8PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported11.9PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-        </array>
-        <key>Supported12.0PluginCompatibilityUUIDs</key>
-        <array>
-            <string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
-            <string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
-        </array>
+	<key>Supported10.14PluginCompatibilityUUIDs</key>
+	<array>
+		<string># UUIDs for versions from 10.12 to 99.99.99</string>
+		<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
+		<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
+		<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
+		<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
+		<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
+		<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
+		<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
+		<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
+		<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
+		<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
+		<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
+		<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
+		<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
+		<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
+	</array>
+	<key>Supported10.15PluginCompatibilityUUIDs</key>
+	<array>
+		<string># UUIDs for versions from 10.12 to 99.99.99</string>
+		<string># For mail version 10.0 (3226) on OS X Version 10.12 (build 16A319)</string>
+		<string>36CCB8BB-2207-455E-89BC-B9D6E47ABB5B</string>
+		<string># For mail version 10.1 (3251) on OS X Version 10.12.1 (build 16B2553a)</string>
+		<string>9054AFD9-2607-489E-8E63-8B09A749BC61</string>
+		<string># For mail version 10.2 (3259) on OS X Version 10.12.2 (build 16D12b)</string>
+		<string>1CD3B36A-0E3B-4A26-8F7E-5BDF96AAC97E</string>
+		<string># For mail version 10.3 (3273) on OS X Version 10.12.4 (build 16G1036)</string>
+		<string>21560BD9-A3CC-482E-9B99-95B7BF61EDC1</string>
+		<string># For mail version 11.0 (3441.0.1) on OS X Version 10.13 (build 17A315i)</string>
+		<string>C86CD990-4660-4E36-8CDA-7454DEB2E199</string>
+		<string># For mail version 12.0 (3445.100.39) on OS X Version 10.14.1 (build 18B45d)</string>
+		<string>A4343FAF-AE18-40D0-8A16-DFAE481AF9C1</string>
+		<string># For mail version 13.0 (3594.4.2) on OS X Version 10.15 (build 19A558d)</string>
+		<string>6EEA38FB-1A0B-469B-BB35-4C2E0EEA9053</string>
+	</array>
+	<key>Supported11.0PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.10PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.1PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.2PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.3PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.4PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.5PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.6PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.7PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.8PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported11.9PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+	</array>
+	<key>Supported12.0PluginCompatibilityUUIDs</key>
+	<array>
+		<string>D985F0E4-3BBC-4B95-BBA1-12056AC4A531</string>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+		<string>224E7F96-2099-499C-A501-63FB68C79CD2</string>
+	</array>
+	<key>Supported12.1PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
+	<key>Supported12.2PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
+	<key>Supported12.3PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
+	<key>Supported12.4PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
+	<key>Supported12.5PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
+	<key>Supported12.6PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
+	<key>Supported12.7PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
+	<key>Supported12.8PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
+	<key>Supported12.9PluginCompatibilityUUIDs</key>
+	<array>
+		<string>25288CEF-7D9B-49A8-BE6B-E41DA6277CF3</string>
+	</array>
 </dict>
 </plist>