diff --git a/.eslintrc.json b/.eslintrc.json
index 6a5fc5b83f3..6bcea9dd045 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -86,7 +86,7 @@
       "error",
       {
         "zones": [
-          // Do not allow angular/node/electron code to be imported into common
+          // Do not allow angular/node code to be imported into common
           {
             "target": "./libs/common/**/*",
             "from": "./libs/angular/**/*"
@@ -94,10 +94,6 @@
           {
             "target": "./libs/common/**/*",
             "from": "./libs/node/**/*"
-          },
-          {
-            "target": "./libs/common/**/*",
-            "from": "./libs/electron/**/*"
           }
         ]
       }
@@ -131,12 +127,6 @@
       "rules": {
         "no-restricted-imports": ["error", { "patterns": ["@bitwarden/node/*", "src/**/*"] }]
       }
-    },
-    {
-      "files": ["libs/electron/src/**/*.ts"],
-      "rules": {
-        "no-restricted-imports": ["error", { "patterns": ["@bitwarden/electron/*", "src/**/*"] }]
-      }
     }
   ]
 }
diff --git a/.github/whitelist-capital-letters.txt b/.github/whitelist-capital-letters.txt
index 5dd8cd621ba..af82f6b811a 100644
--- a/.github/whitelist-capital-letters.txt
+++ b/.github/whitelist-capital-letters.txt
@@ -4,14 +4,10 @@
 ./apps/browser/src/safari/desktop/Base.lproj
 ./apps/browser/src/services/vaultTimeout
 ./apps/browser/store/windows/Assets
-./apps/desktop/src/models/nativeMessaging
-./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses
 ./libs/common/spec/misc/logInStrategies
 ./libs/common/src/abstractions/fileDownload
 ./libs/common/src/abstractions/userVerification
 ./libs/common/src/abstractions/vaultTimeout
-./libs/common/src/emailForwarders
 ./libs/common/src/misc/logInStrategies
 ./libs/common/src/services/userVerification
 ./libs/common/src/services/vaultTimeout
@@ -112,12 +108,6 @@
 ./libs/common/src/enums/nativeMessagingVersion.ts
 ./libs/common/src/enums/cipherRepromptType.ts
 ./libs/common/src/enums/organizationUserType.ts
-./libs/common/src/emailForwarders/fastmailForwarder.ts
-./libs/common/src/emailForwarders/duckDuckGoForwarder.ts
-./libs/common/src/emailForwarders/firefoxRelayForwarder.ts
-./libs/common/src/emailForwarders/anonAddyForwarder.ts
-./libs/common/src/emailForwarders/simpleLoginForwarder.ts
-./libs/common/src/emailForwarders/forwarderOptions.ts
 ./libs/common/src/factories/accountFactory.ts
 ./libs/common/src/factories/globalStateFactory.ts
 ./libs/common/src/factories/stateFactory.ts
@@ -162,16 +152,6 @@
 ./libs/common/src/services/bitwardenFileUpload.service.ts
 ./libs/common/src/services/webCryptoFunction.service.ts
 ./libs/common/src/interfaces/IEncrypted.ts
-./libs/electron/spec/services/electronLog.service.spec.ts
-./libs/electron/src/baseMenu.ts
-./libs/electron/src/services/electronLog.service.ts
-./libs/electron/src/services/electronStorage.service.ts
-./libs/electron/src/services/electronRendererMessaging.service.ts
-./libs/electron/src/services/electronMainMessaging.service.ts
-./libs/electron/src/services/electronPlatformUtils.service.ts
-./libs/electron/src/services/electronRendererStorage.service.ts
-./libs/electron/src/services/electronCrypto.service.ts
-./libs/electron/src/services/electronRendererSecureStorage.service.ts
 ./README.md
 ./LICENSE_BITWARDEN.txt
 ./CONTRIBUTING.md
@@ -186,42 +166,9 @@
 ./apps/desktop/resources/appx/StoreLogo.png
 ./apps/desktop/resources/appx/Wide310x150Logo.png
 ./apps/desktop/resources/appx/Square44x44Logo.png
-./apps/desktop/native-messaging-test-runner/src/ipcService.ts
-./apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts
-./apps/desktop/native-messaging-test-runner/src/logUtils.ts
 ./apps/desktop/README.md
 ./apps/desktop/desktop_native/Cargo.toml
 ./apps/desktop/desktop_native/Cargo.lock
-./apps/desktop/src/app/services/desktopFileDownloadService.ts
-./apps/desktop/src/models/nativeMessaging/unencryptedCommand.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessage.ts
-./apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts
-./apps/desktop/src/models/nativeMessaging/unencryptedMessage.ts
-./apps/desktop/src/models/nativeMessaging/unencryptedMessageResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedCommand.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/successStatusResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/generateResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/failureStatusResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cannotDecryptErrorResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/accountStatusResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cipherResponse.ts
-./apps/desktop/src/models/nativeMessaging/decryptedCommandData.ts
-./apps/desktop/src/models/nativeMessaging/messageCommon.ts
-./apps/desktop/src/models/nativeMessaging/legacyMessage.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload.ts
-./apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload.ts
-./apps/desktop/src/main/desktopCredentialStorageListener.ts
-./apps/desktop/src/main/powerMonitor.main.ts
-./apps/desktop/src/main/nativeMessaging.main.ts
-./apps/desktop/src/services/passwordReprompt.service.ts
-./apps/desktop/src/services/encryptedMessageHandlerService.ts
-./apps/desktop/src/services/nativeMessaging.service.ts
-./apps/desktop/src/services/nativeMessageHandler.service.ts
 ./apps/cli/stores/chocolatey/tools/VERIFICATION.txt
 ./apps/cli/README.md
 ./apps/browser/README.md
diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
index 0a5746ce682..e54dc936eb4 100644
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -63,8 +63,8 @@ jobs:
           repo_url=https://github.com/$GITHUB_REPOSITORY.git
           adj_build_num=${GITHUB_SHA:0:7}
 
-          echo "::set-output name=repo_url::$repo_url"
-          echo "::set-output name=adj_build_number::$adj_build_num"
+          echo "repo_url=$repo_url" >> $GITHUB_OUTPUT
+          echo "adj_build_number=$adj_build_num" >> $GITHUB_OUTPUT
 
 
   locales-test:
@@ -183,7 +183,7 @@ jobs:
           name: dist-opera-MV3-${{ env._BUILD_NUMBER }}.zip
           path: apps/browser/dist/dist-opera-mv3.zip
           if-no-files-found: error
-          
+
       - name: Upload Chrome artifact
         uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535  # v3.0.0
         with:
diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
index e32dbedb24c..41b2a188fab 100644
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -62,7 +62,7 @@ jobs:
         id: retrieve-version
         run: |
           PKG_VERSION=$(jq -r .version package.json)
-          echo "::set-output name=package_version::$PKG_VERSION"
+          echo "package_version=$PKG_VERSION" >> $GITHUB_OUTPUT
 
 
   cli:
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index be69b22a8a5..f92ae8a71e4 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -87,29 +87,29 @@ jobs:
         id: retrieve-version
         run: |
           PKG_VERSION=$(jq -r .version src/package.json)
-          echo "::set-output name=package_version::$PKG_VERSION"
+          echo "package_version=$PKG_VERSION" >> $GITHUB_OUTPUT
 
       - name: Increment Version
         id: increment-version
         run: |
           BUILD_NUMBER=$(expr 3000 + $GITHUB_RUN_NUMBER)
           echo "Setting build number to $BUILD_NUMBER"
-          echo "::set-output name=build_number::$BUILD_NUMBER"
+          echo "build_number=$BUILD_NUMBER" >> $GITHUB_OUTPUT
 
       - name: Get Version Channel
         id: release-channel
         run: |
           case "${{ steps.retrieve-version.outputs.package_version }}" in
             *"alpha"*)
-              echo "::set-output name=channel::alpha"
+              echo "channel=alpha" >> $GITHUB_OUTPUT
               echo "[!] We do not yet support 'alpha'"
               exit 1
               ;;
             *"beta"*)
-              echo "::set-output name=channel::beta"
+              echo "channel=beta" >> $GITHUB_OUTPUT
               ;;
             *)
-              echo "::set-output name=channel::latest"
+              echo "channel=latest" >> $GITHUB_OUTPUT
               ;;
           esac
 
@@ -117,15 +117,15 @@ jobs:
         id: branch-check
         run: |
           if [[ $(git ls-remote --heads origin rc) ]]; then
-            echo "::set-output name=rc_branch_exists::1"
+            echo "rc_branch_exists=1" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=rc_branch_exists::0"
+            echo "rc_branch_exists=0" >> $GITHUB_OUTPUT
           fi
 
           if [[ $(git ls-remote --heads origin hotfix-rc-desktop) ]]; then
-            echo "::set-output name=hotfix_branch_exists::1"
+            echo "hotfix_branch_exists=1" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=hotfix_branch_exists::0"
+            echo "hotfix_branch_exists=0" >> $GITHUB_OUTPUT
           fi
 
 
diff --git a/.github/workflows/build-web.yml b/.github/workflows/build-web.yml
index eea60ccfbb0..b0bd282de6f 100644
--- a/.github/workflows/build-web.yml
+++ b/.github/workflows/build-web.yml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Get GitHub sha as version
         id: version
-        run: echo "::set-output name=value::${GITHUB_SHA:0:7}"
+        run: echo "value=${GITHUB_SHA:0:7}" >> $GITHUB_OUTPUT
 
   build-artifacts:
     name: Build artifacts
@@ -303,7 +303,7 @@ jobs:
             IMAGE_TAG=$IMAGE_TAG-$TAG_EXTENSION
           fi
 
-          echo "::set-output name=value::$IMAGE_TAG"
+          echo "value=$IMAGE_TAG" >> $GITHUB_OUTPUT
 
       - name: Tag image
         env:
diff --git a/.github/workflows/release-desktop-beta.yml b/.github/workflows/release-desktop-beta.yml
index a57b600d0ec..fb456de1951 100644
--- a/.github/workflows/release-desktop-beta.yml
+++ b/.github/workflows/release-desktop-beta.yml
@@ -60,22 +60,22 @@ jobs:
         run: |
           BUILD_NUMBER=$(expr 3000 + $GITHUB_RUN_NUMBER)
           echo "Setting build number to $BUILD_NUMBER"
-          echo "::set-output name=build_number::$BUILD_NUMBER"
+          echo "build_number=$BUILD_NUMBER" >> $GITHUB_OUTPUT
 
       - name: Get Version Channel
         id: release-channel
         run: |
           case "${{ steps.version.outputs.version }}" in
             *"alpha"*)
-              echo "::set-output name=channel::alpha"
+              echo "channel=alpha" >> $GITHUB_OUTPUT
               echo "[!] We do not yet support 'alpha'"
               exit 1
               ;;
             *"beta"*)
-              echo "::set-output name=channel::beta"
+              echo "channel=beta" >> $GITHUB_OUTPUT
               ;;
             *)
-              echo "::set-output name=channel::latest"
+              echo "channel=latest" >> $GITHUB_OUTPUT
               ;;
           esac
 
@@ -102,7 +102,7 @@ jobs:
 
           git push -u origin $branch_name
 
-          echo "::set-output name=branch-name::$branch_name"
+          echo "branch-name=$branch_name" >> $GITHUB_OUTPUT
 
   linux:
     name: Linux Build
diff --git a/.github/workflows/release-desktop.yml b/.github/workflows/release-desktop.yml
index 80c3b71c15d..a4aceac962b 100644
--- a/.github/workflows/release-desktop.yml
+++ b/.github/workflows/release-desktop.yml
@@ -29,6 +29,16 @@ on:
         required: true
         default: true
         type: boolean
+      electron_publish:
+        description: 'Publish electron to S3 bucket'
+        required: true
+        default: true
+        type: boolean
+      github_release:
+        description: 'Publish github release'
+        required: true
+        default: true
+        type: boolean
 
 defaults:
   run:
@@ -70,15 +80,15 @@ jobs:
         run: |
           case "${{ steps.version.outputs.version }}" in
             *"alpha"*)
-              echo "::set-output name=channel::alpha"
+              echo "channel=alpha" >> $GITHUB_OUTPUT
               echo "[!] We do not yet support 'alpha'"
               exit 1
               ;;
             *"beta"*)
-              echo "::set-output name=channel::beta"
+              echo "channel=beta" >> $GITHUB_OUTPUT
               ;;
             *)
-              echo "::set-output name=channel::latest"
+              echo "channel=latest" >> $GITHUB_OUTPUT
               ;;
           esac
 
@@ -136,6 +146,7 @@ jobs:
         run: mv Bitwarden-${{ env.PKG_VERSION }}-universal.pkg Bitwarden-${{ env.PKG_VERSION }}-universal.pkg.archive
 
       - name: Set staged rollout percentage
+        if: ${{ github.event.inputs.electron_publish }}
         env:
           RELEASE_CHANNEL: ${{ steps.release-channel.outputs.channel }}
           ROLLOUT_PCT: ${{ github.event.inputs.rollout_percentage }}
@@ -145,7 +156,7 @@ jobs:
           echo "stagingPercentage: ${ROLLOUT_PCT}" >> apps/desktop/artifacts/${RELEASE_CHANNEL}-mac.yml
 
       - name: Publish artifacts to S3
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        if: ${{ github.event.inputs.release_type != 'Dry Run' && github.event.inputs.electron_publish }}
         env:
           AWS_ACCESS_KEY_ID: ${{ steps.retrieve-secrets.outputs.aws-electron-access-id }}
           AWS_SECRET_ACCESS_KEY: ${{ steps.retrieve-secrets.outputs.aws-electron-access-key }}
@@ -159,7 +170,7 @@ jobs:
           --quiet
 
       - name: Publish artifacts to R2
-        if: ${{ github.event.inputs.release_type != 'Dry Run' }}
+        if: ${{ github.event.inputs.release_type != 'Dry Run' && github.event.inputs.electron_publish }}
         env:
           AWS_ACCESS_KEY_ID: ${{ steps.retrieve-secrets.outputs.r2-electron-access-id }}
           AWS_SECRET_ACCESS_KEY: ${{ steps.retrieve-secrets.outputs.r2-electron-access-key }}
@@ -175,7 +186,7 @@ jobs:
 
       - name: Create Release
         uses: ncipollo/release-action@95215a3cb6e6a1908b3c44e00b4fdb15548b1e09
-        if: ${{ steps.release-channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' }}
+        if: ${{ steps.release-channel.outputs.channel == 'latest' && github.event.inputs.release_type != 'Dry Run' && github.event.inputs.github_release }}
         env:
           PKG_VERSION: ${{ steps.version.outputs.version }}
           RELEASE_CHANNEL: ${{ steps.release-channel.outputs.channel }}
diff --git a/.github/workflows/staged-rollout-desktop.yml b/.github/workflows/staged-rollout-desktop.yml
index d60fa700617..363fe134eee 100644
--- a/.github/workflows/staged-rollout-desktop.yml
+++ b/.github/workflows/staged-rollout-desktop.yml
@@ -54,20 +54,6 @@ jobs:
             r2-electron-bucket-name,
             cf-prod-account"
 
-      - name: Download channel update info files from S3
-        env:
-          AWS_ACCESS_KEY_ID: ${{ steps.retrieve-secrets.outputs.aws-electron-access-id }}
-          AWS_SECRET_ACCESS_KEY: ${{ steps.retrieve-secrets.outputs.aws-electron-access-key }}
-          AWS_DEFAULT_REGION: 'us-west-2'
-          AWS_S3_BUCKET_NAME: ${{ steps.retrieve-secrets.outputs.aws-electron-bucket-name }}
-        run: |
-          aws s3 cp $AWS_S3_BUCKET_NAME/desktop/latest.yml . \
-          --quiet
-          aws s3 cp $AWS_S3_BUCKET_NAME/desktop/latest-linux.yml . \
-          --quiet
-          aws s3 cp $AWS_S3_BUCKET_NAME/desktop/latest-mac.yml . \
-          --quiet
-
       - name: Download channel update info files from R2
         env:
           AWS_ACCESS_KEY_ID: ${{ steps.retrieve-secrets.outputs.r2-electron-access-id }}
@@ -99,7 +85,7 @@ jobs:
             echo
             echo "If you want to pull a staged release because it hasn’t gone well, you must increment the version \
                   number higher than your broken release. Because some of your users will be on the broken 1.0.1, \
-                  releasing a new 1.0.1 would result in them staying on a broken version.”
+                  releasing a new 1.0.1 would result in them staying on a broken version."
             exit 1
           fi
 
@@ -118,10 +104,14 @@ jobs:
           AWS_DEFAULT_REGION: 'us-west-2'
           AWS_S3_BUCKET_NAME: ${{ steps.retrieve-secrets.outputs.aws-electron-bucket-name }}
         run: |
-          aws s3 cp ./ $AWS_S3_BUCKET_NAME/desktop/ \
-          --include "latest*.yml" \
-          --acl "public-read" \
-          --quiet
+          aws s3 cp latest.yml $AWS_S3_BUCKET_NAME/desktop/ \
+          --acl "public-read"
+
+          aws s3 cp latest-linux.yml $AWS_S3_BUCKET_NAME/desktop/ \
+          --acl "public-read"
+
+          aws s3 cp latest-mac.yml $AWS_S3_BUCKET_NAME/desktop/ \
+          --acl "public-read"
 
       - name: Publish channel update info files to R2
         env:
@@ -131,7 +121,11 @@ jobs:
           AWS_S3_BUCKET_NAME: ${{ steps.retrieve-secrets.outputs.r2-electron-bucket-name }}
           CF_ACCOUNT: ${{ steps.retrieve-secrets.outputs.cf-prod-account }}
         run: |
-          aws s3 cp ./ $AWS_S3_BUCKET_NAME/desktop/ \
-          --include "latest*.yml" \
-          --quiet \
+          aws s3 cp latest.yml $AWS_S3_BUCKET_NAME/desktop/ \
+          --endpoint-url https://${CF_ACCOUNT}.r2.cloudflarestorage.com
+          
+          aws s3 cp latest-linux.yml $AWS_S3_BUCKET_NAME/desktop/ \
+          --endpoint-url https://${CF_ACCOUNT}.r2.cloudflarestorage.com
+
+          aws s3 cp latest-mac.yml $AWS_S3_BUCKET_NAME/desktop/ \
           --endpoint-url https://${CF_ACCOUNT}.r2.cloudflarestorage.com
diff --git a/.github/workflows/version-auto-bump.yml b/.github/workflows/version-auto-bump.yml
index 3e5b5fc3c2b..7dee24e9202 100644
--- a/.github/workflows/version-auto-bump.yml
+++ b/.github/workflows/version-auto-bump.yml
@@ -36,7 +36,7 @@ jobs:
 
           NEW_VER=$CURR_MAJOR.$NEW_PATCH
           echo "New Version: $NEW_VER"
-          echo "::set-output name=new-version::$NEW_VER"
+          echo "new-version=$NEW_VER" >> $GITHUB_OUTPUT
 
   trigger_version_bump:
     name: "Trigger desktop version bump workflow"
diff --git a/.github/workflows/version-bump.yml b/.github/workflows/version-bump.yml
index 80d54eef145..f7ba508c6c3 100644
--- a/.github/workflows/version-bump.yml
+++ b/.github/workflows/version-bump.yml
@@ -56,7 +56,7 @@ jobs:
           VERSION: ${{ github.event.inputs.version_number }}
         run: |
           CLIENT=$(python -c "print('$CLIENT_NAME'.lower())")
-          echo "::set-output name=client::$CLIENT"
+          echo "client=$CLIENT" >> $GITHUB_OUTPUT
 
           git switch -c ${CLIENT}_version_bump_${VERSION}
 
@@ -131,9 +131,9 @@ jobs:
         id: version-changed
         run: |
           if [ -n "$(git status --porcelain)" ]; then
-            echo "::set-output name=changes_to_commit::TRUE"
+            echo "changes_to_commit=TRUE" >> $GITHUB_OUTPUT
           else
-            echo "::set-output name=changes_to_commit::FALSE"
+            echo "changes_to_commit=FALSE" >> $GITHUB_OUTPUT
             echo "No changes to commit!";
           fi
 
@@ -142,8 +142,7 @@ jobs:
         env:
           CLIENT: ${{ steps.branch.outputs.client }}
           VERSION: ${{ github.event.inputs.version_number }}
-        run: |
-          git commit -m "Bumped ${CLIENT} version to ${VERSION}" -a
+        run: git commit -m "Bumped ${CLIENT} version to ${VERSION}" -a
 
       - name: Push changes
         if: ${{ steps.version-changed.outputs.changes_to_commit == 'TRUE' }}
diff --git a/README.md b/README.md
index c426251905b..a80918cf251 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
 
 This repository houses all Bitwarden client applications except the [Mobile application](https://github.com/bitwarden/mobile).
 
-Please refer to the [Clients section](https://contributing.bitwarden.com/clients/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+Please refer to the [Clients section](https://contributing.bitwarden.com/docs/clients/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
 
 ## Related projects:
 
diff --git a/apps/browser/README.md b/apps/browser/README.md
index 3ec5e544547..863839fd800 100644
--- a/apps/browser/README.md
+++ b/apps/browser/README.md
@@ -19,4 +19,4 @@ The Bitwarden browser extension is written using the Web Extension API and Angul
 
 ## Documentation
 
-Please refer to the [Browser section](https://contributing.bitwarden.com/clients/browser/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+Please refer to the [Browser section](https://contributing.bitwarden.com/docs/clients/browser/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
diff --git a/apps/browser/src/_locales/ar/messages.json b/apps/browser/src/_locales/ar/messages.json
index 6e4208b13f0..248608de651 100644
--- a/apps/browser/src/_locales/ar/messages.json
+++ b/apps/browser/src/_locales/ar/messages.json
@@ -482,7 +482,7 @@
     "message": "الاسم مطلوب."
   },
   "addedFolder": {
-    "message": "Folder added"
+    "message": "أُضيف المجلد"
   },
   "changeMasterPass": {
     "message": "تغيير كلمة المرور الرئيسية"
@@ -494,7 +494,7 @@
     "message": "تسجيل الدخول بخطوتين يجعل حسابك أكثر أمنا من خلال مطالبتك بالتحقق من تسجيل الدخول باستخدام جهاز آخر مثل مفتاح الأمان، تطبيق المصادقة، الرسائل القصيرة، المكالمة الهاتفية، أو البريد الإلكتروني. يمكن تمكين تسجيل الدخول بخطوتين على خزنة الويب bitwarden.com. هل تريد زيارة الموقع الآن؟"
   },
   "editedFolder": {
-    "message": "Folder saved"
+    "message": "حُفظ المجلد"
   },
   "deleteFolderConfirmation": {
     "message": "هل أنت متأكد من حذف هذا المجلّد؟"
@@ -521,7 +521,7 @@
     "message": "عنوان الـ URI"
   },
   "uriPosition": {
-    "message": "URI $POSITION$",
+    "message": "رابط $POSITION$",
     "description": "A listing of URIs. Ex: URI 1, URI 2, URI 3, etc.",
     "placeholders": {
       "position": {
@@ -571,13 +571,13 @@
     "description": "This is the folder for uncategorized items"
   },
   "enableAddLoginNotification": {
-    "message": "Ask to add login"
+    "message": "اطلب إضافة تسجيل الدخول"
   },
   "addLoginNotificationDesc": {
-    "message": "Ask to add an item if one isn't found in your vault."
+    "message": "اطلب إضافة عنصر إذا لم يُعثر عليه في خزنتك."
   },
   "showCardsCurrentTab": {
-    "message": "Show cards on Tab page"
+    "message": "أظهر البطاقات في صفحة التبويبات"
   },
   "showCardsCurrentTabDesc": {
     "message": "List card items on the Tab page for easy auto-fill."
diff --git a/apps/browser/src/_locales/cs/messages.json b/apps/browser/src/_locales/cs/messages.json
index b3a8a004a29..655d9e3d58e 100644
--- a/apps/browser/src/_locales/cs/messages.json
+++ b/apps/browser/src/_locales/cs/messages.json
@@ -149,7 +149,7 @@
     "message": "Změnit hlavní heslo"
   },
   "fingerprintPhrase": {
-    "message": "Fráze otisku účtu",
+    "message": "Unikátní přístupová fráze",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "yourAccountsFingerprint": {
@@ -606,7 +606,7 @@
     "message": "Zeptat se na aktualizaci existujícího přihlášení"
   },
   "changedPasswordNotificationDesc": {
-    "message": "Ask to update a login's password when a change is detected on a website."
+    "message": "Dotázat se na aktualizaci hesla pro přihlášení, pokud je na webové stránce zjištěno použití jiného hesla."
   },
   "notificationChangeDesc": {
     "message": "Chcete aktualizovat toto heslo v Bitwarden?"
@@ -618,7 +618,7 @@
     "message": "Zobrazit v kontextovém menu"
   },
   "contextMenuItemDesc": {
-    "message": "Use a secondary click to access password generation and matching logins for the website. "
+    "message": "Použijte pravé tlačítko pro přístup k vytvoření hesla a odpovídajícímu přihlášení pro tuto stránku. "
   },
   "defaultUriMatchDetection": {
     "message": "Výchozí zjišťování shody URI",
@@ -1043,10 +1043,10 @@
     "message": "Zobrazit rozeznatelný obrázek vedle každého přihlášení."
   },
   "enableBadgeCounter": {
-    "message": "Show badge counter"
+    "message": "Zobrazovat počet uložených přihlašovacích údajů na stránce"
   },
   "badgeCounterDesc": {
-    "message": "Zobrazit počet přihlašovacích údajů pro aktuální webovou stránku."
+    "message": "Zobrazit počet přihlašovacích údajů pro aktuální webovou stránku na ikoně rozšíření prohlížeče."
   },
   "cardholderName": {
     "message": "Jméno držitele karty"
@@ -1632,7 +1632,7 @@
     "message": "Odstraněné heslo"
   },
   "deletedSend": {
-    "message": "Smazaný Send",
+    "message": "Send odstraněn",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
@@ -1899,10 +1899,10 @@
     "message": "Vypršel časový limit relace. Vraťte se prosím zpět a zkuste se znovu přihlásit."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Exporting individual vault"
+    "message": "Export mého trezoru"
   },
   "exportingPersonalVaultDescription": {
-    "message": "Only the individual vault items associated with $EMAIL$ will be exported. Organization vault items will not be included.",
+    "message": "Budou exportovány pouze položky trezoru spojené s účtem $EMAIL$. Nebudou zahrnuty položky trezoru v organizaci.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -1970,16 +1970,16 @@
     "message": "API klíč"
   },
   "ssoKeyConnectorError": {
-    "message": "Key connector error: make sure key connector is available and working correctly."
+    "message": "Chyba Key Connector: ujistěte se, že je Key Connector k dispozici a funguje správně."
   },
   "premiumSubcriptionRequired": {
     "message": "Vyžadováno prémiové předplatné"
   },
   "organizationIsDisabled": {
-    "message": "Organization suspended."
+    "message": "Organizace je deaktivována."
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in suspended Organizations cannot be accessed. Contact your Organization owner for assistance."
+    "message": "K položkám v deaktivované organizaci nemáte přístup. Požádejte o pomoc vlastníka organizace."
   },
   "cardBrandMir": {
     "message": "Mir"
@@ -2000,19 +2000,19 @@
     "message": "Klikněte zde"
   },
   "environmentEditedReset": {
-    "message": "to reset to pre-configured settings"
+    "message": "pro obnovení do přednastavených nastavení"
   },
   "serverVersion": {
     "message": "Verze serveru"
   },
   "selfHosted": {
-    "message": "Self-hosted"
+    "message": "Vlastní hosting"
   },
   "thirdParty": {
-    "message": "Third-party"
+    "message": "Tretí strana"
   },
   "thirdPartyServerMessage": {
-    "message": "Connected to third-party server implementation, $SERVERNAME$. Please verify bugs using the official server, or report them to the third-party server.",
+    "message": "Připojeno k serveru třetí strany $SERVERNAME$. Ověřte chyby připojením na oficiální server nebo nahlaste problém správci serveru.",
     "placeholders": {
       "servername": {
         "content": "$1",
diff --git a/apps/browser/src/_locales/en_GB/messages.json b/apps/browser/src/_locales/en_GB/messages.json
index 293c6e0559c..810efccc664 100644
--- a/apps/browser/src/_locales/en_GB/messages.json
+++ b/apps/browser/src/_locales/en_GB/messages.json
@@ -59,7 +59,7 @@
     "message": "My vault"
   },
   "allVaults": {
-    "message": "All Vaults"
+    "message": "All vaults"
   },
   "tools": {
     "message": "Tools"
@@ -92,13 +92,13 @@
     "message": "Auto-fill"
   },
   "generatePasswordCopied": {
-    "message": "Generate Password (and Copy)"
+    "message": "Generate password (copied)"
   },
   "copyElementIdentifier": {
-    "message": "Copy Custom Field Name"
+    "message": "Copy custom field name"
   },
   "noMatchingLogins": {
-    "message": "No matching logins."
+    "message": "No matching logins"
   },
   "unlockVaultMenu": {
     "message": "Unlock your vault"
diff --git a/apps/browser/src/_locales/fi/messages.json b/apps/browser/src/_locales/fi/messages.json
index bc362924d83..e0dace731c5 100644
--- a/apps/browser/src/_locales/fi/messages.json
+++ b/apps/browser/src/_locales/fi/messages.json
@@ -3,7 +3,7 @@
     "message": "Bitwarden"
   },
   "extName": {
-    "message": "Bitwarden – Ilmainen salasananhallinta",
+    "message": "Bitwarden - Free Password Manager",
     "description": "Extension name, MUST be less than 40 characters (Safari restriction)"
   },
   "extDesc": {
diff --git a/apps/browser/src/_locales/fr/messages.json b/apps/browser/src/_locales/fr/messages.json
index c2d133c853f..3f273ce1d41 100644
--- a/apps/browser/src/_locales/fr/messages.json
+++ b/apps/browser/src/_locales/fr/messages.json
@@ -577,16 +577,16 @@
     "message": "La \"Notification de demande d'ajout d'identifiant\" apparait automatiquement pour vous demander d'enregistrer dans votre coffre les identifiants que vous utilisez pour la première fois."
   },
   "showCardsCurrentTab": {
-    "message": "Show cards on Tab page"
+    "message": "Afficher les cartes sur la page de l'onglet"
   },
   "showCardsCurrentTabDesc": {
-    "message": "List card items on the Tab page for easy auto-fill."
+    "message": "Lister les éléments de la carte sur la page de l'onglet pour faciliter le remplissage automatique."
   },
   "showIdentitiesCurrentTab": {
-    "message": "Show identities on Tab page"
+    "message": "Afficher les identités sur la page Onglet courant"
   },
   "showIdentitiesCurrentTabDesc": {
-    "message": "List identity items on the Tab page for easy auto-fill."
+    "message": "Lister les éléments d'identité sur la page de l'onglet pour faciliter le remplissage automatique."
   },
   "clearClipboard": {
     "message": "Effacer le presse-papiers",
@@ -618,7 +618,7 @@
     "message": "Afficher les options du menu contextuel"
   },
   "contextMenuItemDesc": {
-    "message": "Use a secondary click to access password generation and matching logins for the website. "
+    "message": "Utilisez un clic secondaire pour accéder à la génération de mots de passe et les identifiants correspondants pour le site Web. "
   },
   "defaultUriMatchDetection": {
     "message": "Détection de correspondance URI par défaut",
@@ -816,7 +816,7 @@
     "message": "Si une clé d'authentification est rattachée à votre identifiant, alors le code de vérification TOTP est automatiquement copié dans le presse-papiers lorsque vous renseignez l'identifiant."
   },
   "enableAutoBiometricsPrompt": {
-    "message": "Ask for biometrics on launch"
+    "message": "Demander la biométrie au lancement"
   },
   "premiumRequired": {
     "message": "Version Premium requise"
@@ -1043,10 +1043,10 @@
     "message": "Afficher une image reconnaissable à côté de chaque identifiant."
   },
   "enableBadgeCounter": {
-    "message": "Show badge counter"
+    "message": "Afficher le compteur de badge"
   },
   "badgeCounterDesc": {
-    "message": "Indicate how many logins you have for the current web page."
+    "message": "Indique le nombre d'identifiants que vous avez pour la page web actuelle."
   },
   "cardholderName": {
     "message": "Nom du titulaire de la carte"
@@ -2000,19 +2000,19 @@
     "message": "Cliquez ici"
   },
   "environmentEditedReset": {
-    "message": "to reset to pre-configured settings"
+    "message": "pour réinitialiser aux paramètres par défaut"
   },
   "serverVersion": {
-    "message": "Server version"
+    "message": "Version du serveur"
   },
   "selfHosted": {
     "message": "Auto-hébergé"
   },
   "thirdParty": {
-    "message": "Third-party"
+    "message": "Tierce partie"
   },
   "thirdPartyServerMessage": {
-    "message": "Connected to third-party server implementation, $SERVERNAME$. Please verify bugs using the official server, or report them to the third-party server.",
+    "message": "Connecté à l'implémentation du serveur tiers, $SERVERNAME$. Veuillez contrôler les bugs en utilisant le serveur officiel, ou rapportez-les au serveur tiers.",
     "placeholders": {
       "servername": {
         "content": "$1",
@@ -2021,7 +2021,7 @@
     }
   },
   "lastSeenOn": {
-    "message": "last seen on: $DATE$",
+    "message": "vu pour la dernière fois le : $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -2030,10 +2030,10 @@
     }
   },
   "loginWithMasterPassword": {
-    "message": "Log in with master password"
+    "message": "Connectez-vous avec le mot de passe maître"
   },
   "loggingInAs": {
-    "message": "Logging in as"
+    "message": "Connexion en tant que"
   },
   "notYou": {
     "message": "Ce n'est pas vous ?"
@@ -2042,6 +2042,6 @@
     "message": "Êtes-vous nouveau ici ?"
   },
   "rememberEmail": {
-    "message": "Remember email"
+    "message": "Se souvenir de l'e-mail"
   }
 }
diff --git a/apps/browser/src/_locales/pl/messages.json b/apps/browser/src/_locales/pl/messages.json
index 5682bb08e91..8b263c097c5 100644
--- a/apps/browser/src/_locales/pl/messages.json
+++ b/apps/browser/src/_locales/pl/messages.json
@@ -2042,6 +2042,6 @@
     "message": "Jesteś tu nowy(a)?"
   },
   "rememberEmail": {
-    "message": "Zapamiętaj email"
+    "message": "Zapamiętaj adres e-mail"
   }
 }
diff --git a/apps/browser/src/_locales/sl/messages.json b/apps/browser/src/_locales/sl/messages.json
index 746ec5540a9..35a1aa7a8fe 100644
--- a/apps/browser/src/_locales/sl/messages.json
+++ b/apps/browser/src/_locales/sl/messages.json
@@ -53,13 +53,13 @@
     "message": "Zavihek"
   },
   "vault": {
-    "message": "Sef"
+    "message": "Trezor"
   },
   "myVault": {
     "message": "Moj trezor"
   },
   "allVaults": {
-    "message": "All vaults"
+    "message": "Vsi trezorji"
   },
   "tools": {
     "message": "Orodja"
@@ -101,7 +101,7 @@
     "message": "Nobenih ujemajočih prijav."
   },
   "unlockVaultMenu": {
-    "message": "Unlock your vault"
+    "message": "Odkleni svoj trezor"
   },
   "loginToVaultMenu": {
     "message": "Log in to your vault"
@@ -131,10 +131,10 @@
     "message": "Send a verification code to your email"
   },
   "sendCode": {
-    "message": "Send code"
+    "message": "Pošlji kodo"
   },
   "codeSent": {
-    "message": "Code sent"
+    "message": "Koda poslana"
   },
   "verificationCode": {
     "message": "Verifikacijska koda"
@@ -242,10 +242,10 @@
     "message": "Lowercase (a-z)"
   },
   "numbers": {
-    "message": "Numbers (0-9)"
+    "message": "Številke (0-9)"
   },
   "specialCharacters": {
-    "message": "Special characters (!@#$%^&*)"
+    "message": "Posebni znaki (!@#$%^&*)"
   },
   "numWords": {
     "message": "Število besed"
@@ -864,7 +864,7 @@
     "message": "To start the WebAuthn 2FA verification. Click the button below to open a new tab and follow the instructions provided in the new tab."
   },
   "webAuthnNewTabOpen": {
-    "message": "Open new tab"
+    "message": "Odpri nov zavihek"
   },
   "webAuthnAuthenticate": {
     "message": "Authenticate WebAuthn"
@@ -879,10 +879,10 @@
     "message": "Please use a supported web browser (such as Chrome) and/or add additional providers that are better supported across web browsers (such as an authenticator app)."
   },
   "twoStepOptions": {
-    "message": "Two-step login options"
+    "message": "Možnosti dvostopenjske prijave"
   },
   "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to turn off all two-factor providers from your account."
+    "message": "Ste izgubili dostop do vseh vaših ponudnikov dvostopenjske prijave? Uporabite svojo kodo za obnovitev in tako onemogočite dvostopenjsko prijavo v svoj račun."
   },
   "recoveryCodeTitle": {
     "message": "Koda za obnovitev"
@@ -927,7 +927,7 @@
     "message": "Specify the base URL of your on-premises hosted Bitwarden installation."
   },
   "customEnvironment": {
-    "message": "Custom environment"
+    "message": "Okolje po meri"
   },
   "customEnvironmentFooter": {
     "message": "For advanced users. You can specify the base URL of each service independently."
@@ -993,7 +993,7 @@
     "message": "Generate and copy a new random password to the clipboard"
   },
   "commandLockVaultDesc": {
-    "message": "Lock the vault"
+    "message": "Zakleni trezor"
   },
   "privateModeWarning": {
     "message": "Private mode support is experimental and some features are limited."
@@ -1002,10 +1002,10 @@
     "message": "Custom fields"
   },
   "copyValue": {
-    "message": "Copy value"
+    "message": "Kopiraj vrednost"
   },
   "value": {
-    "message": "Value"
+    "message": "Vrednost"
   },
   "newCustomField": {
     "message": "New custom field"
@@ -1020,7 +1020,7 @@
     "message": "Skrito"
   },
   "cfTypeBoolean": {
-    "message": "Boolean"
+    "message": "Logična vrednost"
   },
   "cfTypeLinked": {
     "message": "Linked",
@@ -1133,7 +1133,7 @@
     "message": "Priimek"
   },
   "fullName": {
-    "message": "Full name"
+    "message": "Polno ime"
   },
   "identityName": {
     "message": "Ime identitete"
@@ -1190,22 +1190,22 @@
     "message": "Prijave"
   },
   "typeSecureNote": {
-    "message": "Secure note"
+    "message": "Varni zapisek"
   },
   "typeCard": {
-    "message": "Card"
+    "message": "Kartica"
   },
   "typeIdentity": {
-    "message": "Identity"
+    "message": "Identiteta"
   },
   "passwordHistory": {
-    "message": "Password history"
+    "message": "Zgodovina gesel"
   },
   "back": {
-    "message": "Back"
+    "message": "Nazaj"
   },
   "collections": {
-    "message": "Collections"
+    "message": "Zbirke"
   },
   "favorites": {
     "message": "Priljubljeno"
@@ -1226,7 +1226,7 @@
     "message": "Prijave"
   },
   "secureNotes": {
-    "message": "Secure notes"
+    "message": "Varni zapiski"
   },
   "clear": {
     "message": "Počisti",
@@ -1285,15 +1285,15 @@
     "description": "Toggle the display of the URIs of the currently open tabs in the browser."
   },
   "currentUri": {
-    "message": "Current URI",
+    "message": "Trenutni URI",
     "description": "The URI of one of the current open tabs in the browser."
   },
   "organization": {
-    "message": "Organization",
+    "message": "Organizacija",
     "description": "An entity of multiple related people (ex. a team or business organization)."
   },
   "types": {
-    "message": "Types"
+    "message": "Tipi"
   },
   "allItems": {
     "message": "All items"
@@ -1302,13 +1302,13 @@
     "message": "There are no passwords to list."
   },
   "remove": {
-    "message": "Remove"
+    "message": "Odstrani"
   },
   "default": {
-    "message": "Default"
+    "message": "Privzeto"
   },
   "dateUpdated": {
-    "message": "Updated",
+    "message": "Posodobljeno",
     "description": "ex. Date this item was updated"
   },
   "dateCreated": {
@@ -1329,25 +1329,25 @@
     "message": "There are no collections to list."
   },
   "ownership": {
-    "message": "Ownership"
+    "message": "Lastništvo"
   },
   "whoOwnsThisItem": {
     "message": "Who owns this item?"
   },
   "strong": {
-    "message": "Strong",
+    "message": "Močno",
     "description": "ex. A strong password. Scale: Weak -> Good -> Strong"
   },
   "good": {
-    "message": "Good",
+    "message": "Dobro",
     "description": "ex. A good password. Scale: Weak -> Good -> Strong"
   },
   "weak": {
-    "message": "Weak",
+    "message": "Šibko",
     "description": "ex. A weak password. Scale: Weak -> Good -> Strong"
   },
   "weakMasterPassword": {
-    "message": "Weak master password"
+    "message": "Šibko glavno geslo"
   },
   "weakMasterPasswordDesc": {
     "message": "The master password you have chosen is weak. You should use a strong master password (or a passphrase) to properly protect your Bitwarden account. Are you sure you want to use this master password?"
@@ -1357,19 +1357,19 @@
     "description": "PIN code. Ex. The short code (often numeric) that you use to unlock a device."
   },
   "unlockWithPin": {
-    "message": "Unlock with PIN"
+    "message": "Odkleni s PIN kodo"
   },
   "setYourPinCode": {
     "message": "Set your PIN code for unlocking Bitwarden. Your PIN settings will be reset if you ever fully log out of the application."
   },
   "pinRequired": {
-    "message": "PIN code is required."
+    "message": "Potrebna je PIN koda."
   },
   "invalidPin": {
-    "message": "Invalid PIN code."
+    "message": "Nepravilna PIN koda."
   },
   "unlockWithBiometrics": {
-    "message": "Unlock with biometrics"
+    "message": "Prijava z biometriko"
   },
   "awaitDesktop": {
     "message": "Awaiting confirmation from desktop"
@@ -1387,7 +1387,7 @@
     "message": "Clone item"
   },
   "clone": {
-    "message": "Clone"
+    "message": "Kloniraj"
   },
   "passwordGeneratorPolicyInEffect": {
     "message": "One or more organization policies are affecting your generator settings."
@@ -1396,15 +1396,15 @@
     "message": "Vault timeout action"
   },
   "lock": {
-    "message": "Lock",
+    "message": "Zakleni",
     "description": "Verb form: to make secure or inaccesible by"
   },
   "trash": {
-    "message": "Trash",
+    "message": "Koš",
     "description": "Noun: a special folder to hold deleted items"
   },
   "searchTrash": {
-    "message": "Search trash"
+    "message": "Preišči koš"
   },
   "permanentlyDeleteItem": {
     "message": "Permanently delete item"
@@ -1440,7 +1440,7 @@
     "message": "Item auto-filled "
   },
   "setMasterPassword": {
-    "message": "Set master password"
+    "message": "Nastavi glavno geslo"
   },
   "masterPasswordPolicyInEffect": {
     "message": "One or more organization policies require your master password to meet the following requirements:"
@@ -1494,13 +1494,13 @@
     "message": "Terms of Service"
   },
   "privacyPolicy": {
-    "message": "Privacy Policy"
+    "message": "Pravilnik o zasebnosti"
   },
   "hintEqualsPassword": {
     "message": "Your password hint cannot be the same as your password."
   },
   "ok": {
-    "message": "Ok"
+    "message": "V redu"
   },
   "desktopSyncVerificationTitle": {
     "message": "Desktop sync verification"
@@ -1584,7 +1584,7 @@
     }
   },
   "send": {
-    "message": "Send",
+    "message": "Pošlji",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "searchSends": {
@@ -1596,10 +1596,10 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTypeText": {
-    "message": "Text"
+    "message": "Besedilo"
   },
   "sendTypeFile": {
-    "message": "File"
+    "message": "Datoteka"
   },
   "allSends": {
     "message": "All Sends",
@@ -1610,7 +1610,7 @@
     "description": "This text will be displayed after a Send has been accessed the maximum amount of times."
   },
   "expired": {
-    "message": "Expired"
+    "message": "Poteklo"
   },
   "pendingDeletion": {
     "message": "Pending deletion"
@@ -1626,7 +1626,7 @@
     "message": "Remove Password"
   },
   "delete": {
-    "message": "Delete"
+    "message": "Izbriši"
   },
   "removedPassword": {
     "message": "Password removed"
@@ -1636,11 +1636,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLink": {
-    "message": "Send link",
+    "message": "Pošlji povezavo",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disabled": {
-    "message": "Disabled"
+    "message": "Onemogočeno"
   },
   "removePasswordConfirmation": {
     "message": "Are you sure you want to remove the password?"
@@ -1683,10 +1683,10 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "oneDay": {
-    "message": "1 day"
+    "message": "1 dan"
   },
   "days": {
-    "message": "$DAYS$ days",
+    "message": "$DAYS$ dni",
     "placeholders": {
       "days": {
         "content": "$1",
@@ -1835,10 +1835,10 @@
     "message": "In order to complete logging in with SSO, please set a master password to access and protect your vault."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Ur"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Minut"
   },
   "vaultTimeoutPolicyInEffect": {
     "message": "Your organization policies are affecting your vault timeout. Maximum allowed Vault Timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
@@ -1911,7 +1911,7 @@
     }
   },
   "error": {
-    "message": "Error"
+    "message": "Napaka"
   },
   "regenerateUsername": {
     "message": "Regenerate username"
@@ -1936,13 +1936,13 @@
     "message": "Use your domain's configured catch-all inbox."
   },
   "random": {
-    "message": "Random"
+    "message": "Naključno"
   },
   "randomWord": {
-    "message": "Random word"
+    "message": "Naključna beseda"
   },
   "websiteName": {
-    "message": "Website name"
+    "message": "Ime spletne strani"
   },
   "whatWouldYouLikeToGenerate": {
     "message": "What would you like to generate?"
@@ -1997,13 +1997,13 @@
     "message": "Settings have been edited"
   },
   "environmentEditedClick": {
-    "message": "Click here"
+    "message": "Kliknite tukaj"
   },
   "environmentEditedReset": {
     "message": "to reset to pre-configured settings"
   },
   "serverVersion": {
-    "message": "Server version"
+    "message": "Verzija strežnika"
   },
   "selfHosted": {
     "message": "Self-hosted"
@@ -2036,12 +2036,12 @@
     "message": "Logging in as"
   },
   "notYou": {
-    "message": "Not you?"
+    "message": "Niste vi?"
   },
   "newAroundHere": {
     "message": "New around here?"
   },
   "rememberEmail": {
-    "message": "Remember email"
+    "message": "Zapomni si e-pošto"
   }
 }
diff --git a/apps/browser/src/_locales/sr/messages.json b/apps/browser/src/_locales/sr/messages.json
index 37020aa2a7e..fc595643ba0 100644
--- a/apps/browser/src/_locales/sr/messages.json
+++ b/apps/browser/src/_locales/sr/messages.json
@@ -2012,7 +2012,7 @@
     "message": "Трећа страна"
   },
   "thirdPartyServerMessage": {
-    "message": "Connected to third-party server implementation, $SERVERNAME$. Please verify bugs using the official server, or report them to the third-party server.",
+    "message": "Повезан са имплементацијом сервера треће стране, $SERVERNAME$. Проверите грешке користећи званични сервер или их пријавите серверу треће стране.",
     "placeholders": {
       "servername": {
         "content": "$1",
diff --git a/apps/browser/src/alarms/alarm-state.ts b/apps/browser/src/alarms/alarm-state.ts
new file mode 100644
index 00000000000..774bcfe1c03
--- /dev/null
+++ b/apps/browser/src/alarms/alarm-state.ts
@@ -0,0 +1,66 @@
+import { BrowserApi } from "../browser/browserApi";
+import { clearClipboardAlarmName } from "../clipboard";
+
+export const alarmKeys = [clearClipboardAlarmName] as const;
+export type AlarmKeys = typeof alarmKeys[number];
+
+type AlarmState = { [T in AlarmKeys]: number | undefined };
+
+const alarmState: AlarmState = {
+  clearClipboard: null,
+  //TODO once implemented vaultTimeout: null;
+  //TODO once implemented checkNotifications: null;
+  //TODO once implemented (if necessary) processReload: null;
+};
+
+/**
+ * Retrieves the set alarm time (planned execution) for a give an commandName {@link AlarmState}
+ * @param commandName A command that has been previously registered with {@link AlarmState}
+ * @returns {Promise<number>} null or Unix epoch timestamp when the alarm action is supposed to execute
+ * @example
+ * // getAlarmTime(clearClipboard)
+ */
+export async function getAlarmTime(commandName: AlarmKeys): Promise<number> {
+  let alarmTime: number;
+  if (BrowserApi.manifestVersion == 3) {
+    const fromSessionStore = await chrome.storage.session.get(commandName);
+    alarmTime = fromSessionStore[commandName];
+  } else {
+    alarmTime = alarmState[commandName];
+  }
+
+  return alarmTime;
+}
+
+/**
+ * Registers an action that should execute after the given time has passed
+ * @param commandName A command that has been previously registered with {@link AlarmState}
+ * @param delay_ms The number of ms from now in which the command should execute from
+ * @example
+ * // setAlarmTime(clearClipboard, 5000) register the clearClipboard action which will execute when at least 5 seconds from now have passed
+ */
+export async function setAlarmTime(commandName: AlarmKeys, delay_ms: number): Promise<void> {
+  if (!delay_ms || delay_ms === 0) {
+    await this.clearAlarmTime(commandName);
+    return;
+  }
+
+  const time = Date.now() + delay_ms;
+  await setAlarmTimeInternal(commandName, time);
+}
+
+/**
+ * Clears the time currently set for a given command
+ * @param commandName A command that has been previously registered with {@link AlarmState}
+ */
+export async function clearAlarmTime(commandName: AlarmKeys): Promise<void> {
+  await setAlarmTimeInternal(commandName, null);
+}
+
+async function setAlarmTimeInternal(commandName: AlarmKeys, time: number): Promise<void> {
+  if (BrowserApi.manifestVersion == 3) {
+    await chrome.storage.session.set({ [commandName]: time });
+  } else {
+    alarmState[commandName] = time;
+  }
+}
diff --git a/apps/browser/src/alarms/on-alarm-listener.ts b/apps/browser/src/alarms/on-alarm-listener.ts
new file mode 100644
index 00000000000..4b246908778
--- /dev/null
+++ b/apps/browser/src/alarms/on-alarm-listener.ts
@@ -0,0 +1,26 @@
+import { ClearClipboard, clearClipboardAlarmName } from "../clipboard";
+
+import { alarmKeys, clearAlarmTime, getAlarmTime } from "./alarm-state";
+
+export const onAlarmListener = async (alarm: chrome.alarms.Alarm) => {
+  alarmKeys.forEach(async (key) => {
+    const executionTime = await getAlarmTime(key);
+    if (!executionTime) {
+      return;
+    }
+
+    const currentDate = Date.now();
+    if (executionTime > currentDate) {
+      return;
+    }
+
+    await clearAlarmTime(key);
+
+    switch (key) {
+      case clearClipboardAlarmName:
+        ClearClipboard.run();
+        break;
+      default:
+    }
+  });
+};
diff --git a/apps/browser/src/alarms/register-alarms.ts b/apps/browser/src/alarms/register-alarms.ts
new file mode 100644
index 00000000000..c4da2fc27bc
--- /dev/null
+++ b/apps/browser/src/alarms/register-alarms.ts
@@ -0,0 +1,29 @@
+const NUMBER_OF_ALARMS = 6;
+
+export function registerAlarms() {
+  alarmsToBeCreated(NUMBER_OF_ALARMS);
+}
+
+/**
+ * Creates staggered alarms that periodically (1min) raise OnAlarm events. The staggering is calculated based on the numnber of alarms passed in.
+ * @param numberOfAlarms Number of named alarms, that shall be registered
+ * @example
+ * // alarmsToBeCreated(2) results in 2 alarms separated by 30 seconds
+ * @example
+ * // alarmsToBeCreated(4) results in 4 alarms separated by 15 seconds
+ * @example
+ * // alarmsToBeCreated(6) results in 6 alarms separated by 10 seconds
+ * @example
+ * // alarmsToBeCreated(60) results in 60 alarms separated by 1 second
+ */
+function alarmsToBeCreated(numberOfAlarms: number): void {
+  const oneMinuteInMs = 60 * 1000;
+  const offset = oneMinuteInMs / numberOfAlarms;
+
+  let calculatedWhen: number = Date.now() + offset;
+
+  for (let index = 0; index < numberOfAlarms; index++) {
+    chrome.alarms.create(`bw_alarm${index}`, { periodInMinutes: 1, when: calculatedWhen });
+    calculatedWhen += offset;
+  }
+}
diff --git a/apps/browser/src/background.ts b/apps/browser/src/background.ts
index 504b5afb5c0..fc020b19aa3 100644
--- a/apps/browser/src/background.ts
+++ b/apps/browser/src/background.ts
@@ -1,6 +1,7 @@
+import { onAlarmListener } from "./alarms/on-alarm-listener";
+import { registerAlarms } from "./alarms/register-alarms";
 import MainBackground from "./background/main.background";
 import { BrowserApi } from "./browser/browserApi";
-import { ClearClipboard } from "./clipboard";
 import { onCommandListener } from "./listeners/onCommandListener";
 import { onInstallListener } from "./listeners/onInstallListener";
 import { UpdateBadge } from "./listeners/update-badge";
@@ -9,13 +10,12 @@ const manifestV3MessageListeners: ((
   serviceCache: Record<string, unknown>,
   message: { command: string }
 ) => void | Promise<void>)[] = [UpdateBadge.messageListener];
-type AlarmAction = (executionTime: Date, serviceCache: Record<string, unknown>) => void;
-
-const AlarmActions: AlarmAction[] = [ClearClipboard.run];
 
 if (BrowserApi.manifestVersion === 3) {
   chrome.commands.onCommand.addListener(onCommandListener);
   chrome.runtime.onInstalled.addListener(onInstallListener);
+  chrome.alarms.onAlarm.addListener(onAlarmListener);
+  registerAlarms();
   chrome.tabs.onActivated.addListener(UpdateBadge.tabsOnActivatedListener);
   chrome.tabs.onReplaced.addListener(UpdateBadge.tabsOnReplacedListener);
   chrome.tabs.onUpdated.addListener(UpdateBadge.tabsOnUpdatedListener);
@@ -26,14 +26,6 @@ if (BrowserApi.manifestVersion === 3) {
       listener(serviceCache, message);
     });
   });
-  chrome.alarms.onAlarm.addListener((_alarm) => {
-    const executionTime = new Date();
-    const serviceCache = {};
-
-    for (const alarmAction of AlarmActions) {
-      alarmAction(executionTime, serviceCache);
-    }
-  });
 } else {
   const bitwardenMain = ((window as any).bitwardenMain = new MainBackground());
   bitwardenMain.bootstrap().then(() => {
diff --git a/apps/browser/src/background/idle.background.ts b/apps/browser/src/background/idle.background.ts
index 56e2e2dd7e1..1a8c5ae5c50 100644
--- a/apps/browser/src/background/idle.background.ts
+++ b/apps/browser/src/background/idle.background.ts
@@ -1,7 +1,7 @@
 import { NotificationsService } from "@bitwarden/common/abstractions/notifications.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 const IdleInterval = 60 * 5; // 5 minutes
 
@@ -12,7 +12,7 @@ export default class IdleBackground {
 
   constructor(
     private vaultTimeoutService: VaultTimeoutService,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private notificationsService: NotificationsService
   ) {
     this.idle = chrome.idle || (browser != null ? browser.idle : null);
diff --git a/apps/browser/src/background/main.background.ts b/apps/browser/src/background/main.background.ts
index 581da587e45..2d370c91bb7 100644
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -61,14 +61,11 @@ import { FolderApiService } from "@bitwarden/common/services/folder/folder-api.s
 import { KeyConnectorService } from "@bitwarden/common/services/keyConnector.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { NotificationsService } from "@bitwarden/common/services/notifications.service";
-import { OrganizationService } from "@bitwarden/common/services/organization/organization.service";
 import { PasswordGenerationService } from "@bitwarden/common/services/passwordGeneration.service";
 import { PolicyApiService } from "@bitwarden/common/services/policy/policy-api.service";
-import { PolicyService } from "@bitwarden/common/services/policy/policy.service";
 import { ProviderService } from "@bitwarden/common/services/provider.service";
 import { SearchService } from "@bitwarden/common/services/search.service";
 import { SendService } from "@bitwarden/common/services/send.service";
-import { SettingsService } from "@bitwarden/common/services/settings.service";
 import { StateMigrationService } from "@bitwarden/common/services/stateMigration.service";
 import { SyncService } from "@bitwarden/common/services/sync/sync.service";
 import { SyncNotifierService } from "@bitwarden/common/services/sync/syncNotifier.service";
@@ -89,19 +86,22 @@ import { UpdateBadge } from "../listeners/update-badge";
 import { Account } from "../models/account";
 import { PopupUtilsService } from "../popup/services/popup-utils.service";
 import { AutofillService as AutofillServiceAbstraction } from "../services/abstractions/autofill.service";
-import { StateService as StateServiceAbstraction } from "../services/abstractions/state.service";
+import { BrowserStateService as StateServiceAbstraction } from "../services/abstractions/browser-state.service";
 import AutofillService from "../services/autofill.service";
 import { BrowserEnvironmentService } from "../services/browser-environment.service";
+import { BrowserFolderService } from "../services/browser-folder.service";
+import { BrowserOrganizationService } from "../services/browser-organization.service";
+import { BrowserPolicyService } from "../services/browser-policy.service";
+import { BrowserSettingsService } from "../services/browser-settings.service";
+import { BrowserStateService } from "../services/browser-state.service";
 import { BrowserCryptoService } from "../services/browserCrypto.service";
 import BrowserLocalStorageService from "../services/browserLocalStorage.service";
 import BrowserMessagingService from "../services/browserMessaging.service";
 import BrowserMessagingPrivateModeBackgroundService from "../services/browserMessagingPrivateModeBackground.service";
 import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
-import { FolderService } from "../services/folders/folder.service";
 import I18nService from "../services/i18n.service";
 import { KeyGenerationService } from "../services/keyGeneration.service";
 import { LocalBackedSessionStorageService } from "../services/localBackedSessionStorage.service";
-import { StateService } from "../services/state.service";
 import { VaultFilterService } from "../services/vaultFilter.service";
 import VaultTimeoutService from "../services/vaultTimeout/vaultTimeout.service";
 
@@ -227,7 +227,7 @@ export default class MainBackground {
       this.secureStorageService,
       new StateFactory(GlobalState, Account)
     );
-    this.stateService = new StateService(
+    this.stateService = new BrowserStateService(
       this.storageService,
       this.secureStorageService,
       this.memoryStorageService,
@@ -282,7 +282,7 @@ export default class MainBackground {
       this.appIdService,
       (expired: boolean) => this.logout(expired)
     );
-    this.settingsService = new SettingsService(this.stateService);
+    this.settingsService = new BrowserSettingsService(this.stateService);
     this.fileUploadService = new FileUploadService(this.logService, this.apiService);
     this.cipherService = new CipherService(
       this.cryptoService,
@@ -295,7 +295,7 @@ export default class MainBackground {
       this.stateService,
       this.encryptService
     );
-    this.folderService = new FolderService(
+    this.folderService = new BrowserFolderService(
       this.cryptoService,
       this.i18nService,
       this.cipherService,
@@ -317,8 +317,8 @@ export default class MainBackground {
       this.stateService
     );
     this.syncNotifierService = new SyncNotifierService();
-    this.organizationService = new OrganizationService(this.stateService);
-    this.policyService = new PolicyService(this.stateService, this.organizationService);
+    this.organizationService = new BrowserOrganizationService(this.stateService);
+    this.policyService = new BrowserPolicyService(this.stateService, this.organizationService);
     this.policyApiService = new PolicyApiService(
       this.policyService,
       this.apiService,
diff --git a/apps/browser/src/background/notification.background.ts b/apps/browser/src/background/notification.background.ts
index 127fc5203d7..2da4791857d 100644
--- a/apps/browser/src/background/notification.background.ts
+++ b/apps/browser/src/background/notification.background.ts
@@ -15,7 +15,7 @@ import { LoginView } from "@bitwarden/common/models/view/login.view";
 
 import { BrowserApi } from "../browser/browserApi";
 import { AutofillService } from "../services/abstractions/autofill.service";
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 import AddChangePasswordQueueMessage from "./models/addChangePasswordQueueMessage";
 import AddLoginQueueMessage from "./models/addLoginQueueMessage";
@@ -33,7 +33,7 @@ export default class NotificationBackground {
     private authService: AuthService,
     private policyService: PolicyService,
     private folderService: FolderService,
-    private stateService: StateService
+    private stateService: BrowserStateService
   ) {}
 
   async init() {
diff --git a/apps/browser/src/background/service_factories/folder-service.factory.ts b/apps/browser/src/background/service_factories/folder-service.factory.ts
index a7c90d234b1..bb35970325f 100644
--- a/apps/browser/src/background/service_factories/folder-service.factory.ts
+++ b/apps/browser/src/background/service_factories/folder-service.factory.ts
@@ -1,6 +1,6 @@
 import { FolderService as AbstractFolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
 
-import { FolderService } from "../../services/folders/folder.service";
+import { BrowserFolderService } from "../../services/browser-folder.service";
 
 import { cipherServiceFactory, CipherServiceInitOptions } from "./cipher-service.factory";
 import { cryptoServiceFactory, CryptoServiceInitOptions } from "./crypto-service.factory";
@@ -28,7 +28,7 @@ export function folderServiceFactory(
     "folderService",
     opts,
     async () =>
-      new FolderService(
+      new BrowserFolderService(
         await cryptoServiceFactory(cache, opts),
         await i18nServiceFactory(cache, opts),
         await cipherServiceFactory(cache, opts),
diff --git a/apps/browser/src/background/service_factories/organization-service.factory.ts b/apps/browser/src/background/service_factories/organization-service.factory.ts
index ea11d32e26a..4f2eaee8058 100644
--- a/apps/browser/src/background/service_factories/organization-service.factory.ts
+++ b/apps/browser/src/background/service_factories/organization-service.factory.ts
@@ -1,5 +1,6 @@
 import { OrganizationService as AbstractOrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
-import { OrganizationService } from "@bitwarden/common/services/organization/organization.service";
+
+import { BrowserOrganizationService } from "../../services/browser-organization.service";
 
 import { FactoryOptions, CachedServices, factory } from "./factory-options";
 import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
@@ -17,6 +18,6 @@ export function organizationServiceFactory(
     cache,
     "organizationService",
     opts,
-    async () => new OrganizationService(await stateServiceFactory(cache, opts))
+    async () => new BrowserOrganizationService(await stateServiceFactory(cache, opts))
   );
 }
diff --git a/apps/browser/src/background/service_factories/policy-service.factory.ts b/apps/browser/src/background/service_factories/policy-service.factory.ts
index d4940bef259..d20bca3c62e 100644
--- a/apps/browser/src/background/service_factories/policy-service.factory.ts
+++ b/apps/browser/src/background/service_factories/policy-service.factory.ts
@@ -1,5 +1,6 @@
 import { PolicyService as AbstractPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
-import { PolicyService } from "@bitwarden/common/services/policy/policy.service";
+
+import { BrowserPolicyService } from "../../services/browser-policy.service";
 
 import { CachedServices, factory, FactoryOptions } from "./factory-options";
 import {
@@ -26,7 +27,7 @@ export function policyServiceFactory(
     "policyService",
     opts,
     async () =>
-      new PolicyService(
+      new BrowserPolicyService(
         await stateServiceFactory(cache, opts),
         await organizationServiceFactory(cache, opts)
       )
diff --git a/apps/browser/src/background/service_factories/settings-service.factory.ts b/apps/browser/src/background/service_factories/settings-service.factory.ts
index 745a6d08d60..73e0ae52032 100644
--- a/apps/browser/src/background/service_factories/settings-service.factory.ts
+++ b/apps/browser/src/background/service_factories/settings-service.factory.ts
@@ -1,5 +1,6 @@
 import { SettingsService as AbstractSettingsService } from "@bitwarden/common/abstractions/settings.service";
-import { SettingsService } from "@bitwarden/common/services/settings.service";
+
+import { BrowserSettingsService } from "../../services/browser-settings.service";
 
 import { FactoryOptions, CachedServices, factory } from "./factory-options";
 import { stateServiceFactory, StateServiceInitOptions } from "./state-service.factory";
@@ -16,6 +17,6 @@ export function settingsServiceFactory(
     cache,
     "settingsService",
     opts,
-    async () => new SettingsService(await stateServiceFactory(cache, opts))
+    async () => new BrowserSettingsService(await stateServiceFactory(cache, opts))
   );
 }
diff --git a/apps/browser/src/background/service_factories/state-service.factory.ts b/apps/browser/src/background/service_factories/state-service.factory.ts
index 1b81567ac52..6d2c5cb4fa7 100644
--- a/apps/browser/src/background/service_factories/state-service.factory.ts
+++ b/apps/browser/src/background/service_factories/state-service.factory.ts
@@ -2,7 +2,7 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 
 import { Account } from "../../models/account";
-import { StateService } from "../../services/state.service";
+import { BrowserStateService } from "../../services/browser-state.service";
 
 import { CachedServices, factory, FactoryOptions } from "./factory-options";
 import { logServiceFactory, LogServiceInitOptions } from "./log-service.factory";
@@ -34,15 +34,15 @@ export type StateServiceInitOptions = StateServiceFactoryOptions &
   StateMigrationServiceInitOptions;
 
 export async function stateServiceFactory(
-  cache: { stateService?: StateService } & CachedServices,
+  cache: { stateService?: BrowserStateService } & CachedServices,
   opts: StateServiceInitOptions
-): Promise<StateService> {
+): Promise<BrowserStateService> {
   const service = await factory(
     cache,
     "stateService",
     opts,
     async () =>
-      await new StateService(
+      await new BrowserStateService(
         await diskStorageServiceFactory(cache, opts),
         await secureStorageServiceFactory(cache, opts),
         await memoryStorageServiceFactory(cache, opts),
diff --git a/apps/browser/src/clipboard/clear-clipboard.spec.ts b/apps/browser/src/clipboard/clear-clipboard.spec.ts
new file mode 100644
index 00000000000..0166bdb47af
--- /dev/null
+++ b/apps/browser/src/clipboard/clear-clipboard.spec.ts
@@ -0,0 +1,39 @@
+import { BrowserApi } from "../browser/browserApi";
+
+import { ClearClipboard } from "./clear-clipboard";
+
+describe("clearClipboard", () => {
+  describe("run", () => {
+    it("Does not clear clipboard when no active tabs are retrieved", async () => {
+      jest.spyOn(BrowserApi, "getActiveTabs").mockResolvedValue([] as any);
+
+      jest.spyOn(BrowserApi, "sendTabsMessage").mockReturnValue();
+
+      await ClearClipboard.run();
+
+      expect(jest.spyOn(BrowserApi, "sendTabsMessage")).not.toHaveBeenCalled();
+
+      expect(jest.spyOn(BrowserApi, "sendTabsMessage")).not.toHaveBeenCalledWith(1, {
+        command: "clearClipboard",
+      });
+    });
+
+    it("Sends a message to the content script to clear the clipboard", async () => {
+      jest.spyOn(BrowserApi, "getActiveTabs").mockResolvedValue([
+        {
+          id: 1,
+        },
+      ] as any);
+
+      jest.spyOn(BrowserApi, "sendTabsMessage").mockReturnValue();
+
+      await ClearClipboard.run();
+
+      expect(jest.spyOn(BrowserApi, "sendTabsMessage")).toHaveBeenCalledTimes(1);
+
+      expect(jest.spyOn(BrowserApi, "sendTabsMessage")).toHaveBeenCalledWith(1, {
+        command: "clearClipboard",
+      });
+    });
+  });
+});
diff --git a/apps/browser/src/clipboard/clear-clipboard.spec.ts.disabled b/apps/browser/src/clipboard/clear-clipboard.spec.ts.disabled
deleted file mode 100644
index 6f7314d91ac..00000000000
--- a/apps/browser/src/clipboard/clear-clipboard.spec.ts.disabled
+++ /dev/null
@@ -1,79 +0,0 @@
-import { mock, MockProxy } from "jest-mock-extended";
-
-import { BrowserApi } from "../browser/browserApi";
-import { StateService } from "../services/abstractions/state.service";
-
-import { ClearClipboard } from "./clear-clipboard";
-import { getClearClipboardTime, setClearClipboardTime } from "./clipboard-state";
-
-jest.mock("./clipboard-state", () => {
-  return {
-    getClearClipboardTime: jest.fn(),
-    setClearClipboardTime: jest.fn(),
-  };
-});
-
-const getClearClipboardTimeMock = getClearClipboardTime as jest.Mock;
-const setClearClipboardTimeMock = setClearClipboardTime as jest.Mock;
-
-describe("clearClipboard", () => {
-  describe("run", () => {
-    let stateService: MockProxy<StateService>;
-    let serviceCache: Record<string, unknown>;
-
-    beforeEach(() => {
-      stateService = mock<StateService>();
-      serviceCache = {
-        stateService: stateService,
-      };
-    });
-
-    afterEach(() => {
-      jest.resetAllMocks();
-    });
-
-    it("has a clear time that is past execution time", async () => {
-      const executionTime = new Date(2022, 1, 1, 12);
-      const clearTime = new Date(2022, 1, 1, 12, 1);
-
-      jest.spyOn(BrowserApi, "getActiveTabs").mockResolvedValue([
-        {
-          id: 1,
-        },
-      ] as any);
-
-      jest.spyOn(BrowserApi, "sendTabsMessage").mockReturnValue();
-
-      getClearClipboardTimeMock.mockResolvedValue(clearTime.getTime());
-
-      await ClearClipboard.run(executionTime, serviceCache);
-
-      expect(jest.spyOn(BrowserApi, "sendTabsMessage")).toHaveBeenCalledTimes(1);
-
-      expect(jest.spyOn(BrowserApi, "sendTabsMessage")).toHaveBeenCalledWith(1, {
-        command: "clearClipboard",
-      });
-    });
-
-    it("has a clear time before execution time", async () => {
-      const executionTime = new Date(2022, 1, 1, 12);
-      const clearTime = new Date(2022, 1, 1, 11);
-
-      setClearClipboardTimeMock.mockResolvedValue(clearTime.getTime());
-
-      await ClearClipboard.run(executionTime, serviceCache);
-
-      expect(jest.spyOn(BrowserApi, "getActiveTabs")).not.toHaveBeenCalled();
-    });
-
-    it("has an undefined clearTime", async () => {
-      const executionTime = new Date(2022, 1, 1);
-
-      getClearClipboardTimeMock.mockResolvedValue(undefined);
-
-      await ClearClipboard.run(executionTime, serviceCache);
-
-      expect(jest.spyOn(BrowserApi, "getActiveTabs")).not.toHaveBeenCalled();
-    });
-  });
-});
diff --git a/apps/browser/src/clipboard/clear-clipboard.ts b/apps/browser/src/clipboard/clear-clipboard.ts
index 00bf329f8d3..149992555b9 100644
--- a/apps/browser/src/clipboard/clear-clipboard.ts
+++ b/apps/browser/src/clipboard/clear-clipboard.ts
@@ -1,43 +1,15 @@
-import { StateFactory } from "@bitwarden/common/factories/stateFactory";
-import { GlobalState } from "@bitwarden/common/models/domain/global-state";
-
-import { stateServiceFactory } from "../background/service_factories/state-service.factory";
 import { BrowserApi } from "../browser/browserApi";
-import { Account } from "../models/account";
 
-import { getClearClipboardTime } from "./clipboard-state";
+export const clearClipboardAlarmName = "clearClipboard";
 
 export class ClearClipboard {
-  static async run(executionTime: Date, serviceCache: Record<string, unknown>) {
-    const stateFactory = new StateFactory(GlobalState, Account);
-    const stateService = await stateServiceFactory(serviceCache, {
-      cryptoFunctionServiceOptions: {
-        win: self,
-      },
-      encryptServiceOptions: {
-        logMacFailures: false,
-      },
-      logServiceOptions: {
-        isDev: false,
-      },
-      stateMigrationServiceOptions: {
-        stateFactory: stateFactory,
-      },
-      stateServiceOptions: {
-        stateFactory: stateFactory,
-      },
-    });
-
-    const clearClipboardTime = await getClearClipboardTime(stateService);
-
-    if (!clearClipboardTime) {
-      return;
-    }
-
-    if (clearClipboardTime < executionTime.getTime()) {
-      return;
-    }
-
+  /**
+    We currently rely on an active tab with an injected content script (`../content/misc-utils.ts`) to clear the clipboard via `window.navigator.clipboard.writeText(text)`
+    
+    With https://bugs.chromium.org/p/chromium/issues/detail?id=1160302 it was said that service workers,
+    would have access to the clipboard api and then we could migrate to a simpler solution
+    */
+  static async run() {
     const activeTabs = await BrowserApi.getActiveTabs();
     if (!activeTabs || activeTabs.length === 0) {
       return;
diff --git a/apps/browser/src/clipboard/clipboard-state.ts b/apps/browser/src/clipboard/clipboard-state.ts
index a1c15addc0a..cfa2f9459f8 100644
--- a/apps/browser/src/clipboard/clipboard-state.ts
+++ b/apps/browser/src/clipboard/clipboard-state.ts
@@ -1,10 +1,10 @@
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 const clearClipboardStorageKey = "clearClipboardTime";
-export const getClearClipboardTime = async (stateService: StateService) => {
+export const getClearClipboardTime = async (stateService: BrowserStateService) => {
   return await stateService.getFromSessionMemory<number>(clearClipboardStorageKey);
 };
 
-export const setClearClipboardTime = async (stateService: StateService, time: number) => {
+export const setClearClipboardTime = async (stateService: BrowserStateService, time: number) => {
   await stateService.setInSessionMemory(clearClipboardStorageKey, time);
 };
diff --git a/apps/browser/src/clipboard/generate-password-to-clipboard-command.spec.ts b/apps/browser/src/clipboard/generate-password-to-clipboard-command.spec.ts
index e9c2141211f..5d119513f43 100644
--- a/apps/browser/src/clipboard/generate-password-to-clipboard-command.spec.ts
+++ b/apps/browser/src/clipboard/generate-password-to-clipboard-command.spec.ts
@@ -2,30 +2,30 @@ import { mock, MockProxy } from "jest-mock-extended";
 
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 
+import { setAlarmTime } from "../alarms/alarm-state";
 import { BrowserApi } from "../browser/browserApi";
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
-import { setClearClipboardTime } from "./clipboard-state";
+import { clearClipboardAlarmName } from "./clear-clipboard";
 import { GeneratePasswordToClipboardCommand } from "./generate-password-to-clipboard-command";
 
-jest.mock("./clipboard-state", () => {
+jest.mock("../alarms/alarm-state", () => {
   return {
-    getClearClipboardTime: jest.fn(),
-    setClearClipboardTime: jest.fn(),
+    setAlarmTime: jest.fn(),
   };
 });
 
-const setClearClipboardTimeMock = setClearClipboardTime as jest.Mock;
+const setAlarmTimeMock = setAlarmTime as jest.Mock;
 
 describe("GeneratePasswordToClipboardCommand", () => {
   let passwordGenerationService: MockProxy<PasswordGenerationService>;
-  let stateService: MockProxy<StateService>;
+  let stateService: MockProxy<BrowserStateService>;
 
   let sut: GeneratePasswordToClipboardCommand;
 
   beforeEach(() => {
     passwordGenerationService = mock<PasswordGenerationService>();
-    stateService = mock<StateService>();
+    stateService = mock<BrowserStateService>();
 
     passwordGenerationService.getOptions.mockResolvedValue([{ length: 8 }, {} as any]);
 
@@ -53,9 +53,9 @@ describe("GeneratePasswordToClipboardCommand", () => {
         text: "PASSWORD",
       });
 
-      expect(setClearClipboardTimeMock).toHaveBeenCalledTimes(1);
+      expect(setAlarmTimeMock).toHaveBeenCalledTimes(1);
 
-      expect(setClearClipboardTimeMock).toHaveBeenCalledWith(stateService, expect.any(Number));
+      expect(setAlarmTimeMock).toHaveBeenCalledWith(clearClipboardAlarmName, expect.any(Number));
     });
 
     it("does not have clear clipboard value", async () => {
@@ -70,7 +70,7 @@ describe("GeneratePasswordToClipboardCommand", () => {
         text: "PASSWORD",
       });
 
-      expect(setClearClipboardTimeMock).not.toHaveBeenCalled();
+      expect(setAlarmTimeMock).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/apps/browser/src/clipboard/generate-password-to-clipboard-command.ts b/apps/browser/src/clipboard/generate-password-to-clipboard-command.ts
index ca92d2c686f..0cd8eec2c93 100644
--- a/apps/browser/src/clipboard/generate-password-to-clipboard-command.ts
+++ b/apps/browser/src/clipboard/generate-password-to-clipboard-command.ts
@@ -1,14 +1,15 @@
 import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
 
-import { StateService } from "../services/abstractions/state.service";
+import { setAlarmTime } from "../alarms/alarm-state";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
-import { setClearClipboardTime } from "./clipboard-state";
+import { clearClipboardAlarmName } from "./clear-clipboard";
 import { copyToClipboard } from "./copy-to-clipboard-command";
 
 export class GeneratePasswordToClipboardCommand {
   constructor(
     private passwordGenerationService: PasswordGenerationService,
-    private stateService: StateService
+    private stateService: BrowserStateService
   ) {}
 
   async generatePasswordToClipboard(tab: chrome.tabs.Tab) {
@@ -20,7 +21,7 @@ export class GeneratePasswordToClipboardCommand {
     const clearClipboard = await this.stateService.getClearClipboard();
 
     if (clearClipboard != null) {
-      await setClearClipboardTime(this.stateService, Date.now() + clearClipboard * 1000);
+      await setAlarmTime(clearClipboardAlarmName, clearClipboard * 1000);
     }
   }
 }
diff --git a/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.spec.ts b/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.spec.ts
index cc8a5618760..92c5dfb0170 100644
--- a/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.spec.ts
+++ b/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.spec.ts
@@ -1,6 +1,6 @@
 import { BehaviorSubject } from "rxjs";
 
-import { StateService } from "../../services/state.service";
+import { BrowserStateService } from "../../services/browser-state.service";
 
 import { browserSession } from "./browser-session.decorator";
 import { SessionStorable } from "./session-storable";
@@ -22,25 +22,25 @@ describe("browserSession decorator", () => {
   });
 
   it("should create if StateService is a constructor argument", () => {
-    const stateService = Object.create(StateService.prototype, {});
+    const stateService = Object.create(BrowserStateService.prototype, {});
 
     @browserSession
     class TestClass {
-      constructor(private stateService: StateService) {}
+      constructor(private stateService: BrowserStateService) {}
     }
 
     expect(new TestClass(stateService)).toBeDefined();
   });
 
   describe("interaction with @sessionSync decorator", () => {
-    let stateService: StateService;
+    let stateService: BrowserStateService;
 
     @browserSession
     class TestClass {
       @sessionSync({ initializer: (s: string) => s })
       private behaviorSubject = new BehaviorSubject("");
 
-      constructor(private stateService: StateService) {}
+      constructor(private stateService: BrowserStateService) {}
 
       fromJSON(json: any) {
         this.behaviorSubject.next(json);
@@ -48,7 +48,7 @@ describe("browserSession decorator", () => {
     }
 
     beforeEach(() => {
-      stateService = Object.create(StateService.prototype, {}) as StateService;
+      stateService = Object.create(BrowserStateService.prototype, {}) as BrowserStateService;
     });
 
     it("should create a session syncer", () => {
diff --git a/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.ts b/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.ts
index 73cdf767357..5d9d56c1d71 100644
--- a/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.ts
+++ b/apps/browser/src/decorators/session-sync-observable/browser-session.decorator.ts
@@ -1,6 +1,6 @@
 import { Constructor } from "type-fest";
 
-import { StateService } from "../../services/state.service";
+import { BrowserStateService } from "../../services/browser-state.service";
 
 import { SessionStorable } from "./session-storable";
 import { SessionSyncer } from "./session-syncer";
@@ -22,7 +22,13 @@ export function browserSession<TCtor extends Constructor<any>>(constructor: TCto
       super(...args);
 
       // Require state service to be injected
-      const stateService = args.find((arg) => arg instanceof StateService);
+      const stateService: BrowserStateService = [this as any]
+        .concat(args)
+        .find(
+          (arg) =>
+            typeof arg.setInSessionMemory === "function" &&
+            typeof arg.getFromSessionMemory === "function"
+        );
       if (!stateService) {
         throw new Error(
           `Cannot decorate ${constructor.name} with browserSession, Browser's StateService must be injected`
@@ -38,7 +44,7 @@ export function browserSession<TCtor extends Constructor<any>>(constructor: TCto
       );
     }
 
-    buildSyncer(metadata: SyncedItemMetadata, stateService: StateService) {
+    buildSyncer(metadata: SyncedItemMetadata, stateService: BrowserStateService) {
       const syncer = new SessionSyncer((this as any)[metadata.propertyKey], stateService, metadata);
       syncer.init();
       return syncer;
diff --git a/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.spec.ts b/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.spec.ts
index 38ec7aac9a1..c6d46b28fd1 100644
--- a/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.spec.ts
+++ b/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.spec.ts
@@ -8,9 +8,12 @@ describe("sessionSync decorator", () => {
   class TestClass {
     @sessionSync({ ctor: ctor, initializer: initializer })
     private testProperty = new BehaviorSubject("");
+    @sessionSync({ ctor: ctor, initializer: initializer, initializeAs: "array" })
+    private secondTestProperty = new BehaviorSubject("");
 
     complete() {
       this.testProperty.complete();
+      this.secondTestProperty.complete();
     }
   }
 
@@ -19,11 +22,40 @@ describe("sessionSync decorator", () => {
     expect((testClass as any).__syncedItemMetadata).toEqual([
       expect.objectContaining({
         propertyKey: "testProperty",
-        sessionKey: "TestClass_testProperty",
+        sessionKey: "testProperty_0",
         ctor: ctor,
         initializer: initializer,
       }),
-      testClass.complete(),
+      expect.objectContaining({
+        propertyKey: "secondTestProperty",
+        sessionKey: "secondTestProperty_1",
+        ctor: ctor,
+        initializer: initializer,
+        initializeAs: "array",
+      }),
     ]);
+    testClass.complete();
+  });
+
+  class TestClass2 {
+    @sessionSync({ ctor: ctor, initializer: initializer })
+    private testProperty = new BehaviorSubject("");
+
+    complete() {
+      this.testProperty.complete();
+    }
+  }
+
+  it("should maintain sessionKey index count for other test classes", () => {
+    const testClass = new TestClass2();
+    expect((testClass as any).__syncedItemMetadata).toEqual([
+      expect.objectContaining({
+        propertyKey: "testProperty",
+        sessionKey: "testProperty_2",
+        ctor: ctor,
+        initializer: initializer,
+      }),
+    ]);
+    testClass.complete();
   });
 });
diff --git a/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.ts b/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.ts
index df0764528f7..6a6b3d33fa1 100644
--- a/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.ts
+++ b/apps/browser/src/decorators/session-sync-observable/session-sync.decorator.ts
@@ -1,13 +1,17 @@
 import { Jsonify } from "type-fest";
 
 import { SessionStorable } from "./session-storable";
+import { InitializeOptions } from "./sync-item-metadata";
 
-class BuildOptions<T> {
+class BuildOptions<T, TJson = Jsonify<T>> {
   ctor?: new () => T;
-  initializer?: (keyValuePair: Jsonify<T>) => T;
-  initializeAsArray? = false;
+  initializer?: (keyValuePair: TJson) => T;
+  initializeAs?: InitializeOptions;
 }
 
+// Used to ensure uniqueness for each synced observable
+let index = 0;
+
 /**
  * A decorator used to indicate the BehaviorSubject should be synced for this browser session across all contexts.
  *
@@ -20,10 +24,10 @@ class BuildOptions<T> {
  * @param buildOptions
  * Builders for the value, requires either a constructor (ctor) for your BehaviorSubject type or an
  * initializer function that takes a key value pair representation of the BehaviorSubject data
- * and returns your instantiated BehaviorSubject value. `initializeAsArray can optionally be used to indicate
+ * and returns your instantiated BehaviorSubject value. `initializeAs can optionally be used to indicate
  * the provided initializer function should be used to build an array of values. For example,
  * ```ts
- * \@sessionSync({ initializer: Foo.fromJSON, initializeAsArray: true })
+ * \@sessionSync({ initializer: Foo.fromJSON, initializeAs: 'array' })
  * ```
  * is equivalent to
  * ```
@@ -43,10 +47,10 @@ export function sessionSync<T>(buildOptions: BuildOptions<T>) {
 
     p.__syncedItemMetadata.push({
       propertyKey,
-      sessionKey: `${prototype.constructor.name}_${propertyKey}`,
+      sessionKey: `${propertyKey}_${index++}`,
       ctor: buildOptions.ctor,
       initializer: buildOptions.initializer,
-      initializeAsArray: buildOptions.initializeAsArray,
+      initializeAs: buildOptions.initializeAs ?? "object",
     });
   };
 }
diff --git a/apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts b/apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts
index 5286cece1bb..00a0da433a5 100644
--- a/apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts
+++ b/apps/browser/src/decorators/session-sync-observable/session-syncer.spec.ts
@@ -1,8 +1,9 @@
+import { awaitAsync as flushAsyncObservables } from "@bitwarden/angular/../test-utils";
 import { mock, MockProxy } from "jest-mock-extended";
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, ReplaySubject } from "rxjs";
 
 import { BrowserApi } from "../../browser/browserApi";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 
 import { SessionSyncer } from "./session-syncer";
 import { SyncedItemMetadata } from "./sync-item-metadata";
@@ -10,8 +11,13 @@ import { SyncedItemMetadata } from "./sync-item-metadata";
 describe("session syncer", () => {
   const propertyKey = "behaviorSubject";
   const sessionKey = "Test__" + propertyKey;
-  const metaData = { propertyKey, sessionKey, initializer: (s: string) => s };
-  let stateService: MockProxy<StateService>;
+  const metaData: SyncedItemMetadata = {
+    propertyKey,
+    sessionKey,
+    initializer: (s: string) => s,
+    initializeAs: "object",
+  };
+  let stateService: MockProxy<BrowserStateService>;
   let sut: SessionSyncer;
   let behaviorSubject: BehaviorSubject<string>;
 
@@ -23,7 +29,7 @@ describe("session syncer", () => {
       manifest_version: 3,
     });
 
-    stateService = mock<StateService>();
+    stateService = mock<BrowserStateService>();
     sut = new SessionSyncer(behaviorSubject, stateService, metaData);
   });
 
@@ -34,53 +40,85 @@ describe("session syncer", () => {
   });
 
   describe("constructor", () => {
-    it("should throw if behaviorSubject is not an instance of BehaviorSubject", () => {
+    it("should throw if subject is not an instance of Subject", () => {
       expect(() => {
         new SessionSyncer({} as any, stateService, null);
-      }).toThrowError("behaviorSubject must be an instance of BehaviorSubject");
+      }).toThrowError("subject must inherit from Subject");
     });
 
     it("should create if either ctor or initializer is provided", () => {
       expect(
-        new SessionSyncer(behaviorSubject, stateService, { propertyKey, sessionKey, ctor: String })
+        new SessionSyncer(behaviorSubject, stateService, {
+          propertyKey,
+          sessionKey,
+          ctor: String,
+          initializeAs: "object",
+        })
       ).toBeDefined();
       expect(
         new SessionSyncer(behaviorSubject, stateService, {
           propertyKey,
           sessionKey,
           initializer: (s: any) => s,
+          initializeAs: "object",
         })
       ).toBeDefined();
     });
     it("should throw if neither ctor or initializer is provided", () => {
       expect(() => {
-        new SessionSyncer(behaviorSubject, stateService, { propertyKey, sessionKey });
+        new SessionSyncer(behaviorSubject, stateService, {
+          propertyKey,
+          sessionKey,
+          initializeAs: "object",
+        });
       }).toThrowError("ctor or initializer must be provided");
     });
   });
 
-  describe("manifest v2 init", () => {
-    let observeSpy: jest.SpyInstance;
-    let listenForUpdatesSpy: jest.SpyInstance;
-
-    beforeEach(() => {
-      observeSpy = jest.spyOn(behaviorSubject, "subscribe").mockReturnThis();
-      listenForUpdatesSpy = jest.spyOn(BrowserApi, "messageListener").mockReturnValue();
-      jest.spyOn(chrome.runtime, "getManifest").mockReturnValue({
-        name: "bitwarden-test",
-        version: "0.0.0",
-        manifest_version: 2,
-      });
+  describe("init", () => {
+    it("should ignore all updates currently in a ReplaySubject's buffer", () => {
+      const replaySubject = new ReplaySubject<string>(Infinity);
+      replaySubject.next("1");
+      replaySubject.next("2");
+      replaySubject.next("3");
+      sut = new SessionSyncer(replaySubject, stateService, metaData);
+      // block observing the subject
+      jest.spyOn(sut as any, "observe").mockImplementation();
 
       sut.init();
+
+      expect(sut["ignoreNUpdates"]).toBe(3);
     });
 
-    it("should not start observing", () => {
-      expect(observeSpy).not.toHaveBeenCalled();
+    it("should ignore BehaviorSubject's initial value", () => {
+      const behaviorSubject = new BehaviorSubject<string>("initial");
+      sut = new SessionSyncer(behaviorSubject, stateService, metaData);
+      // block observing the subject
+      jest.spyOn(sut as any, "observe").mockImplementation();
+
+      sut.init();
+
+      expect(sut["ignoreNUpdates"]).toBe(1);
     });
 
-    it("should not start listening", () => {
-      expect(listenForUpdatesSpy).not.toHaveBeenCalled();
+    it("should grab an initial value from storage if it exists", () => {
+      stateService.hasInSessionMemory.mockResolvedValue(true);
+      //Block a call to update
+      const updateSpy = jest.spyOn(sut as any, "update").mockImplementation();
+
+      sut.init();
+
+      expect(updateSpy).toHaveBeenCalledWith();
+    });
+
+    it("should not grab an initial value from storage if it does not exist", () => {
+      stateService.hasInSessionMemory.mockResolvedValue(false);
+      //Block a call to update
+      const updateSpy = jest.spyOn(sut as any, "update").mockImplementation();
+
+      sut.init();
+
+      expect(updateSpy).toHaveBeenCalledWith();
     });
   });
 
@@ -146,6 +184,7 @@ describe("session syncer", () => {
       stateService.getFromSessionMemory.mockResolvedValue("test");
 
       await sut.updateFromMessage({ command: `${sessionKey}_update`, id: "different_id" });
+      await flushAsyncObservables();
 
       expect(stateService.getFromSessionMemory).toHaveBeenCalledTimes(1);
       expect(stateService.getFromSessionMemory).toHaveBeenCalledWith(sessionKey, builder);
diff --git a/apps/browser/src/decorators/session-sync-observable/session-syncer.ts b/apps/browser/src/decorators/session-sync-observable/session-syncer.ts
index 2acfed2954f..68294b68c3d 100644
--- a/apps/browser/src/decorators/session-sync-observable/session-syncer.ts
+++ b/apps/browser/src/decorators/session-sync-observable/session-syncer.ts
@@ -1,9 +1,9 @@
-import { BehaviorSubject, concatMap, Subscription } from "rxjs";
+import { BehaviorSubject, concatMap, ReplaySubject, Subject, Subscription } from "rxjs";
 
 import { Utils } from "@bitwarden/common/misc/utils";
 
 import { BrowserApi } from "../../browser/browserApi";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 
 import { SyncedItemMetadata } from "./sync-item-metadata";
 
@@ -11,16 +11,16 @@ export class SessionSyncer {
   subscription: Subscription;
   id = Utils.newGuid();
 
-  // everyone gets the same initial values
-  private ignoreNextUpdate = true;
+  // ignore initial values
+  private ignoreNUpdates = 0;
 
   constructor(
-    private behaviorSubject: BehaviorSubject<any>,
-    private stateService: StateService,
+    private subject: Subject<any>,
+    private stateService: BrowserStateService,
     private metaData: SyncedItemMetadata
   ) {
-    if (!(behaviorSubject instanceof BehaviorSubject)) {
-      throw new Error("behaviorSubject must be an instance of BehaviorSubject");
+    if (!(subject instanceof Subject)) {
+      throw new Error("subject must inherit from Subject");
     }
 
     if (metaData.ctor == null && metaData.initializer == null) {
@@ -29,11 +29,23 @@ export class SessionSyncer {
   }
 
   init() {
-    if (BrowserApi.manifestVersion !== 3) {
-      return;
+    switch (this.subject.constructor) {
+      case ReplaySubject:
+        // ignore all updates currently in the buffer
+        this.ignoreNUpdates = (this.subject as any)._buffer.length;
+        break;
+      case BehaviorSubject:
+        this.ignoreNUpdates = 1;
+        break;
+      default:
+        break;
     }
 
     this.observe();
+    if (this.stateService.hasInSessionMemory(this.metaData.sessionKey)) {
+      this.update();
+    }
+
     this.listenForUpdates();
   }
 
@@ -41,11 +53,11 @@ export class SessionSyncer {
     // This may be a memory leak.
     // There is no good time to unsubscribe from this observable. Hopefully Manifest V3 clears memory from temporary
     // contexts. If so, this is handled by destruction of the context.
-    this.subscription = this.behaviorSubject
+    this.subscription = this.subject
       .pipe(
         concatMap(async (next) => {
-          if (this.ignoreNextUpdate) {
-            this.ignoreNextUpdate = false;
+          if (this.ignoreNUpdates > 0) {
+            this.ignoreNUpdates -= 1;
             return;
           }
           await this.updateSession(next);
@@ -66,10 +78,14 @@ export class SessionSyncer {
     if (message.command != this.updateMessageCommand || message.id === this.id) {
       return;
     }
+    this.update();
+  }
+
+  async update() {
     const builder = SyncedItemMetadata.builder(this.metaData);
     const value = await this.stateService.getFromSessionMemory(this.metaData.sessionKey, builder);
-    this.ignoreNextUpdate = true;
-    this.behaviorSubject.next(value);
+    this.ignoreNUpdates = 1;
+    this.subject.next(value);
   }
 
   private async updateSession(value: any) {
diff --git a/apps/browser/src/decorators/session-sync-observable/sync-item-metadata.ts b/apps/browser/src/decorators/session-sync-observable/sync-item-metadata.ts
index 2b3f4715d46..facfda32fd8 100644
--- a/apps/browser/src/decorators/session-sync-observable/sync-item-metadata.ts
+++ b/apps/browser/src/decorators/session-sync-observable/sync-item-metadata.ts
@@ -1,17 +1,27 @@
+export type InitializeOptions = "array" | "record" | "object";
+
 export class SyncedItemMetadata {
   propertyKey: string;
   sessionKey: string;
   ctor?: new () => any;
   initializer?: (keyValuePair: any) => any;
-  initializeAsArray?: boolean;
+  initializeAs: InitializeOptions;
 
   static builder(metadata: SyncedItemMetadata): (o: any) => any {
     const itemBuilder =
       metadata.initializer != null
         ? metadata.initializer
         : (o: any) => Object.assign(new metadata.ctor(), o);
-    if (metadata.initializeAsArray) {
+    if (metadata.initializeAs === "array") {
       return (keyValuePair: any) => keyValuePair.map((o: any) => itemBuilder(o));
+    } else if (metadata.initializeAs === "record") {
+      return (keyValuePair: any) => {
+        const record: Record<any, any> = {};
+        for (const key in keyValuePair) {
+          record[key] = itemBuilder(keyValuePair[key]);
+        }
+        return record;
+      };
     } else {
       return (keyValuePair: any) => itemBuilder(keyValuePair);
     }
diff --git a/apps/browser/src/decorators/session-sync-observable/synced-item-metadata.spec.ts b/apps/browser/src/decorators/session-sync-observable/synced-item-metadata.spec.ts
index 5cd869a5b67..12b0b57d523 100644
--- a/apps/browser/src/decorators/session-sync-observable/synced-item-metadata.spec.ts
+++ b/apps/browser/src/decorators/session-sync-observable/synced-item-metadata.spec.ts
@@ -8,32 +8,60 @@ describe("builder", () => {
   const ctor = TestClass;
 
   it("should use initializer if provided", () => {
-    const metadata = { propertyKey, sessionKey: key, initializer };
+    const metadata: SyncedItemMetadata = {
+      propertyKey,
+      sessionKey: key,
+      initializer,
+      initializeAs: "object",
+    };
     const builder = SyncedItemMetadata.builder(metadata);
     expect(builder({})).toBe("used initializer");
   });
 
   it("should use ctor if initializer is not provided", () => {
-    const metadata = { propertyKey, sessionKey: key, ctor };
+    const metadata: SyncedItemMetadata = {
+      propertyKey,
+      sessionKey: key,
+      ctor,
+      initializeAs: "object",
+    };
     const builder = SyncedItemMetadata.builder(metadata);
     expect(builder({})).toBeInstanceOf(TestClass);
   });
 
   it("should prefer initializer over ctor", () => {
-    const metadata = { propertyKey, sessionKey: key, ctor, initializer };
+    const metadata: SyncedItemMetadata = {
+      propertyKey,
+      sessionKey: key,
+      ctor,
+      initializer,
+      initializeAs: "object",
+    };
     const builder = SyncedItemMetadata.builder(metadata);
     expect(builder({})).toBe("used initializer");
   });
 
   it("should honor initialize as array", () => {
-    const metadata = {
+    const metadata: SyncedItemMetadata = {
       propertyKey,
       sessionKey: key,
       initializer: initializer,
-      initializeAsArray: true,
+      initializeAs: "array",
     };
     const builder = SyncedItemMetadata.builder(metadata);
     expect(builder([{}])).toBeInstanceOf(Array);
     expect(builder([{}])[0]).toBe("used initializer");
   });
+
+  it("should honor initialize as record", () => {
+    const metadata: SyncedItemMetadata = {
+      propertyKey,
+      sessionKey: key,
+      initializer: initializer,
+      initializeAs: "record",
+    };
+    const builder = SyncedItemMetadata.builder(metadata);
+    expect(builder({ key: "" })).toBeInstanceOf(Object);
+    expect(builder({ key: "" })).toStrictEqual({ key: "used initializer" });
+  });
 });
diff --git a/apps/browser/src/listeners/update-badge.ts b/apps/browser/src/listeners/update-badge.ts
index 9c7c122a45a..8762a15ab2a 100644
--- a/apps/browser/src/listeners/update-badge.ts
+++ b/apps/browser/src/listeners/update-badge.ts
@@ -15,7 +15,7 @@ import { searchServiceFactory } from "../background/service_factories/search-ser
 import { stateServiceFactory } from "../background/service_factories/state-service.factory";
 import { BrowserApi } from "../browser/browserApi";
 import { Account } from "../models/account";
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 import BrowserPlatformUtilsService from "../services/browserPlatformUtils.service";
 
 export type BadgeOptions = {
@@ -25,7 +25,7 @@ export type BadgeOptions = {
 
 export class UpdateBadge {
   private authService: AuthService;
-  private stateService: StateService;
+  private stateService: BrowserStateService;
   private cipherService: CipherService;
   private badgeAction: typeof chrome.action;
   private sidebarAction: OperaSidebarAction | FirefoxSidebarAction;
diff --git a/apps/browser/src/models/account.ts b/apps/browser/src/models/account.ts
index f49c55d2909..cfbcbecf979 100644
--- a/apps/browser/src/models/account.ts
+++ b/apps/browser/src/models/account.ts
@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import {
   Account as BaseAccount,
   AccountSettings as BaseAccountSettings,
@@ -9,6 +11,14 @@ import { BrowserSendComponentState } from "./browserSendComponentState";
 
 export class AccountSettings extends BaseAccountSettings {
   vaultTimeout = -1; // On Restart
+
+  static fromJSON(json: Jsonify<AccountSettings>): AccountSettings {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new AccountSettings(), json, super.fromJSON(json));
+  }
 }
 
 export class Account extends BaseAccount {
@@ -29,4 +39,18 @@ export class Account extends BaseAccount {
     this.ciphers = init?.ciphers ?? new BrowserComponentState();
     this.sendType = init?.sendType ?? new BrowserComponentState();
   }
+
+  static fromJSON(json: Jsonify<Account>): Account {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new Account({}), json, super.fromJSON(json), {
+      settings: AccountSettings.fromJSON(json.settings),
+      groupings: BrowserGroupingsComponentState.fromJSON(json.groupings),
+      send: BrowserSendComponentState.fromJSON(json.send),
+      ciphers: BrowserComponentState.fromJSON(json.ciphers),
+      sendType: BrowserComponentState.fromJSON(json.sendType),
+    });
+  }
 }
diff --git a/apps/browser/src/models/browserComponentState.ts b/apps/browser/src/models/browserComponentState.ts
index d968726c413..c5540d088ff 100644
--- a/apps/browser/src/models/browserComponentState.ts
+++ b/apps/browser/src/models/browserComponentState.ts
@@ -1,4 +1,14 @@
+import { Jsonify } from "type-fest";
+
 export class BrowserComponentState {
   scrollY: number;
   searchText: string;
+
+  static fromJSON(json: Jsonify<BrowserComponentState>) {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new BrowserComponentState(), json);
+  }
 }
diff --git a/apps/browser/src/models/browserGroupingsComponentState.ts b/apps/browser/src/models/browserGroupingsComponentState.ts
index 63eb4aaa88f..f406e3d8271 100644
--- a/apps/browser/src/models/browserGroupingsComponentState.ts
+++ b/apps/browser/src/models/browserGroupingsComponentState.ts
@@ -1,7 +1,9 @@
 import { CipherType } from "@bitwarden/common/enums/cipherType";
+import { Utils } from "@bitwarden/common/misc/utils";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/models/view/collection.view";
 import { FolderView } from "@bitwarden/common/models/view/folder.view";
+import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify";
 
 import { BrowserComponentState } from "./browserComponentState";
 
@@ -15,4 +17,28 @@ export class BrowserGroupingsComponentState extends BrowserComponentState {
   folders: FolderView[];
   collections: CollectionView[];
   deletedCount: number;
+
+  toJSON() {
+    return Utils.merge(this, {
+      collectionCounts: Utils.mapToRecord(this.collectionCounts),
+      folderCounts: Utils.mapToRecord(this.folderCounts),
+      typeCounts: Utils.mapToRecord(this.typeCounts),
+    });
+  }
+
+  static fromJSON(json: DeepJsonify<BrowserGroupingsComponentState>) {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new BrowserGroupingsComponentState(), json, {
+      favoriteCiphers: json.favoriteCiphers?.map((c) => CipherView.fromJSON(c)),
+      noFolderCiphers: json.noFolderCiphers?.map((c) => CipherView.fromJSON(c)),
+      ciphers: json.ciphers?.map((c) => CipherView.fromJSON(c)),
+      collectionCounts: Utils.recordToMap(json.collectionCounts),
+      folderCounts: Utils.recordToMap(json.folderCounts),
+      typeCounts: Utils.recordToMap(json.typeCounts),
+      folders: json.folders?.map((f) => FolderView.fromJSON(f)),
+    });
+  }
 }
diff --git a/apps/browser/src/models/browserSendComponentState.ts b/apps/browser/src/models/browserSendComponentState.ts
index e2bf4eaa5d6..99508737ab1 100644
--- a/apps/browser/src/models/browserSendComponentState.ts
+++ b/apps/browser/src/models/browserSendComponentState.ts
@@ -1,9 +1,28 @@
 import { SendType } from "@bitwarden/common/enums/sendType";
+import { Utils } from "@bitwarden/common/misc/utils";
 import { SendView } from "@bitwarden/common/models/view/send.view";
+import { DeepJsonify } from "@bitwarden/common/types/deep-jsonify";
 
 import { BrowserComponentState } from "./browserComponentState";
 
 export class BrowserSendComponentState extends BrowserComponentState {
   sends: SendView[];
   typeCounts: Map<SendType, number>;
+
+  toJSON() {
+    return Utils.merge(this, {
+      typeCounts: Utils.mapToRecord(this.typeCounts),
+    });
+  }
+
+  static fromJSON(json: DeepJsonify<BrowserSendComponentState>) {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new BrowserSendComponentState(), json, {
+      sends: json.sends?.map((s) => SendView.fromJSON(s)),
+      typeCounts: Utils.recordToMap(json.typeCounts),
+    });
+  }
 }
diff --git a/apps/browser/src/popup/accounts/set-password.component.html b/apps/browser/src/popup/accounts/set-password.component.html
index 517374578c2..9eb551bf269 100644
--- a/apps/browser/src/popup/accounts/set-password.component.html
+++ b/apps/browser/src/popup/accounts/set-password.component.html
@@ -39,13 +39,10 @@
           <div class="box-content-row" appBoxRow>
             <div class="box-content-row-flex">
               <div class="row-main">
-                <label for="masterPassword"
-                  >{{ "masterPass" | i18n }}
-                  <strong
-                    class="sub-label text-{{ passwordStrengthComponent?.masterPasswordScoreColor }}"
-                    *ngIf="passwordStrengthComponent?.masterPasswordScoreText"
-                  >
-                    {{ passwordStrengthComponent?.masterPasswordScoreText }}
+                <label for="masterPassword">
+                  {{ "masterPass" | i18n }}
+                  <strong class="sub-label text-{{ color }}" *ngIf="text">
+                    {{ text }}
                   </strong>
                 </label>
                 <input
diff --git a/apps/browser/src/popup/accounts/two-factor.component.html b/apps/browser/src/popup/accounts/two-factor.component.html
index b2d017a9f97..71d7c2498dd 100644
--- a/apps/browser/src/popup/accounts/two-factor.component.html
+++ b/apps/browser/src/popup/accounts/two-factor.component.html
@@ -86,7 +86,9 @@
       </div>
     </ng-container>
     <ng-container *ngIf="selectedProviderType === providerType.WebAuthn && !webAuthnNewTab">
-      <div id="web-authn-frame"><iframe id="webauthn_iframe" [allow]="webAuthnAllow"></iframe></div>
+      <div id="web-authn-frame">
+        <iframe id="webauthn_iframe" [attr.allow]="webAuthnAllow"></iframe>
+      </div>
       <div class="box">
         <div class="box-content">
           <div class="box-content-row box-content-row-checkbox" appBoxRow>
diff --git a/apps/browser/src/popup/app.component.ts b/apps/browser/src/popup/app.component.ts
index ec094cbe945..da7b0062b8b 100644
--- a/apps/browser/src/popup/app.component.ts
+++ b/apps/browser/src/popup/app.component.ts
@@ -19,7 +19,7 @@ import { MessagingService } from "@bitwarden/common/abstractions/messaging.servi
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 
 import { BrowserApi } from "../browser/browserApi";
-import { StateService } from "../services/abstractions/state.service";
+import { BrowserStateService } from "../services/abstractions/browser-state.service";
 
 import { routerTransition } from "./app-routing.animations";
 
@@ -43,7 +43,7 @@ export class AppComponent implements OnInit, OnDestroy {
     private authService: AuthService,
     private i18nService: I18nService,
     private router: Router,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private messagingService: MessagingService,
     private changeDetectorRef: ChangeDetectorRef,
     private ngZone: NgZone,
diff --git a/apps/browser/src/popup/generator/generator.component.html b/apps/browser/src/popup/generator/generator.component.html
index 1f0a0a328af..8178e355363 100644
--- a/apps/browser/src/popup/generator/generator.component.html
+++ b/apps/browser/src/popup/generator/generator.component.html
@@ -57,11 +57,11 @@
         appStopClick
         appA11yTitle="{{ 'regenerateUsername' | i18n }}"
         (click)="regenerate()"
-        [disabled]="form.loading"
+        [disabled]="$any(form).loading"
       >
         <i
           class="bwi bwi-lg bwi-generate"
-          [ngClass]="form.loading ? 'bwi-spin' : ''"
+          [ngClass]="$any(form).loading ? 'bwi-spin' : ''"
           aria-hidden="true"
         ></i>
       </button>
@@ -351,7 +351,7 @@
             <input
               id="duckduckgo-apikey"
               type="password"
-              name="DuckDudkGoApiKey"
+              name="DuckDuckGoApiKey"
               [(ngModel)]="usernameOptions.forwardedDuckDuckGoToken"
               (blur)="saveUsernameOptions()"
             />
diff --git a/apps/browser/src/popup/scss/misc.scss b/apps/browser/src/popup/scss/misc.scss
index 2e832e92863..0a550915987 100644
--- a/apps/browser/src/popup/scss/misc.scss
+++ b/apps/browser/src/popup/scss/misc.scss
@@ -432,6 +432,12 @@ app-vault-view .box-footer {
   user-select: auto;
 }
 
+/* tweak for inconsistent line heights in cipher view */
+.box-footer button,
+.box-footer a {
+  line-height: 1;
+}
+
 // Workaround for slow performance on external monitors on Chrome + MacOS
 // See: https://bugs.chromium.org/p/chromium/issues/detail?id=971701#c64
 @keyframes redraw {
diff --git a/apps/browser/src/popup/send/send-add-edit.component.html b/apps/browser/src/popup/send/send-add-edit.component.html
index fb1ba6b801c..19e5c535127 100644
--- a/apps/browser/src/popup/send/send-add-edit.component.html
+++ b/apps/browser/src/popup/send/send-add-edit.component.html
@@ -305,8 +305,11 @@
         >
           <div class="row-main text-danger">
             <div class="icon text-danger" aria-hidden="true">
-              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading"></i>
-              <i class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw" [hidden]="!deleteBtn.loading"></i>
+              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="$any(deleteBtn).loading"></i>
+              <i
+                class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
+                [hidden]="!$any(deleteBtn).loading"
+              ></i>
             </div>
             <span>{{ "deleteSend" | i18n }}</span>
           </div>
diff --git a/apps/browser/src/popup/send/send-add-edit.component.ts b/apps/browser/src/popup/send/send-add-edit.component.ts
index 2fb45996ad1..0355b764c30 100644
--- a/apps/browser/src/popup/send/send-add-edit.component.ts
+++ b/apps/browser/src/popup/send/send-add-edit.component.ts
@@ -12,7 +12,7 @@ import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUti
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { SendService } from "@bitwarden/common/abstractions/send.service";
 
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
 @Component({
@@ -33,7 +33,7 @@ export class SendAddEditComponent extends BaseAddEditComponent {
   constructor(
     i18nService: I18nService,
     platformUtilsService: PlatformUtilsService,
-    stateService: StateService,
+    stateService: BrowserStateService,
     messagingService: MessagingService,
     policyService: PolicyService,
     environmentService: EnvironmentService,
diff --git a/apps/browser/src/popup/send/send-groupings.component.ts b/apps/browser/src/popup/send/send-groupings.component.ts
index 1af715ada0f..a5d63eb9d58 100644
--- a/apps/browser/src/popup/send/send-groupings.component.ts
+++ b/apps/browser/src/popup/send/send-groupings.component.ts
@@ -15,7 +15,7 @@ import { SendType } from "@bitwarden/common/enums/sendType";
 import { SendView } from "@bitwarden/common/models/view/send.view";
 
 import { BrowserSendComponentState } from "../../models/browserSendComponentState";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
 const ComponentId = "SendComponent";
@@ -42,7 +42,7 @@ export class SendGroupingsComponent extends BaseSendComponent {
     policyService: PolicyService,
     searchService: SearchService,
     private popupUtils: PopupUtilsService,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private router: Router,
     private syncService: SyncService,
     private changeDetectorRef: ChangeDetectorRef,
@@ -165,12 +165,12 @@ export class SendGroupingsComponent extends BaseSendComponent {
   }
 
   private async saveState() {
-    this.state = {
+    this.state = Object.assign(new BrowserSendComponentState(), {
       scrollY: this.popupUtils.getContentScrollY(window),
       searchText: this.searchText,
       sends: this.sends,
       typeCounts: this.typeCounts,
-    };
+    });
     await this.stateService.setBrowserSendComponentState(this.state);
   }
 
diff --git a/apps/browser/src/popup/send/send-type.component.ts b/apps/browser/src/popup/send/send-type.component.ts
index afd3daeeda5..e899ab9f00f 100644
--- a/apps/browser/src/popup/send/send-type.component.ts
+++ b/apps/browser/src/popup/send/send-type.component.ts
@@ -16,7 +16,7 @@ import { SendType } from "@bitwarden/common/enums/sendType";
 import { SendView } from "@bitwarden/common/models/view/send.view";
 
 import { BrowserComponentState } from "../../models/browserComponentState";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
 const ComponentId = "SendTypeComponent";
@@ -41,7 +41,7 @@ export class SendTypeComponent extends BaseSendComponent {
     policyService: PolicyService,
     searchService: SearchService,
     private popupUtils: PopupUtilsService,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private route: ActivatedRoute,
     private location: Location,
     private changeDetectorRef: ChangeDetectorRef,
diff --git a/apps/browser/src/popup/services/init.service.ts b/apps/browser/src/popup/services/init.service.ts
index a73792cc10f..8008f6c88ce 100644
--- a/apps/browser/src/popup/services/init.service.ts
+++ b/apps/browser/src/popup/services/init.service.ts
@@ -5,7 +5,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService as LogServiceAbstraction } from "@bitwarden/common/abstractions/log.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 
-import { StateService as StateServiceAbstraction } from "../../services/abstractions/state.service";
+import { BrowserStateService as StateServiceAbstraction } from "../../services/abstractions/browser-state.service";
 
 import { PopupUtilsService } from "./popup-utils.service";
 
diff --git a/apps/browser/src/popup/services/services.module.ts b/apps/browser/src/popup/services/services.module.ts
index 236ff4e5b18..0acd8c785d1 100644
--- a/apps/browser/src/popup/services/services.module.ts
+++ b/apps/browser/src/popup/services/services.module.ts
@@ -38,6 +38,7 @@ import { SearchService as SearchServiceAbstraction } from "@bitwarden/common/abs
 import { SendService } from "@bitwarden/common/abstractions/send.service";
 import { SettingsService } from "@bitwarden/common/abstractions/settings.service";
 import { StateService as BaseStateServiceAbstraction } from "@bitwarden/common/abstractions/state.service";
+import { StateMigrationService } from "@bitwarden/common/abstractions/stateMigration.service";
 import { AbstractStorageService } from "@bitwarden/common/abstractions/storage.service";
 import { SyncService } from "@bitwarden/common/abstractions/sync/sync.service.abstraction";
 import { TokenService } from "@bitwarden/common/abstractions/token.service";
@@ -47,6 +48,8 @@ import { UserVerificationService } from "@bitwarden/common/abstractions/userVeri
 import { UsernameGenerationService } from "@bitwarden/common/abstractions/usernameGeneration.service";
 import { VaultTimeoutService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeout.service";
 import { VaultTimeoutSettingsService } from "@bitwarden/common/abstractions/vaultTimeout/vaultTimeoutSettings.service";
+import { StateFactory } from "@bitwarden/common/factories/stateFactory";
+import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { AuthService } from "@bitwarden/common/services/auth.service";
 import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service";
 import { LoginService } from "@bitwarden/common/services/login.service";
@@ -54,9 +57,14 @@ import { SearchService } from "@bitwarden/common/services/search.service";
 
 import MainBackground from "../../background/main.background";
 import { BrowserApi } from "../../browser/browserApi";
+import { Account } from "../../models/account";
 import { AutofillService } from "../../services/abstractions/autofill.service";
-import { StateService as StateServiceAbstraction } from "../../services/abstractions/state.service";
+import { BrowserStateService as StateServiceAbstraction } from "../../services/abstractions/browser-state.service";
 import { BrowserEnvironmentService } from "../../services/browser-environment.service";
+import { BrowserOrganizationService } from "../../services/browser-organization.service";
+import { BrowserPolicyService } from "../../services/browser-policy.service";
+import { BrowserSettingsService } from "../../services/browser-settings.service";
+import { BrowserStateService } from "../../services/browser-state.service";
 import { BrowserFileDownloadService } from "../../services/browserFileDownloadService";
 import BrowserMessagingService from "../../services/browserMessaging.service";
 import BrowserMessagingPrivateModePopupService from "../../services/browserMessagingPrivateModePopup.service";
@@ -190,8 +198,13 @@ function getBgService<T>(service: keyof MainBackground) {
     { provide: EventService, useFactory: getBgService<EventService>("eventService"), deps: [] },
     {
       provide: PolicyService,
-      useFactory: getBgService<PolicyService>("policyService"),
-      deps: [],
+      useFactory: (
+        stateService: StateServiceAbstraction,
+        organizationService: OrganizationService
+      ) => {
+        return new BrowserPolicyService(stateService, organizationService);
+      },
+      deps: [StateServiceAbstraction, OrganizationService],
     },
     {
       provide: PolicyApiServiceAbstraction,
@@ -212,8 +225,10 @@ function getBgService<T>(service: keyof MainBackground) {
     { provide: SyncService, useFactory: getBgService<SyncService>("syncService"), deps: [] },
     {
       provide: SettingsService,
-      useFactory: getBgService<SettingsService>("settingsService"),
-      deps: [],
+      useFactory: (stateService: StateServiceAbstraction) => {
+        return new BrowserSettingsService(stateService);
+      },
+      deps: [StateServiceAbstraction],
     },
     {
       provide: AbstractStorageService,
@@ -261,8 +276,10 @@ function getBgService<T>(service: keyof MainBackground) {
     { provide: PasswordRepromptServiceAbstraction, useClass: PasswordRepromptService },
     {
       provide: OrganizationService,
-      useFactory: getBgService<OrganizationService>("organizationService"),
-      deps: [],
+      useFactory: (stateService: StateServiceAbstraction) => {
+        return new BrowserOrganizationService(stateService);
+      },
+      deps: [StateServiceAbstraction],
     },
     {
       provide: VaultFilterService,
@@ -293,10 +310,36 @@ function getBgService<T>(service: keyof MainBackground) {
       useFactory: getBgService<AbstractStorageService>("memoryStorageService"),
     },
     {
-      provide: StateServiceAbstraction,
-      useFactory: getBgService<StateServiceAbstraction>("stateService"),
+      provide: StateMigrationService,
+      useFactory: getBgService<StateMigrationService>("stateMigrationService"),
       deps: [],
     },
+    {
+      provide: StateServiceAbstraction,
+      useFactory: (
+        storageService: AbstractStorageService,
+        secureStorageService: AbstractStorageService,
+        memoryStorageService: AbstractStorageService,
+        logService: LogServiceAbstraction,
+        stateMigrationService: StateMigrationService
+      ) => {
+        return new BrowserStateService(
+          storageService,
+          secureStorageService,
+          memoryStorageService,
+          logService,
+          stateMigrationService,
+          new StateFactory(GlobalState, Account)
+        );
+      },
+      deps: [
+        AbstractStorageService,
+        SECURE_STORAGE,
+        MEMORY_STORAGE,
+        LogServiceAbstraction,
+        StateMigrationService,
+      ],
+    },
     {
       provide: UsernameGenerationService,
       useFactory: getBgService<UsernameGenerationService>("usernameGenerationService"),
@@ -317,17 +360,19 @@ function getBgService<T>(service: keyof MainBackground) {
     },
     {
       provide: AbstractThemingService,
-      useFactory: () => {
+      useFactory: (
+        stateService: StateServiceAbstraction,
+        platformUtilsService: PlatformUtilsService
+      ) => {
         return new ThemingService(
-          getBgService<StateServiceAbstraction>("stateService")(),
+          stateService,
           // Safari doesn't properly handle the (prefers-color-scheme) media query in the popup window, it always returns light.
           // In Safari we have to use the background page instead, which comes with limitations like not dynamically changing the extension theme when the system theme is changed.
-          getBgService<PlatformUtilsService>("platformUtilsService")().isSafari()
-            ? getBgService<Window>("backgroundWindow")()
-            : window,
+          platformUtilsService.isSafari() ? getBgService<Window>("backgroundWindow")() : window,
           document
         );
       },
+      deps: [StateServiceAbstraction, PlatformUtilsService],
     },
   ],
 })
diff --git a/apps/browser/src/popup/settings/folder-add-edit.component.html b/apps/browser/src/popup/settings/folder-add-edit.component.html
index b8aa391f0fa..3568a971b80 100644
--- a/apps/browser/src/popup/settings/folder-add-edit.component.html
+++ b/apps/browser/src/popup/settings/folder-add-edit.component.html
@@ -40,8 +40,11 @@
         >
           <div class="row-main text-danger">
             <div class="icon text-danger" aria-hidden="true">
-              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading"></i>
-              <i class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw" [hidden]="!deleteBtn.loading"></i>
+              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="$any(deleteBtn).loading"></i>
+              <i
+                class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
+                [hidden]="!$any(deleteBtn).loading"
+              ></i>
             </div>
             <span>{{ "deleteFolder" | i18n }}</span>
           </div>
diff --git a/apps/browser/src/popup/settings/premium.component.html b/apps/browser/src/popup/settings/premium.component.html
index 01ac9258133..a9a569ec176 100644
--- a/apps/browser/src/popup/settings/premium.component.html
+++ b/apps/browser/src/popup/settings/premium.component.html
@@ -49,14 +49,14 @@
         #refreshBtn
         type="button"
         (click)="refresh()"
-        [disabled]="refreshBtn.loading"
+        [disabled]="$any(refreshBtn).loading"
         [appApiAction]="refreshPromise"
         class="btn link block"
       >
-        <span [hidden]="refreshBtn.loading">{{ "premiumRefresh" | i18n }}</span>
+        <span [hidden]="$any(refreshBtn).loading">{{ "premiumRefresh" | i18n }}</span>
         <i
           class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-          [hidden]="!refreshBtn.loading"
+          [hidden]="!$any(refreshBtn).loading"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/browser/src/popup/settings/sync.component.html b/apps/browser/src/popup/settings/sync.component.html
index c28302291f7..ffa0b1ec66b 100644
--- a/apps/browser/src/popup/settings/sync.component.html
+++ b/apps/browser/src/popup/settings/sync.component.html
@@ -17,11 +17,15 @@
       class="btn block primary"
       (click)="sync()"
       #syncBtn
-      [disabled]="syncBtn.loading"
+      [disabled]="$any(syncBtn).loading"
       [appApiAction]="syncPromise"
     >
-      <span [hidden]="syncBtn.loading">{{ "syncVaultNow" | i18n }}</span>
-      <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!syncBtn.loading" aria-hidden="true"></i>
+      <span [hidden]="$any(syncBtn).loading">{{ "syncVaultNow" | i18n }}</span>
+      <i
+        class="bwi bwi-spinner bwi-lg bwi-spin"
+        [hidden]="!$any(syncBtn).loading"
+        aria-hidden="true"
+      ></i>
     </button>
     <p class="text-center text-muted small">{{ "lastSync" | i18n }} {{ lastSync }}</p>
   </div>
diff --git a/apps/browser/src/popup/vault/add-edit-custom-fields.component.html b/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
index 8464655c20b..42200f72fa3 100644
--- a/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
+++ b/apps/browser/src/popup/vault/add-edit-custom-fields.component.html
@@ -81,8 +81,8 @@
           [(ngModel)]="f.value"
           *ngIf="f.type === fieldType.Boolean"
           appTrueFalseValue
-          trueValue="true"
-          falseValue="false"
+          [trueValue]="true"
+          [falseValue]="false"
           attr.aria-describedby="fieldName{{ i }}"
           [readonly]="!cipher.edit && editMode"
         />
diff --git a/apps/browser/src/popup/vault/add-edit.component.html b/apps/browser/src/popup/vault/add-edit.component.html
index 77c94c8108d..069046f4752 100644
--- a/apps/browser/src/popup/vault/add-edit.component.html
+++ b/apps/browser/src/popup/vault/add-edit.component.html
@@ -88,17 +88,17 @@
                 appA11yTitle="{{ 'checkPassword' | i18n }}"
                 (click)="checkPassword()"
                 [appApiAction]="checkPasswordPromise"
-                [disabled]="checkPasswordBtn.loading"
+                [disabled]="$any(checkPasswordBtn).loading"
                 *ngIf="cipher.viewPassword"
               >
                 <i
                   class="bwi bwi-lg bwi-check-circle"
-                  [hidden]="checkPasswordBtn.loading"
+                  [hidden]="$any(checkPasswordBtn).loading"
                   aria-hidden="true"
                 ></i>
                 <i
                   class="bwi bwi-lg bwi-spinner bwi-spin"
-                  [hidden]="!checkPasswordBtn.loading"
+                  [hidden]="!$any(checkPasswordBtn).loading"
                   aria-hidden="true"
                 ></i>
               </button>
@@ -487,7 +487,7 @@
                 type="text"
                 name="Login.Uris[{{ i }}].Uri"
                 [(ngModel)]="u.uri"
-                [hidden]="u.showUriOptionsInput === true"
+                [hidden]="$any(u).showUriOptionsInput === true"
                 placeholder="{{ 'ex' | i18n }} https://google.com"
                 inputmode="url"
                 appInputVerbatim
@@ -500,7 +500,7 @@
                 id="currentUris{{ i }}"
                 name="Login.Uris[{{ i }}].CurrentUris"
                 [(ngModel)]="u.uri"
-                [hidden]="!u.showCurrentUris"
+                [hidden]="!$any(u).showCurrentUris"
               >
                 <option [ngValue]="null">-- {{ "select" | i18n }} --</option>
                 <option *ngFor="let u of currentUris" [ngValue]="u">{{ u }}</option>
@@ -512,7 +512,9 @@
                 id="loginUriMatch{{ i }}"
                 name="Login.Uris[{{ i }}].Match"
                 [(ngModel)]="u.match"
-                [hidden]="u.showOptions === false || (u.showOptions == null && u.match == null)"
+                [hidden]="
+                  $any(u).showOptions === false || ($any(u).showOptions == null && u.match == null)
+                "
                 (change)="loginUriMatchChanged(u)"
               >
                 <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">{{ o.name }}</option>
@@ -526,7 +528,7 @@
                 appStopClick
                 appA11yTitle="{{ 'toggleCurrentUris' | i18n }}"
                 (click)="toggleUriInput(u)"
-                [attr.aria-pressed]="u.showCurrentUris === true"
+                [attr.aria-pressed]="$any(u).showCurrentUris === true"
               >
                 <i aria-hidden="true" class="bwi bwi-lg bwi-list"></i>
               </button>
@@ -536,7 +538,7 @@
                 appStopClick
                 appA11yTitle="{{ 'toggleOptions' | i18n }}"
                 (click)="toggleUriOptions(u)"
-                [attr.aria-pressed]="u.showOptions === true"
+                [attr.aria-pressed]="$any(u).showOptions === true"
               >
                 <i class="bwi bwi-lg bwi-cog" aria-hidden="true"></i>
               </button>
@@ -695,7 +697,7 @@
           <input
             id="collection_{{ i }}"
             type="checkbox"
-            [(ngModel)]="c.checked"
+            [(ngModel)]="$any(c).checked"
             name="Collection[{{ i }}].Checked"
           />
         </div>
@@ -713,8 +715,11 @@
         >
           <div class="row-main text-danger">
             <div class="icon text-danger" aria-hidden="true">
-              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading"></i>
-              <i class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw" [hidden]="!deleteBtn.loading"></i>
+              <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="$any(deleteBtn).loading"></i>
+              <i
+                class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
+                [hidden]="!$any(deleteBtn).loading"
+              ></i>
             </div>
             <span>{{ "deleteItem" | i18n }}</span>
           </div>
diff --git a/apps/browser/src/popup/vault/attachments.component.html b/apps/browser/src/popup/vault/attachments.component.html
index 8ae4e49a692..0101fb60e0f 100644
--- a/apps/browser/src/popup/vault/attachments.component.html
+++ b/apps/browser/src/popup/vault/attachments.component.html
@@ -37,16 +37,16 @@
               (click)="delete(a)"
               #deleteBtn
               [appApiAction]="deletePromises[a.id]"
-              [disabled]="deleteBtn.loading"
+              [disabled]="$any(deleteBtn).loading"
             >
               <i
                 class="bwi bwi-trash bwi-lg bwi-fw"
-                [hidden]="deleteBtn.loading"
+                [hidden]="$any(deleteBtn).loading"
                 aria-hidden="true"
               ></i>
               <i
                 class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-                [hidden]="!deleteBtn.loading"
+                [hidden]="!$any(deleteBtn).loading"
                 aria-hidden="true"
               ></i>
             </button>
diff --git a/apps/browser/src/popup/vault/collections.component.html b/apps/browser/src/popup/vault/collections.component.html
index d8bcf9a0292..36c1336c5b4 100644
--- a/apps/browser/src/popup/vault/collections.component.html
+++ b/apps/browser/src/popup/vault/collections.component.html
@@ -33,7 +33,7 @@
           <input
             id="collection_{{ i }}"
             type="checkbox"
-            [(ngModel)]="c.checked"
+            [(ngModel)]="$any(c).checked"
             name="Collection[{{ i }}].Checked"
           />
         </div>
diff --git a/apps/browser/src/popup/vault/current-tab.component.ts b/apps/browser/src/popup/vault/current-tab.component.ts
index 48b22a518f7..fd0e356476a 100644
--- a/apps/browser/src/popup/vault/current-tab.component.ts
+++ b/apps/browser/src/popup/vault/current-tab.component.ts
@@ -200,7 +200,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     }
   }
 
-  private async load() {
+  protected async load() {
     this.isLoading = false;
     this.tab = await BrowserApi.getTabFromCurrentWindow();
     if (this.tab != null) {
diff --git a/apps/browser/src/popup/vault/vault-filter.component.ts b/apps/browser/src/popup/vault/vault-filter.component.ts
index f8a6f14081d..e67fe69f601 100644
--- a/apps/browser/src/popup/vault/vault-filter.component.ts
+++ b/apps/browser/src/popup/vault/vault-filter.component.ts
@@ -18,7 +18,7 @@ import { FolderView } from "@bitwarden/common/models/view/folder.view";
 
 import { BrowserApi } from "../../browser/browserApi";
 import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { VaultFilterService } from "../../services/vaultFilter.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
@@ -83,7 +83,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
     private platformUtilsService: PlatformUtilsService,
     private searchService: SearchService,
     private location: Location,
-    private browserStateService: StateService,
+    private browserStateService: BrowserStateService,
     private vaultFilterService: VaultFilterService
   ) {
     this.noFolderListSize = 100;
@@ -373,7 +373,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
   }
 
   private async saveState() {
-    this.state = {
+    this.state = Object.assign(new BrowserGroupingsComponentState(), {
       scrollY: this.popupUtils.getContentScrollY(window),
       searchText: this.searchText,
       favoriteCiphers: this.favoriteCiphers,
@@ -385,7 +385,7 @@ export class VaultFilterComponent implements OnInit, OnDestroy {
       folders: this.folders,
       collections: this.collections,
       deletedCount: this.deletedCount,
-    };
+    });
     await this.browserStateService.setBrowserGroupingComponentState(this.state);
   }
 
diff --git a/apps/browser/src/popup/vault/vault-items.component.ts b/apps/browser/src/popup/vault/vault-items.component.ts
index 232a29ea415..b7f63d6d71d 100644
--- a/apps/browser/src/popup/vault/vault-items.component.ts
+++ b/apps/browser/src/popup/vault/vault-items.component.ts
@@ -21,7 +21,7 @@ import { FolderView } from "@bitwarden/common/models/view/folder.view";
 
 import { BrowserApi } from "../../browser/browserApi";
 import { BrowserComponentState } from "../../models/browserComponentState";
-import { StateService } from "../../services/abstractions/state.service";
+import { BrowserStateService } from "../../services/abstractions/browser-state.service";
 import { VaultFilterService } from "../../services/vaultFilter.service";
 import { PopupUtilsService } from "../services/popup-utils.service";
 
@@ -60,7 +60,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnIn
     private ngZone: NgZone,
     private broadcasterService: BroadcasterService,
     private changeDetectorRef: ChangeDetectorRef,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private popupUtils: PopupUtilsService,
     private i18nService: I18nService,
     private folderService: FolderService,
diff --git a/apps/browser/src/popup/vault/vault-select.component.html b/apps/browser/src/popup/vault/vault-select.component.html
index f57056feb59..8ef8c2dc04c 100644
--- a/apps/browser/src/popup/vault/vault-select.component.html
+++ b/apps/browser/src/popup/vault/vault-select.component.html
@@ -27,11 +27,7 @@
         role="dialog"
         aria-modal="true"
       >
-        <button
-          appStopClick
-          (click)="selectAllVaults()"
-          [ngClass]="{ active: !myVaultOnly && !selectOrganizationId }"
-        >
+        <button appStopClick (click)="selectAllVaults()">
           <i class="bwi bwi-fw bwi-filter" aria-hidden="true"></i>
           &nbsp;{{ "allVaults" | i18n }}
         </button>
@@ -60,7 +56,7 @@
           <i
             *ngIf="!organization.enabled"
             class="bwi bwi-fw bwi-exclamation-triangle text-danger"
-            aria-label="{{ 'organizationIsDisabled' | i18n }}"
+            attr.aria-label="{{ 'organizationIsDisabled' | i18n }}"
             appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
           ></i>
         </button>
diff --git a/apps/browser/src/popup/vault/view.component.html b/apps/browser/src/popup/vault/view.component.html
index 73d75b662b8..a7958b76083 100644
--- a/apps/browser/src/popup/vault/view.component.html
+++ b/apps/browser/src/popup/vault/view.component.html
@@ -88,17 +88,17 @@
               appA11yTitle="{{ 'checkPassword' | i18n }}"
               (click)="checkPassword()"
               [appApiAction]="checkPasswordPromise"
-              [disabled]="checkPasswordBtn.loading"
+              [disabled]="$any(checkPasswordBtn).loading"
               *ngIf="cipher.viewPassword"
             >
               <i
                 class="bwi bwi-lg bwi-check-circle"
-                [hidden]="checkPasswordBtn.loading"
+                [hidden]="$any(checkPasswordBtn).loading"
                 aria-hidden="true"
               ></i>
               <i
                 class="bwi bwi-lg bwi-spinner bwi-spin"
-                [hidden]="!checkPasswordBtn.loading"
+                [hidden]="!$any(checkPasswordBtn).loading"
                 aria-hidden="true"
               ></i>
             </button>
@@ -537,12 +537,12 @@
         <small class="row-sub-label">{{ attachment.sizeName }}</small>
         <i
           class="bwi bwi-download bwi-fw row-sub-icon"
-          *ngIf="!attachment.downloading"
+          *ngIf="!$any(attachment).downloading"
           aria-hidden="true"
         ></i>
         <i
           class="bwi bwi-spinner bwi-fw bwi-spin row-sub-icon"
-          *ngIf="attachment.downloading"
+          *ngIf="$any(attachment).downloading"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/browser/src/services/abstractions/state.service.ts b/apps/browser/src/services/abstractions/browser-state.service.ts
similarity index 91%
rename from apps/browser/src/services/abstractions/state.service.ts
rename to apps/browser/src/services/abstractions/browser-state.service.ts
index 53a1b883646..afe5e2ce694 100644
--- a/apps/browser/src/services/abstractions/state.service.ts
+++ b/apps/browser/src/services/abstractions/browser-state.service.ts
@@ -8,7 +8,8 @@ import { BrowserComponentState } from "../../models/browserComponentState";
 import { BrowserGroupingsComponentState } from "../../models/browserGroupingsComponentState";
 import { BrowserSendComponentState } from "../../models/browserSendComponentState";
 
-export abstract class StateService extends BaseStateServiceAbstraction<Account> {
+export abstract class BrowserStateService extends BaseStateServiceAbstraction<Account> {
+  abstract hasInSessionMemory(key: string): Promise<boolean>;
   abstract getFromSessionMemory<T>(key: string, deserializer?: (obj: Jsonify<T>) => T): Promise<T>;
   abstract setInSessionMemory(key: string, value: any): Promise<void>;
   getBrowserGroupingComponentState: (
diff --git a/apps/browser/src/services/autofill.service.ts b/apps/browser/src/services/autofill.service.ts
index 470bd584cf1..f458279de4a 100644
--- a/apps/browser/src/services/autofill.service.ts
+++ b/apps/browser/src/services/autofill.service.ts
@@ -14,7 +14,6 @@ import { BrowserApi } from "../browser/browserApi";
 import AutofillField from "../models/autofillField";
 import AutofillPageDetails from "../models/autofillPageDetails";
 import AutofillScript from "../models/autofillScript";
-import { StateService } from "../services/abstractions/state.service";
 
 import {
   AutoFillOptions,
@@ -22,6 +21,7 @@ import {
   PageDetail,
   FormData,
 } from "./abstractions/autofill.service";
+import { BrowserStateService } from "./abstractions/browser-state.service";
 import {
   AutoFillConstants,
   CreditCardAutoFillConstants,
@@ -39,7 +39,7 @@ export interface GenerateFillScriptOptions {
 export default class AutofillService implements AutofillServiceInterface {
   constructor(
     private cipherService: CipherService,
-    private stateService: StateService,
+    private stateService: BrowserStateService,
     private totpService: TotpService,
     private eventService: EventService,
     private logService: LogService
diff --git a/apps/browser/src/services/folders/folder.service.ts b/apps/browser/src/services/browser-folder.service.ts
similarity index 57%
rename from apps/browser/src/services/folders/folder.service.ts
rename to apps/browser/src/services/browser-folder.service.ts
index e4fc19644da..a9573ab0f78 100644
--- a/apps/browser/src/services/folders/folder.service.ts
+++ b/apps/browser/src/services/browser-folder.service.ts
@@ -4,12 +4,12 @@ import { Folder } from "@bitwarden/common/models/domain/folder";
 import { FolderView } from "@bitwarden/common/models/view/folder.view";
 import { FolderService as BaseFolderService } from "@bitwarden/common/services/folder/folder.service";
 
-import { browserSession, sessionSync } from "../../decorators/session-sync-observable";
+import { browserSession, sessionSync } from "../decorators/session-sync-observable";
 
 @browserSession
-export class FolderService extends BaseFolderService {
-  @sessionSync({ initializer: Folder.fromJSON, initializeAsArray: true })
+export class BrowserFolderService extends BaseFolderService {
+  @sessionSync({ initializer: Folder.fromJSON, initializeAs: "array" })
   protected _folders: BehaviorSubject<Folder[]>;
-  @sessionSync({ initializer: FolderView.fromJSON, initializeAsArray: true })
+  @sessionSync({ initializer: FolderView.fromJSON, initializeAs: "array" })
   protected _folderViews: BehaviorSubject<FolderView[]>;
 }
diff --git a/apps/browser/src/services/browser-organization.service.ts b/apps/browser/src/services/browser-organization.service.ts
new file mode 100644
index 00000000000..63f2848e2e8
--- /dev/null
+++ b/apps/browser/src/services/browser-organization.service.ts
@@ -0,0 +1,12 @@
+import { BehaviorSubject } from "rxjs";
+
+import { Organization } from "@bitwarden/common/models/domain/organization";
+import { OrganizationService } from "@bitwarden/common/services/organization/organization.service";
+
+import { browserSession, sessionSync } from "../decorators/session-sync-observable";
+
+@browserSession
+export class BrowserOrganizationService extends OrganizationService {
+  @sessionSync({ initializer: Organization.fromJSON, initializeAs: "array" })
+  protected _organizations: BehaviorSubject<Organization[]>;
+}
diff --git a/apps/browser/src/services/browser-policy.service.ts b/apps/browser/src/services/browser-policy.service.ts
new file mode 100644
index 00000000000..613e5c39cf4
--- /dev/null
+++ b/apps/browser/src/services/browser-policy.service.ts
@@ -0,0 +1,12 @@
+import { BehaviorSubject } from "rxjs";
+
+import { Policy } from "@bitwarden/common/models/domain/policy";
+import { PolicyService } from "@bitwarden/common/services/policy/policy.service";
+
+import { browserSession, sessionSync } from "../decorators/session-sync-observable";
+
+@browserSession
+export class BrowserPolicyService extends PolicyService {
+  @sessionSync({ ctor: Policy, initializeAs: "array" })
+  protected _policies: BehaviorSubject<Policy[]>;
+}
diff --git a/apps/browser/src/services/browser-settings.service.ts b/apps/browser/src/services/browser-settings.service.ts
new file mode 100644
index 00000000000..78b4f76ea6a
--- /dev/null
+++ b/apps/browser/src/services/browser-settings.service.ts
@@ -0,0 +1,11 @@
+import { BehaviorSubject } from "rxjs";
+
+import { AccountSettingsSettings } from "@bitwarden/common/models/domain/account";
+import { SettingsService } from "@bitwarden/common/services/settings.service";
+
+import { sessionSync } from "../decorators/session-sync-observable";
+
+export class BrowserSettingsService extends SettingsService {
+  @sessionSync({ initializer: (obj: string[][]) => obj })
+  protected _settings: BehaviorSubject<AccountSettingsSettings>;
+}
diff --git a/apps/browser/src/services/state.service.spec.ts b/apps/browser/src/services/browser-state.service.spec.ts
similarity index 77%
rename from apps/browser/src/services/state.service.spec.ts
rename to apps/browser/src/services/browser-state.service.spec.ts
index 5bc4e6ad99b..7d6f8456314 100644
--- a/apps/browser/src/services/state.service.spec.ts
+++ b/apps/browser/src/services/browser-state.service.spec.ts
@@ -1,6 +1,6 @@
-// eslint-disable-next-line no-restricted-imports
-import { Arg, Substitute, SubstituteOf } from "@fluffy-spoon/substitute";
+import { mock, MockProxy } from "jest-mock-extended";
 
+import { EncryptService } from "@bitwarden/common/abstractions/encrypt.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import {
   MemoryStorageServiceInterface,
@@ -18,28 +18,29 @@ import { BrowserComponentState } from "../models/browserComponentState";
 import { BrowserGroupingsComponentState } from "../models/browserGroupingsComponentState";
 import { BrowserSendComponentState } from "../models/browserSendComponentState";
 
+import { AbstractKeyGenerationService } from "./abstractions/abstractKeyGeneration.service";
+import { BrowserStateService } from "./browser-state.service";
 import { LocalBackedSessionStorageService } from "./localBackedSessionStorage.service";
-import { StateService } from "./state.service";
 
 describe("Browser State Service", () => {
-  let secureStorageService: SubstituteOf<AbstractStorageService>;
-  let diskStorageService: SubstituteOf<AbstractStorageService>;
-  let logService: SubstituteOf<LogService>;
-  let stateMigrationService: SubstituteOf<StateMigrationService>;
-  let stateFactory: SubstituteOf<StateFactory<GlobalState, Account>>;
+  let secureStorageService: MockProxy<AbstractStorageService>;
+  let diskStorageService: MockProxy<AbstractStorageService>;
+  let logService: MockProxy<LogService>;
+  let stateMigrationService: MockProxy<StateMigrationService>;
+  let stateFactory: MockProxy<StateFactory<GlobalState, Account>>;
   let useAccountCache: boolean;
 
   let state: State<GlobalState, Account>;
   const userId = "userId";
 
-  let sut: StateService;
+  let sut: BrowserStateService;
 
   beforeEach(() => {
-    secureStorageService = Substitute.for();
-    diskStorageService = Substitute.for();
-    logService = Substitute.for();
-    stateMigrationService = Substitute.for();
-    stateFactory = Substitute.for();
+    secureStorageService = mock();
+    diskStorageService = mock();
+    logService = mock();
+    stateMigrationService = mock();
+    stateFactory = mock();
     useAccountCache = true;
 
     state = new State(new GlobalState());
@@ -54,9 +55,12 @@ describe("Browser State Service", () => {
 
     beforeEach(() => {
       // We need `AbstractCachedStorageService` in the prototype chain to correctly test cache bypass.
-      memoryStorageService = Object.create(LocalBackedSessionStorageService.prototype);
+      memoryStorageService = new LocalBackedSessionStorageService(
+        mock<EncryptService>(),
+        mock<AbstractKeyGenerationService>()
+      );
 
-      sut = new StateService(
+      sut = new BrowserStateService(
         diskStorageService,
         secureStorageService,
         memoryStorageService,
@@ -80,14 +84,14 @@ describe("Browser State Service", () => {
   });
 
   describe("state methods", () => {
-    let memoryStorageService: SubstituteOf<AbstractStorageService & MemoryStorageServiceInterface>;
+    let memoryStorageService: MockProxy<AbstractStorageService & MemoryStorageServiceInterface>;
 
     beforeEach(() => {
-      memoryStorageService = Substitute.for();
-      const stateGetter = (key: string) => Promise.resolve(JSON.parse(JSON.stringify(state)));
-      memoryStorageService.get("state", Arg.any()).mimicks(stateGetter);
+      memoryStorageService = mock();
+      const stateGetter = (key: string) => Promise.resolve(state);
+      memoryStorageService.get.mockImplementation(stateGetter);
 
-      sut = new StateService(
+      sut = new BrowserStateService(
         diskStorageService,
         secureStorageService,
         memoryStorageService,
@@ -128,6 +132,7 @@ describe("Browser State Service", () => {
           [SendType.Text, 5],
         ]);
         state.accounts[userId].send = sendState;
+        (global as any)["watch"] = state;
 
         const actual = await sut.getBrowserSendComponentState();
         expect(actual).toBeInstanceOf(BrowserSendComponentState);
diff --git a/apps/browser/src/services/state.service.ts b/apps/browser/src/services/browser-state.service.ts
similarity index 81%
rename from apps/browser/src/services/state.service.ts
rename to apps/browser/src/services/browser-state.service.ts
index 3f4161f5a6b..24630dcbaef 100644
--- a/apps/browser/src/services/state.service.ts
+++ b/apps/browser/src/services/browser-state.service.ts
@@ -1,24 +1,40 @@
+import { BehaviorSubject } from "rxjs";
 import { Jsonify } from "type-fest";
 
 import { AbstractCachedStorageService } from "@bitwarden/common/abstractions/storage.service";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { StorageOptions } from "@bitwarden/common/models/domain/storage-options";
-import {
-  StateService as BaseStateService,
-  withPrototype,
-} from "@bitwarden/common/services/state.service";
+import { StateService as BaseStateService } from "@bitwarden/common/services/state.service";
 
+import { browserSession, sessionSync } from "../decorators/session-sync-observable";
 import { Account } from "../models/account";
 import { BrowserComponentState } from "../models/browserComponentState";
 import { BrowserGroupingsComponentState } from "../models/browserGroupingsComponentState";
 import { BrowserSendComponentState } from "../models/browserSendComponentState";
 
-import { StateService as StateServiceAbstraction } from "./abstractions/state.service";
+import { BrowserStateService as StateServiceAbstraction } from "./abstractions/browser-state.service";
 
-export class StateService
+@browserSession
+export class BrowserStateService
   extends BaseStateService<GlobalState, Account>
   implements StateServiceAbstraction
 {
+  @sessionSync({
+    initializer: Account.fromJSON as any, // TODO: Remove this any when all any types are removed from Account
+    initializeAs: "record",
+  })
+  protected accountsSubject: BehaviorSubject<{ [userId: string]: Account }>;
+  @sessionSync({ ctor: String })
+  protected activeAccountSubject: BehaviorSubject<string>;
+  @sessionSync({ ctor: Boolean })
+  protected activeAccountUnlockedSubject: BehaviorSubject<boolean>;
+
+  protected accountDeserializer = Account.fromJSON;
+
+  async hasInSessionMemory(key: string): Promise<boolean> {
+    return await this.memoryStorageService.has(key);
+  }
+
   async getFromSessionMemory<T>(key: string, deserializer?: (obj: Jsonify<T>) => T): Promise<T> {
     return this.memoryStorageService instanceof AbstractCachedStorageService
       ? await this.memoryStorageService.getBypassCache<T>(key, { deserializer: deserializer })
@@ -44,7 +60,6 @@ export class StateService
     );
   }
 
-  @withPrototype(BrowserGroupingsComponentState)
   async getBrowserGroupingComponentState(
     options?: StorageOptions
   ): Promise<BrowserGroupingsComponentState> {
@@ -67,7 +82,6 @@ export class StateService
     );
   }
 
-  @withPrototype(BrowserComponentState)
   async getBrowserVaultItemsComponentState(
     options?: StorageOptions
   ): Promise<BrowserComponentState> {
@@ -90,7 +104,6 @@ export class StateService
     );
   }
 
-  @withPrototype(BrowserSendComponentState)
   async getBrowserSendComponentState(options?: StorageOptions): Promise<BrowserSendComponentState> {
     return (
       await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
@@ -111,7 +124,6 @@ export class StateService
     );
   }
 
-  @withPrototype(BrowserComponentState)
   async getBrowserSendTypeComponentState(options?: StorageOptions): Promise<BrowserComponentState> {
     return (
       await this.getAccount(this.reconcileOptions(options, await this.defaultInMemoryOptions()))
diff --git a/apps/browser/src/services/browserPlatformUtils.service.ts b/apps/browser/src/services/browserPlatformUtils.service.ts
index feb50a5ccf1..3d33fa174ec 100644
--- a/apps/browser/src/services/browserPlatformUtils.service.ts
+++ b/apps/browser/src/services/browserPlatformUtils.service.ts
@@ -150,6 +150,10 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
     return Promise.resolve(BrowserApi.getApplicationVersion());
   }
 
+  async getApplicationVersionNumber(): Promise<string> {
+    return (await this.getApplicationVersion()).split(RegExp("[+|-]"))[0].trim();
+  }
+
   supportsWebAuthn(win: Window): boolean {
     return typeof PublicKeyCredential !== "undefined";
   }
diff --git a/apps/browser/store/locales/en_GB/copy.resx b/apps/browser/store/locales/en_GB/copy.resx
index cfb4c5df101..191198691d4 100644
--- a/apps/browser/store/locales/en_GB/copy.resx
+++ b/apps/browser/store/locales/en_GB/copy.resx
@@ -139,7 +139,7 @@ Bitwarden offers Teams and Enterprise plans for companies so you can securely sh
 Why Choose Bitwarden:
 
 World-Class Encryption
-Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashtag, and PBKDF2 SHA-256) so your data stays secure and private.
+Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashing, and PBKDF2 SHA-256) so your data stays secure and private.
 
 Built-in Password Generator
 Generate strong, unique, and random passwords based on security requirements for every website you frequent.
diff --git a/apps/browser/store/locales/fi/copy.resx b/apps/browser/store/locales/fi/copy.resx
index b14f5f8e5f1..fb02d78fe42 100644
--- a/apps/browser/store/locales/fi/copy.resx
+++ b/apps/browser/store/locales/fi/copy.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="Name" xml:space="preserve">
-    <value>Bitwarden – Ilmainen salasanojen hallinta</value>
+    <value>Bitwarden – Free Password Manager</value>
   </data>
   <data name="Summary" xml:space="preserve">
     <value>Turvallinen ja ilmainen salasanojen hallinta kaikille laitteillesi</value>
diff --git a/apps/browser/store/locales/fr/copy.resx b/apps/browser/store/locales/fr/copy.resx
index f8687ca5c4f..f815a003caa 100644
--- a/apps/browser/store/locales/fr/copy.resx
+++ b/apps/browser/store/locales/fr/copy.resx
@@ -148,7 +148,8 @@ Traductions mondiales
 Les traductions de Bitwarden existent dans 40 langues et ne cessent de croître, grâce à notre communauté mondiale.
 
 Applications multiplateformes
-Sécurisez et partagez des données sensibles dans votre coffre-fort Bitwarden à partir de n'importe quel navigateur, appareil mobile ou système d'exploitation de bureau, et plus encore.</value>
+Sécurisez et partagez des données sensibles dans votre coffre-fort Bitwarden à partir de n'importe quel navigateur, appareil mobile ou système d'exploitation de bureau, et plus encore.
+</value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
     <value>Un gestionnaire de mots de passe sécurisé et gratuit pour tous vos appareils</value>
diff --git a/apps/browser/store/locales/sr/copy.resx b/apps/browser/store/locales/sr/copy.resx
index 15634809472..9bfe7990356 100644
--- a/apps/browser/store/locales/sr/copy.resx
+++ b/apps/browser/store/locales/sr/copy.resx
@@ -124,31 +124,31 @@
     <value>Сигурни и бесплатни менаџер лозинке за сва Ваша уређаја</value>
   </data>
   <data name="Description" xml:space="preserve">
-    <value>Bitwarden, Inc. is the parent company of 8bit Solutions LLC.
+    <value>Bitwarden, Inc. је матична компанија фирме 8bit Solutions LLC.
 
-NAMED BEST PASSWORD MANAGER BY THE VERGE, U.S. NEWS &amp; WORLD REPORT, CNET, AND MORE.
+Именован као најбољи управљач лозинкама од стране новинских сајтова као што су THE VERGE, U.S. NEWS &amp; WORLD REPORT, CNET, и других.
 
-Manage, store, secure, and share unlimited passwords across unlimited devices from anywhere. Bitwarden delivers open source password management solutions to everyone, whether at  home, at work, or on the go.
+Управљајте, чувајте, обезбедите, и поделите неограничен број лозинки са неограниченог броја уређаја где год да се налазите. Bitwarden свима доноси решења за управљање лозинкама која су отвореног кода, било да сте код куће, на послу, или на путу.
 
-Generate strong, unique, and random passwords based on security requirements for every website you frequent.
+Генеришите јаке, јединствене, и насумичне лозинке у зависности од безбедносних захтева за сваки сајт који често посећујете.
 
-Bitwarden Send quickly transmits encrypted information --- files and plaintext -- directly to anyone.
+Bitwarden Send брзо преноси шифроване информације--- датотеке и обичан текст-- директно и свима.
 
-Bitwarden offers Teams and Enterprise plans for companies so you can securely share passwords with colleagues.
+Bitwarden нуди планове за компаније и предузећа како бисте могли безбедно да делите лозинке са вашим колегама.
 
-Why Choose Bitwarden:
+Зашто изабрати Bitwarden:
 
-World-Class Encryption
-Passwords are protected with advanced end-to-end encryption (AES-256 bit, salted hashing, and PBKDF2 SHA-256) so your data stays secure and private.
+Шифровање светске класе
+Лозинке су заштићене напредним шифровањем од једног до другог краја (AES-256 bit, salted hashing, и PBKDF2 SHA-256) како би ваши подаци остали безбедни и приватни.
 
-Built-in Password Generator
-Generate strong, unique, and random passwords based on security requirements for every website you frequent.
+Уграђен генератор лозинки
+Генеришите јаке, јединствене, и насумичне лозинке у зависности од безбедносних захтева за сваки сајт који често посећујете.
 
-Global Translations 
-Bitwarden translations exist in 40 languages and are growing, thanks to our global community.
+Глобално преведен
+Bitwarden преводи постоје за 40 језика и стално се унапређују, захваљујући нашој глобалној заједници.
 
-Cross-Platform Applications 
-Secure and share sensitive data within your Bitwarden Vault from any browser, mobile device, or desktop OS, and more.
+Вишеплатформне апликације
+Обезбедите и поделите осетљиве податке у вашем Bitwarden сефу из било ког претраживача, мобилног уређаја, или desktop оперативног система, и других.
 </value>
   </data>
   <data name="AssetTitle" xml:space="preserve">
diff --git a/apps/browser/tsconfig.json b/apps/browser/tsconfig.json
index 70c40f52e60..446ac67c503 100644
--- a/apps/browser/tsconfig.json
+++ b/apps/browser/tsconfig.json
@@ -15,6 +15,7 @@
     }
   },
   "angularCompilerOptions": {
+    "strictTemplates": true,
     "preserveWhitespaces": true
   },
   "include": ["src", "../../libs/common/src/services/**/*.worker.ts"]
diff --git a/apps/cli/README.md b/apps/cli/README.md
index fee24dc4692..49af8791e67 100644
--- a/apps/cli/README.md
+++ b/apps/cli/README.md
@@ -11,7 +11,7 @@ The Bitwarden CLI is a powerful, full-featured command-line interface (CLI) tool
 
 ## Developer Documentation
 
-Please refer to the [CLI section](https://contributing.bitwarden.com/clients/cli/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+Please refer to the [CLI section](https://contributing.bitwarden.com/docs/clients/cli/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
 
 ## User Documentation
 
diff --git a/apps/cli/package-lock.json b/apps/cli/package-lock.json
index fb1053bfbc8..4d3d97301d8 100644
--- a/apps/cli/package-lock.json
+++ b/apps/cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/cli",
-  "version": "2022.10.0",
+  "version": "2022.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/cli",
-      "version": "2022.10.0",
+      "version": "2022.11.0",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@koa/multer": "^3.0.0",
diff --git a/apps/cli/package.json b/apps/cli/package.json
index 154858eaa26..9294dae2ca3 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/cli",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2022.10.0",
+  "version": "2022.11.0",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/cli/src/commands/update.command.ts b/apps/cli/src/commands/update.command.ts
index b058feb72b8..449afabbb55 100644
--- a/apps/cli/src/commands/update.command.ts
+++ b/apps/cli/src/commands/update.command.ts
@@ -1,104 +1,109 @@
 import * as fetch from "node-fetch";
 
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 
 import { Response } from "../models/response";
 import { MessageResponse } from "../models/response/message.response";
 
+const CLIENTS_RELEASE_LIST_ENDPOINT = "https://api.github.com/repos/bitwarden/clients/releases";
+const DEFAULT_DOWNLOAD_URL = "https://github.com/bitwarden/clients/releases";
+const UPDATE_COMMAND = "npm install -g @bitwarden/cli";
+
 export class UpdateCommand {
   inPkg = false;
 
-  constructor(
-    private platformUtilsService: PlatformUtilsService,
-    private i18nService: I18nService,
-    private repoName: string,
-    private executableName: string,
-    private showExtendedMessage: boolean
-  ) {
+  constructor(private platformUtilsService: PlatformUtilsService) {
     this.inPkg = !!(process as any).pkg;
   }
 
   async run(): Promise<Response> {
-    const currentVersion = await this.platformUtilsService.getApplicationVersion();
-
-    const response = await fetch.default(
-      "https://api.github.com/repos/bitwarden/" + this.repoName + "/releases/latest"
-    );
-    if (response.status === 200) {
-      const responseJson = await response.json();
-      const res = new MessageResponse(null, null);
-
-      const tagName: string = responseJson.tag_name;
-      if (tagName === "v" + currentVersion) {
-        res.title = "No update available.";
-        res.noColor = true;
-        return Response.success(res);
-      }
-
-      let downloadUrl: string = null;
-      if (responseJson.assets != null) {
-        for (const a of responseJson.assets) {
-          const download: string = a.browser_download_url;
-          if (download == null) {
-            continue;
-          }
-
-          if (download.indexOf(".zip") === -1) {
-            continue;
-          }
-
-          if (
-            process.platform === "win32" &&
-            download.indexOf(this.executableName + "-windows") > -1
-          ) {
-            downloadUrl = download;
-            break;
-          } else if (
-            process.platform === "darwin" &&
-            download.indexOf(this.executableName + "-macos") > -1
-          ) {
-            downloadUrl = download;
-            break;
-          } else if (
-            process.platform === "linux" &&
-            download.indexOf(this.executableName + "-linux") > -1
-          ) {
-            downloadUrl = download;
-            break;
-          }
-        }
-      }
-
-      res.title = "A new version is available: " + tagName;
-      if (downloadUrl == null) {
-        downloadUrl = "https://github.com/bitwarden/" + this.repoName + "/releases";
-      } else {
-        res.raw = downloadUrl;
-      }
-      res.message = "";
-      if (responseJson.body != null && responseJson.body !== "") {
-        res.message = responseJson.body + "\n\n";
-      }
-
-      res.message += "You can download this update at " + downloadUrl;
-
-      if (this.showExtendedMessage) {
-        if (this.inPkg) {
-          res.message +=
-            "\n\nIf you installed this CLI through a package manager " +
-            "you should probably update using its update command instead.";
-        } else {
-          res.message +=
-            "\n\nIf you installed this CLI through NPM " +
-            "you should update using `npm install -g @bitwarden/" +
-            this.repoName +
-            "`";
-        }
-      }
-      return Response.success(res);
-    } else {
+    const response = await fetch.default(CLIENTS_RELEASE_LIST_ENDPOINT);
+    if (response.status !== 200) {
       return Response.error("Error contacting update API: " + response.status);
     }
+
+    const responseJson = await response.json();
+    const cliRelease = responseJson.find((r: any) => r.tag_name.includes("cli"));
+    if (cliRelease === undefined || cliRelease === null) {
+      return Response.error("Could not find latest CLI version.");
+    }
+
+    const currentVersion = await this.platformUtilsService.getApplicationVersion();
+    if (cliRelease.tag_name === "cli-v" + currentVersion) {
+      const response = new MessageResponse(null, null);
+      response.title = "No update available.";
+      response.noColor = true;
+      return Response.success(response);
+    }
+
+    const res = this.getFoundUpdateResponse(cliRelease);
+    return Response.success(res);
+  }
+
+  private getFoundUpdateResponse(release: any) {
+    const downloadUrl = this.getDownloadUrl(release.assets);
+
+    const response = new MessageResponse(null, null);
+    response.title = "A new version is available: " + release.tag_name;
+    response.raw = downloadUrl;
+    response.message = this.getMessage(release, downloadUrl);
+
+    return response;
+  }
+
+  private getMessage(release: any, downloadUrl: string) {
+    let message = "";
+
+    if (release.body != null && release.body !== "") {
+      message = release.body + "\n\n";
+    }
+
+    message += "You can download this update at " + downloadUrl;
+
+    if (this.inPkg) {
+      message +=
+        "\n\nIf you installed this CLI through a package manager " +
+        "you should probably update using its update command instead.";
+    } else {
+      message +=
+        "\n\nIf you installed this CLI through NPM " +
+        "you should update using `" +
+        UPDATE_COMMAND +
+        "`";
+    }
+
+    return message;
+  }
+
+  private getDownloadUrl(assets: any) {
+    if (assets == null) {
+      return DEFAULT_DOWNLOAD_URL;
+    }
+
+    let downloadUrl: string = DEFAULT_DOWNLOAD_URL;
+
+    for (const a of assets) {
+      const download: string = a.browser_download_url;
+      if (download == null) {
+        continue;
+      }
+
+      if (download.indexOf(".zip") === -1) {
+        continue;
+      }
+
+      if (process.platform === "win32" && download.indexOf("bw-windows") > -1) {
+        downloadUrl = download;
+        break;
+      } else if (process.platform === "darwin" && download.indexOf("bw-macos") > -1) {
+        downloadUrl = download;
+        break;
+      } else if (process.platform === "linux" && download.indexOf("bw-linux") > -1) {
+        downloadUrl = download;
+        break;
+      }
+    }
+
+    return downloadUrl;
   }
 }
diff --git a/apps/cli/src/program.ts b/apps/cli/src/program.ts
index 41a99dcd9bc..930d3f93440 100644
--- a/apps/cli/src/program.ts
+++ b/apps/cli/src/program.ts
@@ -403,13 +403,7 @@ export class Program {
         writeLn("", true);
       })
       .action(async () => {
-        const command = new UpdateCommand(
-          this.main.platformUtilsService,
-          this.main.i18nService,
-          "cli",
-          "bw",
-          true
-        );
+        const command = new UpdateCommand(this.main.platformUtilsService);
         const response = await command.run();
         this.processResponse(response);
       });
diff --git a/apps/cli/src/services/cli-platform-utils.service.ts b/apps/cli/src/services/cli-platform-utils.service.ts
index de7349c1a8b..9a10cf62c22 100644
--- a/apps/cli/src/services/cli-platform-utils.service.ts
+++ b/apps/cli/src/services/cli-platform-utils.service.ts
@@ -88,6 +88,10 @@ export class CliPlatformUtilsService implements PlatformUtilsService {
     return Promise.resolve(this.packageJson.version);
   }
 
+  async getApplicationVersionNumber(): Promise<string> {
+    return (await this.getApplicationVersion()).split(RegExp("[+|-]"))[0].trim();
+  }
+
   getApplicationVersionSync(): string {
     return this.packageJson.version;
   }
diff --git a/apps/desktop/README.md b/apps/desktop/README.md
index e9dd821e1a5..ebde78b7698 100644
--- a/apps/desktop/README.md
+++ b/apps/desktop/README.md
@@ -12,4 +12,4 @@ The Bitwarden desktop app is written using Electron and Angular. The application
 
 ## Documentation
 
-Please refer to the [Desktop section](https://contributing.bitwarden.com/clients/desktop/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+Please refer to the [Desktop section](https://contributing.bitwarden.com/docs/clients/desktop/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts
index a017b4c72cb..5598f4e25ed 100644
--- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts
+++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-create.ts
@@ -5,9 +5,9 @@ import { hideBin } from "yargs/helpers";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion";
 
-import { CredentialCreatePayload } from "../../../src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload";
-import { LogUtils } from "../logUtils";
-import NativeMessageService from "../nativeMessageService";
+import { CredentialCreatePayload } from "../../../src/models/native-messaging/encrypted-message-payloads/credential-create-payload";
+import { LogUtils } from "../log-utils";
+import NativeMessageService from "../native-message.service";
 import * as config from "../variables";
 
 const argv: any = yargs(hideBin(process.argv)).option("name", {
diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts
index 17244623b55..553b5f8ca95 100644
--- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts
+++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-retrieval.ts
@@ -5,8 +5,8 @@ import { hideBin } from "yargs/helpers";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion";
 
-import { LogUtils } from "../logUtils";
-import NativeMessageService from "../nativeMessageService";
+import { LogUtils } from "../log-utils";
+import NativeMessageService from "../native-message.service";
 import * as config from "../variables";
 
 const argv: any = yargs(hideBin(process.argv)).option("uri", {
diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts
index ecfbd3f5bb8..9de17ef63d2 100644
--- a/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts
+++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-credential-update.ts
@@ -5,9 +5,9 @@ import { hideBin } from "yargs/helpers";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion";
 
-import { CredentialUpdatePayload } from "../../../src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload";
-import { LogUtils } from "../logUtils";
-import NativeMessageService from "../nativeMessageService";
+import { CredentialUpdatePayload } from "../../../src/models/native-messaging/encrypted-message-payloads/credential-update-payload";
+import { LogUtils } from "../log-utils";
+import NativeMessageService from "../native-message.service";
 import * as config from "../variables";
 
 // Command line arguments
diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts
index 34bb41abb95..eb711de9cb8 100644
--- a/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts
+++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-generate-password.ts
@@ -5,8 +5,8 @@ import { hideBin } from "yargs/helpers";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion";
 
-import { LogUtils } from "../logUtils";
-import NativeMessageService from "../nativeMessageService";
+import { LogUtils } from "../log-utils";
+import NativeMessageService from "../native-message.service";
 import * as config from "../variables";
 
 const argv: any = yargs(hideBin(process.argv)).option("userId", {
diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts
index f3098062c46..e22e9bc6b5e 100644
--- a/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts
+++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-handshake.ts
@@ -2,8 +2,8 @@ import "module-alias/register";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion";
 
-import { LogUtils } from "../logUtils";
-import NativeMessageService from "../nativeMessageService";
+import { LogUtils } from "../log-utils";
+import NativeMessageService from "../native-message.service";
 import * as config from "../variables";
 
 (async () => {
diff --git a/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts b/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts
index 7782e203cb8..b2d520ff0c8 100644
--- a/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts
+++ b/apps/desktop/native-messaging-test-runner/src/commands/bw-status.ts
@@ -2,8 +2,8 @@ import "module-alias/register";
 
 import { NativeMessagingVersion } from "@bitwarden/common/enums/nativeMessagingVersion";
 
-import { LogUtils } from "../logUtils";
-import NativeMessageService from "../nativeMessageService";
+import { LogUtils } from "../log-utils";
+import NativeMessageService from "../native-message.service";
 import * as config from "../variables";
 
 (async () => {
diff --git a/apps/desktop/native-messaging-test-runner/src/ipcService.ts b/apps/desktop/native-messaging-test-runner/src/ipc.service.ts
similarity index 97%
rename from apps/desktop/native-messaging-test-runner/src/ipcService.ts
rename to apps/desktop/native-messaging-test-runner/src/ipc.service.ts
index eadc69a3513..b1c1b9d16b6 100644
--- a/apps/desktop/native-messaging-test-runner/src/ipcService.ts
+++ b/apps/desktop/native-messaging-test-runner/src/ipc.service.ts
@@ -2,8 +2,8 @@ import { homedir } from "os";
 
 import * as NodeIPC from "node-ipc";
 
-import { MessageCommon } from "../../src/models/nativeMessaging/messageCommon";
-import { UnencryptedMessageResponse } from "../../src/models/nativeMessaging/unencryptedMessageResponse";
+import { MessageCommon } from "../../src/models/native-messaging/message-common";
+import { UnencryptedMessageResponse } from "../../src/models/native-messaging/unencrypted-message-response";
 
 import Deferred from "./deferred";
 import { race } from "./race";
diff --git a/apps/desktop/native-messaging-test-runner/src/logUtils.ts b/apps/desktop/native-messaging-test-runner/src/log-utils.ts
similarity index 100%
rename from apps/desktop/native-messaging-test-runner/src/logUtils.ts
rename to apps/desktop/native-messaging-test-runner/src/log-utils.ts
diff --git a/apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts
similarity index 91%
rename from apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts
rename to apps/desktop/native-messaging-test-runner/src/native-message.service.ts
index d1f29493fc0..8ba6526384e 100644
--- a/apps/desktop/native-messaging-test-runner/src/nativeMessageService.ts
+++ b/apps/desktop/native-messaging-test-runner/src/native-message.service.ts
@@ -9,16 +9,16 @@ import { ConsoleLogService } from "@bitwarden/common/services/consoleLog.service
 import { EncryptServiceImplementation } from "@bitwarden/common/services/cryptography/encrypt.service.implementation";
 import { NodeCryptoFunctionService } from "@bitwarden/node/services/node-crypto-function.service";
 
-import { DecryptedCommandData } from "../../src/models/nativeMessaging/decryptedCommandData";
-import { EncryptedMessage } from "../../src/models/nativeMessaging/encryptedMessage";
-import { CredentialCreatePayload } from "../../src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload";
-import { CredentialUpdatePayload } from "../../src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload";
-import { EncryptedMessageResponse } from "../../src/models/nativeMessaging/encryptedMessageResponse";
-import { MessageCommon } from "../../src/models/nativeMessaging/messageCommon";
-import { UnencryptedMessage } from "../../src/models/nativeMessaging/unencryptedMessage";
-import { UnencryptedMessageResponse } from "../../src/models/nativeMessaging/unencryptedMessageResponse";
+import { DecryptedCommandData } from "../../src/models/native-messaging/decrypted-command-data";
+import { EncryptedMessage } from "../../src/models/native-messaging/encrypted-message";
+import { CredentialCreatePayload } from "../../src/models/native-messaging/encrypted-message-payloads/credential-create-payload";
+import { CredentialUpdatePayload } from "../../src/models/native-messaging/encrypted-message-payloads/credential-update-payload";
+import { EncryptedMessageResponse } from "../../src/models/native-messaging/encrypted-message-response";
+import { MessageCommon } from "../../src/models/native-messaging/message-common";
+import { UnencryptedMessage } from "../../src/models/native-messaging/unencrypted-message";
+import { UnencryptedMessageResponse } from "../../src/models/native-messaging/unencrypted-message-response";
 
-import IPCService, { IPCOptions } from "./ipcService";
+import IPCService, { IPCOptions } from "./ipc.service";
 import * as config from "./variables";
 
 type HandshakeResponse = {
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 962245de294..0790f98f0d1 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bitwarden/desktop",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2022.10.2",
+  "version": "2022.11.0",
   "keywords": [
     "bitwarden",
     "password",
diff --git a/apps/desktop/src/app/accounts/accessibility-cookie.component.ts b/apps/desktop/src/app/accounts/accessibility-cookie.component.ts
index 33c82437484..a8173400ed3 100644
--- a/apps/desktop/src/app/accounts/accessibility-cookie.component.ts
+++ b/apps/desktop/src/app/accounts/accessibility-cookie.component.ts
@@ -7,7 +7,8 @@ import { EnvironmentService } from "@bitwarden/common/abstractions/environment.s
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { getCookie } from "@bitwarden/electron/utils";
+
+import { getCookie } from "../../utils";
 
 const BroadcasterSubscriptionId = "AccessibilityCookieComponent";
 
diff --git a/apps/desktop/src/app/accounts/premium.component.html b/apps/desktop/src/app/accounts/premium.component.html
index f47f377cff2..4ac3cb422cb 100644
--- a/apps/desktop/src/app/accounts/premium.component.html
+++ b/apps/desktop/src/app/accounts/premium.component.html
@@ -57,7 +57,7 @@
           class="primary"
           (click)="purchase()"
           *ngIf="!isPremium"
-          [disabled]="purchaseBtn.loading"
+          [disabled]="$any(purchaseBtn).loading"
         >
           <b>{{ "premiumPurchase" | i18n }}</b>
         </button>
@@ -67,18 +67,18 @@
             #refreshBtn
             type="button"
             (click)="refresh()"
-            [disabled]="refreshBtn.loading"
+            [disabled]="$any(refreshBtn).loading"
             appA11yTitle="{{ 'premiumRefresh' | i18n }}"
             [appApiAction]="refreshPromise"
           >
             <i
               class="bwi bwi-refresh bwi-lg bwi-fw"
-              [hidden]="refreshBtn.loading"
+              [hidden]="$any(refreshBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!refreshBtn.loading"
+              [hidden]="!$any(refreshBtn).loading"
               aria-hidden="true"
             ></i>
           </button>
diff --git a/apps/desktop/src/app/accounts/settings.component.ts b/apps/desktop/src/app/accounts/settings.component.ts
index c0be20dc770..b07a049f18f 100644
--- a/apps/desktop/src/app/accounts/settings.component.ts
+++ b/apps/desktop/src/app/accounts/settings.component.ts
@@ -14,9 +14,9 @@ import { DeviceType } from "@bitwarden/common/enums/deviceType";
 import { StorageLocation } from "@bitwarden/common/enums/storageLocation";
 import { ThemeType } from "@bitwarden/common/enums/themeType";
 import { Utils } from "@bitwarden/common/misc/utils";
-import { isWindowsStore } from "@bitwarden/electron/utils";
 
 import { flagEnabled } from "../../flags";
+import { isWindowsStore } from "../../utils";
 import { SetPinComponent } from "../components/set-pin.component";
 
 @Component({
diff --git a/apps/desktop/src/app/accounts/two-factor.component.html b/apps/desktop/src/app/accounts/two-factor.component.html
index dc67e4e0b40..8809ff2465e 100644
--- a/apps/desktop/src/app/accounts/two-factor.component.html
+++ b/apps/desktop/src/app/accounts/two-factor.component.html
@@ -65,7 +65,7 @@
     </ng-container>
     <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
       <div id="web-authn-frame">
-        <iframe id="webauthn_iframe" [allow]="webAuthnAllow"></iframe>
+        <iframe id="webauthn_iframe" [attr.allow]="webAuthnAllow"></iframe>
       </div>
       <div class="box first">
         <div class="box-content">
diff --git a/apps/desktop/src/app/components/avatar.component.ts b/apps/desktop/src/app/components/avatar.component.ts
index b837c541eb1..8caba7f4593 100644
--- a/apps/desktop/src/app/components/avatar.component.ts
+++ b/apps/desktop/src/app/components/avatar.component.ts
@@ -5,12 +5,7 @@ import { Utils } from "@bitwarden/common/misc/utils";
 
 @Component({
   selector: "app-avatar",
-  template: `<img
-    *ngIf="src"
-    [src]="src"
-    title="{{ data }}"
-    [ngClass]="{ 'rounded-circle': circle }"
-  />`,
+  template: `<img *ngIf="src" [src]="src" [ngClass]="{ 'rounded-circle': circle }" />`,
 })
 export class AvatarComponent implements OnChanges, OnInit {
   @Input() size = 45;
@@ -20,7 +15,7 @@ export class AvatarComponent implements OnChanges, OnInit {
   @Input() circle = false;
 
   @Input() color?: string;
-  @Input() id?: number;
+  @Input() id?: string;
   @Input() text?: string;
 
   private svgCharCount = 2;
diff --git a/apps/desktop/src/app/layout/account-switcher.component.html b/apps/desktop/src/app/layout/account-switcher.component.html
index 4080b2e0314..f361c09939b 100644
--- a/apps/desktop/src/app/layout/account-switcher.component.html
+++ b/apps/desktop/src/app/layout/account-switcher.component.html
@@ -12,7 +12,7 @@
     <app-avatar
       [text]="activeAccount.name"
       [id]="activeAccount.id"
-      size="25"
+      [size]="25"
       [circle]="true"
       [fontSize]="14"
       [dynamic]="true"
@@ -61,7 +61,7 @@
         <app-avatar
           [text]="a.value.profile.name ?? a.value.profile.email"
           [id]="a.value.profile.userId"
-          size="25"
+          [size]="25"
           [circle]="true"
           [fontSize]="14"
           [dynamic]="true"
diff --git a/apps/desktop/src/app/main.ts b/apps/desktop/src/app/main.ts
index 4db6a9419b7..9385f859b19 100644
--- a/apps/desktop/src/app/main.ts
+++ b/apps/desktop/src/app/main.ts
@@ -1,7 +1,7 @@
 import { enableProdMode } from "@angular/core";
 import { platformBrowserDynamic } from "@angular/platform-browser-dynamic";
 
-import { isDev } from "@bitwarden/electron/utils";
+import { isDev } from "../utils";
 
 // tslint:disable-next-line
 require("../scss/styles.scss");
diff --git a/apps/desktop/src/app/send/add-edit.component.html b/apps/desktop/src/app/send/add-edit.component.html
index d61cbf99652..47c0d4ae00c 100644
--- a/apps/desktop/src/app/send/add-edit.component.html
+++ b/apps/desktop/src/app/send/add-edit.component.html
@@ -35,7 +35,7 @@
                 name="Type_{{ o.value }}"
                 id="type_{{ o.value }}"
                 [value]="o.value"
-                (change)="typeChanged(o)"
+                (change)="typeChanged()"
                 [checked]="send.type === o.value"
                 [disabled]="disableSend"
               />
@@ -280,10 +280,14 @@
         appA11yTitle="{{ 'delete' | i18n }}"
         *ngIf="editMode"
       >
-        <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading" aria-hidden="true"></i>
+        <i
+          class="bwi bwi-trash bwi-lg bwi-fw"
+          [hidden]="$any(deleteBtn).loading"
+          aria-hidden="true"
+        ></i>
         <i
           class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-          [hidden]="!deleteBtn.loading"
+          [hidden]="!$any(deleteBtn).loading"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/desktop/src/app/send/efflux-dates.component.html b/apps/desktop/src/app/send/efflux-dates.component.html
index e0fc766b124..37eacad9dc4 100644
--- a/apps/desktop/src/app/send/efflux-dates.component.html
+++ b/apps/desktop/src/app/send/efflux-dates.component.html
@@ -46,7 +46,6 @@
           formControlName="defaultExpirationDateTime"
           required
           placeholder="MM/DD/YYYY HH:MM AM/PM"
-          [readOnly]="disableSend"
         />
         <small *ngIf="editMode" class="help-block">{{ "expirationDateDesc" | i18n }}</small>
       </div>
diff --git a/apps/desktop/src/app/send/send.component.ts b/apps/desktop/src/app/send/send.component.ts
index 95dfb83f367..2ba29cc4ad1 100644
--- a/apps/desktop/src/app/send/send.component.ts
+++ b/apps/desktop/src/app/send/send.component.ts
@@ -10,8 +10,8 @@ import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.serv
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { SendService } from "@bitwarden/common/abstractions/send.service";
 import { SendView } from "@bitwarden/common/models/view/send.view";
-import { invokeMenu, RendererMenuItem } from "@bitwarden/electron/utils";
 
+import { invokeMenu, RendererMenuItem } from "../../utils";
 import { SearchBarService } from "../layout/search/search-bar.service";
 
 import { AddEditComponent } from "./add-edit.component";
@@ -132,6 +132,18 @@ export class SendComponent extends BaseSendComponent implements OnInit, OnDestro
       label: this.i18nService.t("copyLink"),
       click: () => this.copy(send),
     });
+    if (send.password && !send.disabled) {
+      menu.push({
+        label: this.i18nService.t("removePassword"),
+        click: async () => {
+          await this.removePassword(send);
+          if (this.sendId === send.id) {
+            this.sendId = null;
+            this.selectSend(send.id);
+          }
+        },
+      });
+    }
     menu.push({
       label: this.i18nService.t("delete"),
       click: async () => {
diff --git a/apps/desktop/src/app/services/desktopFileDownloadService.ts b/apps/desktop/src/app/services/desktop-file-download.service.ts
similarity index 100%
rename from apps/desktop/src/app/services/desktopFileDownloadService.ts
rename to apps/desktop/src/app/services/desktop-file-download.service.ts
diff --git a/apps/desktop/src/app/services/init.service.ts b/apps/desktop/src/app/services/init.service.ts
index 525d593911d..c706136a758 100644
--- a/apps/desktop/src/app/services/init.service.ts
+++ b/apps/desktop/src/app/services/init.service.ts
@@ -18,7 +18,7 @@ import { EventService } from "@bitwarden/common/services/event.service";
 import { VaultTimeoutService } from "@bitwarden/common/services/vaultTimeout/vaultTimeout.service";
 
 import { I18nService } from "../../services/i18n.service";
-import { NativeMessagingService } from "../../services/nativeMessaging.service";
+import { NativeMessagingService } from "../../services/native-messaging.service";
 
 @Injectable()
 export class InitService {
diff --git a/apps/desktop/src/app/services/services.module.ts b/apps/desktop/src/app/services/services.module.ts
index 6dc9b8b0dbb..8696bd0b395 100644
--- a/apps/desktop/src/app/services/services.module.ts
+++ b/apps/desktop/src/app/services/services.module.ts
@@ -39,25 +39,25 @@ import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { LoginService } from "@bitwarden/common/services/login.service";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { SystemService } from "@bitwarden/common/services/system.service";
-import { ElectronCryptoService } from "@bitwarden/electron/services/electronCrypto.service";
-import { ElectronLogService } from "@bitwarden/electron/services/electronLog.service";
-import { ElectronPlatformUtilsService } from "@bitwarden/electron/services/electronPlatformUtils.service";
-import { ElectronRendererMessagingService } from "@bitwarden/electron/services/electronRendererMessaging.service";
-import { ElectronRendererSecureStorageService } from "@bitwarden/electron/services/electronRendererSecureStorage.service";
-import { ElectronRendererStorageService } from "@bitwarden/electron/services/electronRendererStorage.service";
 
 import { Account } from "../../models/account";
-import { EncryptedMessageHandlerService } from "../../services/encryptedMessageHandlerService";
+import { ElectronCryptoService } from "../../services/electron-crypto.service";
+import { ElectronLogService } from "../../services/electron-log.service";
+import { ElectronPlatformUtilsService } from "../../services/electron-platform-utils.service";
+import { ElectronRendererMessagingService } from "../../services/electron-renderer-messaging.service";
+import { ElectronRendererSecureStorageService } from "../../services/electron-renderer-secure-storage.service";
+import { ElectronRendererStorageService } from "../../services/electron-renderer-storage.service";
+import { EncryptedMessageHandlerService } from "../../services/encrypted-message-handler.service";
 import { I18nService } from "../../services/i18n.service";
-import { NativeMessageHandlerService } from "../../services/nativeMessageHandler.service";
-import { NativeMessagingService } from "../../services/nativeMessaging.service";
-import { PasswordRepromptService } from "../../services/passwordReprompt.service";
+import { NativeMessageHandlerService } from "../../services/native-message-handler.service";
+import { NativeMessagingService } from "../../services/native-messaging.service";
+import { PasswordRepromptService } from "../../services/password-reprompt.service";
 import { StateService } from "../../services/state.service";
 import { LoginGuard } from "../guards/login.guard";
 import { SearchBarService } from "../layout/search/search-bar.service";
 
+import { DesktopFileDownloadService } from "./desktop-file-download.service";
 import { DesktopThemingService } from "./desktop-theming.service";
-import { DesktopFileDownloadService } from "./desktopFileDownloadService";
 import { InitService } from "./init.service";
 
 const RELOAD_CALLBACK = new InjectionToken<() => any>("RELOAD_CALLBACK");
diff --git a/apps/desktop/src/app/vault/add-edit-custom-fields.component.html b/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
index c7efaad70ba..a5cfefdcec5 100644
--- a/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
+++ b/apps/desktop/src/app/vault/add-edit-custom-fields.component.html
@@ -79,8 +79,8 @@
           [(ngModel)]="f.value"
           *ngIf="f.type === fieldType.Boolean"
           appTrueFalseValue
-          trueValue="true"
-          falseValue="false"
+          [trueValue]="true"
+          [falseValue]="false"
           attr.aria-describedby="fieldName{{ i }}"
           [readonly]="!cipher.edit && editMode"
         />
diff --git a/apps/desktop/src/app/vault/add-edit.component.html b/apps/desktop/src/app/vault/add-edit.component.html
index 25de9f6f7b8..2bd1364448e 100644
--- a/apps/desktop/src/app/vault/add-edit.component.html
+++ b/apps/desktop/src/app/vault/add-edit.component.html
@@ -75,16 +75,16 @@
                   appA11yTitle="{{ 'checkPassword' | i18n }}"
                   (click)="checkPassword()"
                   [appApiAction]="checkPasswordPromise"
-                  [disabled]="checkPasswordBtn.loading"
+                  [disabled]="$any(checkPasswordBtn).loading"
                 >
                   <i
                     class="bwi bwi-lg bwi-check-circle"
-                    [hidden]="checkPasswordBtn.loading"
+                    [hidden]="$any(checkPasswordBtn).loading"
                     aria-hidden="true"
                   ></i>
                   <i
                     class="bwi bwi-lg bwi-spinner bwi-spin"
-                    [hidden]="!checkPasswordBtn.loading"
+                    [hidden]="!$any(checkPasswordBtn).loading"
                     aria-hidden="true"
                   ></i>
                 </button>
@@ -485,7 +485,10 @@
                   id="loginUriMatch{{ i }}"
                   name="Login.Uris[{{ i }}].Match"
                   [(ngModel)]="u.match"
-                  [hidden]="u.showOptions === false || (u.showOptions == null && u.match == null)"
+                  [hidden]="
+                    $any(u).showOptions === false ||
+                    ($any(u).showOptions == null && u.match == null)
+                  "
                   (change)="loginUriMatchChanged(u)"
                 >
                   <option *ngFor="let o of uriMatchOptions" [ngValue]="o.value">
@@ -501,7 +504,10 @@
                   appA11yTitle="{{ 'toggleOptions' | i18n }}"
                   (click)="toggleUriOptions(u)"
                   [attr.aria-expanded]="
-                    !(u.showOptions === false || (u.showOptions == null && u.match == null))
+                    !(
+                      $any(u).showOptions === false ||
+                      ($any(u).showOptions == null && u.match == null)
+                    )
                   "
                 >
                   <i class="bwi bwi-lg bwi-cog" aria-hidden="true"></i>
@@ -634,7 +640,7 @@
             <input
               id="collection_{{ i }}"
               type="checkbox"
-              [(ngModel)]="c.checked"
+              [(ngModel)]="$any(c).checked"
               name="Collection[{{ i }}].Checked"
             />
           </div>
@@ -647,12 +653,16 @@
       type="submit"
       class="primary"
       appA11yTitle="{{ 'save' | i18n }}"
-      [disabled]="form.loading"
+      [disabled]="$any(form).loading"
     >
-      <i class="bwi bwi-save-changes bwi-lg bwi-fw" [hidden]="form.loading" aria-hidden="true"></i>
+      <i
+        class="bwi bwi-save-changes bwi-lg bwi-fw"
+        [hidden]="$any(form).loading"
+        aria-hidden="true"
+      ></i>
       <i
         class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-        [hidden]="!form.loading"
+        [hidden]="!$any(form).loading"
         aria-hidden="true"
       ></i>
     </button>
@@ -675,13 +685,17 @@
         class="danger"
         appA11yTitle="{{ 'delete' | i18n }}"
         *ngIf="editMode && !cloneMode"
-        [disabled]="deleteBtn.loading"
+        [disabled]="$any(deleteBtn).loading"
         [appApiAction]="deletePromise"
       >
-        <i class="bwi bwi-trash bwi-lg bwi-fw" [hidden]="deleteBtn.loading" aria-hidden="true"></i>
+        <i
+          class="bwi bwi-trash bwi-lg bwi-fw"
+          [hidden]="$any(deleteBtn).loading"
+          aria-hidden="true"
+        ></i>
         <i
           class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-          [hidden]="!deleteBtn.loading"
+          [hidden]="!$any(deleteBtn).loading"
           aria-hidden="true"
         ></i>
       </button>
diff --git a/apps/desktop/src/app/vault/attachments.component.html b/apps/desktop/src/app/vault/attachments.component.html
index 8a7cb93ce56..0248d78b022 100644
--- a/apps/desktop/src/app/vault/attachments.component.html
+++ b/apps/desktop/src/app/vault/attachments.component.html
@@ -21,16 +21,16 @@
                   (click)="delete(a)"
                   #deleteBtn
                   [appApiAction]="deletePromises[a.id]"
-                  [disabled]="deleteBtn.loading"
+                  [disabled]="$any(deleteBtn).loading"
                 >
                   <i
                     class="bwi bwi-trash bwi-lg bwi-fw"
-                    [hidden]="deleteBtn.loading"
+                    [hidden]="$any(deleteBtn).loading"
                     aria-hidden="true"
                   ></i>
                   <i
                     class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-                    [hidden]="!deleteBtn.loading"
+                    [hidden]="!$any(deleteBtn).loading"
                     aria-hidden="true"
                   ></i>
                 </button>
diff --git a/apps/desktop/src/app/vault/collections.component.html b/apps/desktop/src/app/vault/collections.component.html
index 047bd77d804..113ebe5ff97 100644
--- a/apps/desktop/src/app/vault/collections.component.html
+++ b/apps/desktop/src/app/vault/collections.component.html
@@ -19,7 +19,7 @@
               <input
                 id="collection_{{ i }}"
                 type="checkbox"
-                [(ngModel)]="c.checked"
+                [(ngModel)]="$any(c).checked"
                 name="Collection[{{ i }}].Checked"
               />
             </div>
diff --git a/apps/desktop/src/app/vault/folder-add-edit.component.html b/apps/desktop/src/app/vault/folder-add-edit.component.html
index ea7303dceb2..4e9adec8172 100644
--- a/apps/desktop/src/app/vault/folder-add-edit.component.html
+++ b/apps/desktop/src/app/vault/folder-add-edit.component.html
@@ -47,17 +47,17 @@
             class="danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
           </button>
diff --git a/apps/desktop/src/app/vault/generator.component.html b/apps/desktop/src/app/vault/generator.component.html
index 6111bcc3c6a..6acf7a331bf 100644
--- a/apps/desktop/src/app/vault/generator.component.html
+++ b/apps/desktop/src/app/vault/generator.component.html
@@ -52,11 +52,11 @@
               appStopClick
               appA11yTitle="{{ 'regenerateUsername' | i18n }}"
               (click)="regenerate()"
-              [disabled]="form.loading"
+              [disabled]="$any(form).loading"
             >
               <i
                 class="bwi bwi-lg bwi-generate"
-                [ngClass]="form.loading ? 'bwi-spin' : ''"
+                [ngClass]="$any(form).loading ? 'bwi-spin' : ''"
                 aria-hidden="true"
               ></i>
             </button>
@@ -384,7 +384,7 @@
                   <input
                     id="duckduckgo-apikey"
                     type="password"
-                    name="DuckDudkGoApiKey"
+                    name="DuckDuckGoApiKey"
                     [(ngModel)]="usernameOptions.forwardedDuckDuckGoToken"
                     (blur)="saveUsernameOptions()"
                   />
diff --git a/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html b/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html
index 91a5b9ee772..eaa874d28e1 100644
--- a/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html
+++ b/apps/desktop/src/app/vault/vault-filter/filters/folder-filter.component.html
@@ -63,7 +63,7 @@
             class="edit-button"
             *ngIf="f.node.id"
             (click)="editFolder(f.node)"
-            appA11yTitle="{{ 'editFolder' | i18n }}"
+            appA11yTitle="{{ 'editFolder' | i18n }}: {{ f.node.name }}"
           >
             <i class="bwi bwi-pencil bwi-fw" aria-hidden="true"></i>
           </button>
diff --git a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html b/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
index 3663b69fc46..cfec1cf89d0 100644
--- a/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
+++ b/apps/desktop/src/app/vault/vault-filter/filters/organization-filter.component.html
@@ -24,7 +24,7 @@
             class="filter-button"
             (click)="clearFilter()"
             [attr.aria-pressed]="!hasActiveFilter"
-            appA11yTitle="{{ 'vault' | i18n }}: {{ organizationGrouping.name }}"
+            appA11yTitle="{{ 'vault' | i18n }}: {{ organizationGrouping.name | i18n }}"
           >
             {{ organizationGrouping.name | i18n }}
           </button>
@@ -73,7 +73,7 @@
             class="filter-button"
             (click)="clearFilter()"
             [attr.aria-pressed]="!hasActiveFilter"
-            appA11yTitle="{{ 'vault' | i18n }}: {{ organizationGrouping.name }}"
+            appA11yTitle="{{ 'vault' | i18n }}: {{ organizationGrouping.name | i18n }}"
           >
             {{ organizationGrouping.name | i18n }}
           </button>
@@ -102,18 +102,18 @@
             <button
               class="filter-button"
               (click)="applyOrganizationFilter(organization)"
-              appA11yTitle="{{ 'vault' | i18n }}: {{ organization.name }}"
+              appA11yTitle="{{ 'vault' | i18n }}: {{ organization.name }} {{
+                organization.enabled ? '' : '(' + ('organizationIsDisabled' | i18n) + ')'
+              }}"
               [attr.aria-pressed]="activeFilter.selectedOrganizationId === organization.id"
             >
               <i class="bwi bwi-fw bwi-business" aria-hidden="true"></i>
               &nbsp;{{ organization.name }}
             </button>
-            <span class="ml-auto">
+            <span *ngIf="!organization.enabled" class="ml-auto">
               <i
-                *ngIf="!organization.enabled"
                 class="bwi bwi-fw bwi-exclamation-triangle text-danger mr-auto"
-                aria-label="{{ 'organizationIsDisabled' | i18n }}"
-                appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
+                aria-hidden="true"
               ></i>
             </span>
           </span>
diff --git a/apps/desktop/src/app/vault/vault.component.ts b/apps/desktop/src/app/vault/vault.component.ts
index 8c3e2103cdf..5681535e246 100644
--- a/apps/desktop/src/app/vault/vault.component.ts
+++ b/apps/desktop/src/app/vault/vault.component.ts
@@ -27,8 +27,8 @@ import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { EventType } from "@bitwarden/common/enums/eventType";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { FolderView } from "@bitwarden/common/models/view/folder.view";
-import { invokeMenu, RendererMenuItem } from "@bitwarden/electron/utils";
 
+import { invokeMenu, RendererMenuItem } from "../../utils";
 import { SearchBarService } from "../layout/search/search-bar.service";
 
 import { AddEditComponent } from "./add-edit.component";
diff --git a/apps/desktop/src/app/vault/view.component.html b/apps/desktop/src/app/vault/view.component.html
index 8b1b0445744..5b3896f68ed 100644
--- a/apps/desktop/src/app/vault/view.component.html
+++ b/apps/desktop/src/app/vault/view.component.html
@@ -64,16 +64,16 @@
                 appA11yTitle="{{ 'checkPassword' | i18n }}"
                 (click)="checkPassword()"
                 [appApiAction]="checkPasswordPromise"
-                [disabled]="checkPasswordBtn.loading"
+                [disabled]="$any(checkPasswordBtn).loading"
               >
                 <i
                   class="bwi bwi-lg bwi-check-circle"
-                  [hidden]="checkPasswordBtn.loading"
+                  [hidden]="$any(checkPasswordBtn).loading"
                   aria-hidden="true"
                 ></i>
                 <i
                   class="bwi bwi-lg bwi-spinner bwi-spin"
-                  [hidden]="!checkPasswordBtn.loading"
+                  [hidden]="!$any(checkPasswordBtn).loading"
                   aria-hidden="true"
                 ></i>
               </button>
@@ -472,12 +472,12 @@
           <small class="row-sub-label">{{ attachment.sizeName }}</small>
           <i
             class="bwi bwi-download bwi-fw row-sub-icon"
-            *ngIf="!attachment.downloading"
+            *ngIf="!$any(attachment).downloading"
             aria-hidden="true"
           ></i>
           <i
             class="bwi bwi-spinner bwi-fw bwi-spin row-sub-icon"
-            *ngIf="attachment.downloading"
+            *ngIf="$any(attachment).downloading"
             aria-hidden="true"
           ></i>
         </button>
diff --git a/apps/desktop/src/locales/en/messages.json b/apps/desktop/src/locales/en/messages.json
index fd168510b38..1ca90e8ce2f 100644
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -1779,6 +1779,15 @@
   "disabled": {
     "message": "Disabled"
   },
+  "removePassword": {
+    "message": "Remove password"
+  },
+  "removedPassword": {
+    "message": "Password removed"
+  },
+  "removePasswordConfirmation": {
+    "message": "Are you sure you want to remove the password?"
+  },  
   "maxAccessCountReached": {
     "message": "Max access count reached"
   },
diff --git a/apps/desktop/src/locales/en_GB/messages.json b/apps/desktop/src/locales/en_GB/messages.json
index 12a4f27de17..084e90d0048 100644
--- a/apps/desktop/src/locales/en_GB/messages.json
+++ b/apps/desktop/src/locales/en_GB/messages.json
@@ -45,7 +45,7 @@
     "message": "Share"
   },
   "moveToOrganization": {
-    "message": "Move to Organisation"
+    "message": "Move to organisation"
   },
   "movedItemToOrg": {
     "message": "$ITEMNAME$ moved to $ORGNAME$",
diff --git a/apps/desktop/src/locales/pl/messages.json b/apps/desktop/src/locales/pl/messages.json
index ea5a4e040f3..263a2356b3b 100644
--- a/apps/desktop/src/locales/pl/messages.json
+++ b/apps/desktop/src/locales/pl/messages.json
@@ -1844,7 +1844,7 @@
     "message": "Czas blokowania sejfu przekracza limit określony przez organizację."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatyczne rejestrowanie użytkowników do resetowania hasła"
+    "message": "Automatyczne rejestrowanie użytkowników"
   },
   "resetPasswordAutoEnrollInviteWarning": {
     "message": "Ta organizacja posługuje się zasadą, która automatycznie rejestruje użytkowników do resetowania hasła. Rejestracja umożliwia administratorom organizacji zmianę Twojego hasła głównego."
@@ -2029,7 +2029,7 @@
     "message": "Logowanie jako"
   },
   "rememberEmail": {
-    "message": "Zapamiętaj e-mail"
+    "message": "Zapamiętaj adres e-mail"
   },
   "notYou": {
     "message": "To nie Ty?"
diff --git a/apps/desktop/src/locales/vi/messages.json b/apps/desktop/src/locales/vi/messages.json
index 28075bd45d5..0d7244c122d 100644
--- a/apps/desktop/src/locales/vi/messages.json
+++ b/apps/desktop/src/locales/vi/messages.json
@@ -48,7 +48,7 @@
     "message": "Chuyển tới Tổ chức"
   },
   "movedItemToOrg": {
-    "message": "$ITEMNAME$ moved to $ORGNAME$",
+    "message": "$ITEMNAME$ đã di chuyển tới $ORGNAME$",
     "placeholders": {
       "itemname": {
         "content": "$1",
@@ -805,7 +805,7 @@
     "message": "Đồng bộ thất bại"
   },
   "yourVaultIsLocked": {
-    "message": "Kho mật khẩu đã bị khóa. Xác minh mật khẩu chinhs của bạn để mở."
+    "message": "Kho mật khẩu đã bị khóa. Xác minh mật khẩu chính của bạn để mở."
   },
   "unlock": {
     "message": "Mở khóa"
@@ -1213,7 +1213,7 @@
     "description": "Domain name. Ex. website.com"
   },
   "domainName": {
-    "message": "Domain name",
+    "message": "Tên miền",
     "description": "Domain name. Ex. website.com"
   },
   "host": {
@@ -1662,7 +1662,7 @@
     "message": "Văn bản"
   },
   "deletionDate": {
-    "message": "Deletion date"
+    "message": "Ngày xóa"
   },
   "deletionDateDesc": {
     "message": "Send sẽ được xóa vĩnh viễn vào ngày và giờ được chỉ định.",
@@ -1703,7 +1703,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendLinkLabel": {
-    "message": "Send link",
+    "message": "Gửi liên kết",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "textHiddenByDefault": {
@@ -1752,14 +1752,14 @@
     "message": "1 ngày"
   },
   "custom": {
-    "message": "Custom"
+    "message": "Tùy chỉnh"
   },
   "deleteSendConfirmation": {
     "message": "Bạn có chắc chắn muốn xóa Send này?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkToClipboard": {
-    "message": "Copy Send link to clipboard",
+    "message": "Sao chép liên kết tới Khay nhớ tạm",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLinkOnSave": {
@@ -1777,58 +1777,58 @@
     "message": "Sao chép liên kết"
   },
   "disabled": {
-    "message": "Disabled"
+    "message": "Đã tắt"
   },
   "maxAccessCountReached": {
-    "message": "Max access count reached"
+    "message": "Đã đạt đến số lượng truy cập tối đa"
   },
   "expired": {
-    "message": "Expired"
+    "message": "Đã hết hạn"
   },
   "pendingDeletion": {
     "message": "Đang chờ xóa"
   },
   "webAuthnAuthenticate": {
-    "message": "Authenticate WebAuthn"
+    "message": "Xác thực WebAuthn"
   },
   "hideEmail": {
-    "message": "Hide my email address from recipients."
+    "message": "Ẩn địa chỉ email của tôi khỏi người nhận."
   },
   "sendOptionsPolicyInEffect": {
-    "message": "One or more organization policies are affecting your Send options."
+    "message": "Có một hoặc vài chính sách của tổ chức đang làm ảnh hưởng đến cài đặt tạo mật khẩu của bạn."
   },
   "emailVerificationRequired": {
-    "message": "Email verification required"
+    "message": "Yêu cầu xác nhận danh tính qua Email"
   },
   "emailVerificationRequiredDesc": {
-    "message": "You must verify your email to use this feature."
+    "message": "Bạn phải xác minh email của mình để sử dụng tính năng này."
   },
   "passwordPrompt": {
-    "message": "Master password re-prompt"
+    "message": "Nhắc lại mật khẩu chính"
   },
   "passwordConfirmation": {
-    "message": "Master password confirmation"
+    "message": "Xác nhận mật khẩu chính"
   },
   "passwordConfirmationDesc": {
-    "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
+    "message": "Hành động này được bảo vệ. Để tiếp tục, vui lòng nhập lại mật khẩu chính của bạn để xác minh danh tính của bạn."
   },
   "updatedMasterPassword": {
-    "message": "Updated master password"
+    "message": "Mật khẩu chính đã được cập nhật"
   },
   "updateMasterPassword": {
-    "message": "Update master password"
+    "message": "Cập nhật Mật khẩu chính"
   },
   "updateMasterPasswordWarning": {
-    "message": "Your master password was recently changed by an administrator in your organization. In order to access the vault, you must update it now. Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Mật khẩu chính của bạn gần đây đã được thay đổi bởi một quản trị viên trong tổ chức của bạn. Để truy cập Kho, bạn phải cập nhật nó ngay bây giờ. Tiếp tục sẽ đăng xuất bạn khỏi phiên hiện tại của bạn, yêu cầu bạn đăng nhập lại. Các phiên hoạt động trên các thiết bị khác có thể tiếp tục hoạt động trong tối đa một giờ."
   },
   "hours": {
-    "message": "Hours"
+    "message": "Giờ"
   },
   "minutes": {
-    "message": "Minutes"
+    "message": "Phút"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Your organization policies are affecting your vault timeout. Maximum allowed vault timeout is $HOURS$ hour(s) and $MINUTES$ minute(s)",
+    "message": "Chính sách tổ chức của bạn đang ảnh hưởng đến thời gian chờ Kho của bạn. Thời gian chờ kho tối đa được phép là $HOURS$ giờ và $MINUTES$ phút",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -1841,10 +1841,10 @@
     }
   },
   "vaultTimeoutTooLarge": {
-    "message": "Your vault timeout exceeds the restrictions set by your organization."
+    "message": "Thời gian chờ Kho của bạn vượt quá các hạn chế do tổ chức của bạn đặt ra."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic enrollment"
+    "message": "Đăng ký tự động"
   },
   "resetPasswordAutoEnrollInviteWarning": {
     "message": "This organization has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organization administrators to change your master password."
@@ -1856,13 +1856,13 @@
     "message": "One or more organization policies prevents you from exporting your personal vault."
   },
   "addAccount": {
-    "message": "Add account"
+    "message": "Thêm tài khoản"
   },
   "removeMasterPassword": {
-    "message": "Remove master password"
+    "message": "Xóa mật khẩu chính"
   },
   "removedMasterPassword": {
-    "message": "Master password removed"
+    "message": "Đã xóa mật khẩu chính"
   },
   "convertOrganizationEncryptionDesc": {
     "message": "$ORGANIZATION$ is using SSO with a self-hosted key server. A master password is no longer required to log in for members of this organization.",
@@ -1874,7 +1874,7 @@
     }
   },
   "leaveOrganization": {
-    "message": "Leave organization"
+    "message": "Rời khỏi tổ chức"
   },
   "leaveOrganizationConfirmation": {
     "message": "Are you sure you want to leave this organization?"
@@ -1892,7 +1892,7 @@
     "message": "No more than 5 accounts may be logged in at the same time."
   },
   "accountPreferences": {
-    "message": "Preferences"
+    "message": "Tuỳ chỉnh"
   },
   "appPreferences": {
     "message": "App settings (all accounts)"
@@ -1910,10 +1910,10 @@
     }
   },
   "switchAccount": {
-    "message": "Switch account"
+    "message": "Chuyển tài khoản"
   },
   "options": {
-    "message": "Options"
+    "message": "Tùy chọn"
   },
   "sessionTimeout": {
     "message": "Your session has timed out. Please go back and try logging in again."
@@ -1937,19 +1937,19 @@
     "message": "Đã mở khóa"
   },
   "generator": {
-    "message": "Generator"
+    "message": "Tạo"
   },
   "whatWouldYouLikeToGenerate": {
-    "message": "What would you like to generate?"
+    "message": "Bạn muốn tạo gì?"
   },
   "passwordType": {
-    "message": "Password type"
+    "message": "Loại mật khẩu"
   },
   "regenerateUsername": {
     "message": "Regenerate username"
   },
   "generateUsername": {
-    "message": "Generate username"
+    "message": "Tạo tên tài khoản"
   },
   "usernameType": {
     "message": "Username type"
@@ -1968,22 +1968,22 @@
     "message": "Use your domain's configured catch-all inbox."
   },
   "random": {
-    "message": "Random"
+    "message": "Ngẫu nhiên"
   },
   "randomWord": {
-    "message": "Random word"
+    "message": "Từ ngẫu nhiên"
   },
   "websiteName": {
-    "message": "Website name"
+    "message": "Tên website"
   },
   "service": {
-    "message": "Service"
+    "message": "Dịch vụ"
   },
   "allVaults": {
-    "message": "All vaults"
+    "message": "Tất cả kho"
   },
   "searchOrganization": {
-    "message": "Search organization"
+    "message": "Tìm tổ chức"
   },
   "searchMyVault": {
     "message": "Search my vault"
diff --git a/apps/desktop/src/main.ts b/apps/desktop/src/main.ts
index d54d46487a2..f5a078cdcc5 100644
--- a/apps/desktop/src/main.ts
+++ b/apps/desktop/src/main.ts
@@ -6,20 +6,20 @@ import { StateFactory } from "@bitwarden/common/factories/stateFactory";
 import { GlobalState } from "@bitwarden/common/models/domain/global-state";
 import { MemoryStorageService } from "@bitwarden/common/services/memoryStorage.service";
 import { StateService } from "@bitwarden/common/services/state.service";
-import { ElectronLogService } from "@bitwarden/electron/services/electronLog.service";
-import { ElectronMainMessagingService } from "@bitwarden/electron/services/electronMainMessaging.service";
-import { ElectronStorageService } from "@bitwarden/electron/services/electronStorage.service";
-import { TrayMain } from "@bitwarden/electron/tray.main";
-import { UpdaterMain } from "@bitwarden/electron/updater.main";
-import { WindowMain } from "@bitwarden/electron/window.main";
 
 import { BiometricMain } from "./main/biometric/biometric.main";
-import { DesktopCredentialStorageListener } from "./main/desktopCredentialStorageListener";
+import { DesktopCredentialStorageListener } from "./main/desktop-credential-storage-listener";
 import { MenuMain } from "./main/menu/menu.main";
 import { MessagingMain } from "./main/messaging.main";
-import { NativeMessagingMain } from "./main/nativeMessaging.main";
-import { PowerMonitorMain } from "./main/powerMonitor.main";
+import { NativeMessagingMain } from "./main/native-messaging.main";
+import { PowerMonitorMain } from "./main/power-monitor.main";
+import { TrayMain } from "./main/tray.main";
+import { UpdaterMain } from "./main/updater.main";
+import { WindowMain } from "./main/window.main";
 import { Account } from "./models/account";
+import { ElectronLogService } from "./services/electron-log.service";
+import { ElectronMainMessagingService } from "./services/electron-main-messaging.service";
+import { ElectronStorageService } from "./services/electron-storage.service";
 import { I18nService } from "./services/i18n.service";
 
 export class Main {
@@ -105,15 +105,7 @@ export class Main {
       (win) => this.trayMain.setupWindowListeners(win)
     );
     this.messagingMain = new MessagingMain(this, this.stateService);
-    this.updaterMain = new UpdaterMain(
-      this.i18nService,
-      this.windowMain,
-      "clients",
-      null,
-      null,
-      null,
-      "bitwarden"
-    );
+    this.updaterMain = new UpdaterMain(this.i18nService, this.windowMain, "bitwarden");
     this.menuMain = new MenuMain(this);
     this.powerMonitorMain = new PowerMonitorMain(this);
     this.trayMain = new TrayMain(this.windowMain, this.i18nService, this.stateService);
diff --git a/apps/desktop/src/main/biometric/biometric.windows.main.ts b/apps/desktop/src/main/biometric/biometric.windows.main.ts
index 01e3b563f2f..207e6c38b56 100644
--- a/apps/desktop/src/main/biometric/biometric.windows.main.ts
+++ b/apps/desktop/src/main/biometric/biometric.windows.main.ts
@@ -4,7 +4,8 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { biometrics } from "@bitwarden/desktop-native";
-import { WindowMain } from "@bitwarden/electron/window.main";
+
+import { WindowMain } from "../window.main";
 
 import { BiometricMain } from "./biometric.main";
 
diff --git a/apps/desktop/src/main/desktopCredentialStorageListener.ts b/apps/desktop/src/main/desktop-credential-storage-listener.ts
similarity index 100%
rename from apps/desktop/src/main/desktopCredentialStorageListener.ts
rename to apps/desktop/src/main/desktop-credential-storage-listener.ts
diff --git a/apps/desktop/src/main/menu/menu.about.ts b/apps/desktop/src/main/menu/menu.about.ts
index 64f1adad0ce..33d4f12ea55 100644
--- a/apps/desktop/src/main/menu/menu.about.ts
+++ b/apps/desktop/src/main/menu/menu.about.ts
@@ -1,8 +1,9 @@
 import { BrowserWindow, clipboard, dialog, MenuItemConstructorOptions } from "electron";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { UpdaterMain } from "@bitwarden/electron/updater.main";
-import { isMacAppStore, isSnapStore, isWindowsStore } from "@bitwarden/electron/utils";
+
+import { isMacAppStore, isSnapStore, isWindowsStore } from "../../utils";
+import { UpdaterMain } from "../updater.main";
 
 import { IMenubarMenu } from "./menubar";
 
diff --git a/apps/desktop/src/main/menu/menu.account.ts b/apps/desktop/src/main/menu/menu.account.ts
index b7c4b1f693f..31e0797ebb6 100644
--- a/apps/desktop/src/main/menu/menu.account.ts
+++ b/apps/desktop/src/main/menu/menu.account.ts
@@ -2,7 +2,8 @@ import { BrowserWindow, dialog, MenuItemConstructorOptions, shell } from "electr
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { isMacAppStore, isWindowsStore } from "@bitwarden/electron/utils";
+
+import { isMacAppStore, isWindowsStore } from "../../utils";
 
 import { IMenubarMenu } from "./menubar";
 
diff --git a/apps/desktop/src/main/menu/menu.bitwarden.ts b/apps/desktop/src/main/menu/menu.bitwarden.ts
index d25454d9a49..7a20b381f58 100644
--- a/apps/desktop/src/main/menu/menu.bitwarden.ts
+++ b/apps/desktop/src/main/menu/menu.bitwarden.ts
@@ -2,8 +2,9 @@ import { BrowserWindow, MenuItemConstructorOptions } from "electron";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { UpdaterMain } from "@bitwarden/electron/updater.main";
-import { isMac } from "@bitwarden/electron/utils";
+
+import { isMac } from "../../utils";
+import { UpdaterMain } from "../updater.main";
 
 import { FirstMenu } from "./menu.first";
 import { MenuAccount } from "./menu.updater";
diff --git a/apps/desktop/src/main/menu/menu.file.ts b/apps/desktop/src/main/menu/menu.file.ts
index 71b4a236922..6a7c3ba16dd 100644
--- a/apps/desktop/src/main/menu/menu.file.ts
+++ b/apps/desktop/src/main/menu/menu.file.ts
@@ -2,8 +2,9 @@ import { BrowserWindow, MenuItemConstructorOptions } from "electron";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { UpdaterMain } from "@bitwarden/electron/updater.main";
-import { isMac, isMacAppStore } from "@bitwarden/electron/utils";
+
+import { isMac, isMacAppStore } from "../../utils";
+import { UpdaterMain } from "../updater.main";
 
 import { FirstMenu } from "./menu.first";
 import { MenuAccount } from "./menu.updater";
diff --git a/apps/desktop/src/main/menu/menu.first.ts b/apps/desktop/src/main/menu/menu.first.ts
index 5786b4e68cf..06f24b0570e 100644
--- a/apps/desktop/src/main/menu/menu.first.ts
+++ b/apps/desktop/src/main/menu/menu.first.ts
@@ -2,8 +2,9 @@ import { BrowserWindow, dialog, MenuItem, MenuItemConstructorOptions } from "ele
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { UpdaterMain } from "@bitwarden/electron/updater.main";
-import { isMacAppStore, isSnapStore, isWindowsStore } from "@bitwarden/electron/utils";
+
+import { isMacAppStore, isSnapStore, isWindowsStore } from "../../utils";
+import { UpdaterMain } from "../updater.main";
 
 import { MenuAccount } from "./menu.updater";
 
diff --git a/apps/desktop/src/main/menu/menu.help.ts b/apps/desktop/src/main/menu/menu.help.ts
index 60fce1ce494..fde742b3737 100644
--- a/apps/desktop/src/main/menu/menu.help.ts
+++ b/apps/desktop/src/main/menu/menu.help.ts
@@ -1,7 +1,8 @@
 import { shell, MenuItemConstructorOptions } from "electron";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-import { isMacAppStore, isWindowsStore } from "@bitwarden/electron/utils";
+
+import { isMacAppStore, isWindowsStore } from "../../utils";
 
 import { AboutMenu } from "./menu.about";
 import { IMenubarMenu } from "./menubar";
diff --git a/apps/desktop/src/main/menu/menu.main.ts b/apps/desktop/src/main/menu/menu.main.ts
index 66670e196cc..6a2bd3531b5 100644
--- a/apps/desktop/src/main/menu/menu.main.ts
+++ b/apps/desktop/src/main/menu/menu.main.ts
@@ -1,17 +1,22 @@
 import { app, Menu } from "electron";
 
-import { BaseMenu } from "@bitwarden/electron/baseMenu";
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 
 import { Main } from "../../main";
+import { WindowMain } from "../window.main";
 
 import { MenuUpdateRequest } from "./menu.updater";
 import { Menubar } from "./menubar";
 
 const cloudWebVaultUrl = "https://vault.bitwarden.com";
 
-export class MenuMain extends BaseMenu {
+export class MenuMain {
+  private i18nService: I18nService;
+  private windowMain: WindowMain;
+
   constructor(private main: Main) {
-    super(main.i18nService, main.windowMain);
+    this.i18nService = main.i18nService;
+    this.windowMain = main.windowMain;
   }
 
   async init() {
@@ -49,4 +54,84 @@ export class MenuMain extends BaseMenu {
     }
     return webVaultUrl;
   }
+
+  private initContextMenu() {
+    if (this.windowMain.win == null) {
+      return;
+    }
+
+    const selectionMenu = Menu.buildFromTemplate([
+      {
+        label: this.i18nService.t("copy"),
+        role: "copy",
+      },
+      { type: "separator" },
+      {
+        label: this.i18nService.t("selectAll"),
+        role: "selectAll",
+      },
+    ]);
+
+    const inputMenu = Menu.buildFromTemplate([
+      {
+        label: this.i18nService.t("undo"),
+        role: "undo",
+      },
+      {
+        label: this.i18nService.t("redo"),
+        role: "redo",
+      },
+      { type: "separator" },
+      {
+        label: this.i18nService.t("cut"),
+        role: "cut",
+        enabled: false,
+      },
+      {
+        label: this.i18nService.t("copy"),
+        role: "copy",
+        enabled: false,
+      },
+      {
+        label: this.i18nService.t("paste"),
+        role: "paste",
+      },
+      { type: "separator" },
+      {
+        label: this.i18nService.t("selectAll"),
+        role: "selectAll",
+      },
+    ]);
+
+    const inputSelectionMenu = Menu.buildFromTemplate([
+      {
+        label: this.i18nService.t("cut"),
+        role: "cut",
+      },
+      {
+        label: this.i18nService.t("copy"),
+        role: "copy",
+      },
+      {
+        label: this.i18nService.t("paste"),
+        role: "paste",
+      },
+      { type: "separator" },
+      {
+        label: this.i18nService.t("selectAll"),
+        role: "selectAll",
+      },
+    ]);
+
+    this.windowMain.win.webContents.on("context-menu", (e, props) => {
+      const selected = props.selectionText && props.selectionText.trim() !== "";
+      if (props.isEditable && selected) {
+        inputSelectionMenu.popup({ window: this.windowMain.win });
+      } else if (props.isEditable) {
+        inputMenu.popup({ window: this.windowMain.win });
+      } else if (selected) {
+        selectionMenu.popup({ window: this.windowMain.win });
+      }
+    });
+  }
 }
diff --git a/apps/desktop/src/main/menu/menu.window.ts b/apps/desktop/src/main/menu/menu.window.ts
index 3746e22b726..8f588781a56 100644
--- a/apps/desktop/src/main/menu/menu.window.ts
+++ b/apps/desktop/src/main/menu/menu.window.ts
@@ -2,8 +2,9 @@ import { MenuItemConstructorOptions } from "electron";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { isMac } from "@bitwarden/electron/utils";
-import { WindowMain } from "@bitwarden/electron/window.main";
+
+import { isMac } from "../../utils";
+import { WindowMain } from "../window.main";
 
 import { IMenubarMenu } from "./menubar";
 
diff --git a/apps/desktop/src/main/menu/menubar.ts b/apps/desktop/src/main/menu/menubar.ts
index 441b9ac6550..5048c60dc09 100644
--- a/apps/desktop/src/main/menu/menubar.ts
+++ b/apps/desktop/src/main/menu/menubar.ts
@@ -2,9 +2,10 @@ import { Menu, MenuItemConstructorOptions } from "electron";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
-import { UpdaterMain } from "@bitwarden/electron/updater.main";
-import { isMac } from "@bitwarden/electron/utils";
-import { WindowMain } from "@bitwarden/electron/window.main";
+
+import { isMac } from "../../utils";
+import { UpdaterMain } from "../updater.main";
+import { WindowMain } from "../window.main";
 
 import { AboutMenu } from "./menu.about";
 import { AccountMenu } from "./menu.account";
diff --git a/apps/desktop/src/main/nativeMessaging.main.ts b/apps/desktop/src/main/native-messaging.main.ts
similarity index 99%
rename from apps/desktop/src/main/nativeMessaging.main.ts
rename to apps/desktop/src/main/native-messaging.main.ts
index 0559d2ce96c..ae549ace384 100644
--- a/apps/desktop/src/main/nativeMessaging.main.ts
+++ b/apps/desktop/src/main/native-messaging.main.ts
@@ -8,7 +8,8 @@ import { ipcMain } from "electron";
 import * as ipc from "node-ipc";
 
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { WindowMain } from "@bitwarden/electron/window.main";
+
+import { WindowMain } from "./window.main";
 
 export class NativeMessagingMain {
   private connected: Socket[] = [];
diff --git a/apps/desktop/src/main/powerMonitor.main.ts b/apps/desktop/src/main/power-monitor.main.ts
similarity index 94%
rename from apps/desktop/src/main/powerMonitor.main.ts
rename to apps/desktop/src/main/power-monitor.main.ts
index 438a0e6f9ec..56e6139ccf1 100644
--- a/apps/desktop/src/main/powerMonitor.main.ts
+++ b/apps/desktop/src/main/power-monitor.main.ts
@@ -1,8 +1,7 @@
 import { powerMonitor } from "electron";
 
-import { isSnapStore } from "@bitwarden/electron/utils";
-
 import { Main } from "../main";
+import { isSnapStore } from "../utils";
 
 // tslint:disable-next-line
 const IdleLockSeconds = 5 * 60; // 5 minutes
diff --git a/libs/electron/src/tray.main.ts b/apps/desktop/src/main/tray.main.ts
similarity index 100%
rename from libs/electron/src/tray.main.ts
rename to apps/desktop/src/main/tray.main.ts
diff --git a/libs/electron/src/updater.main.ts b/apps/desktop/src/main/updater.main.ts
similarity index 86%
rename from libs/electron/src/updater.main.ts
rename to apps/desktop/src/main/updater.main.ts
index 638c5efeda4..314ea076b22 100644
--- a/libs/electron/src/updater.main.ts
+++ b/apps/desktop/src/main/updater.main.ts
@@ -4,10 +4,11 @@ import { autoUpdater } from "electron-updater";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 
-import { isAppImage, isDev, isMacAppStore, isWindowsPortable, isWindowsStore } from "./utils";
+import { isAppImage, isDev, isMacAppStore, isWindowsPortable, isWindowsStore } from "../utils";
+
 import { WindowMain } from "./window.main";
 
-const UpdaterCheckInitalDelay = 5 * 1000; // 5 seconds
+const UpdaterCheckInitialDelay = 5 * 1000; // 5 seconds
 const UpdaterCheckInterval = 12 * 60 * 60 * 1000; // 12 hours
 
 export class UpdaterMain {
@@ -18,10 +19,6 @@ export class UpdaterMain {
   constructor(
     private i18nService: I18nService,
     private windowMain: WindowMain,
-    private gitHubProject: string,
-    private onCheckingForUpdate: () => void = null,
-    private onReset: () => void = null,
-    private onUpdateDownloaded: () => void = null,
     private projectName: string
   ) {
     autoUpdater.logger = log;
@@ -36,13 +33,10 @@ export class UpdaterMain {
   }
 
   async init() {
-    global.setTimeout(async () => await this.checkForUpdate(), UpdaterCheckInitalDelay);
+    global.setTimeout(async () => await this.checkForUpdate(), UpdaterCheckInitialDelay);
     global.setInterval(async () => await this.checkForUpdate(), UpdaterCheckInterval);
 
     autoUpdater.on("checking-for-update", () => {
-      if (this.onCheckingForUpdate != null) {
-        this.onCheckingForUpdate();
-      }
       this.doingUpdateCheck = true;
     });
 
@@ -87,10 +81,6 @@ export class UpdaterMain {
     });
 
     autoUpdater.on("update-downloaded", async (info) => {
-      if (this.onUpdateDownloaded != null) {
-        this.onUpdateDownloaded();
-      }
-
       if (this.windowMain.win == null) {
         return;
       }
@@ -132,7 +122,7 @@ export class UpdaterMain {
 
     if (!this.canUpdate) {
       if (withFeedback) {
-        shell.openExternal("https://github.com/bitwarden/" + this.gitHubProject + "/releases");
+        shell.openExternal("https://github.com/bitwarden/clients/releases");
       }
 
       return;
@@ -147,9 +137,6 @@ export class UpdaterMain {
   }
 
   private reset() {
-    if (this.onReset != null) {
-      this.onReset();
-    }
     autoUpdater.autoDownload = true;
     this.doingUpdateCheck = false;
   }
diff --git a/libs/electron/src/window.main.ts b/apps/desktop/src/main/window.main.ts
similarity index 99%
rename from libs/electron/src/window.main.ts
rename to apps/desktop/src/main/window.main.ts
index 47f7e4e9cd3..5b58172ac1b 100644
--- a/libs/electron/src/window.main.ts
+++ b/apps/desktop/src/main/window.main.ts
@@ -6,7 +6,7 @@ import { app, BrowserWindow, screen } from "electron";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 
-import { cleanUserAgent, isDev, isMacAppStore, isSnapStore } from "./utils";
+import { cleanUserAgent, isDev, isMacAppStore, isSnapStore } from "../utils";
 
 const mainWindowSizeKey = "mainWindowSize";
 const WindowEventHandlingDelay = 100;
diff --git a/apps/desktop/src/models/nativeMessaging/decryptedCommandData.ts b/apps/desktop/src/models/native-messaging/decrypted-command-data.ts
similarity index 60%
rename from apps/desktop/src/models/nativeMessaging/decryptedCommandData.ts
rename to apps/desktop/src/models/native-messaging/decrypted-command-data.ts
index 0aea170f6e6..eeab234d7a4 100644
--- a/apps/desktop/src/models/nativeMessaging/decryptedCommandData.ts
+++ b/apps/desktop/src/models/native-messaging/decrypted-command-data.ts
@@ -1,4 +1,4 @@
-import { EncryptedCommand } from "./encryptedCommand";
+import { EncryptedCommand } from "./encrypted-command";
 
 export type DecryptedCommandData = {
   command: EncryptedCommand;
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedCommand.ts b/apps/desktop/src/models/native-messaging/encrypted-command.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedCommand.ts
rename to apps/desktop/src/models/native-messaging/encrypted-command.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload.ts b/apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-create-payload.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-create-payload.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload.ts b/apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-retrieve-payload.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-retrieve-payload.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload.ts b/apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-update-payload.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-payloads/credential-update-payload.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload.ts b/apps/desktop/src/models/native-messaging/encrypted-message-payloads/password-generate-payload.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-payloads/password-generate-payload.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-response.ts
similarity index 76%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-response.ts
index bed85b65e96..5f8deb05a30 100644
--- a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponse.ts
+++ b/apps/desktop/src/models/native-messaging/encrypted-message-response.ts
@@ -1,6 +1,6 @@
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 
-import { MessageCommon } from "./messageCommon";
+import { MessageCommon } from "./message-common";
 
 export type EncryptedMessageResponse = MessageCommon & {
   encryptedPayload: EncString;
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/accountStatusResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/account-status-response.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/accountStatusResponse.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/account-status-response.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cannotDecryptErrorResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/cannot-decrypt-error-response.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cannotDecryptErrorResponse.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/cannot-decrypt-error-response.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cipherResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/cipher-response.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/cipherResponse.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/cipher-response.ts
diff --git a/apps/desktop/src/models/native-messaging/encrypted-message-responses/encrypted-message-response.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/encrypted-message-response.ts
new file mode 100644
index 00000000000..a0d35a7adbd
--- /dev/null
+++ b/apps/desktop/src/models/native-messaging/encrypted-message-responses/encrypted-message-response.ts
@@ -0,0 +1,16 @@
+import { AccountStatusResponse } from "./account-status-response";
+import { CannotDecryptErrorResponse } from "./cannot-decrypt-error-response";
+import { CipherResponse } from "./cipher-response";
+import { FailureStatusResponse } from "./failure-status-response";
+import { GenerateResponse } from "./generate-response";
+import { SuccessStatusResponse } from "./success-status-response";
+import { UserStatusErrorResponse } from "./user-status-error-response";
+
+export type EncyptedMessageResponse =
+  | AccountStatusResponse[]
+  | CannotDecryptErrorResponse
+  | CipherResponse[]
+  | FailureStatusResponse
+  | GenerateResponse
+  | SuccessStatusResponse
+  | UserStatusErrorResponse;
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/failureStatusResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/failure-status-response.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/failureStatusResponse.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/failure-status-response.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/generateResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/generate-response.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/generateResponse.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/generate-response.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/successStatusResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/success-status-response.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/successStatusResponse.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/success-status-response.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse.ts b/apps/desktop/src/models/native-messaging/encrypted-message-responses/user-status-error-response.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message-responses/user-status-error-response.ts
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessage.ts b/apps/desktop/src/models/native-messaging/encrypted-message.ts
similarity index 80%
rename from apps/desktop/src/models/nativeMessaging/encryptedMessage.ts
rename to apps/desktop/src/models/native-messaging/encrypted-message.ts
index bd0b5177a40..fc06214875e 100644
--- a/apps/desktop/src/models/nativeMessaging/encryptedMessage.ts
+++ b/apps/desktop/src/models/native-messaging/encrypted-message.ts
@@ -1,6 +1,6 @@
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 
-import { MessageCommon } from "./messageCommon";
+import { MessageCommon } from "./message-common";
 
 export type EncryptedMessage = MessageCommon & {
   // Will decrypt to a DecryptedCommandData object
diff --git a/apps/desktop/src/models/native-messaging/index.ts b/apps/desktop/src/models/native-messaging/index.ts
new file mode 100644
index 00000000000..7f6701886af
--- /dev/null
+++ b/apps/desktop/src/models/native-messaging/index.ts
@@ -0,0 +1,25 @@
+export * from "./encrypted-message-payloads/credential-create-payload";
+export * from "./encrypted-message-payloads/credential-retrieve-payload";
+export * from "./encrypted-message-payloads/credential-update-payload";
+export * from "./encrypted-message-payloads/password-generate-payload";
+
+export * from "./encrypted-message-responses/account-status-response";
+export * from "./encrypted-message-responses/cannot-decrypt-error-response";
+export * from "./encrypted-message-responses/cipher-response";
+export * from "./encrypted-message-responses/encrypted-message-response";
+export * from "./encrypted-message-responses/failure-status-response";
+export * from "./encrypted-message-responses/generate-response";
+export * from "./encrypted-message-responses/success-status-response";
+export * from "./encrypted-message-responses/user-status-error-response";
+
+export * from "./decrypted-command-data";
+export * from "./encrypted-command";
+export * from "./encrypted-message";
+export * from "./encrypted-message-response";
+export * from "./legacy-message";
+export * from "./legacy-message-wrapper";
+export * from "./message";
+export * from "./message-common";
+export * from "./unencrypted-command";
+export * from "./unencrypted-message";
+export * from "./unencrypted-message-response";
diff --git a/apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts b/apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts
similarity index 77%
rename from apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts
rename to apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts
index 5ef10e73289..03068374069 100644
--- a/apps/desktop/src/models/nativeMessaging/legacyMessageWrapper.ts
+++ b/apps/desktop/src/models/native-messaging/legacy-message-wrapper.ts
@@ -1,6 +1,6 @@
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 
-import { LegacyMessage } from "./legacyMessage";
+import { LegacyMessage } from "./legacy-message";
 
 export type LegacyMessageWrapper = {
   message: LegacyMessage | EncString;
diff --git a/apps/desktop/src/models/nativeMessaging/legacyMessage.ts b/apps/desktop/src/models/native-messaging/legacy-message.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/legacyMessage.ts
rename to apps/desktop/src/models/native-messaging/legacy-message.ts
diff --git a/apps/desktop/src/models/nativeMessaging/messageCommon.ts b/apps/desktop/src/models/native-messaging/message-common.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/messageCommon.ts
rename to apps/desktop/src/models/native-messaging/message-common.ts
diff --git a/apps/desktop/src/models/native-messaging/message.ts b/apps/desktop/src/models/native-messaging/message.ts
new file mode 100644
index 00000000000..b76666bf142
--- /dev/null
+++ b/apps/desktop/src/models/native-messaging/message.ts
@@ -0,0 +1,4 @@
+import { EncryptedMessage } from "./encrypted-message";
+import { UnencryptedMessage } from "./unencrypted-message";
+
+export type Message = UnencryptedMessage | EncryptedMessage;
diff --git a/apps/desktop/src/models/nativeMessaging/unencryptedCommand.ts b/apps/desktop/src/models/native-messaging/unencrypted-command.ts
similarity index 100%
rename from apps/desktop/src/models/nativeMessaging/unencryptedCommand.ts
rename to apps/desktop/src/models/native-messaging/unencrypted-command.ts
diff --git a/apps/desktop/src/models/nativeMessaging/unencryptedMessageResponse.ts b/apps/desktop/src/models/native-messaging/unencrypted-message-response.ts
similarity index 85%
rename from apps/desktop/src/models/nativeMessaging/unencryptedMessageResponse.ts
rename to apps/desktop/src/models/native-messaging/unencrypted-message-response.ts
index a564b1324e2..b4f71ec6253 100644
--- a/apps/desktop/src/models/nativeMessaging/unencryptedMessageResponse.ts
+++ b/apps/desktop/src/models/native-messaging/unencrypted-message-response.ts
@@ -1,4 +1,4 @@
-import { MessageCommon } from "./messageCommon";
+import { MessageCommon } from "./message-common";
 
 export type UnencryptedMessageResponse = MessageCommon &
   (
diff --git a/apps/desktop/src/models/nativeMessaging/unencryptedMessage.ts b/apps/desktop/src/models/native-messaging/unencrypted-message.ts
similarity index 58%
rename from apps/desktop/src/models/nativeMessaging/unencryptedMessage.ts
rename to apps/desktop/src/models/native-messaging/unencrypted-message.ts
index a665f312a98..d4ddb83ad68 100644
--- a/apps/desktop/src/models/nativeMessaging/unencryptedMessage.ts
+++ b/apps/desktop/src/models/native-messaging/unencrypted-message.ts
@@ -1,5 +1,5 @@
-import { MessageCommon } from "./messageCommon";
-import { UnencryptedCommand } from "./unencryptedCommand";
+import { MessageCommon } from "./message-common";
+import { UnencryptedCommand } from "./unencrypted-command";
 
 export type UnencryptedMessage = MessageCommon & {
   command: UnencryptedCommand;
diff --git a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts b/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts
deleted file mode 100644
index a10da2d8571..00000000000
--- a/apps/desktop/src/models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { AccountStatusResponse } from "./accountStatusResponse";
-import { CannotDecryptErrorResponse } from "./cannotDecryptErrorResponse";
-import { CipherResponse } from "./cipherResponse";
-import { FailureStatusResponse } from "./failureStatusResponse";
-import { GenerateResponse } from "./generateResponse";
-import { SuccessStatusResponse } from "./successStatusResponse";
-import { UserStatusErrorResponse } from "./userStatusErrorResponse";
-
-export type EncyptedMessageResponse =
-  | AccountStatusResponse[]
-  | CannotDecryptErrorResponse
-  | CipherResponse[]
-  | FailureStatusResponse
-  | GenerateResponse
-  | SuccessStatusResponse
-  | UserStatusErrorResponse;
diff --git a/apps/desktop/src/models/nativeMessaging/index.ts b/apps/desktop/src/models/nativeMessaging/index.ts
deleted file mode 100644
index 1b0148c3f90..00000000000
--- a/apps/desktop/src/models/nativeMessaging/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-export * from "./encryptedMessagePayloads/credentialCreatePayload";
-export * from "./encryptedMessagePayloads/credentialRetrievePayload";
-export * from "./encryptedMessagePayloads/credentialUpdatePayload";
-export * from "./encryptedMessagePayloads/passwordGeneratePayload";
-
-export * from "./encryptedMessageResponses/accountStatusResponse";
-export * from "./encryptedMessageResponses/cannotDecryptErrorResponse";
-export * from "./encryptedMessageResponses/cipherResponse";
-export * from "./encryptedMessageResponses/encryptedMessageResponse";
-export * from "./encryptedMessageResponses/failureStatusResponse";
-export * from "./encryptedMessageResponses/generateResponse";
-export * from "./encryptedMessageResponses/successStatusResponse";
-export * from "./encryptedMessageResponses/userStatusErrorResponse";
-
-export * from "./decryptedCommandData";
-export * from "./encryptedCommand";
-export * from "./encryptedMessage";
-export * from "./encryptedMessageResponse";
-export * from "./legacyMessage";
-export * from "./legacyMessageWrapper";
-export * from "./message";
-export * from "./messageCommon";
-export * from "./unencryptedCommand";
-export * from "./unencryptedMessage";
-export * from "./unencryptedMessageResponse";
diff --git a/apps/desktop/src/models/nativeMessaging/message.ts b/apps/desktop/src/models/nativeMessaging/message.ts
deleted file mode 100644
index 25d96aa218a..00000000000
--- a/apps/desktop/src/models/nativeMessaging/message.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { EncryptedMessage } from "./encryptedMessage";
-import { UnencryptedMessage } from "./unencryptedMessage";
-
-export type Message = UnencryptedMessage | EncryptedMessage;
diff --git a/apps/desktop/src/package-lock.json b/apps/desktop/src/package-lock.json
index fc77537579f..7006f7ac31b 100644
--- a/apps/desktop/src/package-lock.json
+++ b/apps/desktop/src/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bitwarden/desktop",
-  "version": "2022.10.2",
+  "version": "2022.11.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@bitwarden/desktop",
-      "version": "2022.10.2",
+      "version": "2022.11.0",
       "license": "GPL-3.0",
       "dependencies": {
         "@bitwarden/desktop-native": "file:../desktop_native"
diff --git a/apps/desktop/src/package.json b/apps/desktop/src/package.json
index f7e3af532c3..2be746c7970 100644
--- a/apps/desktop/src/package.json
+++ b/apps/desktop/src/package.json
@@ -2,7 +2,7 @@
   "name": "@bitwarden/desktop",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "2022.10.2",
+  "version": "2022.11.0",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
diff --git a/apps/desktop/src/scss/misc.scss b/apps/desktop/src/scss/misc.scss
index 5818b194710..43da0d31bdf 100644
--- a/apps/desktop/src/scss/misc.scss
+++ b/apps/desktop/src/scss/misc.scss
@@ -534,3 +534,9 @@ img,
 app-vault-view .box-footer {
   user-select: auto;
 }
+
+/* tweak for inconsistent line heights in cipher view */
+.box-footer button,
+.box-footer a {
+  line-height: 1;
+}
diff --git a/libs/electron/src/services/electronCrypto.service.ts b/apps/desktop/src/services/electron-crypto.service.ts
similarity index 100%
rename from libs/electron/src/services/electronCrypto.service.ts
rename to apps/desktop/src/services/electron-crypto.service.ts
diff --git a/libs/electron/spec/services/electronLog.service.spec.ts b/apps/desktop/src/services/electron-log.service.spec.ts
similarity index 75%
rename from libs/electron/spec/services/electronLog.service.spec.ts
rename to apps/desktop/src/services/electron-log.service.spec.ts
index 5802478fb70..5b12edc9450 100644
--- a/libs/electron/spec/services/electronLog.service.spec.ts
+++ b/apps/desktop/src/services/electron-log.service.spec.ts
@@ -1,4 +1,4 @@
-import { ElectronLogService } from "@bitwarden/electron/services/electronLog.service";
+import { ElectronLogService } from "./electron-log.service";
 
 describe("ElectronLogService", () => {
   it("sets dev based on electron method", () => {
diff --git a/libs/electron/src/services/electronLog.service.ts b/apps/desktop/src/services/electron-log.service.ts
similarity index 100%
rename from libs/electron/src/services/electronLog.service.ts
rename to apps/desktop/src/services/electron-log.service.ts
diff --git a/libs/electron/src/services/electronMainMessaging.service.ts b/apps/desktop/src/services/electron-main-messaging.service.ts
similarity index 97%
rename from libs/electron/src/services/electronMainMessaging.service.ts
rename to apps/desktop/src/services/electron-main-messaging.service.ts
index a025e32e373..b8d754b925b 100644
--- a/libs/electron/src/services/electronMainMessaging.service.ts
+++ b/apps/desktop/src/services/electron-main-messaging.service.ts
@@ -3,8 +3,8 @@ import { app, dialog, ipcMain, Menu, MenuItem, nativeTheme, session } from "elec
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import { ThemeType } from "@bitwarden/common/enums/themeType";
 
+import { WindowMain } from "../main/window.main";
 import { RendererMenuItem } from "../utils";
-import { WindowMain } from "../window.main";
 
 export class ElectronMainMessagingService implements MessagingService {
   constructor(private windowMain: WindowMain, private onMessage: (message: any) => void) {
diff --git a/libs/electron/src/services/electronPlatformUtils.service.ts b/apps/desktop/src/services/electron-platform-utils.service.ts
similarity index 97%
rename from libs/electron/src/services/electronPlatformUtils.service.ts
rename to apps/desktop/src/services/electron-platform-utils.service.ts
index 1b710b85f2f..8af865d8452 100644
--- a/libs/electron/src/services/electronPlatformUtils.service.ts
+++ b/apps/desktop/src/services/electron-platform-utils.service.ts
@@ -87,6 +87,10 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
     return ipcRenderer.invoke("appVersion");
   }
 
+  async getApplicationVersionNumber(): Promise<string> {
+    return (await this.getApplicationVersion()).split(/[+|-]/)[0].trim();
+  }
+
   // Temporarily restricted to only Windows until https://github.com/electron/electron/pull/28349
   // has been merged and an updated electron build is available.
   supportsWebAuthn(win: Window): boolean {
diff --git a/libs/electron/src/services/electronRendererMessaging.service.ts b/apps/desktop/src/services/electron-renderer-messaging.service.ts
similarity index 100%
rename from libs/electron/src/services/electronRendererMessaging.service.ts
rename to apps/desktop/src/services/electron-renderer-messaging.service.ts
diff --git a/libs/electron/src/services/electronRendererSecureStorage.service.ts b/apps/desktop/src/services/electron-renderer-secure-storage.service.ts
similarity index 100%
rename from libs/electron/src/services/electronRendererSecureStorage.service.ts
rename to apps/desktop/src/services/electron-renderer-secure-storage.service.ts
diff --git a/libs/electron/src/services/electronRendererStorage.service.ts b/apps/desktop/src/services/electron-renderer-storage.service.ts
similarity index 100%
rename from libs/electron/src/services/electronRendererStorage.service.ts
rename to apps/desktop/src/services/electron-renderer-storage.service.ts
diff --git a/libs/electron/src/services/electronStorage.service.ts b/apps/desktop/src/services/electron-storage.service.ts
similarity index 100%
rename from libs/electron/src/services/electronStorage.service.ts
rename to apps/desktop/src/services/electron-storage.service.ts
diff --git a/apps/desktop/src/services/encryptedMessageHandlerService.ts b/apps/desktop/src/services/encrypted-message-handler.service.ts
similarity index 84%
rename from apps/desktop/src/services/encryptedMessageHandlerService.ts
rename to apps/desktop/src/services/encrypted-message-handler.service.ts
index f5ac1e5fcef..5f45118768e 100644
--- a/apps/desktop/src/services/encryptedMessageHandlerService.ts
+++ b/apps/desktop/src/services/encrypted-message-handler.service.ts
@@ -12,18 +12,18 @@ import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { LoginUriView } from "@bitwarden/common/models/view/login-uri.view";
 import { LoginView } from "@bitwarden/common/models/view/login.view";
 
-import { DecryptedCommandData } from "../models/nativeMessaging/decryptedCommandData";
-import { CredentialCreatePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialCreatePayload";
-import { CredentialRetrievePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialRetrievePayload";
-import { CredentialUpdatePayload } from "../models/nativeMessaging/encryptedMessagePayloads/credentialUpdatePayload";
-import { PasswordGeneratePayload } from "../models/nativeMessaging/encryptedMessagePayloads/passwordGeneratePayload";
-import { AccountStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/accountStatusResponse";
-import { CipherResponse } from "../models/nativeMessaging/encryptedMessageResponses/cipherResponse";
-import { EncyptedMessageResponse } from "../models/nativeMessaging/encryptedMessageResponses/encryptedMessageResponse";
-import { FailureStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/failureStatusResponse";
-import { GenerateResponse } from "../models/nativeMessaging/encryptedMessageResponses/generateResponse";
-import { SuccessStatusResponse } from "../models/nativeMessaging/encryptedMessageResponses/successStatusResponse";
-import { UserStatusErrorResponse } from "../models/nativeMessaging/encryptedMessageResponses/userStatusErrorResponse";
+import { DecryptedCommandData } from "../models/native-messaging/decrypted-command-data";
+import { CredentialCreatePayload } from "../models/native-messaging/encrypted-message-payloads/credential-create-payload";
+import { CredentialRetrievePayload } from "../models/native-messaging/encrypted-message-payloads/credential-retrieve-payload";
+import { CredentialUpdatePayload } from "../models/native-messaging/encrypted-message-payloads/credential-update-payload";
+import { PasswordGeneratePayload } from "../models/native-messaging/encrypted-message-payloads/password-generate-payload";
+import { AccountStatusResponse } from "../models/native-messaging/encrypted-message-responses/account-status-response";
+import { CipherResponse } from "../models/native-messaging/encrypted-message-responses/cipher-response";
+import { EncyptedMessageResponse } from "../models/native-messaging/encrypted-message-responses/encrypted-message-response";
+import { FailureStatusResponse } from "../models/native-messaging/encrypted-message-responses/failure-status-response";
+import { GenerateResponse } from "../models/native-messaging/encrypted-message-responses/generate-response";
+import { SuccessStatusResponse } from "../models/native-messaging/encrypted-message-responses/success-status-response";
+import { UserStatusErrorResponse } from "../models/native-messaging/encrypted-message-responses/user-status-error-response";
 
 import { StateService } from "./state.service";
 
diff --git a/apps/desktop/src/services/nativeMessageHandler.service.ts b/apps/desktop/src/services/native-message-handler.service.ts
similarity index 92%
rename from apps/desktop/src/services/nativeMessageHandler.service.ts
rename to apps/desktop/src/services/native-message-handler.service.ts
index e7c92082075..fd00bf33f8e 100644
--- a/apps/desktop/src/services/nativeMessageHandler.service.ts
+++ b/apps/desktop/src/services/native-message-handler.service.ts
@@ -12,14 +12,14 @@ import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
 import { StateService } from "@bitwarden/common/services/state.service";
 
-import { DecryptedCommandData } from "../models/nativeMessaging/decryptedCommandData";
-import { EncryptedMessage } from "../models/nativeMessaging/encryptedMessage";
-import { EncryptedMessageResponse } from "../models/nativeMessaging/encryptedMessageResponse";
-import { Message } from "../models/nativeMessaging/message";
-import { UnencryptedMessage } from "../models/nativeMessaging/unencryptedMessage";
-import { UnencryptedMessageResponse } from "../models/nativeMessaging/unencryptedMessageResponse";
+import { DecryptedCommandData } from "../models/native-messaging/decrypted-command-data";
+import { EncryptedMessage } from "../models/native-messaging/encrypted-message";
+import { EncryptedMessageResponse } from "../models/native-messaging/encrypted-message-response";
+import { Message } from "../models/native-messaging/message";
+import { UnencryptedMessage } from "../models/native-messaging/unencrypted-message";
+import { UnencryptedMessageResponse } from "../models/native-messaging/unencrypted-message-response";
 
-import { EncryptedMessageHandlerService } from "./encryptedMessageHandlerService";
+import { EncryptedMessageHandlerService } from "./encrypted-message-handler.service";
 
 const EncryptionAlgorithm = "sha1";
 
diff --git a/apps/desktop/src/services/nativeMessaging.service.ts b/apps/desktop/src/services/native-messaging.service.ts
similarity index 95%
rename from apps/desktop/src/services/nativeMessaging.service.ts
rename to apps/desktop/src/services/native-messaging.service.ts
index 83e3705dc7d..0a2b443bfbf 100644
--- a/apps/desktop/src/services/nativeMessaging.service.ts
+++ b/apps/desktop/src/services/native-messaging.service.ts
@@ -15,11 +15,11 @@ import { Utils } from "@bitwarden/common/misc/utils";
 import { EncString } from "@bitwarden/common/models/domain/enc-string";
 import { SymmetricCryptoKey } from "@bitwarden/common/models/domain/symmetric-crypto-key";
 
-import { LegacyMessage } from "../models/nativeMessaging/legacyMessage";
-import { LegacyMessageWrapper } from "../models/nativeMessaging/legacyMessageWrapper";
-import { Message } from "../models/nativeMessaging/message";
+import { LegacyMessage } from "../models/native-messaging/legacy-message";
+import { LegacyMessageWrapper } from "../models/native-messaging/legacy-message-wrapper";
+import { Message } from "../models/native-messaging/message";
 
-import { NativeMessageHandlerService } from "./nativeMessageHandler.service";
+import { NativeMessageHandlerService } from "./native-message-handler.service";
 
 const MessageValidTimeout = 10 * 1000;
 const EncryptionAlgorithm = "sha1";
diff --git a/apps/desktop/src/services/passwordReprompt.service.ts b/apps/desktop/src/services/password-reprompt.service.ts
similarity index 100%
rename from apps/desktop/src/services/passwordReprompt.service.ts
rename to apps/desktop/src/services/password-reprompt.service.ts
diff --git a/libs/electron/spec/utils.spec.ts b/apps/desktop/src/utils.spec.ts
similarity index 96%
rename from libs/electron/spec/utils.spec.ts
rename to apps/desktop/src/utils.spec.ts
index 96af43eb752..e9fbad3df9e 100644
--- a/libs/electron/spec/utils.spec.ts
+++ b/apps/desktop/src/utils.spec.ts
@@ -1,4 +1,4 @@
-import { cleanUserAgent } from "@bitwarden/electron/utils";
+import { cleanUserAgent } from "./utils";
 
 const expectedUserAgent = `Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/${process.versions.chrome} Safari/537.36`;
 
diff --git a/libs/electron/src/utils.ts b/apps/desktop/src/utils.ts
similarity index 100%
rename from libs/electron/src/utils.ts
rename to apps/desktop/src/utils.ts
diff --git a/apps/desktop/tsconfig.json b/apps/desktop/tsconfig.json
index f2f28c73065..9ae70b05f9a 100644
--- a/apps/desktop/tsconfig.json
+++ b/apps/desktop/tsconfig.json
@@ -11,11 +11,11 @@
     "baseUrl": ".",
     "paths": {
       "@bitwarden/common/*": ["../../libs/common/src/*"],
-      "@bitwarden/angular/*": ["../../libs/angular/src/*"],
-      "@bitwarden/electron/*": ["../../libs/electron/src/*"]
+      "@bitwarden/angular/*": ["../../libs/angular/src/*"]
     }
   },
   "angularCompilerOptions": {
+    "strictTemplates": true,
     "preserveWhitespaces": true
   },
   "include": ["src", "../../libs/common/src/services/**/*.worker.ts"]
diff --git a/apps/web/README.md b/apps/web/README.md
index 1193b139a4d..f75c7142389 100644
--- a/apps/web/README.md
+++ b/apps/web/README.md
@@ -21,4 +21,4 @@
 
 ## Documentation
 
-Please refer to the [Web vault section](https://contributing.bitwarden.com/clients/web-vault/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
+Please refer to the [Web vault section](https://contributing.bitwarden.com/docs/clients/web-vault/) of the [Contributing Documentation](https://contributing.bitwarden.com/) for build instructions, recommended tooling, code style tips, and lots of other great information to get you started.
diff --git a/apps/web/config/cloud.json b/apps/web/config/cloud.json
index 5bd5e6b0608..eb13f2febb2 100644
--- a/apps/web/config/cloud.json
+++ b/apps/web/config/cloud.json
@@ -17,6 +17,6 @@
   },
   "flags": {
     "showTrial": true,
-    "showPasswordless": false
+    "showPasswordless": true
   }
 }
diff --git a/apps/web/package.json b/apps/web/package.json
index 7098100f60f..7e39254626e 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bitwarden/web-vault",
-  "version": "2022.10.2",
+  "version": "2022.11.2",
   "scripts": {
     "build:oss": "webpack",
     "build:bit": "webpack -c ../../bitwarden_license/bit-web/webpack.config.js",
diff --git a/apps/web/src/app/accounts/login/login.component.html b/apps/web/src/app/accounts/login/login.component.html
index 3b7724559fe..8202af0dfd8 100644
--- a/apps/web/src/app/accounts/login/login.component.html
+++ b/apps/web/src/app/accounts/login/login.component.html
@@ -78,7 +78,7 @@
       <input
         id="login_input_master-password"
         bitInput
-        type="{{ showPassword ? 'text' : 'password' }}"
+        [type]="showPassword ? 'text' : 'password'"
         formControlName="masterPassword"
         appAutofocus
       />
diff --git a/apps/web/src/app/accounts/register-form/register-form.component.html b/apps/web/src/app/accounts/register-form/register-form.component.html
index d9456d5a6e9..9ae891a4701 100644
--- a/apps/web/src/app/accounts/register-form/register-form.component.html
+++ b/apps/web/src/app/accounts/register-form/register-form.component.html
@@ -34,7 +34,7 @@
         <input
           id="register-form_input_master-password"
           bitInput
-          type="{{ showPassword ? 'text' : 'password' }}"
+          [type]="showPassword ? 'text' : 'password'"
           formControlName="masterPassword"
         />
         <button type="button" bitSuffix bitButton (click)="togglePassword()">
@@ -65,7 +65,7 @@
         <input
           id="register-form_input_confirm-master-password"
           bitInput
-          type="{{ showPassword ? 'text' : 'password' }}"
+          [type]="showPassword ? 'text' : 'password'"
           formControlName="confirmMasterPassword"
         />
         <button type="button" bitSuffix bitButton (click)="togglePassword()">
diff --git a/apps/web/src/app/accounts/register.component.html b/apps/web/src/app/accounts/register.component.html
index ed492a6bb89..8a68d32b039 100644
--- a/apps/web/src/app/accounts/register.component.html
+++ b/apps/web/src/app/accounts/register.component.html
@@ -55,7 +55,7 @@
           <!-- Teams & Enterprise Body -->
           <div *ngIf="layout === 'teams1' || layout === 'teams2' || layout === 'enterprise2'">
             <h1>
-              Start Your <span *ngIf="layout === 'teams1' || layout === 'teams1'">Teams<br /></span
+              Start Your <span *ngIf="layout === 'teams1'">Teams<br /></span
               ><span *ngIf="layout === 'enterprise2'">Enterprise</span> Free Trial Now
             </h1>
             <h2>
diff --git a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts b/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts
index 2c66dae7be1..745bb5767fe 100644
--- a/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts
+++ b/apps/web/src/app/accounts/trial-initiation/vertical-stepper/vertical-stepper.component.ts
@@ -1,5 +1,7 @@
 import { CdkStepper } from "@angular/cdk/stepper";
-import { Component, Input } from "@angular/core";
+import { Component, Input, QueryList } from "@angular/core";
+
+import { VerticalStep } from "./vertical-step.component";
 
 @Component({
   selector: "app-vertical-stepper",
@@ -7,6 +9,8 @@ import { Component, Input } from "@angular/core";
   providers: [{ provide: CdkStepper, useExisting: VerticalStepperComponent }],
 })
 export class VerticalStepperComponent extends CdkStepper {
+  readonly steps: QueryList<VerticalStep>;
+
   @Input()
   activeClass = "active";
 
diff --git a/apps/web/src/app/accounts/two-factor.component.html b/apps/web/src/app/accounts/two-factor.component.html
index 835fd12e785..94066d684b1 100644
--- a/apps/web/src/app/accounts/two-factor.component.html
+++ b/apps/web/src/app/accounts/two-factor.component.html
@@ -80,7 +80,7 @@
           </ng-container>
           <ng-container *ngIf="selectedProviderType === providerType.WebAuthn">
             <div id="web-authn-frame" class="mb-3">
-              <iframe id="webauthn_iframe" [allow]="webAuthnAllow"></iframe>
+              <iframe id="webauthn_iframe" [attr.allow]="webAuthnAllow"></iframe>
             </div>
           </ng-container>
           <ng-container
diff --git a/apps/web/src/app/components/organization-switcher.component.ts b/apps/web/src/app/components/organization-switcher.component.ts
index 70ea6385fe2..a7aafa15da7 100644
--- a/apps/web/src/app/components/organization-switcher.component.ts
+++ b/apps/web/src/app/components/organization-switcher.component.ts
@@ -4,6 +4,7 @@ import { map, Observable } from "rxjs";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import {
   canAccessAdmin,
+  isNotProviderUser,
   OrganizationService,
 } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { Utils } from "@bitwarden/common/misc/utils";
@@ -23,6 +24,7 @@ export class OrganizationSwitcherComponent implements OnInit {
 
   async ngOnInit() {
     this.organizations$ = this.organizationService.organizations$.pipe(
+      map((orgs) => orgs.filter(isNotProviderUser)),
       canAccessAdmin(this.i18nService),
       map((orgs) => orgs.sort(Utils.getSortFunction(this.i18nService, "name")))
     );
diff --git a/libs/angular/src/components/user-verification.component.html b/apps/web/src/app/components/user-verification.component.html
similarity index 100%
rename from libs/angular/src/components/user-verification.component.html
rename to apps/web/src/app/components/user-verification.component.html
diff --git a/apps/web/src/app/components/user-verification.component.ts b/apps/web/src/app/components/user-verification.component.ts
new file mode 100644
index 00000000000..2eb89c28333
--- /dev/null
+++ b/apps/web/src/app/components/user-verification.component.ts
@@ -0,0 +1,23 @@
+import { animate, style, transition, trigger } from "@angular/animations";
+import { Component } from "@angular/core";
+import { NG_VALUE_ACCESSOR } from "@angular/forms";
+
+import { UserVerificationComponent as BaseComponent } from "@bitwarden/angular/components/user-verification.component";
+
+@Component({
+  selector: "app-user-verification",
+  templateUrl: "user-verification.component.html",
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      multi: true,
+      useExisting: UserVerificationComponent,
+    },
+  ],
+  animations: [
+    trigger("sent", [
+      transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
+    ]),
+  ],
+})
+export class UserVerificationComponent extends BaseComponent {}
diff --git a/apps/web/src/app/core/web-platform-utils.service.spec.ts b/apps/web/src/app/core/web-platform-utils.service.spec.ts
new file mode 100644
index 00000000000..5b0271b8227
--- /dev/null
+++ b/apps/web/src/app/core/web-platform-utils.service.spec.ts
@@ -0,0 +1,115 @@
+import { WebPlatformUtilsService } from "./web-platform-utils.service";
+
+describe("Web Platform Utils Service", () => {
+  let webPlatformUtilsService: WebPlatformUtilsService;
+
+  beforeEach(() => {
+    webPlatformUtilsService = new WebPlatformUtilsService(null, null, null);
+  });
+
+  afterEach(() => {
+    delete process.env.APPLICATION_VERSION;
+  });
+
+  describe("getApplicationVersion", () => {
+    test("null", async () => {
+      delete process.env.APPLICATION_VERSION;
+
+      const result = await webPlatformUtilsService.getApplicationVersion();
+      expect(result).toBe("-");
+    });
+
+    test("<empty>", async () => {
+      process.env.APPLICATION_VERSION = "";
+
+      const result = await webPlatformUtilsService.getApplicationVersion();
+      expect(result).toBe("-");
+    });
+
+    test("{version number}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2";
+
+      const result = await webPlatformUtilsService.getApplicationVersion();
+      expect(result).toBe("2022.10.2");
+    });
+
+    test("{version number} - {git hash}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2 - 5f8c1c1";
+
+      const result = await webPlatformUtilsService.getApplicationVersion();
+      expect(result).toBe("2022.10.2 - 5f8c1c1");
+    });
+
+    test("{version number}-{git hash}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2-5f8c1c1";
+
+      const result = await webPlatformUtilsService.getApplicationVersion();
+      expect(result).toBe("2022.10.2-5f8c1c1");
+    });
+
+    test("{version number} + {git hash}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2 + 5f8c1c1";
+
+      const result = await webPlatformUtilsService.getApplicationVersion();
+      expect(result).toBe("2022.10.2 + 5f8c1c1");
+    });
+
+    test("{version number}+{git hash}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2+5f8c1c1";
+
+      const result = await webPlatformUtilsService.getApplicationVersion();
+      expect(result).toBe("2022.10.2+5f8c1c1");
+    });
+  });
+
+  describe("getApplicationVersionNumber", () => {
+    test("null", async () => {
+      delete process.env.APPLICATION_VERSION;
+
+      const result = await webPlatformUtilsService.getApplicationVersionNumber();
+      expect(result).toBe("");
+    });
+
+    test("<empty>", async () => {
+      process.env.APPLICATION_VERSION = "";
+
+      const result = await webPlatformUtilsService.getApplicationVersionNumber();
+      expect(result).toBe("");
+    });
+
+    test("{version number}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2";
+
+      const result = await webPlatformUtilsService.getApplicationVersionNumber();
+      expect(result).toBe("2022.10.2");
+    });
+
+    test("{version number} - {git hash}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2 - 5f8c1c1";
+
+      const result = await webPlatformUtilsService.getApplicationVersionNumber();
+      expect(result).toBe("2022.10.2");
+    });
+
+    test("{version number}-{git hash}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2-5f8c1c1";
+
+      const result = await webPlatformUtilsService.getApplicationVersionNumber();
+      expect(result).toBe("2022.10.2");
+    });
+
+    test("{version number} + {git hash}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2 + 5f8c1c1";
+
+      const result = await webPlatformUtilsService.getApplicationVersionNumber();
+      expect(result).toBe("2022.10.2");
+    });
+
+    test("{version number}+{git hash}", async () => {
+      process.env.APPLICATION_VERSION = "2022.10.2+5f8c1c1";
+
+      const result = await webPlatformUtilsService.getApplicationVersionNumber();
+      expect(result).toBe("2022.10.2");
+    });
+  });
+});
diff --git a/apps/web/src/app/core/web-platform-utils.service.ts b/apps/web/src/app/core/web-platform-utils.service.ts
index 115d53401a9..bb8bf7707e6 100644
--- a/apps/web/src/app/core/web-platform-utils.service.ts
+++ b/apps/web/src/app/core/web-platform-utils.service.ts
@@ -108,6 +108,10 @@ export class WebPlatformUtilsService implements PlatformUtilsService {
     return Promise.resolve(process.env.APPLICATION_VERSION || "-");
   }
 
+  async getApplicationVersionNumber(): Promise<string> {
+    return (await this.getApplicationVersion()).split(RegExp("[+|-]"))[0].trim();
+  }
+
   supportsWebAuthn(win: Window): boolean {
     return typeof PublicKeyCredential !== "undefined";
   }
diff --git a/apps/web/src/app/layouts/navbar.component.ts b/apps/web/src/app/layouts/navbar.component.ts
index 8696f6eb321..aae5c516daf 100644
--- a/apps/web/src/app/layouts/navbar.component.ts
+++ b/apps/web/src/app/layouts/navbar.component.ts
@@ -1,10 +1,11 @@
 import { Component, OnInit } from "@angular/core";
-import { Observable } from "rxjs";
+import { map, Observable } from "rxjs";
 
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
 import {
   canAccessAdmin,
+  isNotProviderUser,
   OrganizationService,
 } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
@@ -54,6 +55,7 @@ export class NavbarComponent implements OnInit {
     this.providers = await this.providerService.getAll();
 
     this.organizations$ = this.organizationService.organizations$.pipe(
+      map((orgs) => orgs.filter(isNotProviderUser)),
       canAccessAdmin(this.i18nService)
     );
   }
diff --git a/apps/web/src/app/organizations/billing/organization-subscription.component.html b/apps/web/src/app/organizations/billing/organization-subscription.component.html
index 2b5f50a8b62..1ebda8f76c0 100644
--- a/apps/web/src/app/organizations/billing/organization-subscription.component.html
+++ b/apps/web/src/app/organizations/billing/organization-subscription.component.html
@@ -44,7 +44,7 @@
       class="btn btn-outline-secondary btn-submit"
       (click)="reinstate()"
       [appApiAction]="reinstatePromise"
-      [disabled]="reinstateBtn.loading"
+      [disabled]="$any(reinstateBtn).loading"
     >
       <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
       <span>{{ "reinstateSubscription" | i18n }}</span>
@@ -113,8 +113,8 @@
       </button>
       <app-change-plan
         [organizationId]="organizationId"
-        (onChanged)="closeChangePlan(true)"
-        (onCanceled)="closeChangePlan(false)"
+        (onChanged)="closeChangePlan()"
+        (onCanceled)="closeChangePlan()"
         *ngIf="showChangePlan"
       ></app-change-plan>
     </ng-container>
@@ -143,7 +143,7 @@
       class="btn btn-outline-danger btn-submit"
       (click)="removeSponsorship()"
       [appApiAction]="removeSponsorshipPromise"
-      [disabled]="removeSponsorshipBtn.loading"
+      [disabled]="$any(removeSponsorshipBtn).loading"
       *ngIf="isSponsoredSubscription"
     >
       <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
@@ -230,7 +230,7 @@
         class="btn btn-outline-danger btn-submit ml-1"
         (click)="cancel()"
         [appApiAction]="cancelPromise"
-        [disabled]="cancelBtn.loading"
+        [disabled]="$any(cancelBtn).loading"
         *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel"
       >
         <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/apps/web/src/app/organizations/components/access-selector/access-selector.component.html b/apps/web/src/app/organizations/components/access-selector/access-selector.component.html
index 10390b3e053..cc4d1d7fa78 100644
--- a/apps/web/src/app/organizations/components/access-selector/access-selector.component.html
+++ b/apps/web/src/app/organizations/components/access-selector/access-selector.component.html
@@ -53,11 +53,13 @@
           <div class="tw-flex tw-flex-col">
             <div class="tw-text-sm">
               {{ item.labelName }}
-              <span *ngIf="item.status == 0" bitBadge badgeType="secondary">
+              <span *ngIf="$any(item).status == 0" bitBadge badgeType="secondary">
                 {{ "invited" | i18n }}
               </span>
             </div>
-            <div class="tw-text-xs tw-text-muted" *ngIf="item.status != 0">{{ item.email }}</div>
+            <div class="tw-text-xs tw-text-muted" *ngIf="$any(item).status != 0">
+              {{ $any(item).email }}
+            </div>
           </div>
         </div>
 
@@ -110,11 +112,11 @@
       </td>
 
       <td bitCell *ngIf="showMemberRoles">
-        {{ item.role | userType: "-" }}
+        {{ $any(item).role | userType: "-" }}
       </td>
 
       <td bitCell *ngIf="showGroupColumn">
-        {{ item.viaGroupName ?? "-" }}
+        {{ $any(item).viaGroupName ?? "-" }}
       </td>
 
       <td bitCell>
diff --git a/apps/web/src/app/organizations/manage/collection-add-edit.component.html b/apps/web/src/app/organizations/manage/collection-add-edit.component.html
index 97c973a4195..41368d589a7 100644
--- a/apps/web/src/app/organizations/manage/collection-add-edit.component.html
+++ b/apps/web/src/app/organizations/manage/collection-add-edit.component.html
@@ -81,7 +81,7 @@
                 <td class="table-list-checkbox" (click)="check(g)">
                   <input
                     type="checkbox"
-                    [(ngModel)]="g.checked"
+                    [(ngModel)]="$any(g).checked"
                     name="Groups[{{ i }}].Checked"
                     [disabled]="g.accessAll || !this.canSave"
                     appStopProp
@@ -101,17 +101,17 @@
                 <td class="text-center">
                   <input
                     type="checkbox"
-                    [(ngModel)]="g.hidePasswords"
+                    [(ngModel)]="$any(g).hidePasswords"
                     name="Groups[{{ i }}].HidePasswords"
-                    [disabled]="!g.checked || g.accessAll || !this.canSave"
+                    [disabled]="!$any(g).checked || g.accessAll || !this.canSave"
                   />
                 </td>
                 <td class="text-center">
                   <input
                     type="checkbox"
-                    [(ngModel)]="g.readOnly"
+                    [(ngModel)]="$any(g).readOnly"
                     name="Groups[{{ i }}].ReadOnly"
-                    [disabled]="!g.checked || g.accessAll || !this.canSave"
+                    [disabled]="!$any(g).checked || g.accessAll || !this.canSave"
                   />
                 </td>
               </tr>
@@ -140,17 +140,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/organizations/manage/entity-events.component.html b/apps/web/src/app/organizations/manage/entity-events.component.html
index 122d0b81888..b41e6f3ba16 100644
--- a/apps/web/src/app/organizations/manage/entity-events.component.html
+++ b/apps/web/src/app/organizations/manage/entity-events.component.html
@@ -52,11 +52,11 @@
             type="button"
             class="btn btn-sm btn-outline-primary ml-3"
             (click)="loadEvents(true)"
-            [disabled]="loaded && refreshBtn.loading"
+            [disabled]="loaded && $any(refreshBtn).loading"
           >
             <i
               class="bwi bwi-refresh bwi-fw"
-              [ngClass]="{ 'bwi-spin': loaded && refreshBtn.loading }"
+              [ngClass]="{ 'bwi-spin': loaded && $any(refreshBtn).loading }"
               aria-hidden="true"
             ></i>
             {{ "refresh" | i18n }}
@@ -101,7 +101,7 @@
           type="button"
           class="btn btn-block btn-link btn-submit"
           (click)="loadEvents(false)"
-          [disabled]="loaded && moreBtn.loading"
+          [disabled]="loaded && $any(moreBtn).loading"
           *ngIf="continuationToken"
         >
           <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/apps/web/src/app/organizations/manage/events.component.html b/apps/web/src/app/organizations/manage/events.component.html
index a7468bcf378..e2c03f0dde5 100644
--- a/apps/web/src/app/organizations/manage/events.component.html
+++ b/apps/web/src/app/organizations/manage/events.component.html
@@ -95,7 +95,7 @@
     bitButton
     buttonType="primary"
     (click)="loadEvents(false)"
-    [disabled]="loaded && moreBtn.loading"
+    [disabled]="loaded && $any(moreBtn).loading"
     *ngIf="continuationToken"
   >
     <i
diff --git a/apps/web/src/app/organizations/manage/group-add-edit.component.html b/apps/web/src/app/organizations/manage/group-add-edit.component.html
index d1055d86e85..83db60051e9 100644
--- a/apps/web/src/app/organizations/manage/group-add-edit.component.html
+++ b/apps/web/src/app/organizations/manage/group-add-edit.component.html
@@ -119,7 +119,7 @@
                 <td class="table-list-checkbox" (click)="check(c)">
                   <input
                     type="checkbox"
-                    [(ngModel)]="c.checked"
+                    [(ngModel)]="$any(c).checked"
                     name="Collection[{{ i }}].Checked"
                     appStopProp
                   />
@@ -132,7 +132,7 @@
                     type="checkbox"
                     [(ngModel)]="c.hidePasswords"
                     name="Collection[{{ i }}].HidePasswords"
-                    [disabled]="!c.checked"
+                    [disabled]="!$any(c).checked"
                   />
                 </td>
                 <td class="text-center">
@@ -140,7 +140,7 @@
                     type="checkbox"
                     [(ngModel)]="c.readOnly"
                     name="Collection[{{ i }}].ReadOnly"
-                    [disabled]="!c.checked"
+                    [disabled]="!$any(c).checked"
                   />
                 </td>
               </tr>
@@ -164,17 +164,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               aria-hidden="true"
               title="{{ 'loading' | i18n }}"
             ></i>
diff --git a/apps/web/src/app/organizations/manage/user-add-edit.component.html b/apps/web/src/app/organizations/manage/user-add-edit.component.html
index 7d15eaa22f3..458d1d0bab3 100644
--- a/apps/web/src/app/organizations/manage/user-add-edit.component.html
+++ b/apps/web/src/app/organizations/manage/user-add-edit.component.html
@@ -341,7 +341,7 @@
                 <td class="table-list-checkbox" (click)="check(c)">
                   <input
                     type="checkbox"
-                    [(ngModel)]="c.checked"
+                    [(ngModel)]="$any(c).checked"
                     name="Collection[{{ i }}].Checked"
                     appStopProp
                   />
@@ -354,7 +354,7 @@
                     type="checkbox"
                     [(ngModel)]="c.hidePasswords"
                     name="Collection[{{ i }}].HidePasswords"
-                    [disabled]="!c.checked"
+                    [disabled]="!$any(c).checked"
                   />
                 </td>
                 <td class="text-center">
@@ -362,7 +362,7 @@
                     type="checkbox"
                     [(ngModel)]="c.readOnly"
                     name="Collection[{{ i }}].ReadOnly"
-                    [disabled]="!c.checked"
+                    [disabled]="!$any(c).checked"
                   />
                 </td>
               </tr>
@@ -416,17 +416,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/organizations/manage/user-groups.component.html b/apps/web/src/app/organizations/manage/user-groups.component.html
index 347125e9825..217af6ea44b 100644
--- a/apps/web/src/app/organizations/manage/user-groups.component.html
+++ b/apps/web/src/app/organizations/manage/user-groups.component.html
@@ -34,7 +34,7 @@
               <td class="table-list-checkbox" (click)="check(g)">
                 <input
                   type="checkbox"
-                  [(ngModel)]="g.checked"
+                  [(ngModel)]="$any(g).checked"
                   name="Groups[{{ i }}].Checked"
                   appStopProp
                 />
diff --git a/apps/web/src/app/organizations/policies/policies.component.ts b/apps/web/src/app/organizations/policies/policies.component.ts
index 0a316f5597d..717e35ac968 100644
--- a/apps/web/src/app/organizations/policies/policies.component.ts
+++ b/apps/web/src/app/organizations/policies/policies.component.ts
@@ -29,7 +29,7 @@ export class PoliciesComponent implements OnInit {
   organization: Organization;
 
   private orgPolicies: PolicyResponse[];
-  private policiesEnabledMap: Map<PolicyType, boolean> = new Map<PolicyType, boolean>();
+  protected policiesEnabledMap: Map<PolicyType, boolean> = new Map<PolicyType, boolean>();
 
   constructor(
     private route: ActivatedRoute,
diff --git a/apps/web/src/app/organizations/settings/organization-billing.component.ts b/apps/web/src/app/organizations/settings/organization-billing.component.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/apps/web/src/app/organizations/vault/add-edit.component.ts b/apps/web/src/app/organizations/vault/add-edit.component.ts
index e8138b1abc7..27a2b9a11dd 100644
--- a/apps/web/src/app/organizations/vault/add-edit.component.ts
+++ b/apps/web/src/app/organizations/vault/add-edit.component.ts
@@ -18,7 +18,6 @@ import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
 import { CipherData } from "@bitwarden/common/models/data/cipher.data";
 import { Cipher } from "@bitwarden/common/models/domain/cipher";
-import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CipherCreateRequest } from "@bitwarden/common/models/request/cipher-create.request";
 import { CipherRequest } from "@bitwarden/common/models/request/cipher.request";
 
@@ -29,7 +28,6 @@ import { AddEditComponent as BaseAddEditComponent } from "../../vault/add-edit.c
   templateUrl: "../../vault/add-edit.component.html",
 })
 export class AddEditComponent extends BaseAddEditComponent {
-  organization: Organization;
   originalCipher: Cipher = null;
 
   constructor(
diff --git a/apps/web/src/app/organizations/vault/vault-items.component.ts b/apps/web/src/app/organizations/vault/vault-items.component.ts
index 670217a724a..044b3d6d752 100644
--- a/apps/web/src/app/organizations/vault/vault-items.component.ts
+++ b/apps/web/src/app/organizations/vault/vault-items.component.ts
@@ -12,7 +12,6 @@ import { SearchService } from "@bitwarden/common/abstractions/search.service";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { TokenService } from "@bitwarden/common/abstractions/token.service";
 import { TotpService } from "@bitwarden/common/abstractions/totp.service";
-import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 
 import { VaultItemsComponent as BaseVaultItemsComponent } from "../../vault/vault-items.component";
@@ -24,9 +23,6 @@ import { VaultItemsComponent as BaseVaultItemsComponent } from "../../vault/vaul
 export class VaultItemsComponent extends BaseVaultItemsComponent {
   @Output() onEventsClicked = new EventEmitter<CipherView>();
 
-  organization: Organization;
-  accessEvents = false;
-
   protected allCiphers: CipherView[] = [];
 
   constructor(
@@ -86,6 +82,7 @@ export class VaultItemsComponent extends BaseVaultItemsComponent {
   async search(timeout: number = null) {
     await super.search(timeout, this.allCiphers);
   }
+
   events(c: CipherView) {
     this.onEventsClicked.emit(c);
   }
diff --git a/apps/web/src/app/organizations/vault/vault.component.html b/apps/web/src/app/organizations/vault/vault.component.html
index dcc20913b9b..7a75ce01c42 100644
--- a/apps/web/src/app/organizations/vault/vault.component.html
+++ b/apps/web/src/app/organizations/vault/vault.component.html
@@ -19,7 +19,7 @@
         <h1>
           {{ "vaultItems" | i18n }}
           <small #actionSpinner [appApiAction]="vaultItemsComponent.actionPromise">
-            <ng-container *ngIf="actionSpinner.loading">
+            <ng-container *ngIf="$any(actionSpinner).loading">
               <i
                 class="bwi bwi-spinner bwi-spin text-muted"
                 title="{{ 'loading' | i18n }}"
diff --git a/apps/web/src/app/organizations/vault/vault.module.ts b/apps/web/src/app/organizations/vault/vault.module.ts
index af32f6588dc..8bae42ec9cb 100644
--- a/apps/web/src/app/organizations/vault/vault.module.ts
+++ b/apps/web/src/app/organizations/vault/vault.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from "@angular/core";
 
+import { OrganizationBadgeModule } from "../../vault/organization-badge/organization-badge.module";
 import { VaultSharedModule } from "../../vault/shared/vault-shared.module";
 
 import { VaultFilterModule } from "./vault-filter/vault-filter.module";
@@ -8,7 +9,7 @@ import { VaultRoutingModule } from "./vault-routing.module";
 import { VaultComponent } from "./vault.component";
 
 @NgModule({
-  imports: [VaultSharedModule, VaultRoutingModule, VaultFilterModule],
+  imports: [VaultSharedModule, VaultRoutingModule, VaultFilterModule, OrganizationBadgeModule],
   declarations: [VaultComponent, VaultItemsComponent],
   exports: [VaultComponent],
 })
diff --git a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
index dabb835d725..b6a2278285f 100644
--- a/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
+++ b/apps/web/src/app/reports/pages/weak-passwords-report.component.ts
@@ -8,6 +8,7 @@ import { PasswordRepromptService } from "@bitwarden/common/abstractions/password
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { CipherType } from "@bitwarden/common/enums/cipherType";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
+import { BadgeTypes } from "@bitwarden/components";
 
 import { CipherReportComponent } from "./cipher-report.component";
 
@@ -16,7 +17,7 @@ import { CipherReportComponent } from "./cipher-report.component";
   templateUrl: "weak-passwords-report.component.html",
 })
 export class WeakPasswordsReportComponent extends CipherReportComponent implements OnInit {
-  passwordStrengthMap = new Map<string, [string, string]>();
+  passwordStrengthMap = new Map<string, [string, BadgeTypes]>();
 
   private passwordStrengthCache = new Map<string, number>();
 
@@ -110,7 +111,7 @@ export class WeakPasswordsReportComponent extends CipherReportComponent implemen
     return true;
   }
 
-  private scoreKey(score: number): [string, string] {
+  private scoreKey(score: number): [string, BadgeTypes] {
     switch (score) {
       case 4:
         return ["strong", "success"];
diff --git a/apps/web/src/app/reports/shared/report-card/report-card.component.ts b/apps/web/src/app/reports/shared/report-card/report-card.component.ts
index 063d52bc682..13a2a04e0d2 100644
--- a/apps/web/src/app/reports/shared/report-card/report-card.component.ts
+++ b/apps/web/src/app/reports/shared/report-card/report-card.component.ts
@@ -1,5 +1,7 @@
 import { Component, Input } from "@angular/core";
 
+import { Icon } from "@bitwarden/components";
+
 import { ReportVariant } from "../models/report-variant";
 
 @Component({
@@ -10,7 +12,7 @@ export class ReportCardComponent {
   @Input() title: string;
   @Input() description: string;
   @Input() route: string;
-  @Input() icon: string;
+  @Input() icon: Icon;
   @Input() variant: ReportVariant;
 
   protected get disabled() {
diff --git a/apps/web/src/app/send/access.component.html b/apps/web/src/app/send/access.component.html
index b5818610203..91ae288d3c2 100644
--- a/apps/web/src/app/send/access.component.html
+++ b/apps/web/src/app/send/access.component.html
@@ -81,7 +81,7 @@
                 id="text"
                 rows="8"
                 name="Text"
-                [(ngModel)]="sendText"
+                [ngModel]="sendText"
                 class="form-control"
                 readonly
               ></textarea>
diff --git a/apps/web/src/app/send/add-edit.component.html b/apps/web/src/app/send/add-edit.component.html
index dcc60a3c7af..dd9f61c6c58 100644
--- a/apps/web/src/app/send/add-edit.component.html
+++ b/apps/web/src/app/send/add-edit.component.html
@@ -55,7 +55,7 @@
                 name="Type_{{ o.value }}"
                 id="type_{{ o.value }}"
                 [value]="o.value"
-                (change)="typeChanged(o)"
+                (change)="typeChanged()"
                 [checked]="send.type === o.value"
               />
               <label class="form-check-label" for="type_{{ o.value }}">
@@ -120,14 +120,7 @@
         <h3 class="mt-5">{{ "share" | i18n }}</h3>
         <div class="form-group" *ngIf="link">
           <label for="link">{{ "sendLinkLabel" | i18n }}</label>
-          <input
-            type="text"
-            readonly
-            id="link"
-            name="Link"
-            [(ngModel)]="link"
-            class="form-control"
-          />
+          <input type="text" readonly id="link" name="Link" [ngModel]="link" class="form-control" />
         </div>
         <div class="form-group">
           <div class="form-check">
@@ -286,17 +279,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/send/efflux-dates.component.html b/apps/web/src/app/send/efflux-dates.component.html
index f8974e00c41..cd7924234ef 100644
--- a/apps/web/src/app/send/efflux-dates.component.html
+++ b/apps/web/src/app/send/efflux-dates.component.html
@@ -13,7 +13,6 @@
               formControlName="fallbackDeletionDate"
               required
               placeholder="MM/DD/YYYY"
-              [readOnly]="disableSend"
               data-date-format="mm/dd/yyyy"
             />
             <input
@@ -24,7 +23,6 @@
               formControlName="fallbackDeletionTime"
               required
               placeholder="HH:MM AM/PM"
-              [readOnly]="disableSend"
             />
           </div>
         </ng-container>
@@ -38,7 +36,6 @@
               formControlName="fallbackDeletionDate"
               required
               placeholder="MM/DD/YYYY"
-              [readOnly]="disableSend"
               data-date-format="mm/dd/yyyy"
             />
             <select
diff --git a/apps/web/src/app/send/send.component.html b/apps/web/src/app/send/send.component.html
index b0ccca88dc4..913ff67c28d 100644
--- a/apps/web/src/app/send/send.component.html
+++ b/apps/web/src/app/send/send.component.html
@@ -59,7 +59,7 @@
         <h1>
           {{ "send" | i18n }}
           <small #actionSpinner [appApiAction]="actionPromise">
-            <ng-container *ngIf="actionSpinner.loading">
+            <ng-container *ngIf="$any(actionSpinner).loading">
               <i
                 class="bwi bwi-spinner bwi-spin text-muted"
                 title="{{ 'loading' | i18n }}"
diff --git a/apps/web/src/app/settings/emergency-access-add-edit.component.html b/apps/web/src/app/settings/emergency-access-add-edit.component.html
index b438cee937c..b3590f8fb0e 100644
--- a/apps/web/src/app/settings/emergency-access-add-edit.component.html
+++ b/apps/web/src/app/settings/emergency-access-add-edit.component.html
@@ -121,16 +121,16 @@
             (click)="delete()"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/settings/organization-plans.component.html b/apps/web/src/app/settings/organization-plans.component.html
index ac6bee95ab7..3ba90d3bd59 100644
--- a/apps/web/src/app/settings/organization-plans.component.html
+++ b/apps/web/src/app/settings/organization-plans.component.html
@@ -240,14 +240,6 @@
             {{ "monthAbbr" | i18n }} =
             {{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "year" | i18n }}
           </small>
-          <small *ngIf="selectablePlan.hasPremiumAccessOption && premiumAccessAddon">
-            {{ "premiumAccess" | i18n }}:
-            {{ selectablePlan.premiumAccessOptionCost / 12 | currency: "$" }} &times; 12
-            {{ "monthAbbr" | i18n }}
-            =
-            {{ 40 | currency: "$" }}
-            /{{ "year" | i18n }}
-          </small>
         </ng-container>
         <ng-container *ngIf="!selectablePlan.isAnnual">
           {{ "monthly" | i18n }}
@@ -272,17 +264,6 @@
             {{ "monthAbbr" | i18n }} =
             {{ additionalStorageTotal(selectablePlan) | currency: "$" }} /{{ "month" | i18n }}
           </small>
-          <small
-            *ngIf="
-              selectablePlan.hasPremiumAccessOption &&
-              formGroup.controls['premiumAccessAddon'].value
-            "
-          >
-            {{ "premiumAccess" | i18n }}:
-            {{ selectablePlan.premiumAccessOptionCost | currency: "$" }} {{ "monthAbbr" | i18n }} =
-            {{ 40 | currency: "$" }}
-            /{{ "month" | i18n }}
-          </small>
         </ng-container>
       </label>
     </div>
diff --git a/apps/web/src/app/settings/sponsoring-org-row.component.html b/apps/web/src/app/settings/sponsoring-org-row.component.html
index 30abad44752..bbff3399590 100644
--- a/apps/web/src/app/settings/sponsoring-org-row.component.html
+++ b/apps/web/src/app/settings/sponsoring-org-row.component.html
@@ -25,7 +25,7 @@
         *ngIf="!isSelfHosted && !sponsoringOrg.familySponsorshipValidUntil"
         [appApiAction]="resendEmailPromise"
         class="dropdown-item btn-submit"
-        [disabled]="resendEmailBtn.loading"
+        [disabled]="$any(resendEmailBtn).loading"
         (click)="resendEmail()"
         [attr.aria-label]="'resendEmailLabel' | i18n: sponsoringOrg.familySponsorshipFriendlyName"
       >
@@ -36,7 +36,7 @@
         #revokeSponsorshipBtn
         [appApiAction]="revokeSponsorshipPromise"
         class="dropdown-item text-danger btn-submit"
-        [disabled]="revokeSponsorshipBtn.loading"
+        [disabled]="$any(revokeSponsorshipBtn).loading"
         (click)="revokeSponsorship()"
         [attr.aria-label]="'revokeAccount' | i18n: sponsoringOrg.familySponsorshipFriendlyName"
       >
diff --git a/apps/web/src/app/settings/two-factor-authenticator.component.html b/apps/web/src/app/settings/two-factor-authenticator.component.html
index 3ed1b2e573e..748c6e0bd60 100644
--- a/apps/web/src/app/settings/two-factor-authenticator.component.html
+++ b/apps/web/src/app/settings/two-factor-authenticator.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
diff --git a/apps/web/src/app/settings/two-factor-duo.component.html b/apps/web/src/app/settings/two-factor-duo.component.html
index 02e3e9c5950..fa76cf362ce 100644
--- a/apps/web/src/app/settings/two-factor-duo.component.html
+++ b/apps/web/src/app/settings/two-factor-duo.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
diff --git a/apps/web/src/app/settings/two-factor-email.component.html b/apps/web/src/app/settings/two-factor-email.component.html
index 5f98fb0d93d..a885aa96244 100644
--- a/apps/web/src/app/settings/two-factor-email.component.html
+++ b/apps/web/src/app/settings/two-factor-email.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
@@ -61,7 +61,7 @@
                 class="btn btn-outline-primary btn-sm btn-submit align-self-start"
                 (click)="sendEmail()"
                 [appApiAction]="emailPromise"
-                [disabled]="sendBtn.loading"
+                [disabled]="$any(sendBtn).loading"
               >
                 <i
                   class="bwi bwi-spinner bwi-spin"
diff --git a/apps/web/src/app/settings/two-factor-recovery.component.html b/apps/web/src/app/settings/two-factor-recovery.component.html
index d3bb8c28b6d..6fdf5591c1e 100644
--- a/apps/web/src/app/settings/two-factor-recovery.component.html
+++ b/apps/web/src/app/settings/two-factor-recovery.component.html
@@ -15,12 +15,7 @@
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
-      <app-two-factor-verify
-        [organizationId]="organizationId"
-        [type]="type"
-        (onAuthed)="auth($event)"
-        *ngIf="!authed"
-      >
+      <app-two-factor-verify [type]="type" (onAuthed)="auth($event)" *ngIf="!authed">
       </app-two-factor-verify>
       <ng-container *ngIf="authed">
         <div class="modal-body text-center">
diff --git a/apps/web/src/app/settings/two-factor-webauthn.component.html b/apps/web/src/app/settings/two-factor-webauthn.component.html
index 1a5676afd85..72f9d66c2c7 100644
--- a/apps/web/src/app/settings/two-factor-webauthn.component.html
+++ b/apps/web/src/app/settings/two-factor-webauthn.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
@@ -54,7 +54,7 @@
               <i class="bwi bwi-li bwi-key"></i>
               <strong *ngIf="!k.configured || !k.name">{{ "webAuthnkeyX" | i18n: i + 1 }}</strong>
               <strong *ngIf="k.configured && k.name">{{ k.name }}</strong>
-              <ng-container *ngIf="k.configured && !removeKeyBtn.loading">
+              <ng-container *ngIf="k.configured && !$any(removeKeyBtn).loading">
                 <ng-container *ngIf="k.migrated">
                   <span>{{ "webAuthnMigrated" | i18n }}</span>
                 </ng-container>
@@ -63,7 +63,7 @@
                 <i
                   class="bwi bwi-spin bwi-spinner text-muted bwi-fw"
                   title="{{ 'loading' | i18n }}"
-                  *ngIf="removeKeyBtn.loading"
+                  *ngIf="$any(removeKeyBtn).loading"
                   aria-hidden="true"
                 ></i>
                 -
@@ -96,16 +96,16 @@
             type="button"
             (click)="readKey()"
             class="btn btn-outline-secondary mr-2"
-            [disabled]="readKeyBtn.loading || webAuthnListening || !keyIdAvailable"
+            [disabled]="$any(readKeyBtn).loading || webAuthnListening || !keyIdAvailable"
             #readKeyBtn
             [appApiAction]="challengePromise"
           >
             {{ "readKey" | i18n }}
           </button>
-          <ng-container *ngIf="readKeyBtn.loading">
+          <ng-container *ngIf="$any(readKeyBtn).loading">
             <i class="bwi bwi-spinner bwi-spin text-muted" aria-hidden="true"></i>
           </ng-container>
-          <ng-container *ngIf="!readKeyBtn.loading">
+          <ng-container *ngIf="!$any(readKeyBtn).loading">
             <ng-container *ngIf="webAuthnListening">
               <i class="bwi bwi-spinner bwi-spin text-muted" aria-hidden="true"></i>
               {{ "twoFactorU2fWaiting" | i18n }}...
@@ -138,8 +138,7 @@
             #disableBtn
             type="button"
             class="btn btn-outline-secondary btn-submit"
-            [appApiAction]="disablePromise"
-            [disabled]="disableBtn.loading"
+            [disabled]="$any(disableBtn).loading"
             (click)="disable()"
             *ngIf="enabled"
           >
diff --git a/apps/web/src/app/settings/two-factor-yubikey.component.html b/apps/web/src/app/settings/two-factor-yubikey.component.html
index ad26df871d0..d377b303ef1 100644
--- a/apps/web/src/app/settings/two-factor-yubikey.component.html
+++ b/apps/web/src/app/settings/two-factor-yubikey.component.html
@@ -18,7 +18,7 @@
       <app-two-factor-verify
         [organizationId]="organizationId"
         [type]="type"
-        (onAuthed)="auth($event)"
+        (onAuthed)="auth($any($event))"
         *ngIf="!authed"
       >
       </app-two-factor-verify>
@@ -104,7 +104,7 @@
             type="button"
             class="btn btn-outline-secondary btn-submit"
             [appApiAction]="disablePromise"
-            [disabled]="disableBtn.loading"
+            [disabled]="$any(disableBtn).loading"
             (click)="disable()"
             *ngIf="enabled"
           >
diff --git a/apps/web/src/app/settings/user-subscription.component.html b/apps/web/src/app/settings/user-subscription.component.html
index 64d6f93602e..cb645d95a4f 100644
--- a/apps/web/src/app/settings/user-subscription.component.html
+++ b/apps/web/src/app/settings/user-subscription.component.html
@@ -46,7 +46,7 @@
       class="btn-submit"
       (click)="reinstate()"
       [appApiAction]="reinstatePromise"
-      [disabled]="reinstateBtn.loading"
+      [disabled]="$any(reinstateBtn).loading"
     >
       <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
       <span>{{ "reinstateSubscription" | i18n }}</span>
@@ -147,7 +147,7 @@
         class="btn-submit tw-ml-auto"
         (click)="cancel()"
         [appApiAction]="cancelPromise"
-        [disabled]="cancelBtn.loading"
+        [disabled]="$any(cancelBtn).loading"
         *ngIf="subscription && !subscription.cancelled && !subscriptionMarkedForCancel"
       >
         <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/apps/web/src/app/settings/verify-email.component.html b/apps/web/src/app/settings/verify-email.component.html
index c599fdad4c9..d1ec7aed2f1 100644
--- a/apps/web/src/app/settings/verify-email.component.html
+++ b/apps/web/src/app/settings/verify-email.component.html
@@ -9,7 +9,7 @@
       class="btn btn-block btn-outline-secondary btn-submit"
       #sendBtn
       [appApiAction]="actionPromise"
-      [disabled]="sendBtn.loading"
+      [disabled]="$any(sendBtn).loading"
       (click)="send()"
     >
       <i class="bwi bwi-spin bwi-spinner" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/apps/web/src/app/shared/loose-components.module.ts b/apps/web/src/app/shared/loose-components.module.ts
index 1dfbc8da6b3..cd9992bd79a 100644
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -1,7 +1,5 @@
 import { NgModule } from "@angular/core";
 
-import { UserVerificationComponent } from "@bitwarden/angular/components/user-verification.component";
-
 import { AcceptEmergencyComponent } from "../accounts/accept-emergency.component";
 import { AcceptOrganizationComponent } from "../accounts/accept-organization.component";
 import { HintComponent } from "../accounts/hint.component";
@@ -24,6 +22,7 @@ import { OrganizationSwitcherComponent } from "../components/organization-switch
 import { PasswordRepromptComponent } from "../components/password-reprompt.component";
 import { PremiumBadgeComponent } from "../components/premium-badge.component";
 import { UserVerificationPromptComponent } from "../components/user-verification-prompt.component";
+import { UserVerificationComponent } from "../components/user-verification.component";
 import { FooterComponent } from "../layouts/footer.component";
 import { FrontendLayoutComponent } from "../layouts/frontend-layout.component";
 import { NavbarComponent } from "../layouts/navbar.component";
@@ -124,7 +123,6 @@ import { BulkRestoreComponent } from "../vault/bulk-restore.component";
 import { BulkShareComponent } from "../vault/bulk-share.component";
 import { CollectionsComponent } from "../vault/collections.component";
 import { FolderAddEditComponent } from "../vault/folder-add-edit.component";
-import { OrganizationBadgeModule } from "../vault/organization-badge/organization-badge.module";
 import { ShareComponent } from "../vault/share.component";
 import { VaultFilterModule } from "../vault/vault-filter/vault-filter.module";
 
@@ -133,13 +131,7 @@ import { SharedModule } from ".";
 // Please do not add to this list of declarations - we should refactor these into modules when doing so makes sense until there are none left.
 // If you are building new functionality, please create or extend a feature module instead.
 @NgModule({
-  imports: [
-    SharedModule,
-    VaultFilterModule,
-    OrganizationBadgeModule,
-    OrganizationCreateModule,
-    RegisterFormModule,
-  ],
+  imports: [SharedModule, VaultFilterModule, OrganizationCreateModule, RegisterFormModule],
   declarations: [
     PremiumBadgeComponent,
     AcceptEmergencyComponent,
diff --git a/apps/web/src/app/tools/generator.component.html b/apps/web/src/app/tools/generator.component.html
index 08019417061..73d032f0761 100644
--- a/apps/web/src/app/tools/generator.component.html
+++ b/apps/web/src/app/tools/generator.component.html
@@ -299,7 +299,7 @@
           id="duckduckgo-apikey"
           class="form-control"
           type="password"
-          name="DuckDudkGoApiKey"
+          name="DuckDuckGoApiKey"
           [(ngModel)]="usernameOptions.forwardedDuckDuckGoToken"
           (blur)="saveUsernameOptions()"
         />
@@ -408,7 +408,7 @@
       type="button"
       class="btn btn-submit btn-primary"
       (click)="regenerate()"
-      [disabled]="form.loading"
+      [disabled]="$any(form).loading"
     >
       <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
       <span>{{ "regenerateUsername" | i18n }}</span>
diff --git a/apps/web/src/app/tools/import-export/export.component.html b/apps/web/src/app/tools/import-export/export.component.html
index 4e27fc70f75..909131b6c76 100644
--- a/apps/web/src/app/tools/import-export/export.component.html
+++ b/apps/web/src/app/tools/import-export/export.component.html
@@ -89,7 +89,7 @@
               <bit-label>{{ "filePassword" | i18n }}</bit-label>
               <input
                 bitInput
-                type="{{ showFilePassword ? 'text' : 'password' }}"
+                [type]="showFilePassword ? 'text' : 'password'"
                 id="filePassword"
                 formControlName="filePassword"
                 name="password"
@@ -123,7 +123,7 @@
               <bit-label>{{ "confirmFilePassword" | i18n }}</bit-label>
               <input
                 bitInput
-                type="{{ showConfirmFilePassword ? 'text' : 'password' }}"
+                [type]="showConfirmFilePassword ? 'text' : 'password'"
                 id="confirmFilePassword"
                 formControlName="confirmFilePassword"
                 name="confirmFilePassword"
@@ -157,7 +157,8 @@
       <button
         type="submit"
         class="btn btn-primary btn-submit"
-        [disabled]="form.loading || disabled"
+        [disabled]="form.loading || disabledByPolicy"
+        [ngClass]="{ manual: disabledByPolicy }"
       >
         <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
         <span>{{ "confirmFormat" | i18n }}</span>
diff --git a/apps/web/src/app/tools/import-export/file-password-prompt.component.html b/apps/web/src/app/tools/import-export/file-password-prompt.component.html
index 0d9e01e8de4..7250cc9e833 100644
--- a/apps/web/src/app/tools/import-export/file-password-prompt.component.html
+++ b/apps/web/src/app/tools/import-export/file-password-prompt.component.html
@@ -19,7 +19,7 @@
             <input
               bitInput
               required
-              type="{{ showFilePassword ? 'text' : 'password' }}"
+              [type]="showFilePassword ? 'text' : 'password'"
               name="filePassword"
               [formControl]="filePassword"
               appAutofocus
diff --git a/apps/web/src/app/tools/import-export/import.component.html b/apps/web/src/app/tools/import-export/import.component.html
index 92441600cb6..1224bc4691c 100644
--- a/apps/web/src/app/tools/import-export/import.component.html
+++ b/apps/web/src/app/tools/import-export/import.component.html
@@ -80,11 +80,13 @@
       right) and select "Settings". Go to "Export" and find the "Export to .csv File" option. Click
       "Export" to save the CSV file.
     </ng-container>
+    <!--
     <ng-container *ngIf="format === 'keeperjson'">
       Log into the Keeper web vault (keepersecurity.com/vault). Click on your "account email" (top
       right) and select "Settings". Go to "Export" and find the "Export to .json File" option. Click
       "Export" to save the JSON file.
     </ng-container>
+    -->
     <ng-container
       *ngIf="format === 'chromecsv' || format === 'operacsv' || format === 'vivaldicsv'"
     >
diff --git a/apps/web/src/app/vault/add-edit-custom-fields.component.html b/apps/web/src/app/vault/add-edit-custom-fields.component.html
index c524f346414..e01360562fb 100644
--- a/apps/web/src/app/vault/add-edit-custom-fields.component.html
+++ b/apps/web/src/app/vault/add-edit-custom-fields.component.html
@@ -122,8 +122,8 @@
               [(ngModel)]="f.value"
               *ngIf="f.type === fieldType.Boolean"
               appTrueFalseValue
-              trueValue="true"
-              falseValue="false"
+              [trueValue]="true"
+              [falseValue]="false"
               [disabled]="cipher.isDeleted || viewOnly"
               attr.aria-describedby="fieldName{{ i }}"
             />
diff --git a/apps/web/src/app/vault/add-edit.component.html b/apps/web/src/app/vault/add-edit.component.html
index 0f5730b70a0..8f4ec12d03a 100644
--- a/apps/web/src/app/vault/add-edit.component.html
+++ b/apps/web/src/app/vault/add-edit.component.html
@@ -118,13 +118,13 @@
                   >
                     <i
                       class="bwi bwi-lg bwi-fw bwi-check-circle"
-                      [hidden]="checkPasswordBtn.loading"
+                      [hidden]="$any(checkPasswordBtn).loading"
                       aria-hidden="true"
                     ></i>
                     <i
                       class="bwi bwi-lg bwi-fw bwi-spinner bwi-spin"
                       aria-hidden="true"
-                      [hidden]="!checkPasswordBtn.loading"
+                      [hidden]="!$any(checkPasswordBtn).loading"
                       title="{{ 'loading' | i18n }}"
                     ></i>
                   </a>
@@ -838,7 +838,7 @@
               <input
                 class="form-check-input"
                 type="checkbox"
-                [(ngModel)]="c.checked"
+                [(ngModel)]="$any(c).checked"
                 id="collection-{{ i }}"
                 name="Collection[{{ i }}].Checked"
                 [disabled]="cipher.isDeleted || viewOnly"
@@ -935,17 +935,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ (cipher.isDeleted ? 'permanentlyDelete' : 'delete') | i18n }}"
             *ngIf="editMode && !cloneMode && !(!cipher.edit && editMode)"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/vault/attachments.component.html b/apps/web/src/app/vault/attachments.component.html
index 0940f0fa89f..074ac41c852 100644
--- a/apps/web/src/app/vault/attachments.component.html
+++ b/apps/web/src/app/vault/attachments.component.html
@@ -26,10 +26,14 @@
           <tbody>
             <tr *ngFor="let a of cipher.attachments">
               <td class="table-list-icon">
-                <i class="bwi bwi-fw bwi-lg bwi-file" *ngIf="!a.downloading" aria-hidden="true"></i>
+                <i
+                  class="bwi bwi-fw bwi-lg bwi-file"
+                  *ngIf="!$any(a).downloading"
+                  aria-hidden="true"
+                ></i>
                 <i
                   class="bwi bwi-spinner bwi-lg bwi-fw bwi-spin"
-                  *ngIf="a.downloading"
+                  *ngIf="$any(a).downloading"
                   aria-hidden="true"
                 ></i>
               </td>
@@ -55,7 +59,7 @@
                       (click)="reupload(a)"
                       #reuploadBtn
                       [appApiAction]="reuploadPromises[a.id]"
-                      [disabled]="reuploadBtn.loading"
+                      [disabled]="$any(reuploadBtn).loading"
                     >
                       {{ "fix" | i18n }}
                     </button>
@@ -72,16 +76,16 @@
                   (click)="delete(a)"
                   #deleteBtn
                   [appApiAction]="deletePromises[a.id]"
-                  [disabled]="deleteBtn.loading"
+                  [disabled]="$any(deleteBtn).loading"
                 >
                   <i
                     class="bwi bwi-trash bwi-lg bwi-fw"
-                    [hidden]="deleteBtn.loading"
+                    [hidden]="$any(deleteBtn).loading"
                     aria-hidden="true"
                   ></i>
                   <i
                     class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-                    [hidden]="!deleteBtn.loading"
+                    [hidden]="!$any(deleteBtn).loading"
                     title="{{ 'loading' | i18n }}"
                     aria-hidden="true"
                   ></i>
diff --git a/apps/web/src/app/vault/bulk-share.component.html b/apps/web/src/app/vault/bulk-share.component.html
index 7b4ffe7a0aa..fa84eb3f543 100644
--- a/apps/web/src/app/vault/bulk-share.component.html
+++ b/apps/web/src/app/vault/bulk-share.component.html
@@ -54,7 +54,7 @@
               <td class="table-list-checkbox">
                 <input
                   type="checkbox"
-                  [(ngModel)]="c.checked"
+                  [(ngModel)]="$any(c).checked"
                   name="Collection[{{ i }}].Checked"
                   appStopProp
                 />
diff --git a/apps/web/src/app/vault/collections.component.html b/apps/web/src/app/vault/collections.component.html
index f7c8dd7b899..603e899c116 100644
--- a/apps/web/src/app/vault/collections.component.html
+++ b/apps/web/src/app/vault/collections.component.html
@@ -37,7 +37,7 @@
               <td class="table-list-checkbox">
                 <input
                   type="checkbox"
-                  [(ngModel)]="c.checked"
+                  [(ngModel)]="$any(c).checked"
                   name="Collection[{{ i }}].Checked"
                   appStopProp
                 />
diff --git a/apps/web/src/app/vault/folder-add-edit.component.html b/apps/web/src/app/vault/folder-add-edit.component.html
index ea660594fdf..1718f654d2f 100644
--- a/apps/web/src/app/vault/folder-add-edit.component.html
+++ b/apps/web/src/app/vault/folder-add-edit.component.html
@@ -46,17 +46,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html b/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html
index 9d5d8b45a7c..81924ba6433 100644
--- a/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html
+++ b/apps/web/src/app/vault/vault-filter/organization-filter/organization-filter.component.html
@@ -167,7 +167,6 @@
               <i
                 *ngIf="!organization.enabled"
                 class="org-options bwi bwi-fw bwi-exclamation-triangle text-danger"
-                aria-label="{{ 'organizationIsDisabled' | i18n }}"
                 appA11yTitle="{{ 'organizationIsDisabled' | i18n }}"
               ></i
               ><button [bitMenuTriggerFor]="orgMenu" class="org-options">
diff --git a/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts b/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts
index b099655d664..d69181f5703 100644
--- a/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts
+++ b/apps/web/src/app/vault/vault-filter/shared/vault-filter-shared.module.ts
@@ -1,6 +1,9 @@
 import { NgModule } from "@angular/core";
 
 import { SharedModule } from "../../../shared";
+import { LinkSsoComponent } from "../organization-filter/link-sso.component";
+import { OrganizationFilterComponent } from "../organization-filter/organization-filter.component";
+import { OrganizationOptionsComponent } from "../organization-filter/organization-options.component";
 
 import { CollectionFilterComponent } from "./collection-filter/collection-filter.component";
 import { FolderFilterComponent } from "./folder-filter/folder-filter.component";
@@ -15,6 +18,9 @@ import { VaultFilterService } from "./vault-filter.service";
     FolderFilterComponent,
     StatusFilterComponent,
     TypeFilterComponent,
+    OrganizationFilterComponent,
+    OrganizationOptionsComponent,
+    LinkSsoComponent,
   ],
   exports: [
     SharedModule,
@@ -22,6 +28,9 @@ import { VaultFilterService } from "./vault-filter.service";
     FolderFilterComponent,
     StatusFilterComponent,
     TypeFilterComponent,
+    OrganizationFilterComponent,
+    OrganizationOptionsComponent,
+    LinkSsoComponent,
   ],
   providers: [VaultFilterService],
 })
diff --git a/apps/web/src/app/vault/vault-filter/vault-filter.module.ts b/apps/web/src/app/vault/vault-filter/vault-filter.module.ts
index f325392094b..8499b2580a8 100644
--- a/apps/web/src/app/vault/vault-filter/vault-filter.module.ts
+++ b/apps/web/src/app/vault/vault-filter/vault-filter.module.ts
@@ -1,19 +1,11 @@
 import { NgModule } from "@angular/core";
 
-import { LinkSsoComponent } from "./organization-filter/link-sso.component";
-import { OrganizationFilterComponent } from "./organization-filter/organization-filter.component";
-import { OrganizationOptionsComponent } from "./organization-filter/organization-options.component";
 import { VaultFilterSharedModule } from "./shared/vault-filter-shared.module";
 import { VaultFilterComponent } from "./vault-filter.component";
 
 @NgModule({
   imports: [VaultFilterSharedModule],
-  declarations: [
-    VaultFilterComponent,
-    OrganizationFilterComponent,
-    OrganizationOptionsComponent,
-    LinkSsoComponent,
-  ],
+  declarations: [VaultFilterComponent],
   exports: [VaultFilterComponent],
 })
 export class VaultFilterModule {}
diff --git a/apps/web/src/app/vault/vault-items.component.html b/apps/web/src/app/vault/vault-items.component.html
index 1c24a96d2fa..c46423833e8 100644
--- a/apps/web/src/app/vault/vault-items.component.html
+++ b/apps/web/src/app/vault/vault-items.component.html
@@ -10,7 +10,7 @@
     <tbody>
       <tr *ngFor="let c of filteredCiphers">
         <td (click)="checkCipher(c)" class="table-list-checkbox">
-          <input type="checkbox" [(ngModel)]="c.checked" appStopProp />
+          <input type="checkbox" [(ngModel)]="$any(c).checked" appStopProp />
         </td>
         <td (click)="checkCipher(c)" class="table-list-icon">
           <app-vault-icon [cipher]="c"></app-vault-icon>
diff --git a/apps/web/src/app/vault/vault-items.component.ts b/apps/web/src/app/vault/vault-items.component.ts
index 4de11e2ead3..9027c53d8c3 100644
--- a/apps/web/src/app/vault/vault-items.component.ts
+++ b/apps/web/src/app/vault/vault-items.component.ts
@@ -289,6 +289,10 @@ export class VaultItemsComponent extends BaseVaultItemsComponent implements OnDe
     this.onOrganzationBadgeClicked.emit(organizationId);
   }
 
+  events(c: CipherView) {
+    // TODO: This should be removed but is needed since we reuse the same template
+  }
+
   protected deleteCipher(id: string, permanent: boolean) {
     return permanent
       ? this.cipherService.deleteWithServer(id)
diff --git a/apps/web/src/app/vault/vault.component.html b/apps/web/src/app/vault/vault.component.html
index fb4afb8386c..73a9b981f73 100644
--- a/apps/web/src/app/vault/vault.component.html
+++ b/apps/web/src/app/vault/vault.component.html
@@ -21,7 +21,7 @@
         <h1>
           {{ "vaultItems" | i18n }}
           <small #actionSpinner [appApiAction]="vaultItemsComponent.actionPromise">
-            <ng-container *ngIf="actionSpinner.loading">
+            <ng-container *ngIf="$any(actionSpinner).loading">
               <i
                 class="bwi bwi-spinner bwi-spin text-muted"
                 title="{{ 'loading' | i18n }}"
diff --git a/apps/web/src/locales/da/messages.json b/apps/web/src/locales/da/messages.json
index bd53b87cb75..54b36fc945f 100644
--- a/apps/web/src/locales/da/messages.json
+++ b/apps/web/src/locales/da/messages.json
@@ -3668,7 +3668,7 @@
     "message": "Skjul adgangskoder"
   },
   "countryPostalCodeRequiredDesc": {
-    "message": "Vi benytter udelukkende disse oplysninger til beregning af moms og finansiel rapportering."
+    "message": "Disse oplysninger benyttes udelukkende til momsberegning og finansiel rapportering."
   },
   "includeVAT": {
     "message": "Inkludér momsoplysninger (valgfrit)"
@@ -3731,31 +3731,31 @@
     "message": "Tilknyt SSO"
   },
   "singleOrg": {
-    "message": "Enkel organisation"
+    "message": "Enkeltorganisation"
   },
   "singleOrgDesc": {
-    "message": "Begræns medlemmer fra at blive medlem af andre organisationer."
+    "message": "Begræns medlemmer i at tilmelde sig andre organisationer."
   },
   "singleOrgBlockCreateMessage": {
-    "message": "Den nuværende organisationspolitik tillader dig ikke at deltage i mere end én organisation. Kontakt organisationsadministratorerne eller benyt en anden Bitwarden-konto under tilmelding."
+    "message": "Den nuværende organisationspolitik tillader dig ikke at deltage i mere end én organisation. Kontakt organisationens admins eller benyt en anden Bitwarden-konto under tilmelding."
   },
   "singleOrgPolicyWarning": {
-    "message": "Organisationsmedlemmer, som ikke er ejere eller admins og allerede medlem af en anden organisation, fjernes fra organisationen."
+    "message": "Organisationsmedlemmer, undtagen ejere eller admins, som allerede er medlem af en anden organisation, fjernes fra organisationen."
   },
   "requireSso": {
     "message": "Kræv single sign-on godkendelse"
   },
   "requireSsoPolicyDesc": {
-    "message": "Kræv at medlemmer logger ind vha. Virksomheds single sign-on metoden."
+    "message": "Kræv, at medlemmer logger ind vha. Virksomheds single sign-on metoden."
   },
   "prerequisite": {
     "message": "Forudsætning"
   },
   "requireSsoPolicyReq": {
-    "message": "Enkel organisation virksomhedspolitikken skal være aktiveret, før denne politik aktiveres."
+    "message": "Enkeltorganisations Virksomhedspolitik skal være aktiveret, før denne politik aktiveres."
   },
   "requireSsoPolicyReqError": {
-    "message": "Single organization-politik er ikke opsat."
+    "message": "Enkeltorganisationspolitik er ikke opsat."
   },
   "requireSsoExemption": {
     "message": "Denne politik håndhæves ikke for organisationsejere og -admins."
@@ -3791,7 +3791,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSendConfirmation": {
-    "message": "Er du sikker på, at du vil slette denne Send?",
+    "message": "Sikker på, at denne Send skal slettes?",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "whatTypeOfSend": {
@@ -3802,7 +3802,7 @@
     "message": "Sletningsdato"
   },
   "deletionDateDesc": {
-    "message": "Send slettes permanent på den angivne dato og tidspunkt.",
+    "message": "Denne Send slettes permanent på den angivne dato og tidspunkt.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDate": {
@@ -3837,7 +3837,7 @@
     "message": "Tilbagekaldt"
   },
   "sendLink": {
-    "message": "Send link",
+    "message": "Send-link",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLink": {
@@ -3851,7 +3851,7 @@
     "message": "Adgangskode fjernet"
   },
   "removePasswordConfirmation": {
-    "message": "Er du sikker på, at du vil fjerne adgangskoden?"
+    "message": "Sikker på, at adgangskoden skal fjernes?"
   },
   "hideEmail": {
     "message": "Skjul min e-mailadresse for modtagere."
@@ -3878,7 +3878,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPassword": {
-    "message": "Denne Send er beskyttet med en adgangskode. Indtast adgangskoden nedenfor for at fortsætte.",
+    "message": "Denne Send er adgangskodebeskyttet. Angiv adgangskoden nedenfor for at fortsætte.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPasswordDontKnow": {
@@ -3893,11 +3893,11 @@
     "message": "Download fil"
   },
   "sendAccessUnavailable": {
-    "message": "Den Send, du forsøger at tilgå, findes ikke eller er ikke længere tilgængelig.",
+    "message": "Den Send, der forsøges tilgået, findes ikke, eller er ikke længere tilgængelig.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "missingSendFile": {
-    "message": "Filen, der er knyttet til denne Send, blev ikke fundet.",
+    "message": "Filen tilknyttet denne Send kunne ikke findes.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "noSendsInList": {
@@ -3908,7 +3908,7 @@
     "message": "Nødadgang"
   },
   "emergencyAccessDesc": {
-    "message": "Tildel og håndtér nødadgang for betroede kontakter. Betroede kontakter kan anmode om adgang til enten at se eller overtage din konto i nødstilfælde. Besøg vores hjælpeside for mere information og detaljer om, hvordan nul-videndeling fungerer."
+    "message": "Tildel og håndtér nødadgang for betroede kontakter. Betroede kontakter kan anmode om adgang til enten at se eller overtage din konto i nødstilfælde. Besøg vores hjælpeside for mere information og detaljer om, hvordan nul-vidensdeling fungerer."
   },
   "emergencyAccessOwnerWarning": {
     "message": "Du er ejer af en eller flere organisationer. Tildeler du overtagelsesrettighed til en nødkontakt, kan vedkommende bruge alle dine tilladelser som ejer efter en overtagelse."
@@ -3917,7 +3917,7 @@
     "message": "Betroede nødkontakter"
   },
   "noTrustedContacts": {
-    "message": "Du har endnu ikke tilføjet nødkontakter. Invitér en betroet kontakt for at komme i gang."
+    "message": "Ingen nødkontakter tilføjet endnu. Invitér en betroet kontakt for at komme i gang."
   },
   "addEmergencyContact": {
     "message": "Tilføj nødkontakt"
@@ -3935,7 +3935,7 @@
     "message": "Redigér nødkontakt"
   },
   "inviteEmergencyContactDesc": {
-    "message": "Invitér en ny nødkontakt ved at angive e-mailadressen på vedkommendes Bitwarden-konto nedenfor. Har vedkommende ikke allerede en Bitwarden-konto, anmoders vedkommende om at oprette én."
+    "message": "Invitér en ny nødkontakt ved at angive e-mailadressen på vedkommendes Bitwarden-konto nedenfor. Har vedkommende endnu ikke en Bitwarden-konto, anmoders vedkommende om at oprette en."
   },
   "emergencyAccessRecoveryInitiated": {
     "message": "Nødadgang igangsat"
@@ -3944,7 +3944,7 @@
     "message": "Nødadgang godkendt"
   },
   "viewDesc": {
-    "message": "Kan se alle elementer i din egen boks."
+    "message": "Kan se alle emner i din egen boks."
   },
   "takeover": {
     "message": "Overtagelse"
@@ -3995,7 +3995,7 @@
     "message": "Anmod om adgang"
   },
   "requestAccessConfirmation": {
-    "message": "Er du sikker på, at du vil anmode om nødadgang? Du vil opnå adgang efter $WAITTIME$ dag(e) eller når brugeren godkender anmodningen.",
+    "message": "Sikker på, at du vil anmode om nødadgang? Du tildeles adgang efter $WAITTIME$ dag(e), eller når brugeren godkender anmodningen.",
     "placeholders": {
       "waittime": {
         "content": "$1",
@@ -4019,7 +4019,7 @@
     "message": "Afvis"
   },
   "approveAccessConfirmation": {
-    "message": "Er du sikker på, at du vil godkende nødadgang? Dette vil tillade $USER$ at $ACTION$ din konto.",
+    "message": "Sikker på, at du vil godkende nødadgang? Dette vil tillade $USER$ at $ACTION$ din konto.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -4035,7 +4035,7 @@
     "message": "Nødadgang godkendt"
   },
   "emergencyRejected": {
-    "message": "Nødadgang afvist"
+    "message": "Nødadgang nægtet"
   },
   "passwordResetFor": {
     "message": "Adgangskode nulstillet for $USER$. Du kan nu logge ind med den nye adgangskode.",
@@ -4050,7 +4050,7 @@
     "message": "Fjern individuel boks"
   },
   "personalOwnershipPolicyDesc": {
-    "message": "Kræv at medlemmer gemmer elementer i en organisation ved at fjerne muligheden for individuelle bokse."
+    "message": "Kræv, at medlemmer gemmer emner i en organisation ved at fjerne muligheden for individuelle bokse."
   },
   "personalOwnershipExemption": {
     "message": "Organisationsejere og administratorer er undtaget fra denne politik."
@@ -4066,7 +4066,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disableSendExemption": {
-    "message": "Organisationsbrugere, der kan håndtere organisationens politikker, er undtaget fra denne politiks håndhævelse."
+    "message": "Organisationsbrugere, som kan håndtere organisationens politikker, er undtaget fra håndhævelsen af denne politik."
   },
   "sendDisabled": {
     "message": "Send fjernet",
@@ -4085,7 +4085,7 @@
     "description": "'Sends' is a plural noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsExemption": {
-    "message": "Organisationsbrugere, som kan håndtere organisationens politikker, er undtaget fra denne politiks håndhævelse."
+    "message": "Organisationsbrugere, som kan håndtere organisationens politikker, er undtaget fra håndhævelsen af denne politik."
   },
   "disableHideEmail": {
     "message": "Vis altid medlemmets e-mailadresse med modtagere, når Sends oprettes eller redigeres.",
@@ -4095,7 +4095,7 @@
     "message": "Følgende organisationspolitikker er i øjeblikket gældende:"
   },
   "sendDisableHideEmailInEffect": {
-    "message": "Brugere har ikke lov til at skjule deres e-mailadresser for modtagere når en Send oprettes eller redigeres.",
+    "message": "Brugere har ikke lov til at skjule deres e-mailadresser for modtagere, når en Send oprettes eller redigeres.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "modifiedPolicyId": {
@@ -4108,7 +4108,7 @@
     }
   },
   "planPrice": {
-    "message": "Abonnementspris"
+    "message": "Abonnementstypepris"
   },
   "estimatedTax": {
     "message": "Anslået moms"
@@ -4202,17 +4202,17 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendNameDesc": {
-    "message": "Et venligt navn til at beskrive denne Send.",
+    "message": "Et logisk navn til at beskrive denne Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTextDesc": {
-    "message": "Den tekst, du vil sende."
+    "message": "Teksten, du vil sende."
   },
   "sendFileDesc": {
-    "message": "Den fil, du vil sende."
+    "message": "Filen, du vil sende."
   },
   "copySendLinkOnSave": {
-    "message": "Kopier linket for at dele denne Send til min udklipsholder ved gem."
+    "message": "Kopiér linket for at dele denne Send til udklipsholden ved gem."
   },
   "sendLinkLabel": {
     "message": "Send link",
@@ -4266,7 +4266,7 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Learn more about Bitwarden Send or sign up to **try it today.**'"
   },
   "sendCreatorIdentifier": {
-    "message": "Bitwarden bruger $USER_IDENTIFIER$ delte følgende med dig",
+    "message": "Bitwarden-bruger $USER_IDENTIFIER$ delte flg. med dig",
     "placeholders": {
       "user_identifier": {
         "content": "$1",
@@ -4275,7 +4275,7 @@
     }
   },
   "viewSendHiddenEmailWarning": {
-    "message": "Bitwarden-brugeren, der oprettede denne Send, har valgt at skjule sin e-mailadresse. Du bør sikre dig, at du stoler på kilden til dette link, inden du bruger eller downloader dets indhold.",
+    "message": "Bitwarden-brugeren, der oprettede denne Send, har valgt at skjule sin e-mailadresse. Du bør sikre dig, at du stoler på kilden til dette link, inden dets indhold downloades/benyttes.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "expirationDateIsInvalid": {
@@ -4285,13 +4285,13 @@
     "message": "Den angivne sletningsdato er ugyldig."
   },
   "expirationDateAndTimeRequired": {
-    "message": "Der kræves en udløbsdato og -tid."
+    "message": "Udløbsdato og -tidspunkt er obligatorisk."
   },
   "deletionDateAndTimeRequired": {
-    "message": "En sletningsdato og -tid er påkrævet."
+    "message": "Sletningsdato og -tidspunkt er obligatorisk."
   },
   "dateParsingError": {
-    "message": "Der opstod en fejl under forsøget på at gemme dine sletnings- og udløbsdatoer."
+    "message": "En fejl opstod under forsøget på at gemme sletnings- og udløbsdatoer."
   },
   "webAuthnFallbackMsg": {
     "message": "Klik på knappen nedenfor for at bekræfte din 2FA."
@@ -4324,7 +4324,7 @@
     "message": "Afmelding lykkedes!"
   },
   "eventEnrollPasswordReset": {
-    "message": "Bruger $ID$ tilmeldt hjælp til nulstilling af adgangskode.",
+    "message": "Bruger $ID$ tilmeldt adgangskodenulstilling.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4333,7 +4333,7 @@
     }
   },
   "eventWithdrawPasswordReset": {
-    "message": "Bruger $ID$ afmeldt hjælp til nulstilling af adgangskode.",
+    "message": "Bruger $ID$ afmeldt adgangskodenulstilling.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4372,7 +4372,7 @@
     "message": "Nulstil adgangskode"
   },
   "resetPasswordLoggedOutWarning": {
-    "message": "Ved at fortsætte logges $NAME$ ud af sin nuværende session, hvilket kræver, at vedkommende logger ind igen. Aktive sessioner på andre enheder forbliver muligvis aktive i op til en time.",
+    "message": "Fortsættes, logges der ud af $NAME$s nuværende session (vil kræve genindlogning). Aktive sessioner på andre enheder kan forbliver aktive i op til en time.",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4384,37 +4384,37 @@
     "message": "denne bruger"
   },
   "resetPasswordMasterPasswordPolicyInEffect": {
-    "message": "Én eller flere organisationspolitikker kræver, at hovedadgangskoden opfylder følgende krav:"
+    "message": "Én eller flere organisationspolitikker kræver, at hovedadgangskoden opfylder flg. krav:"
   },
   "resetPasswordSuccess": {
     "message": "Adgangskode nulstillet!"
   },
   "resetPasswordEnrollmentWarning": {
-    "message": "Indrullering giver organisationsadministratorer mulighed for at ændre din hovedadgangskode"
+    "message": "Indrullering vil tillade organisationsadministratorer at ændre din hovedadgangskode"
   },
   "resetPasswordPolicy": {
-    "message": "Nulstil hovedadgangskode"
+    "message": "Nulstilling af hovedadgangskode"
   },
   "resetPasswordPolicyDescription": {
-    "message": "Tillad administratorer at nulstille hovedadgangskoder for medlemmer."
+    "message": "Tillad admins at nulstille hovedadgangskoder for medlemmer."
   },
   "resetPasswordPolicyWarning": {
-    "message": "Brugere i organisationen skal selvindrullere eller være auto-indrulleret, før administratorer kan nulstille deres hovedadgangskode."
+    "message": "Organisationsmedlemmer skal selvindrullere eller være auto-indrulleret, før admins kan nulstille deres hovedadgangskode."
   },
   "resetPasswordPolicyAutoEnroll": {
     "message": "Auto-indrullering"
   },
   "resetPasswordPolicyAutoEnrollDescription": {
-    "message": "Alle brugere vil automatisk blive tilmeldt adgangskodenulstilling, når deres invitation er accepteret og vil ikke have lov til at afmelde sig."
+    "message": "Adgangskodenulstilling indrullerer automatisk alle medlemmer (uden mulighed for afmelding), når deres invitation accepteres."
   },
   "resetPasswordPolicyAutoEnrollWarning": {
-    "message": "Brugere, som allerede er i organisationen, opsættes ikke med tilbagevirkende kraft til adgangskodenulstilling. De skal selvindrullere, før administratorer kan nulstille deres hovedadgangskode."
+    "message": "Adgangskodenulstilling indrullerer ikke allerede eksisterernde organisationmedlemmer med tilbagevirkende kraft. De skal selvindrullere, før admins kan nulstille deres hovedadgangskode."
   },
   "resetPasswordPolicyAutoEnrollCheckbox": {
-    "message": "Kræv at nye brugere automatisk indrulleres"
+    "message": "Kræv auto-indrullering af nye brugere"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "Denne organisation har en virksomhedspolitik, der auto-opsætter dig til adgangskodenulstilling. Opsætningen giver organisationsadministratorer mulighed for at ændre din hovedadgangskode."
+    "message": "Denne organisation har en Virksomhedspolitik, der auto-indrullerer dig i adgangskodenulstilling. Tilmeldingen giver organisationsadminis mulighed for at ændre din hovedadgangskode."
   },
   "resetPasswordOrgKeysError": {
     "message": "Organisationsnøgler svar er null"
@@ -4423,10 +4423,10 @@
     "message": "Nulstil adgangskode detaljer svar er null"
   },
   "trashCleanupWarning": {
-    "message": "Elementer, som har været i papirkurven i mere end 30 dage, slettes automatisk."
+    "message": "Emner, som har været i papirkurven i flere end 30 dage, slettes automatisk."
   },
   "trashCleanupWarningSelfHosted": {
-    "message": "Elementer, som har været i papirkurven i et stykke tid, slettes automatisk."
+    "message": "Emner, som har befundet i papirkurven i et stykke tid, slettes automatisk."
   },
   "passwordPrompt": {
     "message": "Genanmodning om hovedadgangskode"
@@ -4444,16 +4444,16 @@
     "message": "Gensend notifikation"
   },
   "noSelectedUsersApplicable": {
-    "message": "Denne handling er ikke anvendelig for nogen af de valgte brugere."
+    "message": "Denne handling er ikke relevant for de valgte brugere."
   },
   "removeUsersWarning": {
-    "message": "Er du sikker på, at du vil fjerne følgende brugere? Processen kan tage et par sekunder at fuldføre og kan ikke afbrydes eller annulleres."
+    "message": "Sikker på, at flg. brugere skal fjerne? Processen kan tage nogle sekunder at fuldføre og kan hverken afbrydes eller annulleres."
   },
   "removeOrgUsersConfirmation": {
-    "message": "Når medlemmer fjernes, har de ikke længere adgang til organisationsdata, og denne handling er irreversibel. For at gentilføje medlemmer til organisationen, skal de inviteres og onboardes igen. Processen kan tage et par sekunder at udføre og kan ikke afbrydes eller annulleres."
+    "message": "Når medlemmer fjernes — en handling, der er irreversibel— kan de ikke længere tilgå organisationsdata. For at gentilføje medlemmer til organisationen, skal de inviteres og onboardes igen. Processen, og der hverken kan afbrydes eller annulleres, kan tage nogle sekunder at fuldføre."
   },
   "revokeUsersWarning": {
-    "message": "Når medlemmers adgang tilbagekaldes, har de ikke længere adgang til organisationsdata. For hurtigt at genoprette medlemsadgang, så gå til fanen Tilbagekaldt. Processen kan tage et par sekunder at udføre og kan ikke afbrydes."
+    "message": "Ophæves medlemsstatusser, kan medlemmer ikke længere tilgå organisationsdata. For hurtigt at genoprette medlemsadgang — en process, der ikke kan afbrydes eller annulleres og tager nogle sekunder at udføre —, så gå til fanen Ophævet."
   },
   "theme": {
     "message": "Tema"
@@ -4474,25 +4474,25 @@
     "message": "Bekræft valgte"
   },
   "bulkConfirmStatus": {
-    "message": "Status for massehandling"
+    "message": "Massehandlingsstatus"
   },
   "bulkConfirmMessage": {
-    "message": "Bekræftet med succes."
+    "message": "Hermed bekræftet."
   },
   "bulkReinviteMessage": {
-    "message": "Geninviteret med succes."
+    "message": "Hermed geninviteret."
   },
   "bulkRemovedMessage": {
-    "message": "Fjernet med succes"
+    "message": "Hermed fjernet"
   },
   "bulkRevokedMessage": {
-    "message": "Organisationsadgang tilbagekaldt"
+    "message": "Organisationsadgang ophævet"
   },
   "bulkRestoredMessage": {
-    "message": "Organisationsadgang genetableret"
+    "message": "Organisationsadgang hermed genetableret"
   },
   "bulkFilteredMessage": {
-    "message": "Udelukket, ikke anvendeligt til denne handling."
+    "message": "Udelukket, ikke anvendelig til denne handling"
   },
   "fingerprint": {
     "message": "Fingeraftryk"
@@ -4501,31 +4501,31 @@
     "message": "Fjern brugere"
   },
   "revokeUsers": {
-    "message": "Ophæv brugeradgang"
+    "message": "Ophæv status som bruger"
   },
   "restoreUsers": {
-    "message": "Genetablér brugeradgang"
+    "message": "Gendan status som bruger"
   },
   "error": {
     "message": "Fejl"
   },
   "resetPasswordManageUsers": {
-    "message": "Administrér brugere skal også være aktiveret med tilladelsen Håndtér adgangskodenulstilling"
+    "message": "\"Håndtér brugere\" skal også tildeles med tilladelsen \"Håndtér adgangskodenulstilling\""
   },
   "setupProvider": {
     "message": "Udbyderopsætning"
   },
   "setupProviderLoginDesc": {
-    "message": "Du er blevet inviteret til at oprette en ny udbyder. For at fortsætte skal du logge ind eller oprette en ny Bitwarden-konto."
+    "message": "Du er inviteret til at opsætte en ny udbyder. Log ind/opret en ny Bitwarden-konto for at fortsætte."
   },
   "setupProviderDesc": {
-    "message": "Angiv venligst nedenstående oplysninger for at fuldføre udbyderopsætningen. Kontakt kundesupport, hvis du har spørgsmål."
+    "message": "Angiv nedenstående oplysninger for at fuldføre udbyderopsætningen. Kontakt kundesupporten ved evt. spørgsmål."
   },
   "providerName": {
     "message": "Udbydernavn"
   },
   "providerSetup": {
-    "message": "Udbyderen er nu opsat."
+    "message": "Udbyderen hermed opsat"
   },
   "clients": {
     "message": "Klienter"
@@ -4535,7 +4535,7 @@
     "description": "This is used as a table header to describe which client application created an event log."
   },
   "providerAdmin": {
-    "message": "Udbyder admin"
+    "message": "Udbyder-admin"
   },
   "providerAdminDesc": {
     "message": "Brugeren med den højeste adgang, der kan håndtere alle aspekter af din udbyder samt tilgå og håndtere klientorganisationer."
@@ -4544,25 +4544,25 @@
     "message": "Tjenestebruger"
   },
   "serviceUserDesc": {
-    "message": "Servicebrugere kan få adgang til samt administrere alle klientorganisationer."
+    "message": "Tjenestebrugere kan tilgå samt håndtere alle klientorganisationer."
   },
   "providerInviteUserDesc": {
-    "message": "Invitér en ny bruger til din udbyder ved at angive deres Bitwarden-konto e-mailadresse nedenfor. Hvis de ikke allerede har en Bitwarden-konto, bliver de bedt om at oprette en ny konto."
+    "message": "Invitér en ny bruger til din udbyder ved at angive deres Bitwarden-konto e-mailadresse nedenfor. Har personen ikke allerede har en Bitwarden-konto, anmodes vedkommende om at oprette én."
   },
   "joinProvider": {
     "message": "Tilmeld dig udbyder"
   },
   "joinProviderDesc": {
-    "message": "Du er blevet inviteret til at tilmelde dig udbyderen ovenfor. For at acceptere invitationen skal du logge ind eller oprette en ny Bitwarden-konto."
+    "message": "Du er inviteret til at tilmelde dig udbyderen ovenfor. Log ind eller opret en ny Bitwarden-konto for at acceptere invitationen."
   },
   "providerInviteAcceptFailed": {
-    "message": "Kan ikke acceptere invitationen. Bed en udbyder-admin om at sende en ny invitation."
+    "message": "Kan ikke acceptere invitationen. Bed en udbyder-admin sende en ny invitation."
   },
   "providerInviteAcceptedDesc": {
-    "message": "Du kan få adgang til denne udbyder, når en administrator bekræfter dit medlemskab. Vi sender dig en e-mail, når det sker."
+    "message": "Denne udbyder kan tilgås, når en admin bekræfter dit medlemskab. Du tilsendes en e-mail, når dette sker."
   },
   "providerUsersNeedConfirmed": {
-    "message": "Du har brugere, der har accepteret deres invitation, men som stadig skal bekræftes. Brugere vil ikke have adgang til udbyderen, før de er bekræftet."
+    "message": "Du har brugere, som har accepteret deres invitation uden endnu at være bekræftet. Brugere kan ikke tilgå udbyderen, før de er bekræftet."
   },
   "provider": {
     "message": "Udbyder"
@@ -4571,7 +4571,7 @@
     "message": "Ny klientorganisation"
   },
   "newClientOrganizationDesc": {
-    "message": "Opret en ny klientorganisation, der vil blive knyttet til dig som udbyder. Du vil kunne tilgå og håndtere denne organisation."
+    "message": "Opret en ny klientorganisation, der tilknyttes dig som udbyderen. Du vil kunne tilgå og håndtere denne organisation."
   },
   "addExistingOrganization": {
     "message": "Tilføj eksisterende organisation"
@@ -4580,7 +4580,7 @@
     "message": "Min udbyder"
   },
   "addOrganizationConfirmation": {
-    "message": "Er du sikker på, at du vil tilføje $ORGANIZATION$ som klient til $PROVIDER$?",
+    "message": "Sikker på, at du vil tilføje $ORGANIZATION$ som en klient til $PROVIDER$?",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4593,10 +4593,10 @@
     }
   },
   "organizationJoinedProvider": {
-    "message": "Organisation blev tilføjet udbyderen"
+    "message": "Organisation hermed tilføjet udbyderen"
   },
   "accessingUsingProvider": {
-    "message": "Tilgår organisation ved hjælp af udbyderen $PROVIDER$",
+    "message": "Tilgår organisation vha. udbyderen $PROVIDER$",
     "placeholders": {
       "provider": {
         "content": "$1",
@@ -4605,10 +4605,10 @@
     }
   },
   "providerIsDisabled": {
-    "message": "Udbyder er deaktiveret."
+    "message": "Udbyder suspenderet"
   },
   "providerUpdated": {
-    "message": "Udbyder opdateret"
+    "message": "Udbyder gemt"
   },
   "yourProviderIs": {
     "message": "Din udbyder er $PROVIDER$. De har administrative- og faktureringsrettigheder for din organisation.",
@@ -4629,22 +4629,22 @@
     }
   },
   "detachOrganizationConfirmation": {
-    "message": "Er du sikker på, at du vil frigøre denne organisation? Organisationen vil fortsætte med at eksistere, men vil ikke længere blive håndteret af udbyderen."
+    "message": "Sikker på, at du vil frigøre denne organisation? Organisationen vil fortsat eksistere, men håndteres ikke længere af udbyderen."
   },
   "add": {
     "message": "Tilføj"
   },
   "updatedMasterPassword": {
-    "message": "Hovedadgangskode opdateret"
+    "message": "Hovedadgangskode gemt"
   },
   "updateMasterPassword": {
     "message": "Opdatér hovedadgangskode"
   },
   "updateMasterPasswordWarning": {
-    "message": "Dit hovedadgangskode blev for nylig ændret af en administrator i din organisation. For at få adgang til boksen skal du opdatere din hovedadgangskode nu. Hvis du fortsætter, logges du ud af din nuværende session, hvilket kræver, at du logger ind igen. Aktive sessioner på andre enheder kan fortsætte med at være aktive i op til én time."
+    "message": "Din hovedadgangskode blev for nylig ændret af en admin i din organisation. Opdatér hovedadgangskoden nu for at tilgå boksen. Fortsættes, logges der ud af den nuværende session, og du vil skulle logge ind igen. Aktive sessioner på andre enheder kan forblive aktive i op til én time."
   },
   "masterPasswordInvalidWarning": {
-    "message": "Din hovedadgangskode opfylder ikke organisationspolitikken. For at blive medlem af organisationen skal du opdatere din hovedadgangskode først. Hvis du fortsætter, logges du ud af din aktuelle session, hvilket kræver, at du logger ind igen. Aktive sessioner på andre enheder kan fortsat være aktive i op til én time."
+    "message": "Din hovedadgangskode opfylder ikke organisationspolitikkens krav. For at kunne blive organisationsmedlem, skal din hovedadgangskode derfor opdateres nu. Fortsættes, logges der ud af den nuværende session, og du vil skulle logge ind igen. Aktive sessioner på andre enheder kan forblive aktive i op til én time."
   },
   "maximumVaultTimeout": {
     "message": "Boks-timeout"
@@ -4665,7 +4665,7 @@
     "message": "Minutter"
   },
   "vaultTimeoutPolicyInEffect": {
-    "message": "Din organisations politikker påvirker din boks-timeout. Maksimalt tilladt boks-timeout er $HOURS$ time(r) og $MINUTES$ minut(ter)",
+    "message": "Organisationspolitikkerne påvirker din boks-timeout. Maks. tilladt boks-timeout udgør $HOURS$ time(r) og $MINUTES$ minut(ter)",
     "placeholders": {
       "hours": {
         "content": "$1",
@@ -4681,25 +4681,25 @@
     "message": "Tilpasset boks-timeout"
   },
   "vaultTimeoutToLarge": {
-    "message": "Din boks-timeout overskrider den begrænsning, der er fastsat af din organisation."
+    "message": "Din boks-timeout overskrider den organisationsfastsatte begrænsning."
   },
   "vaultCustomTimeoutMinimum": {
-    "message": "Minimum brugerdefineret timeout er 1 minut."
+    "message": "Tilpasset minimumstimeout udgør 1 minut."
   },
   "vaultTimeoutRangeError": {
     "message": "Boks-timeout er ikke inden for det tilladte interval."
   },
   "disablePersonalVaultExport": {
-    "message": "Deaktivér individuel bokseksport"
+    "message": "Fjern individuel bokseksport"
   },
   "disablePersonalVaultExportDesc": {
     "message": "Tillad ikke medlemmer at eksportere deres individuelle boksdata."
   },
   "vaultExportDisabled": {
-    "message": "Bokseksport deaktiveret"
+    "message": "Bokseksport fjernet"
   },
   "personalVaultExportPolicyInEffect": {
-    "message": "En eller flere organisationspolitikker forhindrer dig i at eksportere din personlige boks."
+    "message": "En eller flere organisationspolitikker forhindrer eksport af din personlige boks."
   },
   "selectType": {
     "message": "Vælg SSO-type"
@@ -4708,7 +4708,7 @@
     "message": "Type"
   },
   "openIdConnectConfig": {
-    "message": "OpenID-forbindelsesopsætning"
+    "message": "OpenID Connect-opsætning"
   },
   "samlSpConfig": {
     "message": "SAML-tjenesteudbyderopsætning"
@@ -4720,10 +4720,10 @@
     "message": "Callback-sti"
   },
   "signedOutCallbackPath": {
-    "message": "Udlogget Callback-sti"
+    "message": "Udlogget callback-sti"
   },
   "authority": {
-    "message": "Myndighed"
+    "message": "Godkender"
   },
   "clientId": {
     "message": "Klient-ID"
@@ -4738,10 +4738,10 @@
     "message": "OIDC-omdirigeringsadfærd"
   },
   "getClaimsFromUserInfoEndpoint": {
-    "message": "Hent claims fra endpoint for brugeroplysninger"
+    "message": "Hent claims fra brugerinfo-slutpunkt"
   },
   "additionalScopes": {
-    "message": "Brugerdefinerede omfang"
+    "message": "Tilpassede scopes (omfang)"
   },
   "additionalUserIdClaimTypes": {
     "message": "Tilpassede bruger-id claim-typer"
@@ -4750,16 +4750,16 @@
     "message": "E-mail claim-typer"
   },
   "additionalNameClaimTypes": {
-    "message": "Tilpassede navne-claimtyper"
+    "message": "Tilpassede navne claim-typer"
   },
   "acrValues": {
     "message": "Anmodet godkendelseskontekst klassereferenceværdier"
   },
   "expectedReturnAcrValue": {
-    "message": "Forventet \"acr\"-claimværdi i svar"
+    "message": "Forventet \"acr\" claim-værdi i svar"
   },
   "spEntityId": {
-    "message": "SP Enheds-ID"
+    "message": "SP enheds-ID"
   },
   "spMetadataUrl": {
     "message": "SAML 2.0 Metadata-URL"
@@ -4792,10 +4792,10 @@
     "message": "Bindingstype"
   },
   "idpSingleSignOnServiceUrl": {
-    "message": "Single Sign-On tjeneste URL"
+    "message": "Single Sign-On tjeneste-URL"
   },
   "idpSingleLogoutServiceUrl": {
-    "message": "Single Log Out-tjeneste URL"
+    "message": "Single Log Out tjeneste-URL"
   },
   "idpX509PublicCert": {
     "message": "X509 offentligt certifikat"
@@ -4813,7 +4813,7 @@
     "message": "Signér godkendelsesanmodninger"
   },
   "ssoSettingsSaved": {
-    "message": "Single Sign-On opsætning blev gemt."
+    "message": "Single Sign-On opsætning gemt"
   },
   "sponsoredFamilies": {
     "message": "Gratis Bitwarden Familier"
@@ -4837,31 +4837,31 @@
     "message": "Linket er ikke længere gyldigt. Bed sponsoren sende et nyt tilbud."
   },
   "reclaimedFreePlan": {
-    "message": "Konvertér til gratis abonnement"
+    "message": "Genindløst gratis abonnement"
   },
   "redeem": {
     "message": "Indløs"
   },
   "sponsoredFamiliesSelectOffer": {
-    "message": "Vælg den organisation, du gerne vil have sponsoreret"
+    "message": "Vælg organisation, du vil sponsorere"
   },
   "familiesSponsoringOrgSelect": {
     "message": "Hvilket gratis Familier-tilbud vil du gerne indløse?"
   },
   "sponsoredFamiliesEmail": {
-    "message": "Angiv din personlige e-mail for at indløse Bitwarden Familier"
+    "message": "Angiv personlig e-mail for at indløse Bitwarden Families"
   },
   "sponsoredFamiliesLeaveCopy": {
-    "message": "Hvis du fjerner et tilbud eller bliver fjernet fra sponsororganisationen, udløber dit Familier-abonnement ved næste fornyelsesdato."
+    "message": "Fjerner du et tilbud eller fjernes du fra sponsororganisationen, udløber dit Familier-abonnement ved næste fornyelsesdato."
   },
   "acceptBitwardenFamiliesHelp": {
     "message": "Acceptér tilbud for en eksisterende organisation, eller opret en ny Familier-organisation."
   },
   "setupSponsoredFamiliesLoginDesc": {
-    "message": "Du er blevet tilbudt en gratis Bitwarden Familier-abonnement organisation. For at fortsætte skal du logge ind på den konto, der modtog tilbuddet."
+    "message": "Du er blevet tilbudt en gratis Bitwarden Familier-abonnementsorganisation. Log ind på den konto, der modtog tilbuddet, for at fortsætte."
   },
   "sponsoredFamiliesAcceptFailed": {
-    "message": "Tilbuddet kan ikke accepteres. Gensend venligst tilbudsmailen fra din virksomhedskonto, og forsøg igen."
+    "message": "Tilbud kan ikke accepteres. Gensend tilbudsmailen fra din Virksomhedskonto, og forsøg igen."
   },
   "sponsoredFamiliesAcceptFailedShort": {
     "message": "Kan ikke acceptere tilbud. $DESCRIPTION$",
@@ -4876,16 +4876,16 @@
     "message": "Acceptér gratis Bitwarden Familier"
   },
   "sponsoredFamiliesOfferRedeemed": {
-    "message": "Gratis Bitwarden Familier-tilbud er blevet indløst"
+    "message": "Gratis Bitwarden Familier-tilbud hermed indløst"
   },
   "redeemed": {
     "message": "Indløst"
   },
   "redeemedAccount": {
-    "message": "Indløst konto"
+    "message": "Konto indløst"
   },
   "revokeAccount": {
-    "message": "Ophæv kontoen $NAME$",
+    "message": "Ophæv konto $NAME$",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4894,7 +4894,7 @@
     }
   },
   "resendEmailLabel": {
-    "message": "Gensend sponsorat-e-mail til $NAME$ sponsorat",
+    "message": "Gensend sponsoratmail til $NAME$-sponsorat",
     "placeholders": {
       "name": {
         "content": "$1",
@@ -4915,7 +4915,7 @@
     "message": "Fjern sponsorat"
   },
   "removeSponsorshipConfirmation": {
-    "message": "Efter at have fjernet et sponsorat, vil du være ansvarlig for dette abonnement og relaterede fakturaer. Er du sikker på, at du vil fortsætte?"
+    "message": "Efter fjernelse af et sponsorat vil du være ansvarlig for abonnementet og relaterede fakturaer. Sikker på, at du vil fortsætte?"
   },
   "sponsorshipCreated": {
     "message": "Sponsorat oprettet"
@@ -4924,7 +4924,7 @@
     "message": "E-mail sendt"
   },
   "revokeSponsorshipConfirmation": {
-    "message": "Efter at have fjernet denne konto, udløber familie-abonnementets sponsorat ved slutningen af faktureringsperioden. Du vil ikke kunne indløse et nyt sponsortilbud, før det eksisterende udløber. Er du sikker på, at du vil fortsætte?"
+    "message": "Efter fjernelse af denne konto udløber Familie-abonnementets sponsorat ved slutningen af faktureringsperioden. Du vil ikke kunne indløse et nyt sponsortilbud, før det eksisterende udløber. Sikker på, at du vil fortsætte?"
   },
   "removeSponsorshipSuccess": {
     "message": "Sponsoratet fjernet"
@@ -4951,13 +4951,13 @@
     "message": "Bekræft din identitet for at fortsætte."
   },
   "verificationCodeRequired": {
-    "message": "Bekræftelseskode er påkrævet."
+    "message": "Bekræftelseskode kræves."
   },
   "invalidVerificationCode": {
     "message": "Ugyldig bekræftelseskode"
   },
   "convertOrganizationEncryptionDesc": {
-    "message": "$ORGANIZATION$ bruger SSO med en selv-hostet nøgleserver. En hovedadgangskode er ikke længere påkrævet for at logge ind for medlemmer af denne organisation.",
+    "message": "$ORGANIZATION$ anvender SSO med en selv-hostet nøgleserver. Organisationsmedlemmer afkræves ikke længere en hovedadgangskode for at logge ind.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -4978,14 +4978,14 @@
     "message": "Tillad SSO-godkendelse"
   },
   "allowSsoDesc": {
-    "message": "Når den er indstillet, vil din konfiguration blive gemt, og medlemmer vil være i stand til at autentificere ved hjælp af deres identitetsudbyder-akkreditiver."
+    "message": "Når indstillet, gemmes opsætningen, og medlemmer vil kunne godkendes vha. deres identitetsudbyderlegitimationsoplysninger."
   },
   "ssoPolicyHelpStart": {
     "message": "Brug",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpLink": {
-    "message": "kræv enkelt-logon-godkendelsespolitik",
+    "message": "kræv Single Sign-On godkendelsespolitik",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpEnd": {
@@ -4993,22 +4993,22 @@
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Use the require single-sign-on authentication policy to require all members to log in with SSO.'"
   },
   "ssoPolicyHelpKeyConnector": {
-    "message": "Kræv SSO-godkendelse og enkeltorganisationspolitikker er påkrævet for at konfigurere Key Connector-dekryptering."
+    "message": "\"Kræv SSO-godkendelse\" samt enkeltorganisationspolitikker kræves for opsætning af Key Connector-dekryptering."
   },
   "memberDecryptionOption": {
     "message": "Medlemsdekrypteringsindstillinger"
   },
   "memberDecryptionPassDesc": {
-    "message": "Når godkendt, dekrypterer medlemmer boks-data ved hjælp af deres hovedadgangskode."
+    "message": "Når godkendt, dekrypterer medlemmer boks-data vha. deres hovedadgangskode."
   },
   "keyConnector": {
     "message": "Key Connector"
   },
   "memberDecryptionKeyConnectorDesc": {
-    "message": "Forbind Login med SSO til din selv-hostede dekrypteringsnøgleserver. Ved at bruge denne mulighed behøver medlemmer ikke at bruge deres hovedadgangskoder til at dekryptere boksdata. Kontakt Bitwarden support for at få hjælp til opsætning."
+    "message": "Forbind login med SSO til din selv-hostet dekrypteringsnøgleserver. Muligheden overflødiggør medlemmers brug af hovedadgangskode ifm. boks-datadekryptering. Kontakt Bitwarden Support for hjælp til opsætningen."
   },
   "keyConnectorPolicyRestriction": {
-    "message": "\"Login med SSO og Key Connector-dekryptering\" er aktiveret. Denne politik omfatter kun ejere og Admins."
+    "message": "\"Login med SSO og Key Connector-dekryptering\" er aktiveret. Denne politik omfatter kun ejere og admins."
   },
   "enabledSso": {
     "message": "SSO aktiveret"
@@ -5023,7 +5023,7 @@
     "message": "Key Connector deaktiveret"
   },
   "keyConnectorWarning": {
-    "message": "Når medlemmer begynder at bruge Key Connector, kan din organisation ikke vende tilbage til hovedadgangskode-dekryptering. Fortsæt kun, hvis du er fortrolig med at implementere og administrere en nøgleserver."
+    "message": "Når medlemmer begynder at bruge Key Connector, kan din organisation ikke vende tilbage til hovedadgangskode-dekryptering. Fortsæt kun, hvis du er fortrolig med at implementere og håndtere en nøgleserver."
   },
   "migratedKeyConnector": {
     "message": "Migreret til Key Connector"
@@ -5032,7 +5032,7 @@
     "message": "Angiv en betalingsmetode der skal tilknyttes organisationen. Bare rolig, vi vil ikke opkræve dig noget, medmindre du vælger yderligere funktioner, eller dit sponsorat udløber."
   },
   "orgCreatedSponsorshipInvalid": {
-    "message": "Sponsortilbuddet er udløbet. Du kan slette den organisation, du har oprettet, for at undgå en opkrævning ved udløbet af din 7-dages prøveperiode. Ellers kan du lukke denne prompt for at beholde organisationen og påtage dig faktureringsansvaret."
+    "message": "Sponsortilbuddet er udløbet. Den oprettede organisation kan slettes for at undgå opkrævning ved udkøb af den 7-dages prøveperiode. Ellers luk denne prompt for at beholde organisationen og påtage dig faktureringsforpligtigelsen."
   },
   "newFamiliesOrganization": {
     "message": "Ny Familier-organisation"
@@ -5047,7 +5047,7 @@
     "message": "Test"
   },
   "keyConnectorTestSuccess": {
-    "message": "Succes! Key Connector nået."
+    "message": "Lykkedes! Key Connector nået."
   },
   "keyConnectorTestFail": {
     "message": "Key Connector kan ikke nås. Tjek URL'en."
@@ -5083,16 +5083,16 @@
     "message": "Rotér token"
   },
   "rotateBillingSyncTokenWarning": {
-    "message": "Hvis du fortsætter, skal du genopsætte faktureringssynk på din selvhostede server."
+    "message": "Fortsættes, vil faktureringssynk skulle genopsættes på din selvhostede server."
   },
   "rotateBillingSyncTokenTitle": {
-    "message": "Rotation af faktureringssynk-token vil ugyldiggøre det foregående token."
+    "message": "Rotering af faktureringssynk-tokenet vil ugyldiggøre det foregående token."
   },
   "selfHostingTitle": {
     "message": "Selvhosting"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
-    "message": "For at opsætte din organisation på din egen server, skal du uploade din licensfil. For at understøtte gratis familieabonnementer og avancerede faktureringsmuligheder for din selv-hostede organisation, skal du konfigurere faktureringssynk."
+    "message": "For at opsætte din organisation på egen server, så upload din licensfil. Opsæt faktureringssynk for at understøtte gratis Familier-abonnementstyper og avancerede faktureringsmuligheder for din selvhostede organisation."
   },
   "billingSyncApiKeyRotated": {
     "message": "Token roteret."
@@ -5101,10 +5101,10 @@
     "message": "Faktureringssynk"
   },
   "billingSyncDesc": {
-    "message": "Faktureringssynk giver gratis familieabonnementer til medlemmer og avancerede faktureringsmuligheder ved at linke din selvhostede Bitwarden til Bitwarden-cloudserveren."
+    "message": "Faktureringssynk giver gratis Familier-abonnementstyper til medlemmer samt avancerede faktureringsmuligheder ved at linke din selvhostede Bitwarden til Bitwarden-cloudserveren."
   },
   "billingSyncKeyDesc": {
-    "message": "Et faktureringssynk-token fra din cloud-organisations abonnementsindstillinger er påkrævet for at udfylde denne formular."
+    "message": "Et faktureringssynk-token fra din cloud-organisations abonnementsindstillinger kræves for at udfylde denne formular."
   },
   "billingSyncKey": {
     "message": "Faktureringssynk-token"
@@ -5137,10 +5137,10 @@
     }
   },
   "formErrorSummarySingle": {
-    "message": "1 felt ovenfor kræver din opmærksomhed."
+    "message": "1 felt ovenfor kræver opmærksomhed."
   },
   "fieldRequiredError": {
-    "message": "$FIELDNAME$ er påkrævet.",
+    "message": "$FIELDNAME$ er obligatorisk.",
     "placeholders": {
       "fieldname": {
         "content": "$1",
@@ -5149,31 +5149,31 @@
     }
   },
   "required": {
-    "message": "krævet"
+    "message": "obligatorisk"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Krævet, hvis enheds-id ikke er en URL."
+    "message": "Obligatorisk, såfremt Enheds-ID ikke er en URL."
   },
   "openIdOptionalCustomizations": {
     "message": "Valgfrie tilpasninger"
   },
   "openIdAuthorityRequired": {
-    "message": "Påkrævet, hvis autoriteten ikke er gyldig."
+    "message": "Obligatorisk, såfremt Godkender ikke er gyldig."
   },
   "separateMultipleWithComma": {
     "message": "Adskil flere med et komma."
   },
   "sessionTimeout": {
-    "message": "Din session er udløbet. Gå tilbage og prøv at logge ind igen."
+    "message": "Session udløbet. Gå tilbage og prøv at logge ind igen."
   },
   "exportingPersonalVaultTitle": {
-    "message": "Eksporterer personlig boks"
+    "message": "Eksport af individuel boks"
   },
   "exportingOrganizationVaultTitle": {
-    "message": "Eksporterer organisationsboks"
+    "message": "Eksport af organisationsboks"
   },
   "exportingPersonalVaultDescription": {
-    "message": "Kun de personlige bokselementer tilknyttet $EMAIL$ eksporteres. Organisationsbokseelementer medtages ikke.",
+    "message": "Kun individuelle boksemner tilknyttet $EMAIL$ eksporteres. Organisationsboksemner medtages ikke.",
     "placeholders": {
       "email": {
         "content": "$1",
@@ -5182,7 +5182,7 @@
     }
   },
   "exportingOrganizationVaultDescription": {
-    "message": "Kun organisationsboksen tilknyttet $ORGANIZATION$ eksporteres. Personlige bokseelementer, samt elementer fra andre organisationer, medtages ikke.",
+    "message": "Kun organisationsboksen tilknyttet $ORGANIZATION$ eksporteres. Individuelle boksemner, samt emner fra andre organisationer, medtages ikke.",
     "placeholders": {
       "organization": {
         "content": "$1",
@@ -5191,7 +5191,7 @@
     }
   },
   "accessDenied": {
-    "message": "Adgang nægtet. Du har ikke tilladelse til at se denne side."
+    "message": "Adgang nægtet. Nødvendig tilladelse til at se siden mangler."
   },
   "masterPassword": {
     "message": "Hovedadgangskode"
diff --git a/apps/web/src/locales/en_GB/messages.json b/apps/web/src/locales/en_GB/messages.json
index aea05dbf573..0a30129378a 100644
--- a/apps/web/src/locales/en_GB/messages.json
+++ b/apps/web/src/locales/en_GB/messages.json
@@ -191,7 +191,7 @@
     "description": "Domain name. Example: website.com"
   },
   "domainName": {
-    "message": "Domain Name",
+    "message": "Domain name",
     "description": "Domain name. Example: website.com"
   },
   "host": {
@@ -315,7 +315,7 @@
     "message": "Identities"
   },
   "typeSecureNotePlural": {
-    "message": "Secure Notes"
+    "message": "Secure notes"
   },
   "folders": {
     "message": "Folders"
@@ -333,7 +333,7 @@
     "message": "Last name"
   },
   "fullName": {
-    "message": "Full Name"
+    "message": "Full name"
   },
   "address1": {
     "message": "Address 1"
@@ -372,7 +372,7 @@
     "message": "Edit item"
   },
   "viewItem": {
-    "message": "View Item"
+    "message": "View item"
   },
   "ex": {
     "message": "e.g.",
@@ -385,7 +385,7 @@
     "message": "Share"
   },
   "moveToOrganization": {
-    "message": "Move to Organisation"
+    "message": "Move to organisation"
   },
   "valueCopied": {
     "message": "$VALUE$ copied",
@@ -428,7 +428,7 @@
     "message": "My vault"
   },
   "allVaults": {
-    "message": "All Vaults"
+    "message": "All vaults"
   },
   "vault": {
     "message": "Vault"
@@ -437,10 +437,10 @@
     "message": "Vaults"
   },
   "vaultItems": {
-    "message": "Vault Items"
+    "message": "Vault items"
   },
   "moveSelectedToOrg": {
-    "message": "Move Selected to Organisation"
+    "message": "Move selected to organisation"
   },
   "deleteSelected": {
     "message": "Delete selected"
@@ -467,7 +467,7 @@
     "message": "Are you sure you want to delete this attachment?"
   },
   "attachmentSaved": {
-    "message": "The attachment has been saved."
+    "message": "Attachment saved"
   },
   "file": {
     "message": "File"
@@ -482,10 +482,10 @@
     "message": "You cannot use this feature until you update your encryption key."
   },
   "addedItem": {
-    "message": "Added item"
+    "message": "Item added"
   },
   "editedItem": {
-    "message": "Edited item"
+    "message": "Item saved"
   },
   "movedItemToOrg": {
     "message": "$ITEMNAME$ moved to $ORGNAME$",
@@ -528,22 +528,22 @@
     "message": "Items sent to bin"
   },
   "movedItems": {
-    "message": "Moved items"
+    "message": "Items moved"
   },
   "overwritePasswordConfirmation": {
     "message": "Are you sure you want to overwrite the current password?"
   },
   "editedFolder": {
-    "message": "Edited folder"
+    "message": "Folder saved"
   },
   "addedFolder": {
-    "message": "Added folder"
+    "message": "Folder added"
   },
   "deleteFolderConfirmation": {
     "message": "Are you sure you want to delete this folder?"
   },
   "deletedFolder": {
-    "message": "Deleted folder"
+    "message": "Folder deleted"
   },
   "loggedOut": {
     "message": "Logged out"
@@ -573,7 +573,7 @@
     "message": "Log in with device"
   },
   "loginWithDeviceEnabledInfo": {
-    "message": "Log in with device must be enabled in the settings of the Bitwarden mobile app. Need another option?"
+    "message": "Log in with device must be set up in the settings of the Bitwarden mobile app. Need another option?"
   },
   "loginWithMasterPassword": {
     "message": "Log in with master password"
@@ -585,7 +585,7 @@
     "message": "New around here?"
   },
   "startTrial": {
-    "message": "Start Trial"
+    "message": "Start trial"
   },
   "logIn": {
     "message": "Log in"
@@ -772,7 +772,7 @@
     "message": "Login unavailable"
   },
   "noTwoStepProviders": {
-    "message": "This account has two-step login enabled. However, none of the configured two-step providers are supported by this web browser."
+    "message": "This account has two-step login set up, however, none of the configured two-step providers are supported by this web browser."
   },
   "noTwoStepProviders2": {
     "message": "Please use a supported web browser (such as Chrome) and/or add additional providers that are better supported across web browsers (such as an authenticator app)."
@@ -781,7 +781,7 @@
     "message": "Two-step login options"
   },
   "recoveryCodeDesc": {
-    "message": "Lost access to all of your two-factor providers? Use your recovery code to disable all two-factor providers from your account."
+    "message": "Lost access to all of your two-step login providers? Use your recovery code to turn off all two-step login providers from your account."
   },
   "recoveryCodeTitle": {
     "message": "Recovery code"
@@ -808,7 +808,7 @@
     "description": "'Duo Security' and 'Duo Mobile' are product names and should not be translated."
   },
   "u2fDesc": {
-    "message": "Use any FIDO U2F enabled security key to access your account."
+    "message": "Use any FIDO U2F compatible security key to access your account."
   },
   "u2fTitle": {
     "message": "FIDO U2F security key"
@@ -817,7 +817,7 @@
     "message": "FIDO2 WebAuthn"
   },
   "webAuthnDesc": {
-    "message": "Use any WebAuthn enabled security key to access your account."
+    "message": "Use any WebAuthn compatible security key to access your account."
   },
   "webAuthnMigrated": {
     "message": "(Migrated from FIDO)"
@@ -891,7 +891,7 @@
     "message": "Warning"
   },
   "confirmVaultExport": {
-    "message": "Confirm Vault Export"
+    "message": "Confirm vault export"
   },
   "exportWarningDesc": {
     "message": "This export contains your vault data in an unencrypted format. You should not store or send the exported file over insecure channels (such as email). Delete it immediately after you are done using it."
@@ -918,16 +918,16 @@
     "message": "This password will be used to export and import this file"
   },
   "confirmMasterPassword": {
-    "message": "Confirm Master Password"
+    "message": "Confirm master password"
   },
   "confirmFormat": {
-    "message": "Confirm Format"
+    "message": "Confirm format"
   },
   "filePassword": {
-    "message": "File Password"
+    "message": "File password"
   },
   "confirmFilePassword": {
-    "message": "Confirm File Password"
+    "message": "Confirm file password"
   },
   "accountBackupOptionDescription": {
     "message": "Use your account encryption key to encrypt the export and restrict import to only the current Bitwarden account."
@@ -936,25 +936,25 @@
     "message": "Set a password to encrypt the export and import it to any Bitwarden account using the password for decryption."
   },
   "fileTypeHeading": {
-    "message": "File Type"
+    "message": "File type"
   },
   "accountBackup": {
-    "message": "Account Backup"
+    "message": "Account backup"
   },
   "passwordProtected": {
-    "message": "Password Protected"
+    "message": "Password protected"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
-    "message": "“File password”  and “Confirm File Password“ do not match."
+    "message": "“File password”  and “Confirm file password“ do not match."
   },
   "confirmVaultImport": {
-    "message": "Confirm Vault Import"
+    "message": "Confirm vault import"
   },
   "confirmVaultImportDesc": {
     "message": "This file is password-protected. Please enter the file password to import data."
   },
   "exportSuccess": {
-    "message": "Your vault data has been exported."
+    "message": "Vault data exported"
   },
   "passwordGenerator": {
     "message": "Password generator"
@@ -990,7 +990,7 @@
     "message": "Numbers (0-9)"
   },
   "specialCharacters": {
-    "message": "Special Characters (!@#$%^&*)"
+    "message": "Special characters (!@#$%^&*)"
   },
   "numWords": {
     "message": "Number of words"
@@ -1016,13 +1016,13 @@
     "description": "To clear something out. Example: To clear browser history."
   },
   "accountUpdated": {
-    "message": "Account updated"
+    "message": "Account saved"
   },
   "changeEmail": {
     "message": "Change email"
   },
   "changeEmailTwoFactorWarning": {
-    "message": "Proceeding will change your account email address. It will not change the email address used for two-factor authentication. You can change this email address in the Two-Step Login settings."
+    "message": "Proceeding will change your account email address. It will not change the email address used for two-step login authentication. You can change this email address in the two-step login settings."
   },
   "newEmail": {
     "message": "New email"
@@ -1043,7 +1043,7 @@
     "message": "Proceeding will log you out of your current session, requiring you to log back in. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "emailChanged": {
-    "message": "Email changed"
+    "message": "Email saved"
   },
   "logBackIn": {
     "message": "Please log back in."
@@ -1112,7 +1112,7 @@
     "message": "Concerned your account is logged in on another device? Proceed below to deauthorise all computers or devices that you have previously used. This security step is recommended if you previously used a public computer or accidentally saved your password on a device that isn't yours. This step will also clear all previously remembered two-step login sessions."
   },
   "deauthorizeSessionsWarning": {
-    "message": "Proceeding will also log you out of your current session, requiring you to log back in. You will also be prompted for two-step login again, if enabled. Active sessions on other devices may continue to remain active for up to one hour."
+    "message": "Proceeding will also log you out of your current session, requiring you to log back in. You will also be prompted for two-step login again, if set up. Active sessions on other devices may continue to remain active for up to one hour."
   },
   "sessionsDeauthorized": {
     "message": "All sessions deauthorised"
@@ -1124,7 +1124,7 @@
     "message": "Purged organisation vault."
   },
   "vaultAccessedByProvider": {
-    "message": "Vault accessed by provider."
+    "message": "Vault accessed by Provider."
   },
   "purgeVaultDesc": {
     "message": "Proceed below to delete all items and folders in your vault. Items that belong to an organisation that you share with will not be deleted."
@@ -1136,7 +1136,7 @@
     "message": "Purging your vault is permanent. It cannot be undone."
   },
   "vaultPurged": {
-    "message": "Your vault has been purged."
+    "message": "Vault purged."
   },
   "deleteAccount": {
     "message": "Delete account"
@@ -1163,13 +1163,13 @@
     "message": "Import data"
   },
   "importError": {
-    "message": "Import Error"
+    "message": "Import error"
   },
   "importErrorDesc": {
     "message": "There was a problem with the data you tried to import. Please resolve the errors listed below in your source file and try again."
   },
   "importSuccess": {
-    "message": "Data has been successfully imported into your vault."
+    "message": "Data successfully imported"
   },
   "importWarning": {
     "message": "You are importing data to $ORGANIZATION$. Your data may be shared with members of this organisation. Do you want to proceed?",
@@ -1224,7 +1224,7 @@
     "message": "Customize your web vault experience."
   },
   "preferencesUpdated": {
-    "message": "Preferences updated"
+    "message": "Preferences saved"
   },
   "language": {
     "message": "Language"
@@ -1285,7 +1285,7 @@
     }
   },
   "domainsUpdated": {
-    "message": "Domains updated"
+    "message": "Domains saved"
   },
   "twoStepLogin": {
     "message": "Two-step login"
@@ -1310,7 +1310,7 @@
     "message": "If you have setup SSO or plan to, Two-step Login may already be enforced through your Identity Provider."
   },
   "twoStepLoginRecoveryWarning": {
-    "message": "Enabling two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (e.g. you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
+    "message": "Setting up two-step login can permanently lock you out of your Bitwarden account. A recovery code allows you to access your account in the event that you can no longer use your normal two-step login provider (example: you lose your device). Bitwarden support will not be able to assist you if you lose access to your account. We recommend you write down or print the recovery code and keep it in a safe place."
   },
   "viewRecoveryCode": {
     "message": "View recovery code"
@@ -1320,13 +1320,13 @@
     "description": "Two-step login providers such as YubiKey, Duo, Authenticator apps, Email, etc."
   },
   "enable": {
-    "message": "Enable"
+    "message": "Turn on"
   },
   "enabled": {
-    "message": "Enabled"
+    "message": "Turned on"
   },
   "restoreAccess": {
-    "message": "Restore Access"
+    "message": "Restore access"
   },
   "premium": {
     "message": "Premium",
@@ -1339,25 +1339,25 @@
     "message": "Premium required"
   },
   "premiumRequiredDesc": {
-    "message": "A premium membership is required to use this feature."
+    "message": "A Premium membership is required to use this feature."
   },
   "youHavePremiumAccess": {
-    "message": "You have premium access"
+    "message": "You have Premium access"
   },
   "alreadyPremiumFromOrg": {
-    "message": "You already have access to premium features because of an organisation of which you are a member."
+    "message": "You already have access to Premium features because of an organisation you are a member of."
   },
   "manage": {
     "message": "Manage"
   },
   "disable": {
-    "message": "Disable"
+    "message": "Turn off"
   },
   "revokeAccess": {
-    "message": "Revoke Access"
+    "message": "Revoke access"
   },
   "twoStepLoginProviderEnabled": {
-    "message": "This two-step login provider is enabled on your account."
+    "message": "This two-step login provider is active on your account."
   },
   "twoStepLoginAuthDesc": {
     "message": "Enter your master password to modify two-step login settings."
@@ -1396,10 +1396,10 @@
     "message": "In case you need to add it to another device, below is the QR code (or key) required by your authenticator app."
   },
   "twoStepDisableDesc": {
-    "message": "Are you sure you want to disable this two-step login provider?"
+    "message": "Are you sure you want to turn off this two-step login provider?"
   },
   "twoStepDisabled": {
-    "message": "Two-step login provider disabled."
+    "message": "Two-step login provider turned off."
   },
   "twoFactorYubikeyAdd": {
     "message": "Add a new YubiKey to your account"
@@ -1417,7 +1417,7 @@
     "message": "Save the form."
   },
   "twoFactorYubikeyWarning": {
-    "message": "Due to platform limitations, YubiKeys cannot be used on all Bitwarden applications. You should enable another two-step login provider so that you can access your account when YubiKeys cannot be used. Supported platforms:"
+    "message": "Due to platform limitations, YubiKeys cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when YubiKeys cannot be used. Supported platforms:"
   },
   "twoFactorYubikeySupportUsb": {
     "message": "Web vault, desktop application, CLI, and all browser extensions on a device with a USB port that can accept your YubiKey."
@@ -1465,7 +1465,7 @@
     "message": "YubiKeys updated"
   },
   "disableAllKeys": {
-    "message": "Disable all keys"
+    "message": "Deactivate all keys"
   },
   "twoFactorDuoDesc": {
     "message": "Enter the Bitwarden application information from your Duo Admin panel."
@@ -1519,31 +1519,31 @@
     "message": "Save the form."
   },
   "twoFactorU2fWarning": {
-    "message": "Due to platform limitations, FIDO U2F cannot be used on all Bitwarden applications. You should enable another two-step login provider so that you can access your account when FIDO U2F cannot be used. Supported platforms:"
+    "message": "Due to platform limitations, FIDO U2F cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when FIDO U2F cannot be used. Supported platforms:"
   },
   "twoFactorU2fSupportWeb": {
-    "message": "Web vault and browser extensions on a desktop/laptop with a U2F enabled browser (Chrome, Opera, Vivaldi, or Firefox with FIDO U2F enabled)."
+    "message": "Web vault and browser extensions on a desktop/laptop with a U2F supported browser (Chrome, Opera, Vivaldi, or Firefox with FIDO U2F turned on)."
   },
   "twoFactorU2fWaiting": {
     "message": "Waiting for you to touch the button on your security key"
   },
   "twoFactorU2fClickSave": {
-    "message": "Click the \"Save\" button below to enable this security key for two-step login."
+    "message": "Use the \"Save\" button below to activate this security key for two-step login."
   },
   "twoFactorU2fProblemReadingTryAgain": {
     "message": "There was a problem reading the security key. Try again."
   },
   "twoFactorWebAuthnWarning": {
-    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should enable another two-step login provider so that you can access your account when WebAuthn cannot be used. Supported platforms:"
+    "message": "Due to platform limitations, WebAuthn cannot be used on all Bitwarden applications. You should set up another two-step login provider so that you can access your account when WebAuthn cannot be used. Supported platforms:"
   },
   "twoFactorWebAuthnSupportWeb": {
-    "message": "Web vault and browser extensions on a desktop/laptop with a WebAuthn enabled browser (Chrome, Opera, Vivaldi, or Firefox with FIDO U2F enabled)."
+    "message": "Web vault and browser extensions on a desktop/laptop with a WebAuthn supported browser (Chrome, Opera, Vivaldi, or Firefox with FIDO U2F turned on)."
   },
   "twoFactorRecoveryYourCode": {
     "message": "Your Bitwarden two-step login recovery code"
   },
   "twoFactorRecoveryNoCode": {
-    "message": "You have not enabled any two-step login providers yet. After you have enabled a two-step login provider you can check back here for your recovery code."
+    "message": "You have not set up any two-step login providers yet. After you have set up a two-step login provider you can check back here for your recovery code."
   },
   "printCode": {
     "message": "Print code",
@@ -1557,14 +1557,14 @@
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "orgsReportsDesc": {
-    "message": "Identify and close security gaps in your organization's accounts by clicking the reports below.",
+    "message": "Identify and close security gaps in your organisation's accounts by clicking the reports below.",
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization Vault."
   },
   "unsecuredWebsitesReport": {
-    "message": "Unsecure Websites"
+    "message": "Unsecure websites"
   },
   "unsecuredWebsitesReportDesc": {
-    "message": "URLs that start with http:// don’t use the best available encryption. Change the Login URIs for these accounts to https:// for safer browsing."
+    "message": "URLs that start with http:// don’t use the best available encryption. Change the login URIs for these accounts to https:// for safer browsing."
   },
   "unsecuredWebsitesFound": {
     "message": "Unsecured websites found"
@@ -1582,13 +1582,13 @@
     "message": "No items in your vault have unsecured URIs."
   },
   "inactive2faReport": {
-    "message": "Inactive Two-step Login"
+    "message": "Inactive two-step login"
   },
   "inactive2faReportDesc": {
-    "message": "Two-step Login adds a layer of protection to your accounts. Turn on Two-Step Login using Bitwarden Authenticator for these accounts or use an alternative method."
+    "message": "Two-step login adds a layer of protection to your accounts. Set up two-step login using Bitwarden authenticator for these accounts or use an alternative method."
   },
   "inactive2faFound": {
-    "message": "Logins without 2FA found"
+    "message": "Logins without two-step login found"
   },
   "inactive2faFoundDesc": {
     "message": "We found $COUNT$ website(s) in your vault that may not be configured with two-step login (according to 2fa.directory). To further protect these accounts, you should set up two-step login.",
@@ -1600,13 +1600,13 @@
     }
   },
   "noInactive2fa": {
-    "message": "No websites were found in your vault with a missing two-factor authentication configuration."
+    "message": "No websites were found in your vault with a missing two-step login configuration."
   },
   "instructions": {
     "message": "Instructions"
   },
   "exposedPasswordsReport": {
-    "message": "Exposed Passwords"
+    "message": "Exposed passwords"
   },
   "exposedPasswordsReportDesc": {
     "message": "Passwords exposed in a data breach are easy targets for attackers. Change these passwords to prevent potential break-ins."
@@ -1639,10 +1639,10 @@
     }
   },
   "weakPasswordsReport": {
-    "message": "Weak Passwords"
+    "message": "Weak passwords"
   },
   "weakPasswordsReportDesc": {
-    "message": "Weak passwords can be easily guessed by attackers. Change these passwords to strong ones using the Password Generator."
+    "message": "Weak passwords can be easily guessed by attackers. Change these passwords to strong ones using the password generator."
   },
   "weakPasswordsFound": {
     "message": "Weak passwords found"
@@ -1660,7 +1660,7 @@
     "message": "No items in your vault have weak passwords."
   },
   "reusedPasswordsReport": {
-    "message": "Reused Passwords"
+    "message": "Reused passwords"
   },
   "reusedPasswordsReportDesc": {
     "message": "Reusing passwords makes it easier for attackers to break into multiple accounts. Change these passwords so that each is unique."
@@ -1690,7 +1690,7 @@
     }
   },
   "dataBreachReport": {
-    "message": "Data Breach"
+    "message": "Data breach"
   },
   "breachDesc": {
     "message": "Breached accounts can expose your personal information. Secure breached accounts by enabling 2FA or creating a stronger password."
@@ -1752,10 +1752,10 @@
     "message": "Billing"
   },
   "billingPlanLabel": {
-    "message": "Billing Plan"
+    "message": "Billing plan"
   },
   "paymentType": {
-    "message": "Payment Type"
+    "message": "Payment type"
   },
   "accountCredit": {
     "message": "Account credit",
@@ -1787,10 +1787,10 @@
     "description": "Another way of saying \"Get a Premium membership\""
   },
   "premiumUpdated": {
-    "message": "You've upgraded to premium."
+    "message": "You've upgraded to Premium."
   },
   "premiumUpgradeUnlockFeatures": {
-    "message": "Upgrade your account to a premium membership and unlock some great additional features."
+    "message": "Upgrade your account to a Premium membership and unlock some great additional features."
   },
   "premiumSignUpStorage": {
     "message": "1 GB encrypted storage for file attachments."
@@ -1799,7 +1799,7 @@
     "message": "Additional two-step login options such as YubiKey, FIDO U2F, and Duo."
   },
   "premiumSignUpEmergency": {
-    "message": "Emergency Access"
+    "message": "Emergency access"
   },
   "premiumSignUpReports": {
     "message": "Password hygiene, account health, and data breach reports to keep your vault safe."
@@ -1811,7 +1811,7 @@
     "message": "Priority customer support."
   },
   "premiumSignUpFuture": {
-    "message": "All future premium features. More coming soon!"
+    "message": "All future Premium features. More coming soon!"
   },
   "premiumPrice": {
     "message": "All for just $PRICE$ /year!",
@@ -1829,7 +1829,7 @@
     "message": "Premium access"
   },
   "premiumAccessDesc": {
-    "message": "You can add premium access to all members of your organisation for $PRICE$ /$INTERVAL$.",
+    "message": "You can add Premium access to all members of your organisation for $PRICE$ /$INTERVAL$.",
     "placeholders": {
       "price": {
         "content": "$1",
@@ -1902,7 +1902,7 @@
     "message": "Payment information"
   },
   "billingInformation": {
-    "message": "Billing Information"
+    "message": "Billing information"
   },
   "billingTrialSubLabel": {
     "message": "Your payment method will not be charged during the 7 day free trial."
@@ -1911,7 +1911,7 @@
     "message": "Credit card"
   },
   "paypalClickSubmit": {
-    "message": "Click the PayPal button to log into your PayPal account, then click the Submit button below to continue."
+    "message": "Select the PayPal button to log into your PayPal account, then click the Submit button below to continue."
   },
   "cancelSubscription": {
     "message": "Cancel subscription"
@@ -1938,7 +1938,7 @@
     "message": "Are you sure you want to cancel? You will lose access to all of this subscription's features at the end of this billing cycle."
   },
   "canceledSubscription": {
-    "message": "The subscription has been cancelled."
+    "message": "Subscription cancelled"
   },
   "neverExpires": {
     "message": "Never expires"
@@ -2058,7 +2058,7 @@
     }
   },
   "contactSupport": {
-    "message": "Contact Customer Support"
+    "message": "Contact customer support"
   },
   "updatedPaymentMethod": {
     "message": "Updated payment method."
@@ -2079,7 +2079,7 @@
     }
   },
   "uploadLicenseFilePremium": {
-    "message": "To upgrade your account to a premium membership you need to upload a valid licence file."
+    "message": "To upgrade your account to a Premium membership you need to upload a valid licence file."
   },
   "uploadLicenseFileOrg": {
     "message": "To create an on-premises hosted organisation you need to upload a valid licence file."
@@ -2237,7 +2237,7 @@
     "message": "On-premise hosting (optional)"
   },
   "usersGetPremium": {
-    "message": "Users get access to premium features"
+    "message": "Users get access to Premium features"
   },
   "controlAccessWithGroups": {
     "message": "Control user access with groups"
@@ -2303,7 +2303,7 @@
     "message": "Your new organisation is ready to go!"
   },
   "organizationUpgraded": {
-    "message": "Your organisation has been upgraded."
+    "message": "Organisation upgraded"
   },
   "leave": {
     "message": "Leave"
@@ -2312,7 +2312,7 @@
     "message": "Are you sure you want to leave this organisation?"
   },
   "leftOrganization": {
-    "message": "You have left the organisation."
+    "message": "You left the organisation"
   },
   "defaultCollection": {
     "message": "Default collection"
@@ -2336,7 +2336,7 @@
     "message": "Policies"
   },
   "singleSignOn": {
-    "message": "Single Sign-On"
+    "message": "Single sign-on"
   },
   "editPolicy": {
     "message": "Edit policy"
@@ -2366,10 +2366,10 @@
     "message": "When a member is revoked, they no longer have access to organisation data. To quickly restore member access, go to the Revoked tab."
   },
   "removeUserConfirmationKeyConnector": {
-    "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organisation will permanently disable their account. This action cannot be undone. Do you want to proceed?"
+    "message": "Warning! This user requires Key Connector to manage their encryption. Removing this user from your organisation will permanently deactivate their account. This action cannot be undone. Do you want to proceed?"
   },
   "externalId": {
-    "message": "External ID"
+    "message": "External id"
   },
   "externalIdDesc": {
     "message": "The external ID can be used as a reference or to link this resource to an external system such as a user directory."
@@ -2438,7 +2438,7 @@
     "message": "Confirmed"
   },
   "clientOwnerEmail": {
-    "message": "Client Owner Email"
+    "message": "Client owner email"
   },
   "owner": {
     "message": "Owner"
@@ -2501,16 +2501,16 @@
     "message": "Web vault"
   },
   "loggedIn": {
-    "message": "Logged in."
+    "message": "Logged in"
   },
   "changedPassword": {
-    "message": "Changed account password."
+    "message": "Changed account password"
   },
   "enabledUpdated2fa": {
-    "message": "Enabled/updated two-step login."
+    "message": "Two-step login saved"
   },
   "disabled2fa": {
-    "message": "Disabled two-step login."
+    "message": "Two-step login turned off"
   },
   "recovered2fa": {
     "message": "Recovered account from two-step login."
@@ -2522,7 +2522,7 @@
     "message": "Login attempt failed with incorrect two-step login."
   },
   "exportedVault": {
-    "message": "Exported vault."
+    "message": "Vault exported"
   },
   "exportedOrganizationVault": {
     "message": "Exported organisation vault."
@@ -2891,16 +2891,16 @@
     "message": "Edit the groups that this user belongs to."
   },
   "invitedUsers": {
-    "message": "Invited user(s)."
+    "message": "User(s) invited"
   },
   "resendInvitation": {
     "message": "Resend invitation"
   },
   "resendEmail": {
-    "message": "Resend Email"
+    "message": "Resend email"
   },
   "hasBeenReinvited": {
-    "message": "$USER$ has been reinvited.",
+    "message": "$USER$ reinvited",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -2915,7 +2915,7 @@
     "message": "Confirm user"
   },
   "hasBeenConfirmed": {
-    "message": "$USER$ has been confirmed.",
+    "message": "$USER$ confirmed.",
     "placeholders": {
       "user": {
         "content": "$1",
@@ -2948,13 +2948,13 @@
     "message": "Check your email inbox for a verification link."
   },
   "emailVerified": {
-    "message": "Your email has been verified."
+    "message": "Account email verified"
   },
   "emailVerifiedFailed": {
     "message": "Unable to verify your email. Try sending a new verification email."
   },
   "emailVerificationRequired": {
-    "message": "Email Verification Required"
+    "message": "Email verification required"
   },
   "emailVerificationRequiredDesc": {
     "message": "You must verify your email to use this feature."
@@ -2993,13 +2993,13 @@
     "message": "Remember email"
   },
   "recoverAccountTwoStepDesc": {
-    "message": "If you cannot access your account through your normal two-step login methods, you can use your two-step login recovery code to disable all two-step providers on your account."
+    "message": "If you cannot access your account through your normal two-step login methods, you can use your two-step login recovery code to turn off all two-step providers on your account."
   },
   "recoverAccountTwoStep": {
     "message": "Recover account two-step login"
   },
   "twoStepRecoverDisabled": {
-    "message": "Two-step login has been disabled on your account."
+    "message": "Two-step login turned off on your account."
   },
   "learnMore": {
     "message": "Learn more"
@@ -3011,13 +3011,13 @@
     "message": "If your account exists, we've sent you an email with further instructions."
   },
   "deleteRecoverConfirmDesc": {
-    "message": "You have requested to delete your Bitwarden account. Click the button below to confirm."
+    "message": "You have requested to delete your Bitwarden account. Use the button below to confirm."
   },
   "myOrganization": {
     "message": "My organisation"
   },
   "organizationInfo": {
-    "message": "Organization info"
+    "message": "Organisation info"
   },
   "deleteOrganization": {
     "message": "Delete organisation"
@@ -3050,7 +3050,7 @@
     "message": "The organisation and all associated data has been deleted."
   },
   "organizationUpdated": {
-    "message": "Organisation updated"
+    "message": "Organisation saved"
   },
   "taxInformation": {
     "message": "Tax information"
@@ -3063,7 +3063,7 @@
     "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "changeBillingPlan": {
-    "message": "Upgrade Plan",
+    "message": "Upgrade plan",
     "description": "A billing plan/package. For example: Families, Teams, Enterprise, etc."
   },
   "changeBillingPlanUpgrade": {
@@ -3096,10 +3096,10 @@
     "message": "Payment with a bank account is only available to customers in the United States. You will be required to verify your bank account. We will make two micro-deposits within the next 1-2 business days. Enter these amounts on the organisation's billing page to verify the bank account."
   },
   "verifyBankAccountFailureWarning": {
-    "message": "Failure to verify the bank account will result in a missed payment and your subscription being disabled."
+    "message": "Failure to verify the bank account will result in a missed payment and your subscription being suspended."
   },
   "verifiedBankAccount": {
-    "message": "Bank account has been verified."
+    "message": "Bank account verified"
   },
   "bankAccount": {
     "message": "Bank account"
@@ -3137,10 +3137,10 @@
     "message": "Enter your installation ID"
   },
   "limitSubscriptionDesc": {
-    "message": "Set a seat limit for your subscription. Once this limit is reached, you will not be able to invite new users."
+    "message": "Set a seat limit for your subscription. Once this limit is reached, you will not be able to invite new members."
   },
   "maxSeatLimit": {
-    "message": "Maximum Seat Limit (optional)",
+    "message": "Seat Limit (optional)",
     "description": "Upper limit of seats to allow through autoscaling"
   },
   "maxSeatCost": {
@@ -3158,7 +3158,7 @@
     "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited users exceed your subscription seats, you will immediately receive a prorated charge for the additional users."
   },
   "subscriptionUserSeats": {
-    "message": "Your subscription allows for a total of $COUNT$ users.",
+    "message": "Your subscription allows for a total of $COUNT$ members.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3167,25 +3167,25 @@
     }
   },
   "limitSubscription": {
-    "message": "Limit Subscription (Optional)"
+    "message": "Limit subscription (optional)"
   },
   "subscriptionSeats": {
-    "message": "Subscription Seats"
+    "message": "Subscription seats"
   },
   "subscriptionUpdated": {
     "message": "Subscription updated"
   },
   "additionalOptions": {
-    "message": "Additional Options"
+    "message": "Additional options"
   },
   "additionalOptionsDesc": {
     "message": "For additional help in managing your subscription, please contact Customer Support."
   },
   "subscriptionUserSeatsUnlimitedAutoscale": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited users exceed your subscription seats, you will immediately receive a prorated charge for the additional users."
+    "message": "Adjustments to your subscription will result in pro-rated changes to your billing totals. If newly invited members exceed your subscription seats, you will immediately receive a pro-rated charge for the additional members."
   },
   "subscriptionUserSeatsLimitedAutoscale": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. If newly invited users exceed your subscription seats, you will immediately receive a prorated charge for the additional users until your $MAX$ seat limit is reached.",
+    "message": "Adjustments to your subscription will result in pro-rated changes to your billing totals. If newly invited members exceed your subscription seats, you will immediately receive a pro-rated charge for the additional members until your $MAX$ seat limit is reached.",
     "placeholders": {
       "max": {
         "content": "$1",
@@ -3194,7 +3194,7 @@
     }
   },
   "subscriptionFreePlan": {
-    "message": "You cannot invite more than $COUNT$ users without upgrading your plan.",
+    "message": "You cannot invite more than $COUNT$ members without upgrading your plan.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3203,7 +3203,7 @@
     }
   },
   "subscriptionFamiliesPlan": {
-    "message": "You cannot invite more than $COUNT$ users without upgrading your plan. Please contact Customer Support to upgrade.",
+    "message": "You cannot invite more than $COUNT$ members without upgrading your plan. Please contact Customer Support to upgrade.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3212,7 +3212,7 @@
     }
   },
   "subscriptionSponsoredFamiliesPlan": {
-    "message": "Your subscription allows for a total of $COUNT$ users. Your plan is sponsored and billed to an external organisation.",
+    "message": "Your subscription allows for a total of $COUNT$ members. Your plan is sponsored and billed to an external organisation.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3221,7 +3221,7 @@
     }
   },
   "subscriptionMaxReached": {
-    "message": "Adjustments to your subscription will result in prorated changes to your billing totals. You cannot invite more than $COUNT$ users without increasing your subscription seats.",
+    "message": "Adjustments to your subscription will result in pro-rated changes to your billing totals. You cannot invite more than $COUNT$ members without increasing your subscription seats.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -3287,7 +3287,7 @@
     "message": "This feature is not available for free organisations. Switch to a paid plan to unlock more features."
   },
   "createOrganizationStep1": {
-    "message": "Create organisation: step 1"
+    "message": "Create organisation: Step 1"
   },
   "createOrganizationCreatePersonalAccount": {
     "message": "Before creating your organisation, you first need to create a free personal account."
@@ -3353,10 +3353,10 @@
     "description": "ex. Date this password was updated"
   },
   "organizationIsDisabled": {
-    "message": "Organisation is disabled."
+    "message": "Organisation suspended"
   },
   "disabledOrganizationFilterError": {
-    "message": "Items in disabled Organisations cannot be accessed. Contact your Organisation owner for assistance."
+    "message": "Items in suspended organisations cannot be accessed. Contact your organisation owner for assistance."
   },
   "licenseIsExpired": {
     "message": "Licence is expired."
@@ -3432,7 +3432,7 @@
     "message": "Fingerprint phrase"
   },
   "dontAskFingerprintAgain": {
-    "message": "Never prompt to verify fingerprint phrases for invited users (Not recommended)",
+    "message": "Never prompt to verify fingerprint phrases for invited users (not recommended)",
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "free": {
@@ -3501,10 +3501,10 @@
     "message": "Require members to set up two-step login."
   },
   "twoStepLoginPolicyWarning": {
-    "message": "Organisation members who are not Owners or Administrators and do not have two-step login turned on for their account will be removed from the organisation and will receive an email notifying them about the change."
+    "message": "Organisation members who are not owners or admins and do not have two-step login setup for their account will be removed from the organisation and will receive an email notifying them about the change."
   },
   "twoStepLoginPolicyUserWarning": {
-    "message": "You are a member of an organisation that requires two-step login to be enabled on your user account. If you disable all two-step login providers you will be automatically removed from these organisations."
+    "message": "You are a member of an organisation that requires two-step login to be setup on your user account. If you turn off all two-step login providers you will be automatically removed from these organisations."
   },
   "passwordGeneratorPolicyDesc": {
     "message": "Set requirements for password generator."
@@ -3596,10 +3596,10 @@
     "message": "Are you sure you want to permanently delete this item?"
   },
   "permanentlyDeletedItem": {
-    "message": "Permanently deleted item"
+    "message": "Item permanently deleted"
   },
   "permanentlyDeletedItems": {
-    "message": "Permanently deleted items"
+    "message": "Items permanently deleted"
   },
   "permanentlyDeleteSelectedItemsDesc": {
     "message": "You have selected $COUNT$ item(s) to permanently delete. Are you sure you want to permanently delete all of these items?",
@@ -3611,7 +3611,7 @@
     }
   },
   "permanentlyDeletedItemId": {
-    "message": "Permanently deleted item $ID$.",
+    "message": "Item $ID$ permanently deleted",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3629,10 +3629,10 @@
     "message": "Restore item"
   },
   "restoredItem": {
-    "message": "Restored item"
+    "message": "Item restored"
   },
   "restoredItems": {
-    "message": "Restored items"
+    "message": "Items restored"
   },
   "restoreItemConfirmation": {
     "message": "Are you sure you want to restore this item?"
@@ -3650,7 +3650,7 @@
     }
   },
   "restoredItemId": {
-    "message": "Restored item $ID$.",
+    "message": "Item $ID$ restored",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3692,7 +3692,7 @@
     "message": "Organisation identifier"
   },
   "ssoLogInWithOrgIdentifier": {
-    "message": "Log in using your organisation's single sign-on portal. Please enter your organisation's identifier to begin."
+    "message": "Log in using your organisation's single sign-on portal. Please enter your organisation's SSO identifier to begin."
   },
   "enterpriseSingleSignOn": {
     "message": "Enterprise single sign-on"
@@ -3713,7 +3713,7 @@
     "message": "SSO validation failed"
   },
   "ssoIdentifierRequired": {
-    "message": "Organisation identifier is required."
+    "message": "Organisation SSO identifier is required."
   },
   "ssoIdentifier": {
     "message": "SSO identifier"
@@ -3740,25 +3740,25 @@
     "message": "Your current organisation has a policy that does not allow you to join more than one organisation. Please contact your organisation admins or sign up from a different Bitwarden account."
   },
   "singleOrgPolicyWarning": {
-    "message": "Organisation members who are not Owners or Administrators and are already a member of another organisation will be removed from your organisation."
+    "message": "Organisation members who are not owners or admins and are already a member of another organisation will be removed from your organisation."
   },
   "requireSso": {
     "message": "Require single sign-on authentication"
   },
   "requireSsoPolicyDesc": {
-    "message": "Require members to log in with the Enterprise Single Sign-On method."
+    "message": "Require members to log in with the Enterprise single sign-on method."
   },
   "prerequisite": {
     "message": "Prerequisite"
   },
   "requireSsoPolicyReq": {
-    "message": "The Single Organization enterprise policy must be turned on before activating this policy."
+    "message": "The single organisation Enterprise policy must be turned on before activating this policy."
   },
   "requireSsoPolicyReqError": {
-    "message": "Single Organisation policy not enabled."
+    "message": "Single organisation policy not set up."
   },
   "requireSsoExemption": {
-    "message": "Organisation Owners and Administrators are exempt from this policy's enforcement."
+    "message": "Organisation owners and admins are exempt from this policy's enforcement."
   },
   "sendTypeFile": {
     "message": "File"
@@ -3767,7 +3767,7 @@
     "message": "Text"
   },
   "createSend": {
-    "message": "Create new send",
+    "message": "New Send",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editSend": {
@@ -3775,15 +3775,15 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "createdSend": {
-    "message": "Created send",
+    "message": "Send saved",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "editedSend": {
-    "message": "Edited send",
+    "message": "Send saved",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deletedSend": {
-    "message": "Deleted send",
+    "message": "Send deleted",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "deleteSend": {
@@ -3841,14 +3841,14 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "copySendLink": {
-    "message": "Copy send link",
+    "message": "Copy Send link",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "removePassword": {
     "message": "Remove password"
   },
   "removedPassword": {
-    "message": "Removed password"
+    "message": "Password removed"
   },
   "removePasswordConfirmation": {
     "message": "Are you sure you want to remove the password?"
@@ -3857,7 +3857,7 @@
     "message": "Hide my email address from recipients."
   },
   "disableThisSend": {
-    "message": "Disable this Send so that no one can access it.",
+    "message": "Deactivate this Send so that no one can access it.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "allSends": {
@@ -3882,11 +3882,11 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendProtectedPasswordDontKnow": {
-    "message": "Don't know the password? Ask the sender for the password needed to access this send.",
+    "message": "Don't know the password? Ask the sender for the password needed to access this Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendHiddenByDefault": {
-    "message": "This send is hidden by default. You can toggle its visibility using the button below.",
+    "message": "This Send is hidden by default. You can toggle its visibility using the button below.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "downloadFile": {
@@ -3905,13 +3905,13 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "emergencyAccess": {
-    "message": "Emergency Access"
+    "message": "Emergency access"
   },
   "emergencyAccessDesc": {
     "message": "Grant and manage emergency access for trusted contacts. Trusted contacts may request access to either View or Takeover your account in case of a emergency. Visit our help page for more information and details into how zero knowledge sharing works."
   },
   "emergencyAccessOwnerWarning": {
-    "message": "You are an Owner of one or more organisations. If you give takeover access to an emergency contact, they will be able to use all your permissions as Owner after a takeover."
+    "message": "You are an owner of one or more organisations. If you give takeover access to an emergency contact, they will be able to use all your permissions as owner after a takeover."
   },
   "trustedEmergencyContacts": {
     "message": "Trusted emergency contacts"
@@ -3938,10 +3938,10 @@
     "message": "Invite a new emergency contact by entering their Bitwarden account email address below. If they do not have a Bitwarden account already, they will be prompted to create a new account."
   },
   "emergencyAccessRecoveryInitiated": {
-    "message": "Emergency Access Initiated"
+    "message": "Emergency access initiated"
   },
   "emergencyAccessRecoveryApproved": {
-    "message": "Emergency Access Approved"
+    "message": "Emergency access approved"
   },
   "viewDesc": {
     "message": "Can view all items in your own vault."
@@ -3953,7 +3953,7 @@
     "message": "Can reset your account with a new master password."
   },
   "waitTime": {
-    "message": "Wait Time"
+    "message": "Wait time"
   },
   "waitTimeDesc": {
     "message": "Time required before automatically granting access."
@@ -4032,7 +4032,7 @@
     }
   },
   "emergencyApproved": {
-    "message": "Emergency access approved."
+    "message": "Emergency access approved"
   },
   "emergencyRejected": {
     "message": "Emergency access rejected"
@@ -4053,27 +4053,27 @@
     "message": "Require members to save items to an organization by removing the individual vault option."
   },
   "personalOwnershipExemption": {
-    "message": "Organisation Owners and Administrators are exempt from this policy's enforcement."
+    "message": "Organisation owners and administrators are exempt from this policy's enforcement."
   },
   "personalOwnershipSubmitError": {
-    "message": "Due to an Enterprise Policy, you are restricted from saving items to your personal vault. Change the Ownership option to an organisation and choose from available Collections."
+    "message": "Due to an Enterprise policy, you are restricted from saving items to your individual vault. Change the ownership option to an organisation and choose from available collections."
   },
   "disableSend": {
     "message": "Remove Send"
   },
   "disableSendPolicyDesc": {
-    "message": "Do not allow members to create or edit sends.",
+    "message": "Do not allow members to create or edit Sends.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "disableSendExemption": {
-    "message": "Organisation users that can manage the organisation's policies are exempt from this policy's enforcement."
+    "message": "Organisation members that can manage the organisation's policies are exempt from this policy's enforcement."
   },
   "sendDisabled": {
-    "message": "Send disabled",
+    "message": "Send removed",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendDisabledWarning": {
-    "message": "Due to an enterprise policy, you are only able to delete an existing Send.",
+    "message": "Due to an Enterprise policy, you are only able to delete an existing Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptions": {
@@ -4085,10 +4085,10 @@
     "description": "'Sends' is a plural noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsExemption": {
-    "message": "Organisation users that can manage the organisation's policies are exempt from this policy's enforcement."
+    "message": "Organisation members that can manage the organisation's policies are exempt from this policy's enforcement."
   },
   "disableHideEmail": {
-    "message": "Always show member’s email address with recipients when creating or editing a send.",
+    "message": "Always show member’s email address with recipients when creating or editing a Send.",
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendOptionsPolicyInEffect": {
@@ -4132,55 +4132,55 @@
     "message": "Admin Permissions"
   },
   "accessEventLogs": {
-    "message": "Access Event Logs"
+    "message": "Access event logs"
   },
   "accessImportExport": {
-    "message": "Access Import/Export"
+    "message": "Access import/export"
   },
   "accessReports": {
-    "message": "Access Reports"
+    "message": "Access reports"
   },
   "missingPermissions": {
     "message": "You lack the necessary permissions to perform this action."
   },
   "manageAllCollections": {
-    "message": "Manage All Collections"
+    "message": "Manage all collections"
   },
   "createNewCollections": {
-    "message": "Create New Collections"
+    "message": "Create new collections"
   },
   "editAnyCollection": {
-    "message": "Edit Any Collection"
+    "message": "Edit any collection"
   },
   "deleteAnyCollection": {
-    "message": "Delete Any Collection"
+    "message": "Delete any collection"
   },
   "manageAssignedCollections": {
-    "message": "Manage Assigned Collections"
+    "message": "Manage assigned collections"
   },
   "editAssignedCollections": {
-    "message": "Edit Assigned Collections"
+    "message": "Edit assigned collections"
   },
   "deleteAssignedCollections": {
-    "message": "Delete Assigned Collections"
+    "message": "Delete assigned collections"
   },
   "manageGroups": {
-    "message": "Manage Groups"
+    "message": "Manage groups"
   },
   "managePolicies": {
-    "message": "Manage Policies"
+    "message": "Manage policies"
   },
   "manageSso": {
     "message": "Manage SSO"
   },
   "manageUsers": {
-    "message": "Manage Users"
+    "message": "Manage users"
   },
   "manageResetPassword": {
-    "message": "Manage Password Reset"
+    "message": "Manage password reset"
   },
   "disableRequiredError": {
-    "message": "You must manually disable the $POLICYNAME$ policy before this policy can be disabled.",
+    "message": "You must manually turn the $POLICYNAME$ policy before this policy can be turned off.",
     "placeholders": {
       "policyName": {
         "content": "$1",
@@ -4192,10 +4192,10 @@
     "message": "An organisation policy is affecting your ownership options."
   },
   "personalOwnershipPolicyInEffectImports": {
-    "message": "An organisation policy has disabled importing items into your personal vault."
+    "message": "An organisation policy has blocked importing items into your individual vault."
   },
   "personalOwnershipCheckboxDesc": {
-    "message": "Disable personal ownership for organisation users"
+    "message": "Remove individual ownership for organisation users"
   },
   "textHiddenByDefault": {
     "message": "When accessing the Send, hide the text by default",
@@ -4206,10 +4206,10 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "sendTextDesc": {
-    "message": "The text you want to send."
+    "message": "The text you want to Send."
   },
   "sendFileDesc": {
-    "message": "The file you want to send."
+    "message": "The file you want to Send."
   },
   "copySendLinkOnSave": {
     "message": "Copy the link to share this Send to my clipboard upon save."
@@ -4309,13 +4309,13 @@
     "message": "Your password hint cannot be the same as your password."
   },
   "enrollPasswordReset": {
-    "message": "Enroll in Password Reset"
+    "message": "Enroll in password reset"
   },
   "enrolledPasswordReset": {
-    "message": "Enrolled in Password Reset"
+    "message": "Enrolled in password reset"
   },
   "withdrawPasswordReset": {
-    "message": "Withdraw from Password Reset"
+    "message": "Withdraw from password reset"
   },
   "enrollPasswordResetSuccess": {
     "message": "Enrolment success!"
@@ -4324,7 +4324,7 @@
     "message": "Withdrawal success!"
   },
   "eventEnrollPasswordReset": {
-    "message": "User $ID$ enrolled in password reset assistance.",
+    "message": "User $ID$ enrolled in password reset.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4333,7 +4333,7 @@
     }
   },
   "eventWithdrawPasswordReset": {
-    "message": "User $ID$ withdrew from password reset assistance.",
+    "message": "User $ID$ withdrew from password reset.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4351,7 +4351,7 @@
     }
   },
   "eventResetSsoLink": {
-    "message": "Reset Sso link for user $ID$",
+    "message": "Reset SSO link for user $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4369,7 +4369,7 @@
     }
   },
   "resetPassword": {
-    "message": "Reset Password"
+    "message": "Reset password"
   },
   "resetPasswordLoggedOutWarning": {
     "message": "Proceeding will log $NAME$ out of their current session, requiring them to log back in. Active sessions on other devices may continue to remain active for up to one hour.",
@@ -4399,34 +4399,34 @@
     "message": "Allow admins to reset master passwords for members."
   },
   "resetPasswordPolicyWarning": {
-    "message": "Users in the organisation will need to self-enroll or be auto-enrolled before administrators can reset their master password."
+    "message": "Members in the organisation will need to self-enroll or be auto-enrolled before administrators can reset their master password."
   },
   "resetPasswordPolicyAutoEnroll": {
-    "message": "Automatic Enrollment"
+    "message": "Automatic enrollment"
   },
   "resetPasswordPolicyAutoEnrollDescription": {
-    "message": "All users will be automatically enrolled in password reset once their invite is accepted."
+    "message": "All members will be automatically enrolled in password reset once their invite is accepted and will not be allowed to withdraw."
   },
   "resetPasswordPolicyAutoEnrollWarning": {
-    "message": "Users already in the organisation will not be retroactively enrolled in password reset. They will need to self-enroll before administrators can reset their master password."
+    "message": "Members already in the organisation will not be retroactively enrolled in password reset. They will need to self-enroll before administrators can reset their master password."
   },
   "resetPasswordPolicyAutoEnrollCheckbox": {
-    "message": "Automatically enroll new users"
+    "message": "Require new members to be enrolled automatically"
   },
   "resetPasswordAutoEnrollInviteWarning": {
-    "message": "This organisation has an enterprise policy that will automatically enroll you in password reset. Enrollment will allow organisation administrators to change your master password."
+    "message": "This organisation has an Enterprise policy that will automatically enroll you in password reset. Enrollment will allow organisation administrators to change your master password."
   },
   "resetPasswordOrgKeysError": {
-    "message": "Organisation Keys response is null"
+    "message": "Organisation keys response is null"
   },
   "resetPasswordDetailsError": {
-    "message": "Reset Password Details response is null"
+    "message": "Reset password details response is null"
   },
   "trashCleanupWarning": {
-    "message": "Items that have been in Trash more than 30 days will be automatically deleted."
+    "message": "Items that have been in the bin more than 30 days will be automatically deleted."
   },
   "trashCleanupWarningSelfHosted": {
-    "message": "Items that have been in Trash for a while will be automatically deleted."
+    "message": "Items that have been in the bin for a while will be automatically deleted."
   },
   "passwordPrompt": {
     "message": "Master password re-prompt"
@@ -4438,7 +4438,7 @@
     "message": "This action is protected. To continue, please re-enter your master password to verify your identity."
   },
   "reinviteSelected": {
-    "message": "Resend Invitations"
+    "message": "Resend invitations"
   },
   "resendNotification": {
     "message": "Resend notification"
@@ -4462,7 +4462,7 @@
     "message": "Choose a theme for your web vault."
   },
   "themeSystem": {
-    "message": "Use System Theme"
+    "message": "Use system theme"
   },
   "themeDark": {
     "message": "Dark"
@@ -4471,16 +4471,16 @@
     "message": "Light"
   },
   "confirmSelected": {
-    "message": "Confirm Selected"
+    "message": "Confirm selected"
   },
   "bulkConfirmStatus": {
     "message": "Bulk action status"
   },
   "bulkConfirmMessage": {
-    "message": "Confirmed successfully."
+    "message": "Confirmed successfully"
   },
   "bulkReinviteMessage": {
-    "message": "Reinvited successfully."
+    "message": "Reinvited successfully"
   },
   "bulkRemovedMessage": {
     "message": "Removed successfully"
@@ -4492,40 +4492,40 @@
     "message": "Restored organisation access successfully"
   },
   "bulkFilteredMessage": {
-    "message": "Excluded, not applicable for this action."
+    "message": "Excluded, not applicable for this action"
   },
   "fingerprint": {
     "message": "Fingerprint"
   },
   "removeUsers": {
-    "message": "Remove Users"
+    "message": "Remove users"
   },
   "revokeUsers": {
-    "message": "Revoke Users"
+    "message": "Revoke users"
   },
   "restoreUsers": {
-    "message": "Restore Users"
+    "message": "Restore users"
   },
   "error": {
     "message": "Error"
   },
   "resetPasswordManageUsers": {
-    "message": "Manage Users must also be enabled with the Manage Password Reset permission"
+    "message": "Manage users must also be granted with the manage password reset permission"
   },
   "setupProvider": {
-    "message": "Provider Setup"
+    "message": "Provider setup"
   },
   "setupProviderLoginDesc": {
-    "message": "You've been invited to setup a new provider. To continue, you need to log in or create a new Bitwarden account."
+    "message": "You've been invited to setup a new Provider. To continue, you need to log in or create a new Bitwarden account."
   },
   "setupProviderDesc": {
-    "message": "Please enter the details below to complete the provider setup. Contact Customer Support if you have any questions."
+    "message": "Please enter the details below to complete the Provider setup. Contact Customer Support if you have any questions."
   },
   "providerName": {
-    "message": "Provider Name"
+    "message": "Provider name"
   },
   "providerSetup": {
-    "message": "The provider has been set up."
+    "message": "Provider successfully set up"
   },
   "clients": {
     "message": "Clients"
@@ -4535,19 +4535,19 @@
     "description": "This is used as a table header to describe which client application created an event log."
   },
   "providerAdmin": {
-    "message": "Provider Admin"
+    "message": "Provider admin"
   },
   "providerAdminDesc": {
-    "message": "The highest access user that can manage all aspects of your provider as well as access and manage client organisations."
+    "message": "The highest access user that can manage all aspects of your Provider as well as access and manage client organisations."
   },
   "serviceUser": {
-    "message": "Service User"
+    "message": "Service user"
   },
   "serviceUserDesc": {
     "message": "Service users can access and manage all client organisations."
   },
   "providerInviteUserDesc": {
-    "message": "Invite a new user to your provider by entering their Bitwarden account email address below. If they do not have a Bitwarden account already, they will be prompted to create a new account."
+    "message": "Invite a new user to your Provider by entering their Bitwarden account email address below. If they do not have a Bitwarden account already, they will be prompted to create a new account."
   },
   "joinProvider": {
     "message": "Join Provider"
diff --git a/apps/web/src/locales/eu/messages.json b/apps/web/src/locales/eu/messages.json
index 2879afce9b0..61d47324783 100644
--- a/apps/web/src/locales/eu/messages.json
+++ b/apps/web/src/locales/eu/messages.json
@@ -1297,17 +1297,17 @@
     "message": "Ziurtatu zure kontua saioa hastean beste urrats bat egitea eskatuz."
   },
   "twoStepLoginOrganizationDescStart": {
-    "message": "Enforce Bitwarden Two-step Login options for members by using the ",
+    "message": "Behartu kideei Bitwardenen saioa hasteko bi urratseko aukera, hau erabiliz",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
   },
   "twoStepLoginPolicy": {
-    "message": "Two-step Login Policy"
+    "message": "Bi urratseko saio hasieraren politika"
   },
   "twoStepLoginOrganizationDuoDesc": {
-    "message": "To enforce Two-step Login through Duo, use the options below."
+    "message": "Duo bidezko bi urratseko saio hasiera behartzeko, erabili hurrengo aukerak."
   },
   "twoStepLoginOrganizationSsoDesc": {
-    "message": "If you have setup SSO or plan to, Two-step Login may already be enforced through your Identity Provider."
+    "message": "SSO ezarrita baduzu edo hori egiteko asmoa baduzu, baliteke bi urratseko saio-hasiera iada zure identitate-hornitzailearen bidez erabiltzen aritzea."
   },
   "twoStepLoginRecoveryWarning": {
     "message": "Bi urratseko saio hasiera gaitzeak betirako blokea dezake Bitwarden kontura sartzea. Berreskuratze-kode baten bidez, zure kontura sar zaitezke, bi urratseko saio hasierako hornitzailea erabili ezin baduzu (adb. gailua galtzen baduzu). Bitwarden-ek ezingo dizu lagundu zure konturako sarbidea galtzen baduzu. Berreskuratze-kodea idatzi edo inprimatzea eta leku seguruan edukitzea gomendatzen dugu."
@@ -1557,7 +1557,7 @@
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "orgsReportsDesc": {
-    "message": "Identify and close security gaps in your organization's accounts by clicking the reports below.",
+    "message": "Identifikatu eta itxi erakundetako kontuetako segurtasun hutsuneak, ondorengo txostenetan klik eginez.",
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization Vault."
   },
   "unsecuredWebsitesReport": {
@@ -2597,7 +2597,7 @@
     }
   },
   "viewedCardNumberItemId": {
-    "message": "Viewed Card Number for item $ID$.",
+    "message": "$ID$ elementuko txartel zenbakia ikusia.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3017,7 +3017,7 @@
     "message": "Nire erakundea"
   },
   "organizationInfo": {
-    "message": "Organization info"
+    "message": "Erakundearen informazioa"
   },
   "deleteOrganization": {
     "message": "Ezabatu erakundea"
@@ -3345,7 +3345,7 @@
     "description": "ex. Date this item was updated"
   },
   "dateCreated": {
-    "message": "Created",
+    "message": "Sortuta",
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
@@ -3716,10 +3716,10 @@
     "message": "Erakundearen identifikatzailea beharrezkoa da."
   },
   "ssoIdentifier": {
-    "message": "SSO identifier"
+    "message": "SSO identifikatzailea"
   },
   "ssoIdentifierHint": {
-    "message": "Provide this ID to your members to login with SSO."
+    "message": "Eman ID hau kideei, SSOrekin saioa hasteko."
   },
   "unlinkSso": {
     "message": "SSO deskonektatu"
@@ -4123,7 +4123,7 @@
     "message": "Baimenak"
   },
   "permission": {
-    "message": "Permission"
+    "message": "Baimena"
   },
   "managerPermissions": {
     "message": "Kudeatu baimenak"
@@ -4531,7 +4531,7 @@
     "message": "Bezeroa"
   },
   "client": {
-    "message": "Client",
+    "message": "Bezeroa",
     "description": "This is used as a table header to describe which client application created an event log."
   },
   "providerAdmin": {
@@ -5419,7 +5419,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "Input must not exceed $COUNT$ characters in length.",
+    "message": "Sarrerak ezin ditu $COUNT$ karaktere baino gehiago eduki.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -5443,10 +5443,10 @@
     "message": "Piztuta"
   },
   "members": {
-    "message": "Members"
+    "message": "Kideak"
   },
   "reporting": {
-    "message": "Reporting"
+    "message": "Informatzen"
   },
   "cardBrandMir": {
     "message": "Mir"
@@ -5455,57 +5455,57 @@
     "message": "Erabiltzaile kopurua"
   },
   "loggingInAs": {
-    "message": "Logging in as"
+    "message": "Honela hasi saioa"
   },
   "notYou": {
-    "message": "Not you?"
+    "message": "Ez zara zu?"
   },
   "multiSelectPlaceholder": {
-    "message": "-- Type to Filter --"
+    "message": "-- Idatzi iragazteko --"
   },
   "multiSelectLoading": {
-    "message": "Retrieving options..."
+    "message": "Aukerak berreskuratzen..."
   },
   "multiSelectNotFound": {
-    "message": "No items found"
+    "message": "Ez da elementurik aurkitu"
   },
   "multiSelectClearAll": {
-    "message": "Clear all"
+    "message": "Ezabatu dena"
   },
   "from": {
-    "message": "From"
+    "message": "Igorlea"
   },
   "to": {
-    "message": "To"
+    "message": "Nora"
   },
   "member": {
-    "message": "Member"
+    "message": "Kidea"
   },
   "update": {
-    "message": "Update"
+    "message": "Eguneratu"
   },
   "role": {
-    "message": "Role"
+    "message": "Rola"
   },
   "canView": {
-    "message": "Can view"
+    "message": "Ikus dezake"
   },
   "canViewExceptPass": {
-    "message": "Can view, except passwords"
+    "message": "Ikus dezake, pasahitza izan ezik"
   },
   "canEdit": {
-    "message": "Can edit"
+    "message": "Editatu dezake"
   },
   "canEditExceptPass": {
-    "message": "Can edit, except passwords"
+    "message": "Editatu dezake, pasahitza izan ezik"
   },
   "group": {
-    "message": "Group"
+    "message": "Taldea"
   },
   "groupAccessAll": {
-    "message": "This group can access and modify all items."
+    "message": "Talde hau elementu guztietara sartu eta aldaketak egin ditzake."
   },
   "memberAccessAll": {
-    "message": "This member can access and modify all items."
+    "message": "Kide hau elementu guztietara sartu eta aldaketak egin ditzake."
   }
 }
diff --git a/apps/web/src/locales/pl/messages.json b/apps/web/src/locales/pl/messages.json
index 1ba40fad5e1..1d3e755aa3c 100644
--- a/apps/web/src/locales/pl/messages.json
+++ b/apps/web/src/locales/pl/messages.json
@@ -2948,7 +2948,7 @@
     "message": "Sprawdź swoją skrzynkę e-mail, aby uzyskać kod weryfikacyjny."
   },
   "emailVerified": {
-    "message": "Twój adres e-mail został zweryfikowany."
+    "message": "Adres e-mail został zweryfikowany"
   },
   "emailVerifiedFailed": {
     "message": "Nie możemy zweryfikować Twojego adresu e-mail. Spróbuj ponownie wysłać wiadomość weryfikacyjną."
@@ -4477,7 +4477,7 @@
     "message": "Status akcji zbiorczej"
   },
   "bulkConfirmMessage": {
-    "message": "Potwierdzono."
+    "message": "Potwierdzono"
   },
   "bulkReinviteMessage": {
     "message": "Zaproszony ponownie."
@@ -4635,7 +4635,7 @@
     "message": "Dodaj"
   },
   "updatedMasterPassword": {
-    "message": "Hasło główne zostało zaktualizowane"
+    "message": "Hasło główne zostało zapisane"
   },
   "updateMasterPassword": {
     "message": "Zaktualizuj hasło główne"
@@ -4972,7 +4972,7 @@
     "message": "Usuń hasło główne"
   },
   "removedMasterPassword": {
-    "message": "Hasło główne zostało usunięte."
+    "message": "Hasło główne zostało usunięte"
   },
   "allowSso": {
     "message": "Zezwalaj na logowanie jednokrotne SSO"
diff --git a/apps/web/src/locales/ru/messages.json b/apps/web/src/locales/ru/messages.json
index 72d610f22b7..aad95307bda 100644
--- a/apps/web/src/locales/ru/messages.json
+++ b/apps/web/src/locales/ru/messages.json
@@ -1884,10 +1884,10 @@
     "description": "Short abbreviation for 'month'"
   },
   "paymentChargedAnnually": {
-    "message": "Ваш метод оплаты будет активирован немедленно и использоваться ежегодно. Вы можете отменить это в любой момент."
+    "message": "Необходимая сумма с вашего метода оплаты будет списана немедленно, а затем с периодичностью каждый год. Можно отменить в любой момент."
   },
   "paymentCharged": {
-    "message": "Ваш метод оплаты будет активирован немедленно и использоваться каждый $INTERVAL$. Вы можете отменить это в любой момент.",
+    "message": "Необходимая сумма с вашего метода оплаты будет списана немедленно, а затем с периодичностью $INTERVAL$. Можно отменить в любой момент.",
     "placeholders": {
       "interval": {
         "content": "$1",
@@ -2020,7 +2020,7 @@
     "message": "Нет транзакций."
   },
   "chargeNoun": {
-    "message": "Списание",
+    "message": "Платеж",
     "description": "Noun. A charge from a payment method."
   },
   "refundNoun": {
@@ -3278,7 +3278,7 @@
     "message": "Загрузка"
   },
   "upgrade": {
-    "message": "Обновить"
+    "message": "Перейти"
   },
   "upgradeOrganization": {
     "message": "Обновить организацию"
diff --git a/apps/web/src/locales/sr/messages.json b/apps/web/src/locales/sr/messages.json
index bc0fe56cf7e..07c55259af2 100644
--- a/apps/web/src/locales/sr/messages.json
+++ b/apps/web/src/locales/sr/messages.json
@@ -1291,23 +1291,23 @@
     "message": "Дво-коракна лозинка"
   },
   "twoStepLoginEnforcement": {
-    "message": "Two-step Login Enforcement"
+    "message": "Спровођење пријаве у два корака"
   },
   "twoStepLoginDesc": {
     "message": "Заштитите свој налог захтевањем додатног корака приликом пријављивања."
   },
   "twoStepLoginOrganizationDescStart": {
-    "message": "Enforce Bitwarden Two-step Login options for members by using the ",
+    "message": "Примени Bitwarden опције за пријаву у два корака за чланове користећи ",
     "description": "This will be used as part of a larger sentence, broken up to include links. The full sentence will read 'Enforce Bitwarden Two-step Login options for members by using the Two-step Login Policy.'"
   },
   "twoStepLoginPolicy": {
-    "message": "Two-step Login Policy"
+    "message": "Опције дво-коракне политике"
   },
   "twoStepLoginOrganizationDuoDesc": {
-    "message": "To enforce Two-step Login through Duo, use the options below."
+    "message": "Да бисте спровели пријаву у два корака Duoупотребите опције испод."
   },
   "twoStepLoginOrganizationSsoDesc": {
-    "message": "If you have setup SSO or plan to, Two-step Login may already be enforced through your Identity Provider."
+    "message": "Ако сте поставили SSO или планирате, Пријава у два корака је можда већ принуђена преко вашег добављача идентитета."
   },
   "twoStepLoginRecoveryWarning": {
     "message": "Омогућавање пријаве у два корака може вас трајно закључати са вашег Bitwarden-а налога. Код за опоравак омогућава вам приступ вашем налогу у случају да више не можете да користите свог уобичајеног добављача услуге пријављивања у два корака (нпр. ако изгубите уређај). Подршка Bitwarden-а неће вам моћи помоћи ако изгубите приступ свом налогу. Препоручујемо да запишете или одштампате код за опоравак и сачувате га на сигурном месту."
@@ -1557,7 +1557,7 @@
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization vault."
   },
   "orgsReportsDesc": {
-    "message": "Identify and close security gaps in your organization's accounts by clicking the reports below.",
+    "message": "Идентификујте и затворите безбедносне празнине у вашим налозима организације кликом на извештаје у наставку.",
     "description": "Vault health reports can be used to evaluate the security of your Bitwarden individual or organization Vault."
   },
   "unsecuredWebsitesReport": {
@@ -1591,7 +1591,7 @@
     "message": "Нађене пријаве без 2FA"
   },
   "inactive2faFoundDesc": {
-    "message": "We found $COUNT$ website(s) in your vault that may not be configured with two-step login (according to 2fa.directory). To further protect these accounts, you should set up two-step login.",
+    "message": "Нашли смо $COUNT$ сајта у вашем сефу који можда нису конфигурисани за пријаву у два корака (према 2fa.directory). Да бисте додатно заштитили ове налоге, требало би да подесите пријаву у два корака.",
     "placeholders": {
       "count": {
         "content": "$1",
@@ -2360,10 +2360,10 @@
     "message": "Да ли сте сигурни да желите да уклоните овог корисника?"
   },
   "removeOrgUserConfirmation": {
-    "message": "When a member is removed, they no longer have access to organization data and this action is irreversible. To add the member back to the organization, they must be invited and onboarded again."
+    "message": "Када се члан уклони, он више нема приступ подацима организације и ова радња је неповратна. Да бисте поново додали члана у организацију, они морају бити позвани и поново укључени."
   },
   "revokeUserConfirmation": {
-    "message": "When a member is revoked, they no longer have access to organization data. To quickly restore member access, go to the Revoked tab."
+    "message": "Када се члан опозове, он више нема приступ подацима организације. Да бисте брзо вратили приступ члановима, идите на картицу Опозвано."
   },
   "removeUserConfirmationKeyConnector": {
     "message": "Упозорење! Овај корисник захтева Key Connector да управља њиховом шифровањем. Уклањање овог корисника из ваше организације трајно ће онемогућити њихов рачун. Ова радња се не може поништити. Да ли желите да наставите?"
@@ -2732,7 +2732,7 @@
     }
   },
   "revokedUserId": {
-    "message": "Revoked organization access for $ID$.",
+    "message": "Опозван приступ организацији за $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2741,7 +2741,7 @@
     }
   },
   "restoredUserId": {
-    "message": "Restored organization access for $ID$.",
+    "message": "Враћен приступ организацији за $ID$.",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2750,7 +2750,7 @@
     }
   },
   "revokeUserId": {
-    "message": "Revoke $ID$ access",
+    "message": "Опозови приступ „$ID$“",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3345,7 +3345,7 @@
     "description": "ex. Date this item was updated"
   },
   "dateCreated": {
-    "message": "Created",
+    "message": "Креирано",
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
@@ -3426,7 +3426,7 @@
     "description": "A 'fingerprint phrase' is a unique word phrase (similar to a passphrase) that a user can use to authenticate their public key with another user, for the purposes of sharing."
   },
   "fingerprintMatchInfo": {
-    "message": "Please make sure your vault is unlocked and Fingerprint phrase matches the other device."
+    "message": "Уверите се да је ваш сеф откључан и да се фраза отиска прста подудара на другом уређају."
   },
   "fingerprintPhraseHeader": {
     "message": "Сигурносна фраза сефа"
@@ -3716,10 +3716,10 @@
     "message": "Потребан је идентификатор организације."
   },
   "ssoIdentifier": {
-    "message": "SSO identifier"
+    "message": "SSO идентификација"
   },
   "ssoIdentifierHint": {
-    "message": "Provide this ID to your members to login with SSO."
+    "message": "Дајте овај ИД својим члановима за пријаву са SSO."
   },
   "unlinkSso": {
     "message": "Откачи SSO"
@@ -4486,10 +4486,10 @@
     "message": "Успешно уклоњено"
   },
   "bulkRevokedMessage": {
-    "message": "Revoked organization access successfully"
+    "message": "Успешно опозван приступ организацији"
   },
   "bulkRestoredMessage": {
-    "message": "Restored organization access successfully"
+    "message": "Успешно враћен приступ организацији"
   },
   "bulkFilteredMessage": {
     "message": "Искључено, није применљиво за ову акцију."
@@ -5035,13 +5035,13 @@
     "message": "The sponsorship offer has expired. You may delete the organization you created to avoid a charge at the end of your 7 day trial. Otherwise you may close this prompt to keep the organization and assume billing responsibility."
   },
   "newFamiliesOrganization": {
-    "message": "New Families organization"
+    "message": "Нова организација Families"
   },
   "acceptOffer": {
     "message": "Прихвати понуду"
   },
   "sponsoringOrg": {
-    "message": "Sponsoring organization"
+    "message": "Спонзорска организација"
   },
   "keyConnectorTest": {
     "message": "Тест"
@@ -5089,7 +5089,7 @@
     "message": "Rotating the billing sync token will invalidate the previous token."
   },
   "selfHostingTitle": {
-    "message": "Self-hosting"
+    "message": "Ауто-хстинг"
   },
   "selfHostingEnterpriseOrganizationSectionCopy": {
     "message": "To set-up your organization on your own server, you will need to upload your license file. To support Free Families plans and advanced billing capabilities for your self-hosted organization, you will need to set up billing sync."
@@ -5152,13 +5152,13 @@
     "message": "обавезно"
   },
   "idpSingleSignOnServiceUrlRequired": {
-    "message": "Required if Entity ID is not a URL."
+    "message": "Потребно ако Entity ID није УРЛ."
   },
   "openIdOptionalCustomizations": {
     "message": "Опциона подешавања"
   },
   "openIdAuthorityRequired": {
-    "message": "Required if Authority is not valid."
+    "message": "Потребно ако Authority није добро."
   },
   "separateMultipleWithComma": {
     "message": "Вишеструко одвојите зарезом."
@@ -5392,15 +5392,15 @@
     "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
   },
   "scimUrl": {
-    "message": "SCIM URL",
+    "message": "SCIM УРЛ",
     "description": "the text, 'SCIM' and 'URL', are acronymns and should not be translated."
   },
   "scimApiKeyRotated": {
-    "message": "SCIM API key successfully rotated",
+    "message": "SCIM API кључ успешно ротиран",
     "description": "the text, 'SCIM' and 'API', are acronymns and should not be translated."
   },
   "scimSettingsSaved": {
-    "message": "SCIM settings saved",
+    "message": "SCIM подешавања сачувана",
     "description": "the text, 'SCIM', is an acronymn and should not be translated."
   },
   "inputRequired": {
@@ -5419,7 +5419,7 @@
     }
   },
   "inputMaxLength": {
-    "message": "Input must not exceed $COUNT$ characters in length.",
+    "message": "Унос не сме бити већи од $COUNT$ карактера.",
     "placeholders": {
       "count": {
         "content": "$1",
diff --git a/apps/web/src/locales/sv/messages.json b/apps/web/src/locales/sv/messages.json
index 029b078423b..74d273b2d21 100644
--- a/apps/web/src/locales/sv/messages.json
+++ b/apps/web/src/locales/sv/messages.json
@@ -181,7 +181,7 @@
     "description": "This is the folder for uncategorized items"
   },
   "addFolder": {
-    "message": "Skapa mapp"
+    "message": "Lägg till mapp"
   },
   "editFolder": {
     "message": "Redigera mapp"
@@ -1351,7 +1351,7 @@
     "message": "Hantera"
   },
   "disable": {
-    "message": "Inaktivera"
+    "message": "Stäng av"
   },
   "revokeAccess": {
     "message": "Återkalla åtkomst"
@@ -1639,7 +1639,7 @@
     }
   },
   "weakPasswordsReport": {
-    "message": "Rapport om svaga lösenord"
+    "message": "Svaga lösenord"
   },
   "weakPasswordsReportDesc": {
     "message": "Svaga lösenord kan enkelt gissas av hackare och automatiserade verktyg som används för att knäcka lösenord. Bitwardens lösenordsgenerator kan hjälpa dig att skapa starka lösenord."
@@ -2567,7 +2567,7 @@
     }
   },
   "viewAllLoginOptions": {
-    "message": "View all log in options"
+    "message": "Visa alla inloggningsalternativ"
   },
   "viewedItemId": {
     "message": "Visade objektet $ID$.",
@@ -2960,7 +2960,7 @@
     "message": "Du måste verifiera din e-post för att använda den här funktionen."
   },
   "updateBrowser": {
-    "message": "Uppdatera webbläsaren"
+    "message": "Uppdatera webbläsare"
   },
   "updateBrowserDesc": {
     "message": "Du använder en webbläsare som inte stöds. Webbvalvet kanske inte fungerar som det ska."
@@ -3345,7 +3345,7 @@
     "description": "ex. Date this item was updated"
   },
   "dateCreated": {
-    "message": "Created",
+    "message": "Skapad",
     "description": "ex. Date this item was created"
   },
   "datePasswordUpdated": {
@@ -4702,7 +4702,7 @@
     "message": "One or more organization policies prevents you from exporting your individual vault."
   },
   "selectType": {
-    "message": "Select SSO type"
+    "message": "Välj SSO-typ"
   },
   "type": {
     "message": "Typ"
@@ -5110,10 +5110,10 @@
     "message": "Billing sync token"
   },
   "active": {
-    "message": "Active"
+    "message": "Aktiv"
   },
   "inactive": {
-    "message": "Inactive"
+    "message": "Inaktiv"
   },
   "sentAwaitingSync": {
     "message": "Sent (awaiting sync)"
@@ -5266,7 +5266,7 @@
     "message": "You cannot redeem for the active account. Enter a different email."
   },
   "revokeWhenExpired": {
-    "message": "Expires $DATE$",
+    "message": "Upphör $DATE$",
     "placeholders": {
       "date": {
         "content": "$1",
@@ -5358,7 +5358,7 @@
     "description": "the text, 'SCIM', is an acronymn and should not be translated."
   },
   "scimEnabledCheckboxDesc": {
-    "message": "Enable SCIM",
+    "message": "Aktivera SCIM",
     "description": "the text, 'SCIM', is an acronymn and should not be translated."
   },
   "scimEnabledCheckboxDescHelpText": {
@@ -5440,7 +5440,7 @@
     "message": "Turn on"
   },
   "on": {
-    "message": "On"
+    "message": "På"
   },
   "members": {
     "message": "Medlemmar"
@@ -5467,7 +5467,7 @@
     "message": "Retrieving options..."
   },
   "multiSelectNotFound": {
-    "message": "No items found"
+    "message": "Inga objekt hittades"
   },
   "multiSelectClearAll": {
     "message": "Clear all"
diff --git a/apps/web/src/locales/tr/messages.json b/apps/web/src/locales/tr/messages.json
index 8624a02f8fd..1de248d2c5c 100644
--- a/apps/web/src/locales/tr/messages.json
+++ b/apps/web/src/locales/tr/messages.json
@@ -4390,13 +4390,13 @@
     "message": "Parola başarıyla sıfırlandı."
   },
   "resetPasswordEnrollmentWarning": {
-    "message": "Katılmak kuruluş yöneticilerinin ana parolanızı değiştirmesine izin verir. Katılmak istediğinize emin misiniz?"
+    "message": "Katılmak kuruluş yöneticilerinin ana parolanızı değiştirmesine izin verir"
   },
   "resetPasswordPolicy": {
     "message": "Ana parola sıfırlama"
   },
   "resetPasswordPolicyDescription": {
-    "message": "Kuruluş yöneticilerinin kuruluş kullanıcılarının ana parolalarını sıfırlamasına izin ver."
+    "message": "Kuruluş yöneticilerinin üyelerin ana parolalarını sıfırlamasına izin ver."
   },
   "resetPasswordPolicyWarning": {
     "message": "Yöneticilerin kullanıcıların ana parolalarını sıfırlayabilmesi önce kuruluştaki kullanıcıların kendileri katılmaları veya otomatik eklenmeleri gerekir."
@@ -4492,7 +4492,7 @@
     "message": "Kuruluş erişimi başarıyla geri getirildi"
   },
   "bulkFilteredMessage": {
-    "message": "İstisna. Bu eylem için geçerli değildir."
+    "message": "İstisna. Bu eylem için geçerli değildir"
   },
   "fingerprint": {
     "message": "Parmak izi"
@@ -4608,7 +4608,7 @@
     "message": "Sağlayıcı devre dışı."
   },
   "providerUpdated": {
-    "message": "Sağlayıcı güncellendi"
+    "message": "Sağlayıcı kaydedildi"
   },
   "yourProviderIs": {
     "message": "Sağlayıcınız: $PROVIDER$. Kuruluşunuzun yönetim ve ödeme yetkileri sağlayıcınıza aittir.",
@@ -4708,13 +4708,13 @@
     "message": "Tür"
   },
   "openIdConnectConfig": {
-    "message": "OpenID Connect Yapılandırması"
+    "message": "OpenID Connect yapılandırması"
   },
   "samlSpConfig": {
-    "message": "SAML Servis Sağlayıcı Yapılandırması"
+    "message": "SAML servis sağlayıcı yapılandırması"
   },
   "samlIdpConfig": {
-    "message": "SAML Kimlik Sağlayıcı Yapılandırması"
+    "message": "SAML kimlik sağlayıcı yapılandırması"
   },
   "callbackPath": {
     "message": "Callback yolu"
diff --git a/apps/web/src/locales/vi/messages.json b/apps/web/src/locales/vi/messages.json
index 78301d7d0b0..ad826f0152e 100644
--- a/apps/web/src/locales/vi/messages.json
+++ b/apps/web/src/locales/vi/messages.json
@@ -434,7 +434,7 @@
     "message": "Kho"
   },
   "vaults": {
-    "message": "Vaults"
+    "message": "Kho"
   },
   "vaultItems": {
     "message": "Vault items"
@@ -936,22 +936,22 @@
     "message": "Set a password to encrypt the export and import it to any Bitwarden account using the password for decryption."
   },
   "fileTypeHeading": {
-    "message": "File type"
+    "message": "Loại tệp"
   },
   "accountBackup": {
-    "message": "Account backup"
+    "message": "Sao lưu tài khoản"
   },
   "passwordProtected": {
-    "message": "Password protected"
+    "message": "Mật khẩu đã được bảo vệ"
   },
   "filePasswordAndConfirmFilePasswordDoNotMatch": {
     "message": "“File password”  and “Confirm file password“ do not match."
   },
   "confirmVaultImport": {
-    "message": "Confirm vault import"
+    "message": "Xác nhận nhập kho lưu trữ"
   },
   "confirmVaultImportDesc": {
-    "message": "This file is password-protected. Please enter the file password to import data."
+    "message": "Tập tin này được mật khẩu bảo vệ. Vui lòng nhập mật khẩu tệp để nhập dữ liệu."
   },
   "exportSuccess": {
     "message": "Dữ liệu kho cảu bạn đã được trích xuất."
@@ -979,15 +979,15 @@
     "message": "Độ dài"
   },
   "uppercase": {
-    "message": "Uppercase (A-Z)",
+    "message": "Chữ in hoa (A-Z)",
     "description": "Include uppercase letters in the password generator."
   },
   "lowercase": {
-    "message": "Lowercase (a-z)",
+    "message": "Chữ in thường (a-z)",
     "description": "Include lowercase letters in the password generator."
   },
   "numbers": {
-    "message": "Numbers (0-9)"
+    "message": "Số (0-9)"
   },
   "specialCharacters": {
     "message": "Special characters (!@#$%^&*)"
@@ -1787,10 +1787,10 @@
     "description": "Another way of saying \"Get a Premium membership\""
   },
   "premiumUpdated": {
-    "message": "You've upgraded to Premium."
+    "message": "Bạn đã nâng cấp lên Cao Cấp."
   },
   "premiumUpgradeUnlockFeatures": {
-    "message": "Upgrade your account to a Premium membership and unlock some great additional features."
+    "message": "Nâng cấp tài khoản của bạn lên thành viên Cao Cấp và mở khóa một số tính năng bổ sung tuyệt vời."
   },
   "premiumSignUpStorage": {
     "message": "1 GB encrypted storage for file attachments."
@@ -2990,7 +2990,7 @@
     }
   },
   "rememberEmail": {
-    "message": "Remember email"
+    "message": "Ghi nhớ đăng nhập"
   },
   "recoverAccountTwoStepDesc": {
     "message": "If you cannot access your account through your normal two-step login methods, you can use your two-step login recovery code to turn off all two-step providers on your account."
@@ -3278,13 +3278,13 @@
     "message": "Loading"
   },
   "upgrade": {
-    "message": "Upgrade"
+    "message": "Nâng cấp"
   },
   "upgradeOrganization": {
     "message": "Upgrade organization"
   },
   "upgradeOrganizationDesc": {
-    "message": "This feature is not available for free organizations. Switch to a paid plan to unlock more features."
+    "message": "Tính năng này không có sẵn cho các tổ chức miễn phí. Chuyển sang gói trả phí để mở khóa nhiều tính năng hơn."
   },
   "createOrganizationStep1": {
     "message": "Create organization: Step 1"
@@ -3311,7 +3311,7 @@
     "message": "Privacy Policy"
   },
   "filters": {
-    "message": "Filters"
+    "message": "Bộ lọc"
   },
   "vaultTimeout": {
     "message": "Vault timeout"
@@ -3486,7 +3486,7 @@
     "message": "Minimum length"
   },
   "clone": {
-    "message": "Clone"
+    "message": "Tạo bản sao"
   },
   "masterPassPolicyTitle": {
     "message": "Master password requirements"
diff --git a/apps/web/src/locales/zh_CN/messages.json b/apps/web/src/locales/zh_CN/messages.json
index 7145d3c606c..fcc48dbb4c8 100644
--- a/apps/web/src/locales/zh_CN/messages.json
+++ b/apps/web/src/locales/zh_CN/messages.json
@@ -1121,7 +1121,7 @@
     "message": "清空密码库"
   },
   "purgedOrganizationVault": {
-    "message": "组织密码库已清空。"
+    "message": "清空了组织密码库。"
   },
   "vaultAccessedByProvider": {
     "message": "密码库被提供商访问。"
@@ -2522,7 +2522,7 @@
     "message": "登录失败，两步登录不正确。"
   },
   "exportedVault": {
-    "message": "导出了密码库。"
+    "message": "导出了密码库"
   },
   "exportedOrganizationVault": {
     "message": "导出了组织密码库。"
@@ -2651,7 +2651,7 @@
     }
   },
   "createdCollectionId": {
-    "message": "已创建集合 $ID$。",
+    "message": "创建了集合 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2660,7 +2660,7 @@
     }
   },
   "editedCollectionId": {
-    "message": "已编辑集合 $ID$。",
+    "message": "编辑了集合 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2669,7 +2669,7 @@
     }
   },
   "deletedCollectionId": {
-    "message": "已删除集合 $ID$。",
+    "message": "删除了集合 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2678,7 +2678,7 @@
     }
   },
   "editedPolicyId": {
-    "message": "已编辑策略 $ID$。",
+    "message": "编辑了策略 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2687,7 +2687,7 @@
     }
   },
   "createdGroupId": {
-    "message": "已创建群组 $ID$。",
+    "message": "创建了群组 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2696,7 +2696,7 @@
     }
   },
   "editedGroupId": {
-    "message": "已编辑群组 $ID$。",
+    "message": "编辑了群组 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2705,7 +2705,7 @@
     }
   },
   "deletedGroupId": {
-    "message": "已删除群组 $ID$。",
+    "message": "删除了群组 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2714,7 +2714,7 @@
     }
   },
   "removedUserId": {
-    "message": "已移除用户 $ID$。",
+    "message": "移除了用户 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2723,7 +2723,7 @@
     }
   },
   "removeUserIdAccess": {
-    "message": "移除 $ID$ 的访问权限",
+    "message": "移除了 $ID$ 的访问权限",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2732,7 +2732,7 @@
     }
   },
   "revokedUserId": {
-    "message": "已撤销 $ID$ 的组织访问权限。",
+    "message": "撤销了 $ID$ 的组织访问权限。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2741,7 +2741,7 @@
     }
   },
   "restoredUserId": {
-    "message": "已恢复 $ID$ 的组织访问权限。",
+    "message": "恢复了 $ID$ 的组织访问权限。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2759,7 +2759,7 @@
     }
   },
   "createdAttachmentForItem": {
-    "message": "已为项目 $ID$ 创建附件。",
+    "message": "为项目 $ID$ 创建了附件。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2768,7 +2768,7 @@
     }
   },
   "deletedAttachmentForItem": {
-    "message": "已删除项目 $ID$ 的附件。",
+    "message": "删除了项目 $ID$ 的附件。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2777,7 +2777,7 @@
     }
   },
   "editedCollectionsForItem": {
-    "message": "已为项目 $ID$ 编辑集合。",
+    "message": "编辑了项目 $ID$ 集合。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2786,7 +2786,7 @@
     }
   },
   "invitedUserId": {
-    "message": "已邀请用户 $ID$。",
+    "message": "邀请了用户 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2795,7 +2795,7 @@
     }
   },
   "confirmedUserId": {
-    "message": "已确认用户 $ID$。",
+    "message": "确认了用户 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2804,7 +2804,7 @@
     }
   },
   "editedUserId": {
-    "message": "已编辑用户 $ID$。",
+    "message": "编辑了用户 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2813,7 +2813,7 @@
     }
   },
   "editedGroupsForUser": {
-    "message": "已为用户 $ID$ 编辑群组。",
+    "message": "编辑了用户 $ID$ 的群组。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2831,7 +2831,7 @@
     }
   },
   "createdOrganizationId": {
-    "message": "已创建组织 $ID$。",
+    "message": "创建了组织 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2840,7 +2840,7 @@
     }
   },
   "addedOrganizationId": {
-    "message": "已添加组织 $ID$。",
+    "message": "添加了组织 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2849,7 +2849,7 @@
     }
   },
   "removedOrganizationId": {
-    "message": "已移除组织 $ID$。",
+    "message": "移除了组织 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -2858,7 +2858,7 @@
     }
   },
   "accessedClientVault": {
-    "message": "已访问 $ID$ 组织密码库。",
+    "message": "访问了 $ID$ 组织密码库。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3611,7 +3611,7 @@
     }
   },
   "permanentlyDeletedItemId": {
-    "message": "项目 $ID$ 已永久删除",
+    "message": "永久删除了项目 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -3650,7 +3650,7 @@
     }
   },
   "restoredItemId": {
-    "message": "项目 $ID$ 已恢复",
+    "message": "恢复了项目 $ID$",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4099,7 +4099,7 @@
     "description": "'Send' is a noun and the name of a feature called 'Bitwarden Send'. It should not be translated."
   },
   "modifiedPolicyId": {
-    "message": "策略 $ID$ 已修改。",
+    "message": "修改了策略 $ID$。",
     "placeholders": {
       "id": {
         "content": "$1",
@@ -4342,7 +4342,7 @@
     }
   },
   "eventAdminPasswordReset": {
-    "message": "已重置用户 $ID$ 的主密码。",
+    "message": "重置了用户 $ID$ 的主密码。",
     "placeholders": {
       "id": {
         "content": "$1",
diff --git a/apps/web/tsconfig.json b/apps/web/tsconfig.json
index b226cd4c09a..34d57985050 100644
--- a/apps/web/tsconfig.json
+++ b/apps/web/tsconfig.json
@@ -12,6 +12,7 @@
     }
   },
   "angularCompilerOptions": {
+    "strictTemplates": true,
     "preserveWhitespaces": true
   },
   "files": ["src/polyfills.ts", "src/main.ts", "../../bitwarden_license/bit-web/src/main.ts"],
diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html b/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html
index 5dafe8c536d..776af86c27d 100644
--- a/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html
+++ b/bitwarden_license/bit-web/src/app/organizations/manage/scim.component.html
@@ -54,7 +54,7 @@
     <bit-label>{{ "scimApiKey" | i18n }}</bit-label>
     <input
       bitInput
-      type="{{ showScimKey ? 'text' : 'password' }}"
+      [type]="showScimKey ? 'text' : 'password'"
       formControlName="clientSecret"
       id="clientSecret"
     />
@@ -70,7 +70,7 @@
     </ng-container>
     <ng-container #rotateButton [appApiAction]="rotatePromise">
       <button
-        [disabled]="rotateButton.loading"
+        [disabled]="$any(rotateButton).loading"
         type="button"
         bitSuffix
         bitButton
@@ -80,7 +80,7 @@
         <i
           aria-hidden="true"
           class="bwi bwi-lg bwi-generate"
-          [ngClass]="{ 'bwi-spin': rotateButton.loading }"
+          [ngClass]="{ 'bwi-spin': $any(rotateButton).loading }"
         ></i>
       </button>
     </ng-container>
diff --git a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts b/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts
index a268cbccf6c..a03afe5d24f 100644
--- a/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts
+++ b/bitwarden_license/bit-web/src/app/organizations/manage/sso.component.ts
@@ -97,13 +97,13 @@ export class SsoComponent implements OnInit, OnDestroy {
   spMetadataUrl: string;
   spAcsUrl: string;
 
-  private enabled = this.formBuilder.control(false);
+  protected enabled = this.formBuilder.control(false);
 
-  private ssoIdentifier = this.formBuilder.control("", {
+  protected ssoIdentifier = this.formBuilder.control("", {
     validators: [Validators.maxLength(50), Validators.required],
   });
 
-  private openIdForm = this.formBuilder.group<ControlsOf<SsoConfigView["openId"]>>(
+  protected openIdForm = this.formBuilder.group<ControlsOf<SsoConfigView["openId"]>>(
     {
       authority: new FormControl("", Validators.required),
       clientId: new FormControl("", Validators.required),
@@ -126,7 +126,7 @@ export class SsoComponent implements OnInit, OnDestroy {
     }
   );
 
-  private samlForm = this.formBuilder.group<ControlsOf<SsoConfigView["saml"]>>(
+  protected samlForm = this.formBuilder.group<ControlsOf<SsoConfigView["saml"]>>(
     {
       spNameIdFormat: new FormControl(Saml2NameIdFormat.NotConfigured),
       spOutboundSigningAlgorithm: new FormControl(defaultSigningAlgorithm),
@@ -150,7 +150,7 @@ export class SsoComponent implements OnInit, OnDestroy {
     }
   );
 
-  private ssoConfigForm = this.formBuilder.group<ControlsOf<SsoConfigView>>({
+  protected ssoConfigForm = this.formBuilder.group<ControlsOf<SsoConfigView>>({
     configType: new FormControl(SsoType.None),
     keyConnectorEnabled: new FormControl(false),
     keyConnectorUrl: new FormControl(""),
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/events.component.html b/bitwarden_license/bit-web/src/app/providers/manage/events.component.html
index d27b53e8d9d..c64a5722583 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/events.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/manage/events.component.html
@@ -98,7 +98,7 @@
     type="button"
     class="btn btn-block btn-link btn-submit"
     (click)="loadEvents(false)"
-    [disabled]="loaded && moreBtn.loading"
+    [disabled]="loaded && $any(moreBtn).loading"
     *ngIf="continuationToken"
   >
     <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/people.component.html b/bitwarden_license/bit-web/src/app/providers/manage/people.component.html
index 5eaa94303cc..f76356bd36d 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/people.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/manage/people.component.html
@@ -149,7 +149,6 @@
           <td>
             <span *ngIf="u.type === userType.ProviderAdmin">{{ "providerAdmin" | i18n }}</span>
             <span *ngIf="u.type === userType.ServiceUser">{{ "serviceUser" | i18n }}</span>
-            <span *ngIf="u.type === userType.Custom">{{ "custom" | i18n }}</span>
           </td>
           <td class="table-list-options">
             <div class="dropdown" appListDropdown>
@@ -184,16 +183,6 @@
                   <i class="bwi bwi-fw bwi-check" aria-hidden="true"></i>
                   {{ "confirm" | i18n }}
                 </a>
-                <a
-                  class="dropdown-item"
-                  href="#"
-                  appStopClick
-                  (click)="groups(u)"
-                  *ngIf="accessGroups"
-                >
-                  <i class="bwi bwi-fw bwi-sitemap" aria-hidden="true"></i>
-                  {{ "groups" | i18n }}
-                </a>
                 <a
                   class="dropdown-item"
                   href="#"
diff --git a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html b/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html
index d784294071e..24be5ca2a7f 100644
--- a/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/manage/user-add-edit.component.html
@@ -102,17 +102,17 @@
             class="btn btn-outline-danger"
             appA11yTitle="{{ 'delete' | i18n }}"
             *ngIf="editMode"
-            [disabled]="deleteBtn.loading"
+            [disabled]="$any(deleteBtn).loading"
             [appApiAction]="deletePromise"
           >
             <i
               class="bwi bwi-trash bwi-lg bwi-fw"
-              [hidden]="deleteBtn.loading"
+              [hidden]="$any(deleteBtn).loading"
               aria-hidden="true"
             ></i>
             <i
               class="bwi bwi-spinner bwi-spin bwi-lg bwi-fw"
-              [hidden]="!deleteBtn.loading"
+              [hidden]="!$any(deleteBtn).loading"
               title="{{ 'loading' | i18n }}"
               aria-hidden="true"
             ></i>
diff --git a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html
index 8bbbe41774c..cd0e792d1dc 100644
--- a/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html
+++ b/bitwarden_license/bit-web/src/app/providers/setup/setup.component.html
@@ -30,9 +30,6 @@
         <i class="bwi bwi-spinner bwi-spin" title="{{ 'loading' | i18n }}" aria-hidden="true"></i>
         <span>{{ "submit" | i18n }}</span>
       </button>
-      <button type="button" class="btn btn-outline-secondary" (click)="cancel()" *ngIf="showCancel">
-        {{ "cancel" | i18n }}
-      </button>
     </div>
   </form>
 </div>
diff --git a/jest.config.js b/jest.config.js
index 535c9e00a36..13eefb7b7df 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -19,7 +19,6 @@ module.exports = {
     "<rootDir>/libs/angular/jest.config.js",
     "<rootDir>/libs/common/jest.config.js",
     "<rootDir>/libs/components/jest.config.js",
-    "<rootDir>/libs/electron/jest.config.js",
     "<rootDir>/libs/node/jest.config.js",
   ],
 
diff --git a/libs/angular/src/components/add-edit.component.ts b/libs/angular/src/components/add-edit.component.ts
index 371cc8d575f..7194b882955 100644
--- a/libs/angular/src/components/add-edit.component.ts
+++ b/libs/angular/src/components/add-edit.component.ts
@@ -23,6 +23,7 @@ import { SecureNoteType } from "@bitwarden/common/enums/secureNoteType";
 import { UriMatchType } from "@bitwarden/common/enums/uriMatchType";
 import { Utils } from "@bitwarden/common/misc/utils";
 import { Cipher } from "@bitwarden/common/models/domain/cipher";
+import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CardView } from "@bitwarden/common/models/view/card.view";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 import { CollectionView } from "@bitwarden/common/models/view/collection.view";
@@ -74,6 +75,7 @@ export class AddEditComponent implements OnInit, OnDestroy {
   allowPersonal = true;
   reprompt = false;
   canUseReprompt = true;
+  organization: Organization;
 
   protected destroy$ = new Subject<void>();
   protected writeableCollections: CollectionView[];
diff --git a/libs/angular/src/components/attachments.component.ts b/libs/angular/src/components/attachments.component.ts
index 819ab436619..a484661be31 100644
--- a/libs/angular/src/components/attachments.component.ts
+++ b/libs/angular/src/components/attachments.component.ts
@@ -292,4 +292,8 @@ export class AttachmentsComponent implements OnInit {
   protected deleteCipherAttachment(attachmentId: string) {
     return this.cipherService.deleteAttachmentWithServer(this.cipher.id, attachmentId);
   }
+
+  protected async reupload(attachment: AttachmentView) {
+    // TODO: This should be removed but is needed since we re-use the same template
+  }
 }
diff --git a/libs/angular/src/components/share.component.ts b/libs/angular/src/components/share.component.ts
index c7520ed5165..e12aeb02113 100644
--- a/libs/angular/src/components/share.component.ts
+++ b/libs/angular/src/components/share.component.ts
@@ -5,7 +5,10 @@ import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/abstractions/log.service";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
+import {
+  isNotProviderUser,
+  OrganizationService,
+} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
 import { OrganizationUserStatusType } from "@bitwarden/common/enums/organizationUserStatusType";
 import { Utils } from "@bitwarden/common/misc/utils";
@@ -54,7 +57,10 @@ export class ShareComponent implements OnInit, OnDestroy {
     this.organizations$ = this.organizationService.organizations$.pipe(
       map((orgs) => {
         return orgs
-          .filter((o) => o.enabled && o.status === OrganizationUserStatusType.Confirmed)
+          .filter(
+            (o) =>
+              o.enabled && o.status === OrganizationUserStatusType.Confirmed && isNotProviderUser(o)
+          )
           .sort(Utils.getSortFunction(this.i18nService, "name"));
       })
     );
diff --git a/libs/angular/src/components/user-verification.component.ts b/libs/angular/src/components/user-verification.component.ts
index 198a214c495..3234d353c14 100644
--- a/libs/angular/src/components/user-verification.component.ts
+++ b/libs/angular/src/components/user-verification.component.ts
@@ -1,6 +1,5 @@
-import { animate, style, transition, trigger } from "@angular/animations";
-import { Component, OnInit } from "@angular/core";
-import { ControlValueAccessor, NG_VALUE_ACCESSOR, FormControl } from "@angular/forms";
+import { Directive, OnInit } from "@angular/core";
+import { ControlValueAccessor, FormControl } from "@angular/forms";
 
 import { KeyConnectorService } from "@bitwarden/common/abstractions/keyConnector.service";
 import { UserVerificationService } from "@bitwarden/common/abstractions/userVerification/userVerification.service.abstraction";
@@ -14,21 +13,8 @@ import { Verification } from "@bitwarden/common/types/verification";
  * This is exposed to the parent component via the ControlValueAccessor interface (e.g. bind it to a FormControl).
  * Use UserVerificationService to verify the user's input.
  */
-@Component({
+@Directive({
   selector: "app-user-verification",
-  templateUrl: "user-verification.component.html",
-  providers: [
-    {
-      provide: NG_VALUE_ACCESSOR,
-      multi: true,
-      useExisting: UserVerificationComponent,
-    },
-  ],
-  animations: [
-    trigger("sent", [
-      transition(":enter", [style({ opacity: 0 }), animate("100ms", style({ opacity: 1 }))]),
-    ]),
-  ],
 })
 // eslint-disable-next-line rxjs-angular/prefer-takeuntil
 export class UserVerificationComponent implements ControlValueAccessor, OnInit {
diff --git a/libs/angular/src/components/vault-items.component.ts b/libs/angular/src/components/vault-items.component.ts
index b0d51777cb5..28df06890ad 100644
--- a/libs/angular/src/components/vault-items.component.ts
+++ b/libs/angular/src/components/vault-items.component.ts
@@ -1,6 +1,7 @@
 import { Directive, EventEmitter, Input, Output } from "@angular/core";
 
 import { SearchService } from "@bitwarden/common/abstractions/search.service";
+import { Organization } from "@bitwarden/common/models/domain/organization";
 import { CipherView } from "@bitwarden/common/models/view/cipher.view";
 
 @Directive()
@@ -17,6 +18,8 @@ export class VaultItemsComponent {
   searchPlaceholder: string = null;
   filter: (cipher: CipherView) => boolean = null;
   deleted = false;
+  organization: Organization;
+  accessEvents = false;
 
   protected searchPending = false;
 
diff --git a/libs/angular/src/pipes/i18n.pipe.ts b/libs/angular/src/pipes/i18n.pipe.ts
index 730f439b468..afab9b8d024 100644
--- a/libs/angular/src/pipes/i18n.pipe.ts
+++ b/libs/angular/src/pipes/i18n.pipe.ts
@@ -8,7 +8,7 @@ import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 export class I18nPipe implements PipeTransform {
   constructor(private i18nService: I18nService) {}
 
-  transform(id: string, p1?: string, p2?: string, p3?: string): string {
+  transform(id: string, p1?: string | number, p2?: string | number, p3?: string | number): string {
     return this.i18nService.t(id, p1, p2, p3);
   }
 }
diff --git a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
index 5f33a8b78ac..eede037006c 100644
--- a/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
+++ b/libs/angular/src/vault/vault-filter/services/vault-filter.service.ts
@@ -4,7 +4,10 @@ import { firstValueFrom, from, mergeMap, Observable } from "rxjs";
 import { CipherService } from "@bitwarden/common/abstractions/cipher.service";
 import { CollectionService } from "@bitwarden/common/abstractions/collection.service";
 import { FolderService } from "@bitwarden/common/abstractions/folder/folder.service.abstraction";
-import { OrganizationService } from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
+import {
+  isNotProviderUser,
+  OrganizationService,
+} from "@bitwarden/common/abstractions/organization/organization.service.abstraction";
 import { PolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
 import { StateService } from "@bitwarden/common/abstractions/state.service";
 import { PolicyType } from "@bitwarden/common/enums/policyType";
@@ -40,7 +43,9 @@ export class VaultFilterService {
   async buildOrganizations(): Promise<Organization[]> {
     let organizations = await this.organizationService.getAll();
     if (organizations != null) {
-      organizations = organizations.sort((a, b) => a.name.localeCompare(b.name));
+      organizations = organizations
+        .filter(isNotProviderUser)
+        .sort((a, b) => a.name.localeCompare(b.name));
     }
 
     return organizations;
diff --git a/libs/angular/test-utils.ts b/libs/angular/test-utils.ts
new file mode 100644
index 00000000000..a2422e698fd
--- /dev/null
+++ b/libs/angular/test-utils.ts
@@ -0,0 +1,3 @@
+export async function awaitAsync(ms = 0) {
+  await new Promise((resolve) => setTimeout(resolve, ms));
+}
diff --git a/libs/common/spec/misc/utils.spec.ts b/libs/common/spec/misc/utils.spec.ts
index e1de2655322..fb57c33fff1 100644
--- a/libs/common/spec/misc/utils.spec.ts
+++ b/libs/common/spec/misc/utils.spec.ts
@@ -241,4 +241,72 @@ describe("Utils Service", () => {
       expect(Utils.fromByteStringToArray(null)).toEqual(null);
     });
   });
+
+  describe("mapToRecord", () => {
+    it("should handle null", () => {
+      expect(Utils.mapToRecord(null)).toEqual(null);
+    });
+
+    it("should handle empty map", () => {
+      expect(Utils.mapToRecord(new Map())).toEqual({});
+    });
+
+    it("should handle convert a Map to a Record", () => {
+      const map = new Map([
+        ["key1", "value1"],
+        ["key2", "value2"],
+      ]);
+      expect(Utils.mapToRecord(map)).toEqual({ key1: "value1", key2: "value2" });
+    });
+
+    it("should handle convert a Map to a Record with non-string keys", () => {
+      const map = new Map([
+        [1, "value1"],
+        [2, "value2"],
+      ]);
+      const result = Utils.mapToRecord(map);
+      expect(result).toEqual({ 1: "value1", 2: "value2" });
+      expect(Utils.recordToMap(result)).toEqual(map);
+    });
+
+    it("should not convert an object if it's not a map", () => {
+      const obj = { key1: "value1", key2: "value2" };
+      expect(Utils.mapToRecord(obj as any)).toEqual(obj);
+    });
+  });
+
+  describe("recordToMap", () => {
+    it("should handle null", () => {
+      expect(Utils.recordToMap(null)).toEqual(null);
+    });
+
+    it("should handle empty record", () => {
+      expect(Utils.recordToMap({})).toEqual(new Map());
+    });
+
+    it("should handle convert a Record to a Map", () => {
+      const record = { key1: "value1", key2: "value2" };
+      expect(Utils.recordToMap(record)).toEqual(new Map(Object.entries(record)));
+    });
+
+    it("should handle convert a Record to a Map with non-string keys", () => {
+      const record = { 1: "value1", 2: "value2" };
+      const result = Utils.recordToMap(record);
+      expect(result).toEqual(
+        new Map([
+          [1, "value1"],
+          [2, "value2"],
+        ])
+      );
+      expect(Utils.mapToRecord(result)).toEqual(record);
+    });
+
+    it("should not convert an object if already a map", () => {
+      const map = new Map([
+        ["key1", "value1"],
+        ["key2", "value2"],
+      ]);
+      expect(Utils.recordToMap(map as any)).toEqual(map);
+    });
+  });
 });
diff --git a/libs/common/src/abstractions/api.service.ts b/libs/common/src/abstractions/api.service.ts
index a8e2f45283c..d130f514134 100644
--- a/libs/common/src/abstractions/api.service.ts
+++ b/libs/common/src/abstractions/api.service.ts
@@ -163,6 +163,11 @@ import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key
 import { UserKeyResponse } from "../models/response/user-key.response";
 import { SendAccessView } from "../models/view/send-access.view";
 
+/**
+ * @deprecated The `ApiService` class is deprecated and calls should be extracted into individual
+ * api services. The `send` method is still allowed to be used within api services. For background
+ * of this decision please read https://contributing.bitwarden.com/architecture/adr/refactor-api-service.
+ */
 export abstract class ApiService {
   send: (
     method: "GET" | "POST" | "PUT" | "DELETE",
diff --git a/libs/common/src/abstractions/i18n.service.ts b/libs/common/src/abstractions/i18n.service.ts
index 23f2d4fd235..f4a9b8ceef8 100644
--- a/libs/common/src/abstractions/i18n.service.ts
+++ b/libs/common/src/abstractions/i18n.service.ts
@@ -6,6 +6,6 @@ export abstract class I18nService {
   translationLocale: string;
   collator: Intl.Collator;
   localeNames: Map<string, string>;
-  t: (id: string, p1?: string, p2?: string, p3?: string) => string;
+  t: (id: string, p1?: string | number, p2?: string | number, p3?: string | number) => string;
   translate: (id: string, p1?: string, p2?: string, p3?: string) => string;
 }
diff --git a/libs/common/src/abstractions/organization/organization.service.abstraction.ts b/libs/common/src/abstractions/organization/organization.service.abstraction.ts
index 68c64654d57..7a59455163f 100644
--- a/libs/common/src/abstractions/organization/organization.service.abstraction.ts
+++ b/libs/common/src/abstractions/organization/organization.service.abstraction.ts
@@ -70,6 +70,10 @@ export function canAccessAdmin(i18nService: I18nService) {
   );
 }
 
+export function isNotProviderUser(org: Organization): boolean {
+  return !org.isProviderUser;
+}
+
 export abstract class OrganizationService {
   organizations$: Observable<Organization[]>;
 
diff --git a/libs/common/src/abstractions/platformUtils.service.ts b/libs/common/src/abstractions/platformUtils.service.ts
index c4300d13227..8f2f5461273 100644
--- a/libs/common/src/abstractions/platformUtils.service.ts
+++ b/libs/common/src/abstractions/platformUtils.service.ts
@@ -19,6 +19,7 @@ export abstract class PlatformUtilsService {
   isViewOpen: () => Promise<boolean>;
   launchUri: (uri: string, options?: any) => void;
   getApplicationVersion: () => Promise<string>;
+  getApplicationVersionNumber: () => Promise<string>;
   supportsWebAuthn: (win: Window) => boolean;
   supportsDuo: () => boolean;
   showToast: (
diff --git a/libs/common/src/emailForwarders/anonAddyForwarder.ts b/libs/common/src/email-forwarders/anon-addy-forwarder.ts
similarity index 96%
rename from libs/common/src/emailForwarders/anonAddyForwarder.ts
rename to libs/common/src/email-forwarders/anon-addy-forwarder.ts
index af4e3c9bce0..c4657f8372d 100644
--- a/libs/common/src/emailForwarders/anonAddyForwarder.ts
+++ b/libs/common/src/email-forwarders/anon-addy-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class AnonAddyForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/emailForwarders/duckDuckGoForwarder.ts b/libs/common/src/email-forwarders/duck-duck-go-forwarder.ts
similarity index 95%
rename from libs/common/src/emailForwarders/duckDuckGoForwarder.ts
rename to libs/common/src/email-forwarders/duck-duck-go-forwarder.ts
index a4730733874..a600c904bc7 100644
--- a/libs/common/src/emailForwarders/duckDuckGoForwarder.ts
+++ b/libs/common/src/email-forwarders/duck-duck-go-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class DuckDuckGoForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/emailForwarders/fastmailForwarder.ts b/libs/common/src/email-forwarders/fastmail-forwarder.ts
similarity index 98%
rename from libs/common/src/emailForwarders/fastmailForwarder.ts
rename to libs/common/src/email-forwarders/fastmail-forwarder.ts
index 19b7d043cf2..dc24c623a34 100644
--- a/libs/common/src/emailForwarders/fastmailForwarder.ts
+++ b/libs/common/src/email-forwarders/fastmail-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class FastmailForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/emailForwarders/firefoxRelayForwarder.ts b/libs/common/src/email-forwarders/firefox-relay-forwarder.ts
similarity index 95%
rename from libs/common/src/emailForwarders/firefoxRelayForwarder.ts
rename to libs/common/src/email-forwarders/firefox-relay-forwarder.ts
index bdfaecc117c..f64dc4b06a4 100644
--- a/libs/common/src/emailForwarders/firefoxRelayForwarder.ts
+++ b/libs/common/src/email-forwarders/firefox-relay-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class FirefoxRelayForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/emailForwarders/forwarderOptions.ts b/libs/common/src/email-forwarders/forwarder-options.ts
similarity index 100%
rename from libs/common/src/emailForwarders/forwarderOptions.ts
rename to libs/common/src/email-forwarders/forwarder-options.ts
diff --git a/libs/common/src/emailForwarders/forwarder.ts b/libs/common/src/email-forwarders/forwarder.ts
similarity index 75%
rename from libs/common/src/emailForwarders/forwarder.ts
rename to libs/common/src/email-forwarders/forwarder.ts
index 05b84c913af..da3d1bb485c 100644
--- a/libs/common/src/emailForwarders/forwarder.ts
+++ b/libs/common/src/email-forwarders/forwarder.ts
@@ -1,6 +1,6 @@
 import { ApiService } from "../abstractions/api.service";
 
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export interface Forwarder {
   generate(apiService: ApiService, options: ForwarderOptions): Promise<string>;
diff --git a/libs/common/src/emailForwarders/simpleLoginForwarder.ts b/libs/common/src/email-forwarders/simple-login-forwarder.ts
similarity index 96%
rename from libs/common/src/emailForwarders/simpleLoginForwarder.ts
rename to libs/common/src/email-forwarders/simple-login-forwarder.ts
index adc8a13aefc..ef1eecb59ba 100644
--- a/libs/common/src/emailForwarders/simpleLoginForwarder.ts
+++ b/libs/common/src/email-forwarders/simple-login-forwarder.ts
@@ -1,7 +1,7 @@
 import { ApiService } from "../abstractions/api.service";
 
 import { Forwarder } from "./forwarder";
-import { ForwarderOptions } from "./forwarderOptions";
+import { ForwarderOptions } from "./forwarder-options";
 
 export class SimpleLoginForwarder implements Forwarder {
   async generate(apiService: ApiService, options: ForwarderOptions): Promise<string> {
diff --git a/libs/common/src/misc/utils.ts b/libs/common/src/misc/utils.ts
index ff21a919f1f..ead692d6663 100644
--- a/libs/common/src/misc/utils.ts
+++ b/libs/common/src/misc/utils.ts
@@ -1,5 +1,6 @@
 /* eslint-disable no-useless-escape */
 import { getHostname, parse } from "tldts";
+import { Merge } from "type-fest";
 
 import { CryptoService } from "../abstractions/crypto.service";
 import { EncryptService } from "../abstractions/encrypt.service";
@@ -55,6 +56,10 @@ export class Utils {
   }
 
   static fromB64ToArray(str: string): Uint8Array {
+    if (str == null) {
+      return null;
+    }
+
     if (Utils.isNode) {
       return new Uint8Array(Buffer.from(str, "base64"));
     } else {
@@ -108,6 +113,9 @@ export class Utils {
   }
 
   static fromBufferToB64(buffer: ArrayBuffer): string {
+    if (buffer == null) {
+      return null;
+    }
     if (Utils.isNode) {
       return Buffer.from(buffer).toString("base64");
     } else {
@@ -423,6 +431,57 @@ export class Utils {
     return this.global.bitwardenContainerService;
   }
 
+  /**
+   * Converts map to a Record<string, V> with the same data. Inverse of recordToMap
+   * Useful in toJSON methods, since Maps are not serializable
+   * @param map
+   * @returns
+   */
+  static mapToRecord<K extends string | number, V>(map: Map<K, V>): Record<string, V> {
+    if (map == null) {
+      return null;
+    }
+    if (!(map instanceof Map)) {
+      return map;
+    }
+    return Object.fromEntries(map);
+  }
+
+  /**
+   * Converts record to a Map<string, V> with the same data. Inverse of mapToRecord
+   * Useful in fromJSON methods, since Maps are not serializable
+   *
+   * Warning: If the record has string keys that are numbers, they will be converted to numbers in the map
+   * @param record
+   * @returns
+   */
+  static recordToMap<K extends string | number, V>(record: Record<K, V>): Map<K, V> {
+    if (record == null) {
+      return null;
+    } else if (record instanceof Map) {
+      return record;
+    }
+
+    const entries = Object.entries(record);
+    if (entries.length === 0) {
+      return new Map();
+    }
+
+    if (isNaN(Number(entries[0][0]))) {
+      return new Map(entries) as Map<K, V>;
+    } else {
+      return new Map(entries.map((e) => [Number(e[0]), e[1]])) as Map<K, V>;
+    }
+  }
+
+  /** Applies Object.assign, but converts the type nicely using Type-Fest Merge<Destination, Source> */
+  static merge<Destination, Source>(
+    destination: Destination,
+    source: Source
+  ): Merge<Destination, Source> {
+    return Object.assign(destination, source) as unknown as Merge<Destination, Source>;
+  }
+
   private static isMobile(win: Window) {
     let mobile = false;
     ((a) => {
diff --git a/libs/common/src/models/domain/account.ts b/libs/common/src/models/domain/account.ts
index 75a1eebfebb..0715b0c49b6 100644
--- a/libs/common/src/models/domain/account.ts
+++ b/libs/common/src/models/domain/account.ts
@@ -1,4 +1,4 @@
-import { Except, Jsonify } from "type-fest";
+import { Jsonify } from "type-fest";
 
 import { AuthenticationStatus } from "../../enums/authenticationStatus";
 import { KdfType } from "../../enums/kdfType";
@@ -40,7 +40,7 @@ export class EncryptionPair<TEncrypted, TDecrypted> {
   }
 
   static fromJSON<TEncrypted, TDecrypted>(
-    obj: Jsonify<EncryptionPair<Jsonify<TEncrypted>, Jsonify<TDecrypted>>>,
+    obj: { encrypted?: Jsonify<TEncrypted>; decrypted?: string | Jsonify<TDecrypted> },
     decryptedFromJson?: (decObj: Jsonify<TDecrypted> | string) => TDecrypted,
     encryptedFromJson?: (encObj: Jsonify<TEncrypted>) => TEncrypted
   ) {
@@ -123,7 +123,7 @@ export class AccountKeys {
   apiKeyClientSecret?: string;
 
   toJSON() {
-    return Object.assign(this as Except<AccountKeys, "publicKey">, {
+    return Utils.merge(this, {
       publicKey: Utils.fromBufferToByteString(this.publicKey),
     });
   }
@@ -251,7 +251,7 @@ export class AccountSettings {
 }
 
 export type AccountSettingsSettings = {
-  equivalentDomains?: { [id: string]: any };
+  equivalentDomains?: string[][];
 };
 
 export class AccountTokens {
diff --git a/libs/common/src/models/domain/organization.ts b/libs/common/src/models/domain/organization.ts
index 75de3a30906..4e84a84ef8b 100644
--- a/libs/common/src/models/domain/organization.ts
+++ b/libs/common/src/models/domain/organization.ts
@@ -1,3 +1,5 @@
+import { Jsonify } from "type-fest";
+
 import { OrganizationUserStatusType } from "../../enums/organizationUserStatusType";
 import { OrganizationUserType } from "../../enums/organizationUserType";
 import { ProductType } from "../../enums/productType";
@@ -205,4 +207,15 @@ export class Organization {
   get hasProvider() {
     return this.providerId != null || this.providerName != null;
   }
+
+  static fromJSON(json: Jsonify<Organization>) {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new Organization(), json, {
+      familySponsorshipLastSyncDate: new Date(json.familySponsorshipLastSyncDate),
+      familySponsorshipValidUntil: new Date(json.familySponsorshipValidUntil),
+    });
+  }
 }
diff --git a/libs/common/src/models/domain/state.spec.ts b/libs/common/src/models/domain/state.spec.ts
index 64e71d7cb2c..aa4f36549c2 100644
--- a/libs/common/src/models/domain/state.spec.ts
+++ b/libs/common/src/models/domain/state.spec.ts
@@ -4,22 +4,25 @@ import { State } from "./state";
 describe("state", () => {
   describe("fromJSON", () => {
     it("should deserialize to an instance of itself", () => {
-      expect(State.fromJSON({})).toBeInstanceOf(State);
+      expect(State.fromJSON({}, () => new Account({}))).toBeInstanceOf(State);
     });
 
     it("should always assign an object to accounts", () => {
-      const state = State.fromJSON({});
+      const state = State.fromJSON({}, () => new Account({}));
       expect(state.accounts).not.toBeNull();
       expect(state.accounts).toEqual({});
     });
 
     it("should build an account map", () => {
       const accountsSpy = jest.spyOn(Account, "fromJSON");
-      const state = State.fromJSON({
-        accounts: {
-          userId: {},
+      const state = State.fromJSON(
+        {
+          accounts: {
+            userId: {},
+          },
         },
-      });
+        Account.fromJSON
+      );
 
       expect(state.accounts["userId"]).toBeInstanceOf(Account);
       expect(accountsSpy).toHaveBeenCalled();
diff --git a/libs/common/src/models/domain/state.ts b/libs/common/src/models/domain/state.ts
index be99d9bdabe..c08e6fe70f6 100644
--- a/libs/common/src/models/domain/state.ts
+++ b/libs/common/src/models/domain/state.ts
@@ -19,26 +19,28 @@ export class State<
 
   // TODO, make Jsonify<State,TGlobalState,TAccount> work. It currently doesn't because Globals doesn't implement Jsonify.
   static fromJSON<TGlobalState extends GlobalState, TAccount extends Account>(
-    obj: any
+    obj: any,
+    accountDeserializer: (json: Jsonify<TAccount>) => TAccount
   ): State<TGlobalState, TAccount> {
     if (obj == null) {
       return null;
     }
 
     return Object.assign(new State(null), obj, {
-      accounts: State.buildAccountMapFromJSON(obj?.accounts),
+      accounts: State.buildAccountMapFromJSON(obj?.accounts, accountDeserializer),
     });
   }
 
-  private static buildAccountMapFromJSON(
-    jsonAccounts: Jsonify<{ [userId: string]: Jsonify<Account> }>
+  private static buildAccountMapFromJSON<TAccount extends Account>(
+    jsonAccounts: { [userId: string]: Jsonify<TAccount> },
+    accountDeserializer: (json: Jsonify<TAccount>) => TAccount
   ) {
     if (!jsonAccounts) {
       return {};
     }
-    const accounts: { [userId: string]: Account } = {};
+    const accounts: { [userId: string]: TAccount } = {};
     for (const userId in jsonAccounts) {
-      accounts[userId] = Account.fromJSON(jsonAccounts[userId]);
+      accounts[userId] = accountDeserializer(jsonAccounts[userId]);
     }
     return accounts;
   }
diff --git a/libs/common/src/models/view/send-file.view.ts b/libs/common/src/models/view/send-file.view.ts
index 7ed291a2b73..3ac12b8203d 100644
--- a/libs/common/src/models/view/send-file.view.ts
+++ b/libs/common/src/models/view/send-file.view.ts
@@ -1,3 +1,4 @@
+import { DeepJsonify } from "../../types/deep-jsonify";
 import { SendFile } from "../domain/send-file";
 
 import { View } from "./view";
@@ -28,4 +29,12 @@ export class SendFileView implements View {
     }
     return 0;
   }
+
+  static fromJSON(json: DeepJsonify<SendFileView>) {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new SendFileView(), json);
+  }
 }
diff --git a/libs/common/src/models/view/send-text.view.ts b/libs/common/src/models/view/send-text.view.ts
index cd10c799b64..638f66ad661 100644
--- a/libs/common/src/models/view/send-text.view.ts
+++ b/libs/common/src/models/view/send-text.view.ts
@@ -1,3 +1,4 @@
+import { DeepJsonify } from "../../types/deep-jsonify";
 import { SendText } from "../domain/send-text";
 
 import { View } from "./view";
@@ -17,4 +18,12 @@ export class SendTextView implements View {
   get maskedText(): string {
     return this.text != null ? "••••••••" : null;
   }
+
+  static fromJSON(json: DeepJsonify<SendTextView>) {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new SendTextView(), json);
+  }
 }
diff --git a/libs/common/src/models/view/send.view.ts b/libs/common/src/models/view/send.view.ts
index 3ef6bf9f0e3..c5da1d2f683 100644
--- a/libs/common/src/models/view/send.view.ts
+++ b/libs/common/src/models/view/send.view.ts
@@ -1,5 +1,6 @@
 import { SendType } from "../../enums/sendType";
 import { Utils } from "../../misc/utils";
+import { DeepJsonify } from "../../types/deep-jsonify";
 import { Send } from "../domain/send";
 import { SymmetricCryptoKey } from "../domain/symmetric-crypto-key";
 
@@ -65,4 +66,26 @@ export class SendView implements View {
   get pendingDelete(): boolean {
     return this.deletionDate <= new Date();
   }
+
+  toJSON() {
+    return Utils.merge(this, {
+      key: Utils.fromBufferToB64(this.key),
+    });
+  }
+
+  static fromJSON(json: DeepJsonify<SendView>) {
+    if (json == null) {
+      return null;
+    }
+
+    return Object.assign(new SendView(), json, {
+      key: Utils.fromB64ToArray(json.key)?.buffer,
+      cryptoKey: SymmetricCryptoKey.fromJSON(json.cryptoKey),
+      text: SendTextView.fromJSON(json.text),
+      file: SendFileView.fromJSON(json.file),
+      revisionDate: json.revisionDate == null ? null : new Date(json.revisionDate),
+      deletionDate: json.deletionDate == null ? null : new Date(json.deletionDate),
+      expirationDate: json.expirationDate == null ? null : new Date(json.expirationDate),
+    });
+  }
 }
diff --git a/libs/common/src/services/api.service.ts b/libs/common/src/services/api.service.ts
index 6b660bb367e..dddbe7a58bd 100644
--- a/libs/common/src/services/api.service.ts
+++ b/libs/common/src/services/api.service.ts
@@ -172,6 +172,11 @@ import { TwoFactorYubiKeyResponse } from "../models/response/two-factor-yubi-key
 import { UserKeyResponse } from "../models/response/user-key.response";
 import { SendAccessView } from "../models/view/send-access.view";
 
+/**
+ * @deprecated The `ApiService` class is deprecated and calls should be extracted into individual
+ * api services. The `send` method is still allowed to be used within api services. For background
+ * of this decision please read https://contributing.bitwarden.com/architecture/adr/refactor-api-service.
+ */
 export class ApiService implements ApiServiceAbstraction {
   private device: DeviceType;
   private deviceType: string;
@@ -2081,7 +2086,7 @@ export class ApiService implements ApiServiceAbstraction {
     request.headers.set("Bitwarden-Client-Name", this.platformUtilsService.getClientType());
     request.headers.set(
       "Bitwarden-Client-Version",
-      await this.platformUtilsService.getApplicationVersion()
+      await this.platformUtilsService.getApplicationVersionNumber()
     );
     return this.nativeFetch(request);
   }
diff --git a/libs/common/src/services/cipher.service.ts b/libs/common/src/services/cipher.service.ts
index a7b54942e2c..b93c60d6228 100644
--- a/libs/common/src/services/cipher.service.ts
+++ b/libs/common/src/services/cipher.service.ts
@@ -412,7 +412,7 @@ export class CipherService implements CipherServiceAbstraction {
         : firstValueFrom(this.settingsService.settings$).then(
             (settings: AccountSettingsSettings) => {
               let matches: any[] = [];
-              settings.equivalentDomains?.forEach((eqDomain: any) => {
+              settings?.equivalentDomains?.forEach((eqDomain: any) => {
                 if (eqDomain.length && eqDomain.indexOf(domain) >= 0) {
                   matches = matches.concat(eqDomain);
                 }
diff --git a/libs/common/src/services/i18n.service.ts b/libs/common/src/services/i18n.service.ts
index 5076e1dbdf5..9fd39b092a0 100644
--- a/libs/common/src/services/i18n.service.ts
+++ b/libs/common/src/services/i18n.service.ts
@@ -122,7 +122,7 @@ export class I18nService implements I18nServiceAbstraction {
     return this.translate(id, p1, p2, p3);
   }
 
-  translate(id: string, p1?: string, p2?: string, p3?: string): string {
+  translate(id: string, p1?: string | number, p2?: string | number, p3?: string | number): string {
     let result: string;
     // eslint-disable-next-line
     if (this.localeMessages.hasOwnProperty(id) && this.localeMessages[id]) {
@@ -136,13 +136,13 @@ export class I18nService implements I18nServiceAbstraction {
 
     if (result !== "") {
       if (p1 != null) {
-        result = result.split("__$1__").join(p1);
+        result = result.split("__$1__").join(p1.toString());
       }
       if (p2 != null) {
-        result = result.split("__$2__").join(p2);
+        result = result.split("__$2__").join(p2.toString());
       }
       if (p3 != null) {
-        result = result.split("__$3__").join(p3);
+        result = result.split("__$3__").join(p3.toString());
       }
     }
 
diff --git a/libs/common/src/services/organization/organization.service.ts b/libs/common/src/services/organization/organization.service.ts
index 5d936c53ae7..b0d7791ec26 100644
--- a/libs/common/src/services/organization/organization.service.ts
+++ b/libs/common/src/services/organization/organization.service.ts
@@ -6,7 +6,7 @@ import { OrganizationData } from "../../models/data/organization.data";
 import { Organization } from "../../models/domain/organization";
 
 export class OrganizationService implements InternalOrganizationServiceAbstraction {
-  private _organizations = new BehaviorSubject<Organization[]>([]);
+  protected _organizations = new BehaviorSubject<Organization[]>([]);
 
   organizations$ = this._organizations.asObservable();
 
diff --git a/libs/common/src/services/policy/policy.service.ts b/libs/common/src/services/policy/policy.service.ts
index 757c3b3e05f..c20682184bc 100644
--- a/libs/common/src/services/policy/policy.service.ts
+++ b/libs/common/src/services/policy/policy.service.ts
@@ -16,7 +16,7 @@ import { ListResponse } from "../../models/response/list.response";
 import { PolicyResponse } from "../../models/response/policy.response";
 
 export class PolicyService implements InternalPolicyServiceAbstraction {
-  private _policies: BehaviorSubject<Policy[]> = new BehaviorSubject([]);
+  protected _policies: BehaviorSubject<Policy[]> = new BehaviorSubject([]);
 
   policies$ = this._policies.asObservable();
 
diff --git a/libs/common/src/services/settings.service.ts b/libs/common/src/services/settings.service.ts
index 923bd8970dd..4a6986e37f1 100644
--- a/libs/common/src/services/settings.service.ts
+++ b/libs/common/src/services/settings.service.ts
@@ -6,7 +6,7 @@ import { Utils } from "../misc/utils";
 import { AccountSettingsSettings } from "../models/domain/account";
 
 export class SettingsService implements SettingsServiceAbstraction {
-  private _settings: BehaviorSubject<AccountSettingsSettings> = new BehaviorSubject({});
+  protected _settings: BehaviorSubject<AccountSettingsSettings> = new BehaviorSubject({});
 
   settings$ = this._settings.asObservable();
 
diff --git a/libs/common/src/services/state.service.ts b/libs/common/src/services/state.service.ts
index 0c1c3b725ab..fe787f21c0e 100644
--- a/libs/common/src/services/state.service.ts
+++ b/libs/common/src/services/state.service.ts
@@ -1,4 +1,5 @@
 import { BehaviorSubject, concatMap } from "rxjs";
+import { Jsonify } from "type-fest";
 
 import { LogService } from "../abstractions/log.service";
 import { StateService as StateServiceAbstraction } from "../abstractions/state.service";
@@ -13,6 +14,7 @@ import { StorageLocation } from "../enums/storageLocation";
 import { ThemeType } from "../enums/themeType";
 import { UriMatchType } from "../enums/uriMatchType";
 import { StateFactory } from "../factories/stateFactory";
+import { Utils } from "../misc/utils";
 import { CipherData } from "../models/data/cipher.data";
 import { CollectionData } from "../models/data/collection.data";
 import { EncryptedOrganizationKeyData } from "../models/data/encrypted-organization-key.data";
@@ -65,13 +67,13 @@ export class StateService<
   TAccount extends Account = Account
 > implements StateServiceAbstraction<TAccount>
 {
-  private accountsSubject = new BehaviorSubject<{ [userId: string]: TAccount }>({});
+  protected accountsSubject = new BehaviorSubject<{ [userId: string]: TAccount }>({});
   accounts$ = this.accountsSubject.asObservable();
 
-  private activeAccountSubject = new BehaviorSubject<string | null>(null);
+  protected activeAccountSubject = new BehaviorSubject<string | null>(null);
   activeAccount$ = this.activeAccountSubject.asObservable();
 
-  private activeAccountUnlockedSubject = new BehaviorSubject<boolean>(false);
+  protected activeAccountUnlockedSubject = new BehaviorSubject<boolean>(false);
   activeAccountUnlocked$ = this.activeAccountUnlockedSubject.asObservable();
 
   private hasBeenInited = false;
@@ -79,6 +81,9 @@ export class StateService<
 
   private accountDiskCache = new Map<string, TAccount>();
 
+  // default account serializer, must be overridden by child class
+  protected accountDeserializer = Account.fromJSON as (json: Jsonify<TAccount>) => TAccount;
+
   constructor(
     protected storageService: AbstractStorageService,
     protected secureStorageService: AbstractStorageService,
@@ -676,7 +681,7 @@ export class StateService<
     const account = await this.getAccount(
       this.reconcileOptions(options, await this.defaultInMemoryOptions())
     );
-    return this.recordToMap(account?.keys?.organizationKeys?.decrypted);
+    return Utils.recordToMap(account?.keys?.organizationKeys?.decrypted);
   }
 
   async setDecryptedOrganizationKeys(
@@ -686,7 +691,7 @@ export class StateService<
     const account = await this.getAccount(
       this.reconcileOptions(options, await this.defaultInMemoryOptions())
     );
-    account.keys.organizationKeys.decrypted = this.mapToRecord(value);
+    account.keys.organizationKeys.decrypted = Utils.mapToRecord(value);
     await this.saveAccount(
       account,
       this.reconcileOptions(options, await this.defaultInMemoryOptions())
@@ -774,7 +779,7 @@ export class StateService<
     const account = await this.getAccount(
       this.reconcileOptions(options, await this.defaultInMemoryOptions())
     );
-    return this.recordToMap(account?.keys?.providerKeys?.decrypted);
+    return Utils.recordToMap(account?.keys?.providerKeys?.decrypted);
   }
 
   async setDecryptedProviderKeys(
@@ -784,7 +789,7 @@ export class StateService<
     const account = await this.getAccount(
       this.reconcileOptions(options, await this.defaultInMemoryOptions())
     );
-    account.keys.providerKeys.decrypted = this.mapToRecord(value);
+    account.keys.providerKeys.decrypted = Utils.mapToRecord(value);
     await this.saveAccount(
       account,
       this.reconcileOptions(options, await this.defaultInMemoryOptions())
@@ -2744,7 +2749,7 @@ export class StateService<
 
   protected async state(): Promise<State<TGlobalState, TAccount>> {
     const state = await this.memoryStorageService.get<State<TGlobalState, TAccount>>(keys.state, {
-      deserializer: (s) => State.fromJSON(s),
+      deserializer: (s) => State.fromJSON(s, this.accountDeserializer),
     });
     return state;
   }
@@ -2765,50 +2770,6 @@ export class StateService<
       await this.setState(updatedState);
     });
   }
-
-  private mapToRecord<V>(map: Map<string, V>): Record<string, V> {
-    return map == null ? null : Object.fromEntries(map);
-  }
-
-  private recordToMap<V>(record: Record<string, V>): Map<string, V> {
-    return record == null ? null : new Map(Object.entries(record));
-  }
-}
-
-export function withPrototype<T>(
-  constructor: new (...args: any[]) => T,
-  converter: (input: any) => T = (i) => i
-): (
-  target: any,
-  propertyKey: string | symbol,
-  descriptor: PropertyDescriptor
-) => { value: (...args: any[]) => Promise<T> } {
-  return (target: any, propertyKey: string | symbol, descriptor: PropertyDescriptor) => {
-    const originalMethod = descriptor.value;
-
-    return {
-      value: function (...args: any[]) {
-        const originalResult: Promise<T> = originalMethod.apply(this, args);
-
-        if (!(originalResult instanceof Promise)) {
-          throw new Error(
-            `Error applying prototype to stored value -- result is not a promise for method ${String(
-              propertyKey
-            )}`
-          );
-        }
-
-        return originalResult.then((result) => {
-          return result == null ||
-            result.constructor.name === constructor.prototype.constructor.name
-            ? converter(result as T)
-            : converter(
-                Object.create(constructor.prototype, Object.getOwnPropertyDescriptors(result)) as T
-              );
-        });
-      },
-    };
-  };
 }
 
 function withPrototypeForArrayMembers<T>(
@@ -2847,7 +2808,7 @@ function withPrototypeForArrayMembers<T>(
             return result.map((r) => {
               return r == null ||
                 r.constructor.name === memberConstructor.prototype.constructor.name
-                ? memberConverter(r)
+                ? r
                 : memberConverter(
                     Object.create(memberConstructor.prototype, Object.getOwnPropertyDescriptors(r))
                   );
diff --git a/libs/common/src/services/usernameGeneration.service.ts b/libs/common/src/services/usernameGeneration.service.ts
index 72eb11b3430..ce5857f37cc 100644
--- a/libs/common/src/services/usernameGeneration.service.ts
+++ b/libs/common/src/services/usernameGeneration.service.ts
@@ -2,13 +2,13 @@ import { ApiService } from "../abstractions/api.service";
 import { CryptoService } from "../abstractions/crypto.service";
 import { StateService } from "../abstractions/state.service";
 import { UsernameGenerationService as BaseUsernameGenerationService } from "../abstractions/usernameGeneration.service";
-import { AnonAddyForwarder } from "../emailForwarders/anonAddyForwarder";
-import { DuckDuckGoForwarder } from "../emailForwarders/duckDuckGoForwarder";
-import { FastmailForwarder } from "../emailForwarders/fastmailForwarder";
-import { FirefoxRelayForwarder } from "../emailForwarders/firefoxRelayForwarder";
-import { Forwarder } from "../emailForwarders/forwarder";
-import { ForwarderOptions } from "../emailForwarders/forwarderOptions";
-import { SimpleLoginForwarder } from "../emailForwarders/simpleLoginForwarder";
+import { AnonAddyForwarder } from "../email-forwarders/anon-addy-forwarder";
+import { DuckDuckGoForwarder } from "../email-forwarders/duck-duck-go-forwarder";
+import { FastmailForwarder } from "../email-forwarders/fastmail-forwarder";
+import { FirefoxRelayForwarder } from "../email-forwarders/firefox-relay-forwarder";
+import { Forwarder } from "../email-forwarders/forwarder";
+import { ForwarderOptions } from "../email-forwarders/forwarder-options";
+import { SimpleLoginForwarder } from "../email-forwarders/simple-login-forwarder";
 import { EFFLongWordList } from "../misc/wordlist";
 
 const DefaultOptions = {
diff --git a/libs/components/src/badge/badge.directive.ts b/libs/components/src/badge/badge.directive.ts
index 352da9c41fd..c5482423e52 100644
--- a/libs/components/src/badge/badge.directive.ts
+++ b/libs/components/src/badge/badge.directive.ts
@@ -1,6 +1,6 @@
 import { Directive, ElementRef, HostBinding, Input } from "@angular/core";
 
-type BadgeTypes = "primary" | "secondary" | "success" | "danger" | "warning" | "info";
+export type BadgeTypes = "primary" | "secondary" | "success" | "danger" | "warning" | "info";
 
 const styles: Record<BadgeTypes, string[]> = {
   primary: ["tw-bg-primary-500"],
diff --git a/libs/components/src/button/button.component.html b/libs/components/src/button/button.component.html
index ee4d150dfcc..836eb0f9655 100644
--- a/libs/components/src/button/button.component.html
+++ b/libs/components/src/button/button.component.html
@@ -1,5 +1,6 @@
 <span class="tw-relative">
   <span [ngClass]="{ 'tw-invisible': loading }">
+    <i class="bwi bwi-lg" [ngClass]="iconClass" aria-hidden="true" *ngIf="icon"></i>
     <ng-content></ng-content>
   </span>
   <span
diff --git a/libs/components/src/button/button.component.ts b/libs/components/src/button/button.component.ts
index 9a27bfdd9ed..aeec8dfa688 100644
--- a/libs/components/src/button/button.component.ts
+++ b/libs/components/src/button/button.component.ts
@@ -20,8 +20,8 @@ const buttonStyles: Record<ButtonTypes, string[]> = {
     "tw-bg-transparent",
     "tw-border-text-muted",
     "!tw-text-muted",
-    "hover:tw-bg-secondary-500",
-    "hover:tw-border-secondary-500",
+    "hover:tw-bg-text-muted",
+    "hover:tw-border-text-muted",
     "hover:!tw-text-contrast",
     "disabled:tw-bg-transparent",
     "disabled:tw-border-text-muted/60",
@@ -76,7 +76,16 @@ export class ButtonComponent implements ButtonLikeAbstraction {
   }
 
   @Input() buttonType: ButtonTypes = null;
+
   @Input() block?: boolean;
+
   @Input() loading = false;
+
   @Input() disabled = false;
+
+  @Input("bitIconButton") icon: string;
+
+  get iconClass() {
+    return [this.icon, "!tw-m-0"];
+  }
 }
diff --git a/libs/components/src/button/button.stories.ts b/libs/components/src/button/button.stories.ts
index 6619d7a3a3f..881824c6ae5 100644
--- a/libs/components/src/button/button.stories.ts
+++ b/libs/components/src/button/button.stories.ts
@@ -101,3 +101,17 @@ export const Block = BlockTemplate.bind({});
 Block.args = {
   block: true,
 };
+
+const IconTemplate: Story = (args) => ({
+  props: args,
+  template: `
+    <button bitButton [bitIconButton]="icon" buttonType="primary" class="tw-mr-2"></button>
+    <button bitButton [bitIconButton]="icon"buttonType="secondary" class="tw-mr-2"></button>
+    <button bitButton [bitIconButton]="icon" buttonType="danger" class="tw-mr-2"></button>
+  `,
+});
+
+export const Icon = IconTemplate.bind({});
+Icon.args = {
+  icon: "bwi-eye",
+};
diff --git a/libs/components/src/checkbox/checkbox.component.ts b/libs/components/src/checkbox/checkbox.component.ts
new file mode 100644
index 00000000000..07b2066e8a4
--- /dev/null
+++ b/libs/components/src/checkbox/checkbox.component.ts
@@ -0,0 +1,104 @@
+import { Component, HostBinding, Input, Optional, Self } from "@angular/core";
+import { NgControl, Validators } from "@angular/forms";
+
+import { BitFormControlAbstraction } from "../form-control";
+
+@Component({
+  selector: "input[type=checkbox][bitCheckbox]",
+  template: "",
+  providers: [{ provide: BitFormControlAbstraction, useExisting: CheckboxComponent }],
+  styles: [
+    `
+      :host:checked:before {
+        -webkit-mask-image: url('data:image/svg+xml,%3Csvg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8" viewBox="0 0 10 10"%3E%3Cpath d="M0.5 6.2L2.9 8.6L9.5 1.4" fill="none" stroke="white" stroke-width="2"%3E%3C/path%3E%3C/svg%3E');
+        mask-image: url('data:image/svg+xml,%3Csvg class="svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="8" height="8" viewBox="0 0 10 10"%3E%3Cpath d="M0.5 6.2L2.9 8.6L9.5 1.4" fill="none" stroke="white" stroke-width="2"%3E%3C/path%3E%3C/svg%3E');
+        -webkit-mask-position: center;
+        mask-position: center;
+        -webkit-mask-repeat: no-repeat;
+        mask-repeat: no-repeat;
+      }
+    `,
+  ],
+})
+export class CheckboxComponent implements BitFormControlAbstraction {
+  @HostBinding("class")
+  protected inputClasses = [
+    "tw-appearance-none",
+    "tw-outline-none",
+    "tw-relative",
+    "tw-transition",
+    "tw-cursor-pointer",
+    "tw-inline-block",
+    "tw-rounded",
+    "tw-border",
+    "tw-border-solid",
+    "tw-border-secondary-500",
+    "tw-h-3.5",
+    "tw-w-3.5",
+    "tw-mr-1.5",
+    "tw-bottom-[-1px]", // Fix checkbox looking off-center
+
+    "before:tw-content-['']",
+    "before:tw-block",
+    "before:tw-absolute",
+    "before:tw-inset-0",
+
+    "hover:tw-border-2",
+    "[&>label]:tw-border-2",
+
+    "focus-visible:tw-ring-2",
+    "focus-visible:tw-ring-offset-2",
+    "focus-visible:tw-ring-primary-700",
+
+    "disabled:tw-cursor-auto",
+    "disabled:tw-border",
+    "disabled:tw-bg-secondary-100",
+
+    "checked:tw-bg-primary-500",
+    "checked:tw-border-primary-500",
+
+    "checked:hover:tw-bg-primary-700",
+    "checked:hover:tw-border-primary-700",
+    "[&>label:hover]:checked:tw-bg-primary-700",
+    "[&>label:hover]:checked:tw-border-primary-700",
+
+    "checked:before:tw-bg-text-contrast",
+
+    "checked:disabled:tw-border-secondary-100",
+    "checked:disabled:tw-bg-secondary-100",
+
+    "checked:disabled:before:tw-bg-text-muted",
+  ];
+
+  constructor(@Optional() @Self() private ngControl?: NgControl) {}
+
+  @HostBinding()
+  @Input()
+  get disabled() {
+    return this._disabled ?? this.ngControl?.disabled ?? false;
+  }
+  set disabled(value: any) {
+    this._disabled = value != null && value !== false;
+  }
+  private _disabled: boolean;
+
+  @Input()
+  get required() {
+    return (
+      this._required ?? this.ngControl?.control?.hasValidator(Validators.requiredTrue) ?? false
+    );
+  }
+  set required(value: any) {
+    this._required = value != null && value !== false;
+  }
+  private _required: boolean;
+
+  get hasError() {
+    return this.ngControl?.status === "INVALID" && this.ngControl?.touched;
+  }
+
+  get error(): [string, any] {
+    const key = Object.keys(this.ngControl.errors)[0];
+    return [key, this.ngControl.errors[key]];
+  }
+}
diff --git a/libs/components/src/checkbox/checkbox.module.ts b/libs/components/src/checkbox/checkbox.module.ts
new file mode 100644
index 00000000000..d03b9cf5050
--- /dev/null
+++ b/libs/components/src/checkbox/checkbox.module.ts
@@ -0,0 +1,14 @@
+import { CommonModule } from "@angular/common";
+import { NgModule } from "@angular/core";
+
+import { FormControlModule } from "../form-control";
+import { SharedModule } from "../shared";
+
+import { CheckboxComponent } from "./checkbox.component";
+
+@NgModule({
+  imports: [SharedModule, CommonModule, FormControlModule],
+  declarations: [CheckboxComponent],
+  exports: [CheckboxComponent],
+})
+export class CheckboxModule {}
diff --git a/libs/components/src/checkbox/checkbox.stories.ts b/libs/components/src/checkbox/checkbox.stories.ts
new file mode 100644
index 00000000000..c7bb4bf80e2
--- /dev/null
+++ b/libs/components/src/checkbox/checkbox.stories.ts
@@ -0,0 +1,104 @@
+import { Component, Input } from "@angular/core";
+import { FormsModule, ReactiveFormsModule, FormBuilder, Validators } from "@angular/forms";
+import { Meta, moduleMetadata, Story } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/src/abstractions/i18n.service";
+
+import { FormControlModule } from "../form-control";
+import { I18nMockService } from "../utils/i18n-mock.service";
+
+import { CheckboxModule } from "./checkbox.module";
+
+const template = `
+  <form [formGroup]="formObj">
+    <bit-form-control>
+      <input type="checkbox" bitCheckbox formControlName="checkbox">
+      <bit-label>Click me</bit-label>
+    </bit-form-control>
+  </form>`;
+
+@Component({
+  selector: "app-example",
+  template,
+})
+class ExampleComponent {
+  protected formObj = this.formBuilder.group({
+    checkbox: [false, Validators.requiredTrue],
+  });
+
+  @Input() set checked(value: boolean) {
+    this.formObj.patchValue({ checkbox: value });
+  }
+
+  @Input() set disabled(disable: boolean) {
+    if (disable) {
+      this.formObj.disable();
+    } else {
+      this.formObj.enable();
+    }
+  }
+
+  constructor(private formBuilder: FormBuilder) {}
+}
+
+export default {
+  title: "Component Library/Form/Checkbox",
+  component: ExampleComponent,
+  decorators: [
+    moduleMetadata({
+      declarations: [ExampleComponent],
+      imports: [FormsModule, ReactiveFormsModule, FormControlModule, CheckboxModule],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              required: "required",
+              inputRequired: "Input is required.",
+              inputEmail: "Input is not an email-address.",
+            });
+          },
+        },
+      ],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=3930%3A16850&t=xXPx6GJYsJfuMQPE-4",
+    },
+  },
+  args: {
+    checked: false,
+    disabled: false,
+  },
+} as Meta;
+
+const DefaultTemplate: Story<ExampleComponent> = (args: ExampleComponent) => ({
+  props: args,
+  template: `<app-example [checked]="checked" [disabled]="disabled"></app-example>`,
+});
+
+export const Default = DefaultTemplate.bind({});
+
+const CustomTemplate: Story = (args) => ({
+  props: args,
+  template: `
+    <div class="tw-flex tw-flex-col tw-w-32">
+      <label class="tw-text-main tw-flex tw-bg-secondary-300 tw-p-2 tw-items-baseline">
+        A-Z
+        <input class="tw-ml-auto focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox>
+      </label>
+      <label class="tw-text-main tw-flex tw-bg-secondary-300 tw-p-2 tw-items-baseline">
+        a-z
+        <input class="tw-ml-auto focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox>
+      </label>
+      <label class="tw-text-main tw-flex tw-bg-secondary-300 tw-p-2 tw-items-baseline">
+        0-9
+        <input class="tw-ml-auto focus-visible:tw-ring-offset-secondary-300" type="checkbox" bitCheckbox>
+      </label>
+    </div>
+  `,
+});
+
+export const Custom = CustomTemplate.bind({});
diff --git a/libs/components/src/checkbox/index.ts b/libs/components/src/checkbox/index.ts
new file mode 100644
index 00000000000..cec5a17a67a
--- /dev/null
+++ b/libs/components/src/checkbox/index.ts
@@ -0,0 +1 @@
+export * from "./checkbox.module";
diff --git a/libs/components/src/form-control/form-control.abstraction.ts b/libs/components/src/form-control/form-control.abstraction.ts
new file mode 100644
index 00000000000..6c65c6740b6
--- /dev/null
+++ b/libs/components/src/form-control/form-control.abstraction.ts
@@ -0,0 +1,6 @@
+export abstract class BitFormControlAbstraction {
+  disabled: boolean;
+  required: boolean;
+  hasError: boolean;
+  error: [string, any];
+}
diff --git a/libs/components/src/form-control/form-control.component.html b/libs/components/src/form-control/form-control.component.html
new file mode 100644
index 00000000000..9e31bc9ec40
--- /dev/null
+++ b/libs/components/src/form-control/form-control.component.html
@@ -0,0 +1,13 @@
+<label [class]="labelClasses">
+  <ng-content></ng-content>
+  <span [class]="labelContentClasses">
+    <ng-content select="bit-label"></ng-content>
+    <span *ngIf="required" class="tw-text-xs tw-font-normal"> ({{ "required" | i18n }})</span>
+  </span>
+</label>
+<div>
+  <ng-content select="bit-hint" *ngIf="!hasError"></ng-content>
+</div>
+<div *ngIf="hasError" class="tw-mt-1 tw-text-danger">
+  <i class="bwi bwi-error"></i> {{ displayError }}
+</div>
diff --git a/libs/components/src/form-control/form-control.component.ts b/libs/components/src/form-control/form-control.component.ts
new file mode 100644
index 00000000000..3dc080f71b9
--- /dev/null
+++ b/libs/components/src/form-control/form-control.component.ts
@@ -0,0 +1,68 @@
+import { coerceBooleanProperty } from "@angular/cdk/coercion";
+import { Component, ContentChild, HostBinding, Input } from "@angular/core";
+
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+
+import { BitFormControlAbstraction } from "./form-control.abstraction";
+
+@Component({
+  selector: "bit-form-control",
+  templateUrl: "form-control.component.html",
+})
+export class FormControlComponent {
+  @Input() label: string;
+
+  private _inline: boolean;
+  @Input() get inline() {
+    return this._inline;
+  }
+  set inline(value: boolean | string | null) {
+    this._inline = coerceBooleanProperty(value);
+  }
+
+  @ContentChild(BitFormControlAbstraction) protected formControl: BitFormControlAbstraction;
+
+  @HostBinding("class") get classes() {
+    return ["tw-mb-6"].concat(this.inline ? ["tw-inline-block", "tw-mr-4"] : ["tw-block"]);
+  }
+
+  constructor(private i18nService: I18nService) {}
+
+  protected get labelClasses() {
+    return ["tw-transition", "tw-select-none", "tw-mb-0"].concat(
+      this.formControl.disabled ? "tw-cursor-auto" : "tw-cursor-pointer"
+    );
+  }
+
+  protected get labelContentClasses() {
+    return ["tw-font-semibold"].concat(
+      this.formControl.disabled ? "tw-text-muted" : "tw-text-main"
+    );
+  }
+
+  get required() {
+    return this.formControl.required;
+  }
+
+  get hasError() {
+    return this.formControl.hasError;
+  }
+
+  get error() {
+    return this.formControl.error;
+  }
+
+  get displayError() {
+    switch (this.error[0]) {
+      case "required":
+        return this.i18nService.t("inputRequired");
+      default:
+        // Attempt to show a custom error message.
+        if (this.error[1]?.message) {
+          return this.error[1]?.message;
+        }
+
+        return this.error;
+    }
+  }
+}
diff --git a/libs/components/src/form-control/form-control.module.ts b/libs/components/src/form-control/form-control.module.ts
new file mode 100644
index 00000000000..8a0377582c2
--- /dev/null
+++ b/libs/components/src/form-control/form-control.module.ts
@@ -0,0 +1,14 @@
+import { NgModule } from "@angular/core";
+
+import { SharedModule } from "../shared";
+
+import { FormControlComponent } from "./form-control.component";
+import { BitHintComponent } from "./hint.component";
+import { BitLabel } from "./label.directive";
+
+@NgModule({
+  imports: [SharedModule],
+  declarations: [FormControlComponent, BitLabel, BitHintComponent],
+  exports: [FormControlComponent, BitLabel, BitHintComponent],
+})
+export class FormControlModule {}
diff --git a/libs/components/src/form-field/hint.component.ts b/libs/components/src/form-control/hint.component.ts
similarity index 100%
rename from libs/components/src/form-field/hint.component.ts
rename to libs/components/src/form-control/hint.component.ts
diff --git a/libs/components/src/form-control/index.ts b/libs/components/src/form-control/index.ts
new file mode 100644
index 00000000000..0b30cb68857
--- /dev/null
+++ b/libs/components/src/form-control/index.ts
@@ -0,0 +1,3 @@
+export * from "./form-control.module";
+export * from "./form-control.abstraction";
+export * from "./form-control.component";
diff --git a/libs/components/src/form-field/label.directive.ts b/libs/components/src/form-control/label.directive.ts
similarity index 100%
rename from libs/components/src/form-field/label.directive.ts
rename to libs/components/src/form-control/label.directive.ts
diff --git a/libs/components/src/form-field/form-field-control.ts b/libs/components/src/form-field/form-field-control.ts
index ee63407a8bd..d47696edde4 100644
--- a/libs/components/src/form-field/form-field-control.ts
+++ b/libs/components/src/form-field/form-field-control.ts
@@ -1,3 +1,5 @@
+export type InputTypes = "text" | "password" | "number" | "datetime-local" | "email" | "checkbox";
+
 export abstract class BitFormFieldControl {
   ariaDescribedBy: string;
   id: string;
@@ -5,4 +7,7 @@ export abstract class BitFormFieldControl {
   required: boolean;
   hasError: boolean;
   error: [string, any];
+  type?: InputTypes;
+  spellcheck?: boolean;
+  focus?: () => void;
 }
diff --git a/libs/components/src/form-field/form-field.component.ts b/libs/components/src/form-field/form-field.component.ts
index 9fbaeb688ca..9553641188e 100644
--- a/libs/components/src/form-field/form-field.component.ts
+++ b/libs/components/src/form-field/form-field.component.ts
@@ -7,9 +7,10 @@ import {
   ViewChild,
 } from "@angular/core";
 
+import { BitHintComponent } from "../form-control/hint.component";
+
 import { BitErrorComponent } from "./error.component";
 import { BitFormFieldControl } from "./form-field-control";
-import { BitHintComponent } from "./hint.component";
 import { BitPrefixDirective } from "./prefix.directive";
 import { BitSuffixDirective } from "./suffix.directive";
 
diff --git a/libs/components/src/form-field/form-field.module.ts b/libs/components/src/form-field/form-field.module.ts
index ec2fe456df6..989375167d4 100644
--- a/libs/components/src/form-field/form-field.module.ts
+++ b/libs/components/src/form-field/form-field.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from "@angular/core";
 
+import { FormControlModule } from "../form-control";
 import { BitInputDirective } from "../input/input.directive";
 import { InputModule } from "../input/input.module";
 import { MultiSelectComponent } from "../multi-select/multi-select.component";
@@ -9,32 +10,30 @@ import { SharedModule } from "../shared";
 import { BitErrorSummary } from "./error-summary.component";
 import { BitErrorComponent } from "./error.component";
 import { BitFormFieldComponent } from "./form-field.component";
-import { BitHintComponent } from "./hint.component";
-import { BitLabel } from "./label.directive";
+import { BitPasswordInputToggleDirective } from "./password-input-toggle.directive";
 import { BitPrefixDirective } from "./prefix.directive";
 import { BitSuffixDirective } from "./suffix.directive";
 
 @NgModule({
-  imports: [SharedModule, InputModule, MultiSelectModule],
-  exports: [
-    BitErrorComponent,
-    BitErrorSummary,
-    BitFormFieldComponent,
-    BitHintComponent,
-    BitLabel,
-    BitPrefixDirective,
-    BitSuffixDirective,
-    BitInputDirective,
-    MultiSelectComponent,
-  ],
+  imports: [SharedModule, FormControlModule, InputModule, MultiSelectModule],
   declarations: [
     BitErrorComponent,
     BitErrorSummary,
     BitFormFieldComponent,
-    BitHintComponent,
-    BitLabel,
+    BitPasswordInputToggleDirective,
     BitPrefixDirective,
     BitSuffixDirective,
   ],
+  exports: [
+    BitErrorComponent,
+    BitErrorSummary,
+    BitFormFieldComponent,
+    BitInputDirective,
+    BitPasswordInputToggleDirective,
+    BitPrefixDirective,
+    BitSuffixDirective,
+    MultiSelectComponent,
+    FormControlModule,
+  ],
 })
 export class FormFieldModule {}
diff --git a/libs/components/src/form-field/form-field.stories.ts b/libs/components/src/form-field/form-field.stories.ts
index 68d341e6922..329f71c0ff5 100644
--- a/libs/components/src/form-field/form-field.stories.ts
+++ b/libs/components/src/form-field/form-field.stories.ts
@@ -12,7 +12,9 @@ import { Meta, moduleMetadata, Story } from "@storybook/angular";
 import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
 
 import { ButtonModule } from "../button";
+import { CheckboxModule } from "../checkbox";
 import { InputModule } from "../input/input.module";
+import { RadioButtonModule } from "../radio-button";
 import { I18nMockService } from "../utils/i18n-mock.service";
 
 import { BitFormFieldComponent } from "./form-field.component";
@@ -23,7 +25,15 @@ export default {
   component: BitFormFieldComponent,
   decorators: [
     moduleMetadata({
-      imports: [FormsModule, ReactiveFormsModule, FormFieldModule, InputModule, ButtonModule],
+      imports: [
+        FormsModule,
+        ReactiveFormsModule,
+        FormFieldModule,
+        InputModule,
+        ButtonModule,
+        CheckboxModule,
+        RadioButtonModule,
+      ],
       providers: [
         {
           provide: I18nService,
@@ -55,6 +65,8 @@ const formObj = fb.group({
 const defaultFormObj = fb.group({
   name: ["", [Validators.required]],
   email: ["", [Validators.required, Validators.email, forbiddenNameValidator(/bit/i)]],
+  terms: [false, [Validators.requiredTrue]],
+  updates: ["yes"],
 });
 
 // Custom error message, `message` is shown as the error message
@@ -166,13 +178,9 @@ const ButtonGroupTemplate: Story<BitFormFieldComponent> = (args: BitFormFieldCom
   template: `
     <bit-form-field>
       <bit-label>Label</bit-label>
-      <input bitInput placeholder="Placeholder" />
-      <button bitSuffix bitButton>
-        <i aria-hidden="true" class="bwi bwi-lg bwi-eye"></i>
-      </button>
-      <button bitSuffix bitButton>
-        <i aria-hidden="true" class="bwi bwi-lg bwi-clone"></i>
-      </button>
+      <input bitInput placeholder="Placeholder" type="password" />
+      <button bitSuffix bitButton bitIconButton="bwi-eye"></button>
+      <button bitSuffix bitButton bitIconButton="bwi-clone"></button>
     </bit-form-field>
   `,
 });
@@ -188,12 +196,8 @@ const DisabledButtonInputGroupTemplate: Story<BitFormFieldComponent> = (
     <bit-form-field>
       <bit-label>Label</bit-label>
       <input bitInput placeholder="Placeholder" disabled />
-      <button bitSuffix bitButton disabled>
-        <i aria-hidden="true" class="bwi bwi-lg bwi-eye"></i>
-      </button>
-      <button bitSuffix bitButton>
-        <i aria-hidden="true" class="bwi bwi-lg bwi-clone"></i>
-      </button>
+      <button bitSuffix bitButton bitIconButton="bwi-eye" disabled></button>
+      <button bitSuffix bitButton bitIconButton="bwi-clone"></button>
     </bit-form-field>
   `,
 });
diff --git a/libs/components/src/form-field/password-input-toggle.directive.ts b/libs/components/src/form-field/password-input-toggle.directive.ts
new file mode 100644
index 00000000000..6189de636ea
--- /dev/null
+++ b/libs/components/src/form-field/password-input-toggle.directive.ts
@@ -0,0 +1,54 @@
+import {
+  AfterContentInit,
+  Directive,
+  EventEmitter,
+  Host,
+  HostListener,
+  Input,
+  OnChanges,
+  Output,
+} from "@angular/core";
+
+import { ButtonComponent } from "../button";
+
+import { BitFormFieldComponent } from "./form-field.component";
+
+@Directive({
+  selector: "[bitPasswordInputToggle]",
+})
+export class BitPasswordInputToggleDirective implements AfterContentInit, OnChanges {
+  @Input() toggled = false;
+  @Output() toggledChange = new EventEmitter<boolean>();
+
+  @HostListener("click") onClick() {
+    this.toggled = !this.toggled;
+    this.toggledChange.emit(this.toggled);
+
+    this.update();
+
+    this.formField.input?.focus();
+  }
+
+  constructor(@Host() private button: ButtonComponent, private formField: BitFormFieldComponent) {}
+
+  get icon() {
+    return this.toggled ? "bwi-eye-slash" : "bwi-eye";
+  }
+
+  ngOnChanges(): void {
+    this.update();
+  }
+
+  ngAfterContentInit(): void {
+    this.toggled = this.formField.input.type !== "password";
+    this.button.icon = this.icon;
+  }
+
+  private update() {
+    this.button.icon = this.icon;
+    if (this.formField.input?.type != null) {
+      this.formField.input.type = this.toggled ? "text" : "password";
+      this.formField.input.spellcheck = this.toggled ? false : undefined;
+    }
+  }
+}
diff --git a/libs/components/src/form-field/password-input-toggle.spec.ts b/libs/components/src/form-field/password-input-toggle.spec.ts
new file mode 100644
index 00000000000..5c6a9d48d00
--- /dev/null
+++ b/libs/components/src/form-field/password-input-toggle.spec.ts
@@ -0,0 +1,100 @@
+import { Component, DebugElement } from "@angular/core";
+import { ComponentFixture, TestBed } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+
+import { ButtonComponent, ButtonModule } from "../button";
+import { InputModule } from "../input/input.module";
+
+import { BitFormFieldControl } from "./form-field-control";
+import { BitFormFieldComponent } from "./form-field.component";
+import { FormFieldModule } from "./form-field.module";
+import { BitPasswordInputToggleDirective } from "./password-input-toggle.directive";
+
+@Component({
+  selector: "test-form-field",
+  template: `
+    <form>
+      <bit-form-field>
+        <bit-label>Password</bit-label>
+        <input bitInput type="password" />
+        <button type="button" bitButton bitSuffix bitPasswordInputToggle></button>
+      </bit-form-field>
+    </form>
+  `,
+})
+class TestFormFieldComponent {}
+
+describe("PasswordInputToggle", () => {
+  let fixture: ComponentFixture<TestFormFieldComponent>;
+  let button: ButtonComponent;
+  let input: BitFormFieldControl;
+  let toggle: DebugElement;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [FormFieldModule, ButtonModule, InputModule],
+      declarations: [TestFormFieldComponent],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TestFormFieldComponent);
+    fixture.detectChanges();
+
+    toggle = fixture.debugElement.query(By.directive(BitPasswordInputToggleDirective));
+    const buttonEl = fixture.debugElement.query(By.directive(ButtonComponent));
+    button = buttonEl.componentInstance;
+    const formFieldEl = fixture.debugElement.query(By.directive(BitFormFieldComponent));
+    const formField: BitFormFieldComponent = formFieldEl.componentInstance;
+    input = formField.input;
+  });
+
+  describe("initial state", () => {
+    it("has correct icon", () => {
+      expect(button.icon).toBe("bwi-eye");
+    });
+
+    it("input is type password", () => {
+      expect(input.type).toBe("password");
+    });
+
+    it("spellcheck is disabled", () => {
+      expect(input.spellcheck).toBe(undefined);
+    });
+  });
+
+  describe("when toggled", () => {
+    beforeEach(() => {
+      toggle.triggerEventHandler("click");
+    });
+
+    it("has correct icon", () => {
+      expect(button.icon).toBe("bwi-eye-slash");
+    });
+
+    it("input is type text", () => {
+      expect(input.type).toBe("text");
+    });
+
+    it("spellcheck is disabled", () => {
+      expect(input.spellcheck).toBe(false);
+    });
+  });
+
+  describe("when toggled twice", () => {
+    beforeEach(() => {
+      toggle.triggerEventHandler("click");
+      toggle.triggerEventHandler("click");
+    });
+
+    it("has correct icon", () => {
+      expect(button.icon).toBe("bwi-eye");
+    });
+
+    it("input is type password", () => {
+      expect(input.type).toBe("password");
+    });
+
+    it("spellcheck is disabled", () => {
+      expect(input.spellcheck).toBe(undefined);
+    });
+  });
+});
diff --git a/libs/components/src/form-field/password-input-toggle.stories.ts b/libs/components/src/form-field/password-input-toggle.stories.ts
new file mode 100644
index 00000000000..ff6e14c0c91
--- /dev/null
+++ b/libs/components/src/form-field/password-input-toggle.stories.ts
@@ -0,0 +1,77 @@
+import { FormsModule, ReactiveFormsModule } from "@angular/forms";
+import { Meta, moduleMetadata, Story } from "@storybook/angular";
+
+import { ButtonModule } from "../button";
+import { InputModule } from "../input/input.module";
+
+import { FormFieldModule } from "./form-field.module";
+import { BitPasswordInputToggleDirective } from "./password-input-toggle.directive";
+
+export default {
+  title: "Component Library/Form/Password Toggle",
+  component: BitPasswordInputToggleDirective,
+  decorators: [
+    moduleMetadata({
+      imports: [FormsModule, ReactiveFormsModule, FormFieldModule, InputModule, ButtonModule],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/file/f32LSg3jaegICkMu7rPARm/Tailwind-Component-Library-Update?node-id=1881%3A17689",
+    },
+    docs: {
+      description: {
+        component:
+          "Directive for toggling the visibility of a password input. Works by either having living inside a `bit-form-field` or by using the `toggled` two-way binding.",
+      },
+    },
+  },
+} as Meta;
+
+const Template: Story<BitPasswordInputToggleDirective> = (
+  args: BitPasswordInputToggleDirective
+) => ({
+  props: {
+    ...args,
+  },
+  template: `
+    <form>
+      <bit-form-field>
+        <bit-label>Password</bit-label>
+        <input bitInput type="password" />
+        <button type="button" bitButton bitSuffix bitPasswordInputToggle></button>
+      </bit-form-field>
+    </form>
+  `,
+});
+
+export const Default = Template.bind({});
+Default.props = {};
+
+const TemplateBinding: Story<BitPasswordInputToggleDirective> = (
+  args: BitPasswordInputToggleDirective
+) => ({
+  props: {
+    ...args,
+  },
+  template: `
+    <form>
+      <bit-form-field>
+        <bit-label>Password</bit-label>
+        <input bitInput type="password" />
+        <button type="button" bitButton bitSuffix bitPasswordInputToggle [(toggled)]="toggled"></button>
+      </bit-form-field>
+
+      <label class="tw-text-main">
+        Checked:
+        <input type="checkbox" [(ngModel)]="toggled" [ngModelOptions]="{standalone: true}" />
+      </label>
+    </form>
+  `,
+});
+
+export const Binding = TemplateBinding.bind({});
+Binding.props = {
+  toggled: false,
+};
diff --git a/libs/components/src/form/form.stories.ts b/libs/components/src/form/form.stories.ts
new file mode 100644
index 00000000000..050ea5e2c8f
--- /dev/null
+++ b/libs/components/src/form/form.stories.ts
@@ -0,0 +1,111 @@
+import {
+  AbstractControl,
+  FormsModule,
+  ReactiveFormsModule,
+  ValidationErrors,
+  ValidatorFn,
+  Validators,
+  FormBuilder,
+} from "@angular/forms";
+import { Meta, moduleMetadata, Story } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+
+import { ButtonModule } from "../button";
+import { CheckboxModule } from "../checkbox";
+import { FormControlModule } from "../form-control";
+import { FormFieldModule } from "../form-field";
+import { InputModule } from "../input/input.module";
+import { RadioButtonModule } from "../radio-button";
+import { I18nMockService } from "../utils/i18n-mock.service";
+
+export default {
+  title: "Component Library/Form",
+  decorators: [
+    moduleMetadata({
+      imports: [
+        FormsModule,
+        ReactiveFormsModule,
+        FormFieldModule,
+        InputModule,
+        ButtonModule,
+        FormControlModule,
+        CheckboxModule,
+        RadioButtonModule,
+      ],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              required: "required",
+              checkboxRequired: "Option is required",
+              inputRequired: "Input is required.",
+              inputEmail: "Input is not an email-address.",
+            });
+          },
+        },
+      ],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=1881%3A17689",
+    },
+  },
+} as Meta;
+
+const fb = new FormBuilder();
+const exampleFormObj = fb.group({
+  name: ["", [Validators.required]],
+  email: ["", [Validators.required, Validators.email, forbiddenNameValidator(/bit/i)]],
+  terms: [false, [Validators.requiredTrue]],
+  updates: ["yes"],
+});
+
+// Custom error message, `message` is shown as the error message
+function forbiddenNameValidator(nameRe: RegExp): ValidatorFn {
+  return (control: AbstractControl): ValidationErrors | null => {
+    const forbidden = nameRe.test(control.value);
+    return forbidden ? { forbiddenName: { message: "forbiddenName" } } : null;
+  };
+}
+
+const FullExampleTemplate: Story = (args) => ({
+  props: {
+    formObj: exampleFormObj,
+    submit: () => exampleFormObj.markAllAsTouched(),
+    ...args,
+  },
+  template: `
+    <form [formGroup]="formObj" (ngSubmit)="submit()">
+      <bit-form-field>
+        <bit-label>Name</bit-label>
+        <input bitInput formControlName="name" />
+      </bit-form-field>
+
+      <bit-form-field>
+        <bit-label>Email</bit-label>
+        <input bitInput formControlName="email" />
+      </bit-form-field>
+
+      <bit-form-control>
+        <bit-label>Agree to terms</bit-label>
+        <input type="checkbox" bitCheckbox formControlName="terms">
+        <bit-hint>Required for the service to work properly</bit-hint>
+      </bit-form-control>
+
+      <bit-radio-group formControlName="updates">
+        <bit-label>Subscribe to updates?</bit-label>
+        <bit-radio-button value="yes">Yes</bit-radio-button>
+        <bit-radio-button value="no">No</bit-radio-button>
+        <bit-radio-button value="later">Decide later</bit-radio-button>
+      </bit-radio-group>
+
+      <button type="submit" bitButton buttonType="primary">Submit</button>
+    </form>
+  `,
+});
+
+export const FullExample = FullExampleTemplate.bind({});
diff --git a/libs/components/src/icon-button/icon-button.component.ts b/libs/components/src/icon-button/icon-button.component.ts
index ef9474bf98d..c7fe53695b6 100644
--- a/libs/components/src/icon-button/icon-button.component.ts
+++ b/libs/components/src/icon-button/icon-button.component.ts
@@ -79,7 +79,7 @@ const sizes: Record<IconButtonSize, string[]> = {
 };
 
 @Component({
-  selector: "button[bitIconButton]",
+  selector: "button[bitIconButton]:not(button[bitButton])",
   templateUrl: "icon-button.component.html",
   providers: [{ provide: ButtonLikeAbstraction, useExisting: BitIconButtonComponent }],
 })
diff --git a/libs/components/src/index.ts b/libs/components/src/index.ts
index 8abb6bade3d..abae5395575 100644
--- a/libs/components/src/index.ts
+++ b/libs/components/src/index.ts
@@ -4,6 +4,7 @@ export * from "./badge";
 export * from "./banner";
 export * from "./button";
 export * from "./callout";
+export * from "./checkbox";
 export * from "./dialog";
 export * from "./form-field";
 export * from "./icon-button";
diff --git a/libs/components/src/input/input.directive.ts b/libs/components/src/input/input.directive.ts
index 619b0229057..6821faf69da 100644
--- a/libs/components/src/input/input.directive.ts
+++ b/libs/components/src/input/input.directive.ts
@@ -1,7 +1,7 @@
-import { Directive, HostBinding, Input, Optional, Self } from "@angular/core";
+import { Directive, ElementRef, HostBinding, Input, NgZone, Optional, Self } from "@angular/core";
 import { NgControl, Validators } from "@angular/forms";
 
-import { BitFormFieldControl } from "../form-field/form-field-control";
+import { BitFormFieldControl, InputTypes } from "../form-field/form-field-control";
 
 // Increments for each instance of this component
 let nextId = 0;
@@ -41,14 +41,14 @@ export class BitInputDirective implements BitFormFieldControl {
 
   @HostBinding("attr.aria-describedby") ariaDescribedBy: string;
 
-  get labelForId(): string {
-    return this.id;
-  }
-
   @HostBinding("attr.aria-invalid") get ariaInvalid() {
     return this.hasError ? true : undefined;
   }
 
+  @HostBinding("attr.type") @Input() type?: InputTypes;
+
+  @HostBinding("attr.spellcheck") @Input() spellcheck?: boolean;
+
   @HostBinding()
   @Input()
   get required() {
@@ -62,6 +62,10 @@ export class BitInputDirective implements BitFormFieldControl {
   @Input() hasPrefix = false;
   @Input() hasSuffix = false;
 
+  get labelForId(): string {
+    return this.id;
+  }
+
   get hasError() {
     return this.ngControl?.status === "INVALID" && this.ngControl?.touched;
   }
@@ -70,5 +74,18 @@ export class BitInputDirective implements BitFormFieldControl {
     const key = Object.keys(this.ngControl.errors)[0];
     return [key, this.ngControl.errors[key]];
   }
-  constructor(@Optional() @Self() private ngControl: NgControl) {}
+
+  constructor(
+    @Optional() @Self() private ngControl: NgControl,
+    private ngZone: NgZone,
+    private elementRef: ElementRef<HTMLInputElement>
+  ) {}
+
+  focus() {
+    this.ngZone.runOutsideAngular(() => {
+      const end = this.elementRef.nativeElement.value.length;
+      this.elementRef.nativeElement.setSelectionRange(end, end);
+      this.elementRef.nativeElement.focus();
+    });
+  }
 }
diff --git a/libs/components/src/radio-button/index.ts b/libs/components/src/radio-button/index.ts
new file mode 100644
index 00000000000..b832cf2c5c9
--- /dev/null
+++ b/libs/components/src/radio-button/index.ts
@@ -0,0 +1,3 @@
+export * from "./radio-button.module";
+export * from "./radio-button.component";
+export * from "./radio-group.component";
diff --git a/libs/components/src/radio-button/radio-button.component.html b/libs/components/src/radio-button/radio-button.component.html
new file mode 100644
index 00000000000..6ecbbff862d
--- /dev/null
+++ b/libs/components/src/radio-button/radio-button.component.html
@@ -0,0 +1,14 @@
+<bit-form-control inline>
+  <input
+    type="radio"
+    bitRadio
+    [id]="inputId"
+    [name]="name"
+    [disabled]="disabled"
+    [value]="value"
+    [checked]="selected"
+    (change)="onInputChange()"
+    (blur)="onBlur()"
+  />
+  <bit-label><ng-content></ng-content></bit-label>
+</bit-form-control>
diff --git a/libs/components/src/radio-button/radio-button.component.spec.ts b/libs/components/src/radio-button/radio-button.component.spec.ts
new file mode 100644
index 00000000000..1d2759c1af1
--- /dev/null
+++ b/libs/components/src/radio-button/radio-button.component.spec.ts
@@ -0,0 +1,79 @@
+import { Component } from "@angular/core";
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { By } from "@angular/platform-browser";
+
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+
+import { I18nMockService } from "../utils/i18n-mock.service";
+
+import { RadioButtonModule } from "./radio-button.module";
+import { RadioGroupComponent } from "./radio-group.component";
+
+describe("RadioButton", () => {
+  let mockGroupComponent: MockedButtonGroupComponent;
+  let fixture: ComponentFixture<TestApp>;
+  let testAppComponent: TestApp;
+  let radioButton: HTMLInputElement;
+
+  beforeEach(waitForAsync(() => {
+    mockGroupComponent = new MockedButtonGroupComponent();
+
+    TestBed.configureTestingModule({
+      imports: [RadioButtonModule],
+      declarations: [TestApp],
+      providers: [
+        { provide: RadioGroupComponent, useValue: mockGroupComponent },
+        { provide: I18nService, useValue: new I18nMockService({}) },
+      ],
+    });
+
+    TestBed.compileComponents();
+    fixture = TestBed.createComponent(TestApp);
+    fixture.detectChanges();
+    testAppComponent = fixture.debugElement.componentInstance;
+    radioButton = fixture.debugElement.query(By.css("input[type=radio]")).nativeElement;
+  }));
+
+  it("should emit value when clicking on radio button", () => {
+    testAppComponent.value = "value";
+    fixture.detectChanges();
+
+    radioButton.click();
+    fixture.detectChanges();
+
+    expect(mockGroupComponent.onInputChange).toHaveBeenCalledWith("value");
+  });
+
+  it("should check radio button when selected matches value", () => {
+    testAppComponent.value = "value";
+    fixture.detectChanges();
+
+    mockGroupComponent.selected = "value";
+    fixture.detectChanges();
+
+    expect(radioButton.checked).toBe(true);
+  });
+
+  it("should not check radio button when selected does not match value", () => {
+    testAppComponent.value = "value";
+    fixture.detectChanges();
+
+    mockGroupComponent.selected = "nonMatchingValue";
+    fixture.detectChanges();
+
+    expect(radioButton.checked).toBe(false);
+  });
+});
+
+class MockedButtonGroupComponent implements Partial<RadioGroupComponent> {
+  onInputChange = jest.fn();
+  selected = null;
+}
+
+@Component({
+  selector: "test-app",
+  template: ` <bit-radio-button [value]="value">Element</bit-radio-button>`,
+})
+class TestApp {
+  value?: string;
+}
diff --git a/libs/components/src/radio-button/radio-button.component.ts b/libs/components/src/radio-button/radio-button.component.ts
new file mode 100644
index 00000000000..32aa6e5577a
--- /dev/null
+++ b/libs/components/src/radio-button/radio-button.component.ts
@@ -0,0 +1,40 @@
+import { Component, HostBinding, Input } from "@angular/core";
+
+import { RadioGroupComponent } from "./radio-group.component";
+
+let nextId = 0;
+
+@Component({
+  selector: "bit-radio-button",
+  templateUrl: "radio-button.component.html",
+})
+export class RadioButtonComponent {
+  @HostBinding("attr.id") @Input() id = `bit-radio-button-${nextId++}`;
+  @Input() value: unknown;
+
+  constructor(private groupComponent: RadioGroupComponent) {}
+
+  get inputId() {
+    return `${this.id}-input`;
+  }
+
+  get name() {
+    return this.groupComponent.name;
+  }
+
+  get selected() {
+    return this.groupComponent.selected === this.value;
+  }
+
+  get disabled() {
+    return this.groupComponent.disabled;
+  }
+
+  protected onInputChange() {
+    this.groupComponent.onInputChange(this.value);
+  }
+
+  protected onBlur() {
+    this.groupComponent.onBlur();
+  }
+}
diff --git a/libs/components/src/radio-button/radio-button.module.ts b/libs/components/src/radio-button/radio-button.module.ts
new file mode 100644
index 00000000000..11b5bc3732a
--- /dev/null
+++ b/libs/components/src/radio-button/radio-button.module.ts
@@ -0,0 +1,15 @@
+import { CommonModule } from "@angular/common";
+import { NgModule } from "@angular/core";
+
+import { FormControlModule } from "../form-control";
+
+import { RadioButtonComponent } from "./radio-button.component";
+import { RadioGroupComponent } from "./radio-group.component";
+import { RadioInputComponent } from "./radio-input.component";
+
+@NgModule({
+  imports: [CommonModule, FormControlModule],
+  declarations: [RadioInputComponent, RadioButtonComponent, RadioGroupComponent],
+  exports: [FormControlModule, RadioInputComponent, RadioButtonComponent, RadioGroupComponent],
+})
+export class RadioButtonModule {}
diff --git a/libs/components/src/radio-button/radio-button.stories.ts b/libs/components/src/radio-button/radio-button.stories.ts
new file mode 100644
index 00000000000..d2689e84d2c
--- /dev/null
+++ b/libs/components/src/radio-button/radio-button.stories.ts
@@ -0,0 +1,107 @@
+import { Component, Input } from "@angular/core";
+import { FormsModule, ReactiveFormsModule, FormBuilder } from "@angular/forms";
+import { Meta, moduleMetadata, Story } from "@storybook/angular";
+
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+
+import { I18nMockService } from "../utils/i18n-mock.service";
+
+import { RadioButtonModule } from "./radio-button.module";
+
+const template = `
+  <form [formGroup]="formObj">
+    <bit-radio-group formControlName="radio" aria-label="Example radio group">
+      <bit-label *ngIf="label">Group of radio buttons</bit-label>
+      <bit-radio-button [value]="TestValue.First" id="radio-first">First</bit-radio-button>
+      <bit-radio-button [value]="TestValue.Second" id="radio-second">Second</bit-radio-button>
+      <bit-radio-button [value]="TestValue.Third" id="radio-third">Third</bit-radio-button>
+    </bit-radio-group>
+  </form>`;
+
+enum TestValue {
+  First,
+  Second,
+  Third,
+}
+
+@Component({
+  selector: "app-example",
+  template,
+})
+class ExampleComponent {
+  protected TestValue = TestValue;
+
+  protected formObj = this.formBuilder.group({
+    radio: TestValue.First,
+  });
+
+  @Input() label: boolean;
+
+  @Input() set selected(value: TestValue) {
+    this.formObj.patchValue({ radio: value });
+  }
+
+  @Input() set disabled(disable: boolean) {
+    if (disable) {
+      this.formObj.disable();
+    } else {
+      this.formObj.enable();
+    }
+  }
+
+  constructor(private formBuilder: FormBuilder) {}
+}
+
+export default {
+  title: "Component Library/Form/Radio Button",
+  component: ExampleComponent,
+  decorators: [
+    moduleMetadata({
+      declarations: [ExampleComponent],
+      imports: [FormsModule, ReactiveFormsModule, RadioButtonModule],
+      providers: [
+        {
+          provide: I18nService,
+          useFactory: () => {
+            return new I18nMockService({
+              required: "required",
+              inputRequired: "Input is required.",
+              inputEmail: "Input is not an email-address.",
+            });
+          },
+        },
+      ],
+    }),
+  ],
+  parameters: {
+    design: {
+      type: "figma",
+      url: "https://www.figma.com/file/Zt3YSeb6E6lebAffrNLa0h/Tailwind-Component-Library?node-id=3930%3A16850&t=xXPx6GJYsJfuMQPE-4",
+    },
+  },
+  args: {
+    selected: TestValue.First,
+    disabled: false,
+    label: true,
+  },
+  argTypes: {
+    selected: {
+      options: [TestValue.First, TestValue.Second, TestValue.Third],
+      control: {
+        type: "inline-radio",
+        labels: {
+          [TestValue.First]: "First",
+          [TestValue.Second]: "Second",
+          [TestValue.Third]: "Third",
+        },
+      },
+    },
+  },
+} as Meta;
+
+const DefaultTemplate: Story<ExampleComponent> = (args: ExampleComponent) => ({
+  props: args,
+  template: `<app-example [selected]="selected" [disabled]="disabled" [label]="label"></app-example>`,
+});
+
+export const Default = DefaultTemplate.bind({});
diff --git a/libs/components/src/radio-button/radio-group.component.html b/libs/components/src/radio-button/radio-group.component.html
new file mode 100644
index 00000000000..2931020b2b8
--- /dev/null
+++ b/libs/components/src/radio-button/radio-group.component.html
@@ -0,0 +1,14 @@
+<ng-container *ngIf="label">
+  <fieldset>
+    <legend class="tw-mb-1 tw-block tw-text-sm tw-font-semibold tw-text-main">
+      <ng-content select="bit-label"></ng-content>
+    </legend>
+    <ng-container *ngTemplateOutlet="content"></ng-container>
+  </fieldset>
+</ng-container>
+
+<ng-container *ngIf="!label">
+  <ng-container *ngTemplateOutlet="content"></ng-container>
+</ng-container>
+
+<ng-template #content><ng-content></ng-content></ng-template>
diff --git a/libs/components/src/radio-button/radio-group.component.spec.ts b/libs/components/src/radio-button/radio-group.component.spec.ts
new file mode 100644
index 00000000000..d9df8e2d706
--- /dev/null
+++ b/libs/components/src/radio-button/radio-group.component.spec.ts
@@ -0,0 +1,79 @@
+import { Component } from "@angular/core";
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { FormsModule } from "@angular/forms";
+import { By } from "@angular/platform-browser";
+
+import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
+
+import { I18nMockService } from "../utils/i18n-mock.service";
+
+import { RadioButtonComponent } from "./radio-button.component";
+import { RadioButtonModule } from "./radio-button.module";
+
+describe("RadioGroupComponent", () => {
+  let fixture: ComponentFixture<TestApp>;
+  let testAppComponent: TestApp;
+  let buttonElements: RadioButtonComponent[];
+  let radioButtons: HTMLInputElement[];
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [FormsModule, RadioButtonModule],
+      declarations: [TestApp],
+      providers: [{ provide: I18nService, useValue: new I18nMockService({}) }],
+    });
+
+    TestBed.compileComponents();
+    fixture = TestBed.createComponent(TestApp);
+    fixture.detectChanges();
+    testAppComponent = fixture.debugElement.componentInstance;
+    buttonElements = fixture.debugElement
+      .queryAll(By.css("bit-radio-button"))
+      .map((e) => e.componentInstance);
+    radioButtons = fixture.debugElement
+      .queryAll(By.css("input[type=radio]"))
+      .map((e) => e.nativeElement);
+
+    fixture.detectChanges();
+  }));
+
+  it("should select second element when setting selected to second", async () => {
+    testAppComponent.selected = "second";
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    expect(buttonElements[1].selected).toBe(true);
+  });
+
+  it("should not select second element when setting selected to third", async () => {
+    testAppComponent.selected = "third";
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    expect(buttonElements[1].selected).toBe(false);
+  });
+
+  it("should emit new value when changing selection by clicking on radio button", async () => {
+    testAppComponent.selected = "first";
+    fixture.detectChanges();
+    await fixture.whenStable();
+
+    radioButtons[1].click();
+
+    expect(testAppComponent.selected).toBe("second");
+  });
+});
+
+@Component({
+  selector: "test-app",
+  template: `
+    <bit-radio-group [(ngModel)]="selected">
+      <bit-radio-button value="first">First</bit-radio-button>
+      <bit-radio-button value="second">Second</bit-radio-button>
+      <bit-radio-button value="third">Third</bit-radio-button>
+    </bit-radio-group>
+  `,
+})
+class TestApp {
+  selected?: string;
+}
diff --git a/libs/components/src/radio-button/radio-group.component.ts b/libs/components/src/radio-button/radio-group.component.ts
new file mode 100644
index 00000000000..4b882303941
--- /dev/null
+++ b/libs/components/src/radio-button/radio-group.component.ts
@@ -0,0 +1,63 @@
+import { Component, ContentChild, HostBinding, Input, Optional, Self } from "@angular/core";
+import { ControlValueAccessor, NgControl } from "@angular/forms";
+
+import { BitLabel } from "../form-control/label.directive";
+
+let nextId = 0;
+
+@Component({
+  selector: "bit-radio-group",
+  templateUrl: "radio-group.component.html",
+})
+export class RadioGroupComponent implements ControlValueAccessor {
+  selected: unknown;
+  disabled = false;
+
+  private _name?: string;
+  @Input() get name() {
+    return this._name ?? this.ngControl?.name?.toString();
+  }
+  set name(value: string) {
+    this._name = value;
+  }
+
+  @HostBinding("attr.role") role = "radiogroup";
+  @HostBinding("attr.id") @Input() id = `bit-radio-group-${nextId++}`;
+
+  @ContentChild(BitLabel) protected label: BitLabel;
+
+  constructor(@Optional() @Self() private ngControl?: NgControl) {
+    if (ngControl != null) {
+      ngControl.valueAccessor = this;
+    }
+  }
+
+  // ControlValueAccessor
+  onChange: (value: unknown) => void;
+  onTouched: () => void;
+
+  writeValue(value: boolean): void {
+    this.selected = value;
+  }
+
+  registerOnChange(fn: (value: unknown) => void): void {
+    this.onChange = fn;
+  }
+
+  registerOnTouched(fn: () => void): void {
+    this.onTouched = fn;
+  }
+
+  setDisabledState(isDisabled: boolean): void {
+    this.disabled = isDisabled;
+  }
+
+  onInputChange(value: unknown) {
+    this.selected = value;
+    this.onChange(this.selected);
+  }
+
+  onBlur() {
+    this.onTouched();
+  }
+}
diff --git a/libs/components/src/radio-button/radio-input.component.ts b/libs/components/src/radio-button/radio-input.component.ts
new file mode 100644
index 00000000000..bc767add6e5
--- /dev/null
+++ b/libs/components/src/radio-button/radio-input.component.ts
@@ -0,0 +1,99 @@
+import { Component, HostBinding, Input, Optional, Self } from "@angular/core";
+import { NgControl, Validators } from "@angular/forms";
+
+import { BitFormControlAbstraction } from "../form-control";
+
+let nextId = 0;
+
+@Component({
+  selector: "input[type=radio][bitRadio]",
+  template: "",
+  providers: [{ provide: BitFormControlAbstraction, useExisting: RadioInputComponent }],
+})
+export class RadioInputComponent implements BitFormControlAbstraction {
+  @HostBinding("attr.id") @Input() id = `bit-radio-input-${nextId++}`;
+
+  @HostBinding("class")
+  protected inputClasses = [
+    "tw-appearance-none",
+    "tw-outline-none",
+    "tw-relative",
+    "tw-transition",
+    "tw-cursor-pointer",
+    "tw-inline-block",
+    "tw-rounded-full",
+    "tw-border",
+    "tw-border-solid",
+    "tw-border-secondary-500",
+    "tw-w-3.5",
+    "tw-h-3.5",
+    "tw-mr-1.5",
+    "tw-bottom-[-1px]", // Fix checkbox looking off-center
+
+    "hover:tw-border-2",
+    "[&>label:hover]:tw-border-2",
+
+    "before:tw-content-['']",
+    "before:tw-transition",
+    "before:tw-block",
+    "before:tw-absolute",
+    "before:tw-rounded-full",
+    "before:tw-inset-[2px]",
+
+    "focus-visible:tw-ring-2",
+    "focus-visible:tw-ring-offset-2",
+    "focus-visible:tw-ring-primary-700",
+
+    "disabled:tw-cursor-auto",
+    "disabled:tw-border",
+    "disabled:tw-bg-secondary-100",
+
+    "checked:tw-bg-text-contrast",
+    "checked:tw-border-primary-500",
+
+    "checked:hover:tw-border",
+    "checked:hover:tw-border-primary-700",
+    "checked:hover:before:tw-bg-primary-700",
+    "[&>label:hover]:checked:tw-bg-primary-700",
+    "[&>label:hover]:checked:tw-border-primary-700",
+
+    "checked:before:tw-bg-primary-500",
+
+    "checked:disabled:tw-border-secondary-100",
+    "checked:disabled:tw-bg-secondary-100",
+
+    "checked:disabled:before:tw-bg-text-muted",
+  ];
+
+  constructor(@Optional() @Self() private ngControl?: NgControl) {}
+
+  @HostBinding()
+  @Input()
+  get disabled() {
+    return this._disabled ?? this.ngControl?.disabled ?? false;
+  }
+  set disabled(value: any) {
+    this._disabled = value != null && value !== false;
+  }
+  private _disabled: boolean;
+
+  @Input()
+  get required() {
+    return (
+      this._required ?? this.ngControl?.control?.hasValidator(Validators.requiredTrue) ?? false
+    );
+  }
+  set required(value: any) {
+    this._required = value != null && value !== false;
+  }
+  private _required: boolean;
+
+  get hasError() {
+    return this.ngControl?.status === "INVALID" && this.ngControl?.touched;
+  }
+
+  get error(): [string, any] {
+    const key = Object.keys(this.ngControl.errors)[0];
+    return [key, this.ngControl.errors[key]];
+  }
+}
diff --git a/libs/electron/jest.config.js b/libs/electron/jest.config.js
deleted file mode 100644
index 104e723a844..00000000000
--- a/libs/electron/jest.config.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const { pathsToModuleNameMapper } = require("ts-jest");
-
-const { compilerOptions } = require("../shared/tsconfig.libs");
-
-const sharedConfig = require("../../libs/shared/jest.config.base");
-
-module.exports = {
-  ...sharedConfig,
-  preset: "ts-jest",
-  testEnvironment: "jsdom",
-  moduleNameMapper: pathsToModuleNameMapper(compilerOptions?.paths || {}, {
-    prefix: "<rootDir>/",
-  }),
-};
diff --git a/libs/electron/package.json b/libs/electron/package.json
deleted file mode 100644
index 1ecbea89a13..00000000000
--- a/libs/electron/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "name": "@bitwarden/electron",
-  "version": "0.0.0",
-  "description": "Common code used across Bitwarden JavaScript projects.",
-  "keywords": [
-    "bitwarden"
-  ],
-  "author": "Bitwarden Inc.",
-  "homepage": "https://bitwarden.com",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/bitwarden/jslib"
-  },
-  "license": "GPL-3.0",
-  "scripts": {
-    "clean": "rimraf dist/**/*",
-    "build": "npm run clean && tsc",
-    "build:watch": "npm run clean && tsc -watch"
-  },
-  "dependencies": {
-    "@bitwarden/common": "file:../common"
-  }
-}
diff --git a/libs/electron/src/baseMenu.ts b/libs/electron/src/baseMenu.ts
deleted file mode 100644
index 6682f896c6f..00000000000
--- a/libs/electron/src/baseMenu.ts
+++ /dev/null
@@ -1,225 +0,0 @@
-import { Menu, MenuItemConstructorOptions } from "electron";
-
-import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
-
-import { WindowMain } from "./window.main";
-
-export class BaseMenu {
-  protected editMenuItemOptions: MenuItemConstructorOptions;
-  protected viewSubMenuItemOptions: MenuItemConstructorOptions[];
-  protected windowMenuItemOptions: MenuItemConstructorOptions;
-  protected macAppMenuItemOptions: MenuItemConstructorOptions[];
-  protected macWindowSubmenuOptions: MenuItemConstructorOptions[];
-
-  constructor(protected i18nService: I18nService, protected windowMain: WindowMain) {}
-
-  protected initProperties() {
-    this.editMenuItemOptions = {
-      label: this.i18nService.t("edit"),
-      submenu: [
-        {
-          label: this.i18nService.t("undo"),
-          role: "undo",
-        },
-        {
-          label: this.i18nService.t("redo"),
-          role: "redo",
-        },
-        { type: "separator" },
-        {
-          label: this.i18nService.t("cut"),
-          role: "cut",
-        },
-        {
-          label: this.i18nService.t("copy"),
-          role: "copy",
-        },
-        {
-          label: this.i18nService.t("paste"),
-          role: "paste",
-        },
-        { type: "separator" },
-        {
-          label: this.i18nService.t("selectAll"),
-          role: "selectAll",
-        },
-      ],
-    };
-
-    this.viewSubMenuItemOptions = [
-      {
-        label: this.i18nService.t("zoomIn"),
-        role: "zoomIn",
-        accelerator: "CmdOrCtrl+=",
-      },
-      {
-        label: this.i18nService.t("zoomOut"),
-        role: "zoomOut",
-        accelerator: "CmdOrCtrl+-",
-      },
-      {
-        label: this.i18nService.t("resetZoom"),
-        role: "resetZoom",
-        accelerator: "CmdOrCtrl+0",
-      },
-      { type: "separator" },
-      {
-        label: this.i18nService.t("toggleFullScreen"),
-        role: "togglefullscreen",
-      },
-      { type: "separator" },
-      {
-        label: this.i18nService.t("reload"),
-        role: "forceReload",
-      },
-      {
-        label: this.i18nService.t("toggleDevTools"),
-        role: "toggleDevTools",
-        accelerator: "F12",
-      },
-    ];
-
-    this.windowMenuItemOptions = {
-      label: this.i18nService.t("window"),
-      role: "window",
-      submenu: [
-        {
-          label: this.i18nService.t("minimize"),
-          role: "minimize",
-        },
-        {
-          label: this.i18nService.t("close"),
-          role: "close",
-        },
-      ],
-    };
-
-    if (process.platform === "darwin") {
-      this.macAppMenuItemOptions = [
-        {
-          label: this.i18nService.t("services"),
-          role: "services",
-          submenu: [],
-        },
-        { type: "separator" },
-        {
-          label: this.i18nService.t("hideBitwarden"),
-          role: "hide",
-        },
-        {
-          label: this.i18nService.t("hideOthers"),
-          role: "hideOthers",
-        },
-        {
-          label: this.i18nService.t("showAll"),
-          role: "unhide",
-        },
-        { type: "separator" },
-        {
-          label: this.i18nService.t("quitBitwarden"),
-          role: "quit",
-        },
-      ];
-
-      this.macWindowSubmenuOptions = [
-        {
-          label: this.i18nService.t("minimize"),
-          role: "minimize",
-        },
-        {
-          label: this.i18nService.t("zoom"),
-          role: "zoom",
-        },
-        { type: "separator" },
-        {
-          label: this.i18nService.t("bringAllToFront"),
-          role: "front",
-        },
-        {
-          label: this.i18nService.t("close"),
-          role: "close",
-        },
-      ];
-    }
-  }
-
-  protected initContextMenu() {
-    if (this.windowMain.win == null) {
-      return;
-    }
-
-    const selectionMenu = Menu.buildFromTemplate([
-      {
-        label: this.i18nService.t("copy"),
-        role: "copy",
-      },
-      { type: "separator" },
-      {
-        label: this.i18nService.t("selectAll"),
-        role: "selectAll",
-      },
-    ]);
-
-    const inputMenu = Menu.buildFromTemplate([
-      {
-        label: this.i18nService.t("undo"),
-        role: "undo",
-      },
-      {
-        label: this.i18nService.t("redo"),
-        role: "redo",
-      },
-      { type: "separator" },
-      {
-        label: this.i18nService.t("cut"),
-        role: "cut",
-        enabled: false,
-      },
-      {
-        label: this.i18nService.t("copy"),
-        role: "copy",
-        enabled: false,
-      },
-      {
-        label: this.i18nService.t("paste"),
-        role: "paste",
-      },
-      { type: "separator" },
-      {
-        label: this.i18nService.t("selectAll"),
-        role: "selectAll",
-      },
-    ]);
-
-    const inputSelectionMenu = Menu.buildFromTemplate([
-      {
-        label: this.i18nService.t("cut"),
-        role: "cut",
-      },
-      {
-        label: this.i18nService.t("copy"),
-        role: "copy",
-      },
-      {
-        label: this.i18nService.t("paste"),
-        role: "paste",
-      },
-      { type: "separator" },
-      {
-        label: this.i18nService.t("selectAll"),
-        role: "selectAll",
-      },
-    ]);
-
-    this.windowMain.win.webContents.on("context-menu", (e, props) => {
-      const selected = props.selectionText && props.selectionText.trim() !== "";
-      if (props.isEditable && selected) {
-        inputSelectionMenu.popup({ window: this.windowMain.win });
-      } else if (props.isEditable) {
-        inputMenu.popup({ window: this.windowMain.win });
-      } else if (selected) {
-        selectionMenu.popup({ window: this.windowMain.win });
-      }
-    });
-  }
-}
diff --git a/libs/electron/src/globals.d.ts b/libs/electron/src/globals.d.ts
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/libs/electron/tsconfig.json b/libs/electron/tsconfig.json
deleted file mode 100644
index 6004a56fb55..00000000000
--- a/libs/electron/tsconfig.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "extends": "../shared/tsconfig.libs",
-  "include": ["src", "spec"],
-  "exclude": ["node_modules", "dist"]
-}
diff --git a/libs/electron/tsconfig.spec.json b/libs/electron/tsconfig.spec.json
deleted file mode 100644
index fc8520e7376..00000000000
--- a/libs/electron/tsconfig.spec.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "./tsconfig.json"
-}
diff --git a/libs/shared/tsconfig.libs.json b/libs/shared/tsconfig.libs.json
index 5ac6b719fac..bb739dcfa2c 100644
--- a/libs/shared/tsconfig.libs.json
+++ b/libs/shared/tsconfig.libs.json
@@ -4,7 +4,6 @@
     "paths": {
       "@bitwarden/common/*": ["../common/src/*"],
       "@bitwarden/angular/*": ["../angular/src/*"],
-      "@bitwarden/electron/*": ["../electron/src/*"],
       "@bitwarden/node/*": ["../node/src/*"]
     }
   }
diff --git a/package-lock.json b/package-lock.json
index fb69cf82452..72c67ede2be 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -181,7 +181,7 @@
     },
     "apps/cli": {
       "name": "@bitwarden/cli",
-      "version": "2022.10.0",
+      "version": "2022.11.0",
       "license": "GPL-3.0-only",
       "dependencies": {
         "@koa/multer": "^3.0.0",
@@ -216,7 +216,7 @@
     },
     "apps/desktop": {
       "name": "@bitwarden/desktop",
-      "version": "2022.10.2",
+      "version": "2022.11.0",
       "hasInstallScript": true,
       "license": "GPL-3.0"
     },
@@ -230,7 +230,7 @@
     },
     "apps/web": {
       "name": "@bitwarden/web-vault",
-      "version": "2022.10.2"
+      "version": "2022.11.2"
     },
     "libs/angular": {
       "name": "@bitwarden/angular",
@@ -246,14 +246,6 @@
       "name": "@bitwarden/components",
       "version": "0.0.0"
     },
-    "libs/electron": {
-      "name": "@bitwarden/electron",
-      "version": "0.0.0",
-      "license": "GPL-3.0",
-      "dependencies": {
-        "@bitwarden/common": "file:../common"
-      }
-    },
     "libs/node": {
       "name": "@bitwarden/node",
       "version": "0.0.0",
@@ -3092,10 +3084,6 @@
       "resolved": "apps/desktop/desktop_native",
       "link": true
     },
-    "node_modules/@bitwarden/electron": {
-      "resolved": "libs/electron",
-      "link": true
-    },
     "node_modules/@bitwarden/node": {
       "resolved": "libs/node",
       "link": true
@@ -45193,12 +45181,6 @@
         "@napi-rs/cli": "^2.6.2"
       }
     },
-    "@bitwarden/electron": {
-      "version": "file:libs/electron",
-      "requires": {
-        "@bitwarden/common": "file:../common"
-      }
-    },
     "@bitwarden/node": {
       "version": "file:libs/node",
       "requires": {
diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json
index cf7bbd7c960..6988851dbc5 100644
--- a/tsconfig.eslint.json
+++ b/tsconfig.eslint.json
@@ -17,7 +17,6 @@
     "paths": {
       "@bitwarden/common/*": ["./libs/common/src/*"],
       "@bitwarden/angular/*": ["./libs/angular/src/*"],
-      "@bitwarden/electron/*": ["./libs/electron/src/*"],
       "@bitwarden/node/*": ["./libs/node/src/*"],
       "@bitwarden/components": ["./libs/components/src"]
     },
diff --git a/tsconfig.json b/tsconfig.json
index 6761a4f5c20..d9189e23eb4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,7 +17,6 @@
     "paths": {
       "@bitwarden/common/*": ["./libs/common/src/*"],
       "@bitwarden/angular/*": ["./libs/angular/src/*"],
-      "@bitwarden/electron/*": ["./libs/electron/src/*"],
       "@bitwarden/node/*": ["./libs/node/src/*"],
       "@bitwarden/components": ["./libs/components/src"]
     },