diff --git a/Feels (iOS).entitlements b/Feels (iOS).entitlements
index 657f901..63fe57e 100644
--- a/Feels (iOS).entitlements	
+++ b/Feels (iOS).entitlements	
@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.88oak.ifeel</string>
+		<string>iCloud.com.88oakapps.ifeel</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -14,7 +14,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.88oak.ifeel</string>
+		<string>group.com.88oakapps.ifeel</string>
 	</array>
 </dict>
 </plist>
diff --git a/Feels (iOS)Dev.entitlements b/Feels (iOS)Dev.entitlements
index 02fee9c..ff8e656 100644
--- a/Feels (iOS)Dev.entitlements	
+++ b/Feels (iOS)Dev.entitlements	
@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.88oak.ifeelDebug</string>
+		<string>iCloud.com.88oakapps.ifeelDebug</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -14,7 +14,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.88oak.ifeelDebug</string>
+		<string>group.com.88oakapps.ifeelDebug</string>
 	</array>
 </dict>
 </plist>
diff --git a/Feels.xcodeproj/project.pbxproj b/Feels.xcodeproj/project.pbxproj
index 64d0163..8b31a10 100644
--- a/Feels.xcodeproj/project.pbxproj
+++ b/Feels.xcodeproj/project.pbxproj
@@ -1120,7 +1120,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 23;
-				DEVELOPMENT_TEAM = V3PF3M6B6U;
+				DEVELOPMENT_TEAM = QND55P4443;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Feels--iOS--Info.plist";
@@ -1135,7 +1135,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.88oak.ifeelDebug2;
+				PRODUCT_BUNDLE_IDENTIFIER = com.88oakapps.ifeelDebug;
 				PRODUCT_NAME = iFeel;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
@@ -1156,7 +1156,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 23;
-				DEVELOPMENT_TEAM = V3PF3M6B6U;
+				DEVELOPMENT_TEAM = QND55P4443;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = "Feels--iOS--Info.plist";
@@ -1171,7 +1171,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.88oak.ifeel;
+				PRODUCT_BUNDLE_IDENTIFIER = com.88oakapps.ifeel;
 				PRODUCT_NAME = iFeel;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
@@ -1326,7 +1326,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = V3PF3M6B6U;
+				DEVELOPMENT_TEAM = QND55P4443;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = FeelsWidget/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = FeelsWidget;
@@ -1338,7 +1338,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.88oak.ifeelDebug2.FeelsWidgetDebug;
+				PRODUCT_BUNDLE_IDENTIFIER = com.88oakapps.ifeelDebug.FeelsWidgetDebug;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
@@ -1358,7 +1358,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
-				DEVELOPMENT_TEAM = V3PF3M6B6U;
+				DEVELOPMENT_TEAM = QND55P4443;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = FeelsWidget/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = FeelsWidget;
@@ -1370,7 +1370,7 @@
 					"@executable_path/../../Frameworks",
 				);
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.88oak.ifeel.FeelsWidget;
+				PRODUCT_BUNDLE_IDENTIFIER = com.88oakapps.ifeel.FeelsWidget;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SDKROOT = iphoneos;
diff --git a/FeelsWidgetExtension.entitlements b/FeelsWidgetExtension.entitlements
index 657f901..63fe57e 100644
--- a/FeelsWidgetExtension.entitlements
+++ b/FeelsWidgetExtension.entitlements
@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.88oak.ifeel</string>
+		<string>iCloud.com.88oakapps.ifeel</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -14,7 +14,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.88oak.ifeel</string>
+		<string>group.com.88oakapps.ifeel</string>
 	</array>
 </dict>
 </plist>
diff --git a/FeelsWidgetExtensionDev.entitlements b/FeelsWidgetExtensionDev.entitlements
index 02fee9c..ff8e656 100644
--- a/FeelsWidgetExtensionDev.entitlements
+++ b/FeelsWidgetExtensionDev.entitlements
@@ -6,7 +6,7 @@
 	<string>development</string>
 	<key>com.apple.developer.icloud-container-identifiers</key>
 	<array>
-		<string>iCloud.com.88oak.ifeelDebug</string>
+		<string>iCloud.com.88oakapps.ifeelDebug</string>
 	</array>
 	<key>com.apple.developer.icloud-services</key>
 	<array>
@@ -14,7 +14,7 @@
 	</array>
 	<key>com.apple.security.application-groups</key>
 	<array>
-		<string>group.com.88oak.ifeelDebug</string>
+		<string>group.com.88oakapps.ifeelDebug</string>
 	</array>
 </dict>
 </plist>
diff --git a/Shared/Random.swift b/Shared/Random.swift
index 85fe0ea..968aa9f 100644
--- a/Shared/Random.swift
+++ b/Shared/Random.swift
@@ -9,8 +9,8 @@ import Foundation
 import SwiftUI
 
 struct Constants {
-    static let groupShareId = "group.com.88oak.ifeel"
-    static let groupShareIdDebug = "group.com.88oak.ifeelDebug"
+    static let groupShareId = "group.com.88oakapps.ifeel"
+    static let groupShareIdDebug = "group.com.88oakapps.ifeelDebug"
 }
 
 struct GroupUserDefaults {