diff --git a/App/TapMatch/Multiplatform/InfoPlist.xcstrings b/App/TapMatch/Multiplatform/InfoPlist.xcstrings
index 76066771..9a9e6aac 100644
--- a/App/TapMatch/Multiplatform/InfoPlist.xcstrings
+++ b/App/TapMatch/Multiplatform/InfoPlist.xcstrings
@@ -164,7 +164,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "Staging"
+            "value" : "TapMatch"
           }
         },
         "es" : {
diff --git a/App/Trinket/Multiplatform/InfoPlist.xcstrings b/App/Trinket/Multiplatform/InfoPlist.xcstrings
index efb906f0..be2954f8 100644
--- a/App/Trinket/Multiplatform/InfoPlist.xcstrings
+++ b/App/Trinket/Multiplatform/InfoPlist.xcstrings
@@ -322,7 +322,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "new",
-            "value" : "\"Allow\" to see your optimized ads"
+            "value" : "Allow to see your optimized ads"
           }
         },
         "es" : {
diff --git a/Packages/MatchCore/Sources/AnalyticsKeys/UserPropertyKeys.swift b/Packages/MatchCore/Sources/AnalyticsKeys/UserPropertyKeys.swift
index 08b3229c..2449751e 100644
--- a/Packages/MatchCore/Sources/AnalyticsKeys/UserPropertyKeys.swift
+++ b/Packages/MatchCore/Sources/AnalyticsKeys/UserPropertyKeys.swift
@@ -3,6 +3,5 @@ import AnalyticsClient
 public extension UserPropertyKeys {
   var id: String { "id" }
   var gender: String { "gender" }
-  var username: String { "username" }
   var onboardCompleted: String { "onboard_completed" }
 }
diff --git a/Packages/MatchCore/Sources/AppLogic/AuthLogic.swift b/Packages/MatchCore/Sources/AppLogic/AuthLogic.swift
index 370db276..d00adba1 100644
--- a/Packages/MatchCore/Sources/AppLogic/AuthLogic.swift
+++ b/Packages/MatchCore/Sources/AppLogic/AuthLogic.swift
@@ -90,7 +90,6 @@ public struct AuthLogic {
 
       analytics.setUserProperty(key: \.id, value: user.id)
       analytics.setUserProperty(key: \.gender, value: user.gender.rawValue)
-      analytics.setUserProperty(key: \.username, value: user.berealUsername)
 
       appsFlyer.customerUserID(user.id)
       appsFlyer.waitForATTUserAuthorization(60)
diff --git a/Packages/MatchCore/Sources/UsernameSettingLogic/UsernameSetting.swift b/Packages/MatchCore/Sources/UsernameSettingLogic/UsernameSetting.swift
index 52bd062b..db1be162 100644
--- a/Packages/MatchCore/Sources/UsernameSettingLogic/UsernameSetting.swift
+++ b/Packages/MatchCore/Sources/UsernameSettingLogic/UsernameSetting.swift
@@ -115,7 +115,6 @@ public struct UsernameSettingLogic {
            .updateTentenResponse(.success),
            .updateInstagramResponse(.success):
         state.isActivityIndicatorVisible = false
-        analytics.setUserProperty(key: \.username, value: state.value)
         return .send(.delegate(.nextScreen))
 
       case let .updateBeRealResponse(.failure(error as ServerError)):
diff --git a/Packages/Trinket/Sources/MembershipFeature/Localizable.xcstrings b/Packages/Trinket/Sources/MembershipFeature/Localizable.xcstrings
index 84602997..639d7ea0 100644
--- a/Packages/Trinket/Sources/MembershipFeature/Localizable.xcstrings
+++ b/Packages/Trinket/Sources/MembershipFeature/Localizable.xcstrings
@@ -2,6 +2,7 @@
   "sourceLanguage" : "en",
   "strings" : {
     "%@ for %@" : {
+      "extractionState" : "stale",
       "localizations" : {
         "en" : {
           "stringUnit" : {
@@ -695,6 +696,7 @@
       }
     },
     "when they use your invitation code you get" : {
+      "extractionState" : "stale",
       "localizations" : {
         "es" : {
           "stringUnit" : {
diff --git a/Packages/Trinket/Sources/SettingsFeature/Localizable.xcstrings b/Packages/Trinket/Sources/SettingsFeature/Localizable.xcstrings
index e67ca914..86da6d8b 100644
--- a/Packages/Trinket/Sources/SettingsFeature/Localizable.xcstrings
+++ b/Packages/Trinket/Sources/SettingsFeature/Localizable.xcstrings
@@ -15,16 +15,16 @@
             "value" : "基本情報"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "VỀ CHÚNG TÔI"
+            "value" : "정보"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "정보"
+            "value" : "VỀ CHÚNG TÔI"
           }
         }
       }
@@ -43,16 +43,16 @@
             "value" : "お問い合わせ"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Liên hệ với chúng tôi"
+            "value" : "문의하기"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "문의하기"
+            "value" : "Liên hệ với chúng tôi"
           }
         }
       }
@@ -71,16 +71,16 @@
             "value" : "アカウントを削除する"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Xóa tài khoản"
+            "value" : "계정 삭제"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "계정 삭제"
+            "value" : "Xóa tài khoản"
           }
         }
       }
@@ -99,16 +99,16 @@
             "value" : "プロフィール編集"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Chỉnh sửa hồ sơ"
+            "value" : "프로필 수정"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "프로필 수정"
+            "value" : "Chỉnh sửa hồ sơ"
           }
         }
       }
@@ -127,16 +127,16 @@
             "value" : "よくある質問"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Câu hỏi thường gặp"
+            "value" : "자주 묻는 질문"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "자주 묻는 질문"
+            "value" : "Câu hỏi thường gặp"
           }
         }
       }
@@ -155,16 +155,16 @@
             "value" : "ヘルプ"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Trợ giúp"
+            "value" : "도움말"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "도움말"
+            "value" : "Trợ giúp"
           }
         }
       }
@@ -183,16 +183,16 @@
             "value" : "Trinketの使い方"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Cách hoạt động"
+            "value" : "작동 방식"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "작동 방식"
+            "value" : "Cách hoạt động"
           }
         }
       }
@@ -211,16 +211,16 @@
             "value" : "会員ステータス"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Tình trạng hội viên"
+            "value" : "회원 상태"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "회원 상태"
+            "value" : "Tình trạng hội viên"
           }
         }
       }
@@ -239,16 +239,16 @@
             "value" : "自分のプロフィール"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Hồ sơ của tôi"
+            "value" : "내 프로필"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "내 프로필"
+            "value" : "Hồ sơ của tôi"
           }
         }
       }
@@ -267,16 +267,16 @@
             "value" : "その他"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Khác"
+            "value" : "기타"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "기타"
+            "value" : "Khác"
           }
         }
       }
@@ -295,16 +295,16 @@
             "value" : "プライバシーポリシー"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Chính sách bảo mật"
+            "value" : "개인정보 처리방침"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "개인정보 처리방침"
+            "value" : "Chính sách bảo mật"
           }
         }
       }
@@ -323,16 +323,16 @@
             "value" : "プロフィール"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "HỒ SƠ"
+            "value" : "프로필"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "프로필"
+            "value" : "HỒ SƠ"
           }
         }
       }
@@ -345,21 +345,25 @@
             "value" : "プッシュ通知"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Thông báo đẩy"
+            "value" : "푸시 알림"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "푸시 알림"
+            "value" : "Thông báo đẩy"
           }
         }
       }
+    },
+    "Rate Trinket" : {
+
     },
     "Rate Trinket." : {
+      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -373,16 +377,16 @@
             "value" : "Trinketを評価"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Đánh giá Trinket."
+            "value" : "Trinket 평가하기"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Trinket 평가하기"
+            "value" : "Đánh giá Trinket."
           }
         }
       }
@@ -401,16 +405,16 @@
             "value" : "設定"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Cài đặt"
+            "value" : "설정"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "설정"
+            "value" : "Cài đặt"
           }
         }
       }
@@ -429,16 +433,16 @@
             "value" : "Trinketをシェア"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Chia sẻ Trinket"
+            "value" : "Trinket 공유하기"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Trinket 공유하기"
+            "value" : "Chia sẻ Trinket"
           }
         }
       }
@@ -457,16 +461,16 @@
             "value" : "利用規約"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Điều khoản sử dụng"
+            "value" : "이용 약관"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "이용 약관"
+            "value" : "Điều khoản sử dụng"
           }
         }
       }
@@ -485,20 +489,20 @@
             "value" : "バージョン"
           }
         },
-        "vi" : {
+        "ko" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Phiên bản"
+            "value" : "버전"
           }
         },
-        "ko" : {
+        "vi" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "버전"
+            "value" : "Phiên bản"
           }
         }
       }
     }
   },
   "version" : "1.0"
-}
+}
\ No newline at end of file
diff --git a/TapMatch.xcworkspace/xcshareddata/swiftpm/Package.resolved b/TapMatch.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 18b3aeb4..af7d5f8c 100644
--- a/TapMatch.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/TapMatch.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -167,8 +167,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-clocks",
       "state" : {
-        "revision" : "3581e280bf0d90c3fb9236fb23e75a5d8c46b533",
-        "version" : "1.0.4"
+        "revision" : "b9b24b69e2adda099a1fa381cda1eeec272d5b53",
+        "version" : "1.0.5"
       }
     },
     {
@@ -176,8 +176,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-collections",
       "state" : {
-        "revision" : "3d2dc41a01f9e49d84f0a3925fb858bed64f702d",
-        "version" : "1.1.2"
+        "revision" : "9bf03ff58ce34478e66aaee630e491823326fd06",
+        "version" : "1.1.3"
       }
     },
     {
@@ -239,8 +239,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/swift-perception",
       "state" : {
-        "revision" : "1552c8f722ac256cc0b8daaf1a7073217d4fcdfb",
-        "version" : "1.3.4"
+        "revision" : "bc67aa8e461351c97282c2419153757a446ae1c9",
+        "version" : "1.3.5"
       }
     },
     {
@@ -248,8 +248,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-protobuf.git",
       "state" : {
-        "revision" : "e17d61f26df0f0e06f58f6977ba05a097a720106",
-        "version" : "1.27.1"
+        "revision" : "564597ad2fe2513a94dd8f3ba27ea2ff4be3cb37",
+        "version" : "1.28.0"
       }
     },
     {
@@ -258,7 +258,7 @@
       "location" : "https://github.com/swiftlang/swift-syntax",
       "state" : {
         "revision" : "515f79b522918f83483068d99c68daeb5116342d",
-        "version" : "600.0.0-prerelease-2024-08-14"
+        "version" : "600.0.0-prerelease-2024-08-20"
       }
     },
     {
@@ -275,8 +275,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/pointfreeco/xctest-dynamic-overlay",
       "state" : {
-        "revision" : "9829b6a67cc9fb08ccdb499eb92d2be5cc2f5d64",
-        "version" : "1.2.4"
+        "revision" : "96beb108a57f24c8476ae1f309239270772b2940",
+        "version" : "1.2.5"
       }
     }
   ],